telepathy-gabble: console UI: don't bother preparing the channel

Simon McVittie smcv at kemper.freedesktop.org
Mon Oct 14 08:21:20 PDT 2013


Module: telepathy-gabble
Branch: master
Commit: 37eef7721f1d6493bb241618fc6ca73f4d658744
URL:    http://cgit.freedesktop.org/telepathy/telepathy-gabble/commit/?id=37eef7721f1d6493bb241618fc6ca73f4d658744

Author: Will Thompson <will at willthompson.co.uk>
Date:   Wed Aug 28 08:30:56 2013 +0100

console UI: don't bother preparing the channel

Simon said:

> + # We only prepare the channel so that ::invalidated will be emitted
> + # when it closes.
>
> Is this really necessary? I would expect that channels would invalidate
> anyway.

And he's right: the channel proxy does invalidate without being prepared
if the connection goes away, or if someone else calls Close() on the
channel.

---

 plugins/telepathy-gabble-xmpp-console |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/plugins/telepathy-gabble-xmpp-console b/plugins/telepathy-gabble-xmpp-console
index 1d13121..a72c92b 100755
--- a/plugins/telepathy-gabble-xmpp-console
+++ b/plugins/telepathy-gabble-xmpp-console
@@ -345,7 +345,6 @@ class Window(Gtk.Window):
     def __create_cb(self, request, result, _):
         try:
             channel, context = request.create_and_handle_channel_finish(result)
-            channel.prepare_async(None, self.__channel_prepared_cb, None)
             channel.connect('invalidated', self.__channel_invalidated_cb)
 
             bus_name = channel.get_bus_name()
@@ -368,11 +367,6 @@ Check that you have the console plugin installed.""" % {
         self.__build_ui()
         self.show_all()
 
-    def __channel_prepared_cb(self, channel, result, user_data):
-        # We only prepare the channel so that ::invalidated will be emitted
-        # when it closes.
-        pass
-
     def __channel_invalidated_cb(self, channel, domain, code, message):
         self.infobar.show()
         self.infobar_close_button.grab_focus()



More information about the telepathy-commits mailing list