Merge branch 'master' into nextnext

14 files changed, 106 insertions, 45 deletions

diff --git a/.gitignore b/.gitignore
index fef0533de..7613f338b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,12 +3,14 @@
 *.gcno
 *.gcov
 *.l[ao]
+*.log
 *.loT
 *.orig
 *.pc
 *.py[co]
 *.rej
 *.sw[op]
+*.trs
 *~
 *#
 .#*
@@ -103,3 +105,4 @@ cscope.out
 /tests/twisted/tools/with-session-bus-*.bustle-logs
 /tests/twisted/with-session-bus-*.address
 /tests/twisted/with-session-bus-*.pid
+/tools/telepathy-glib-env
diff --git a/NEWS b/NEWS
index 8016c4d95..9ba0eb19f 100644
--- a/NEWS
+++ b/NEWS
@@ -81,6 +81,63 @@ Internal changes:
 • Remove regression tests for obsolete APIs to reduce delta between
   0.20 and 1.0 branches (Simon, Guillaume)
 
+telepathy-gabble 0.18.4 (2016-11-15)
+====================================
+
+The "crawling" release.
+
+Fixes:
+
+• Update wocky
+   · Use SoupSession instead of SoupSessionAsync to fix
+      function deprecation errors (fd.o #96383, Diane Trout)
+   · Replaced deprecated usage of gnutls_certificate_credentials
+      with gnutls_certificate_credentials_t (George Kiagiadakis)
+   · Updated CRL of the ssl-related unit tests to fix errors
+      when running the tests with the openssl backend, due to
+      the CRL being expired (fd.o #79548, Diane Trout)
+   · Renamed a unit test to avoid duplicate test names, which
+      is an error in recent GLib versions (Diane Trout)
+   · Removed WockyHttpProxy in favour of GIO http proxy,
+      fixing a failing unit test (fd.o #94031, George Kiagiadakis)
+   · Bumped GLib dependency to 2.44 for using the GIO
+      http proxy (George Kiagiadakis)
+   · Fixed a race condition in the wocky-connector-test (George
+      Kiagiadakis)
+
+• Replaced deprecated _BSD_SOURCE with _DEFAULT_SOURCE
+   to fix compilation with recent glibc (Diane Trout)
+
+• Make XEP-0030 disco#info query advertise the disco#info feature
+  (fd.o #98127, Maxime Buquet)
+
+telepathy-gabble 0.18.3 (2014-05-07)
+====================================
+
+Fixes:
+
+• fd.o #76465: fix a crash in Jingle (Guillaume)
+
+telepathy-gabble 0.18.2 (2014-03-20)
+====================================
+
+The “mithril boxing gloves” release.
+
+Fixes:
+
+• update Wocky:
+  · don't try to cancel a source ID twice, which issues a critical warning
+    in GLib 2.39
+  · fix failure to build with recent (Markdown-based) gtk-doc
+
+• plugin loader: don't crash if g_dir_open() fails twice (fd.o #66085, Will)
+
+• fix a crash in 1-1 Tubes on 64-bit machines (fd.o #70038, Guillaume)
+
+• fix enum cast warnings under clang (fd.o #70038, Guillaume)
+
+• add a regression test for fd.o #68829 (Simon)
+
 telepathy-gabble 0.18.1 (2013-09-06)
 ====================================
 
diff --git a/lib/ext/wocky b/lib/ext/wocky
-Subproject c5932733128be4bfb1d5b0ce9be5b136746266d
+Subproject 352247c52b89b5a58c02f8675a95ea64cc3724d
diff --git a/plugins/telepathy-gabble-1-xmpp-console b/plugins/telepathy-gabble-1-xmpp-console
index ea5831563..a44ba4784 100755
--- a/plugins/telepathy-gabble-1-xmpp-console
+++ b/plugins/telepathy-gabble-1-xmpp-console
@@ -355,13 +355,13 @@ class Window(Gtk.Window):
                 bus_name, sidecar_path, CONSOLE_IFACE, None)
 
         except GLib.GError as e:
-            print """
+            print("""
 Couldn't connect to the XMPP console interface on '%(name)s':
 %(e)s
 Check that you have the console plugin installed.""" % {
                 'name': request.get_account().get_path_suffix(),
                 'e': e,
-            }
+            })
             raise SystemExit(2)
 
         self.__build_ui()
@@ -377,8 +377,8 @@ Check that you have the console plugin installed.""" % {
         try:
             self.snoopy.teardown()
         except GLib.GError, e:
-            print "Couldn't turn off the monitor (maybe the connection went away?)"
-            print e
+            print("Couldn't turn off the monitor (maybe the connection went away?)")
+            print(e)
         Gtk.main_quit()
 
 def usage(am):
@@ -387,7 +387,7 @@ def usage(am):
         for account in am.dup_valid_accounts()
         if account.get_cm_name() == 'gabble')
 
-    print """
+    print("""
 Usage:
 
   %(arg0)s gabble/jabber/blahblah
@@ -397,14 +397,14 @@ Here are some account identifiers:
   %(accounts)s
 """ % { 'arg0': sys.argv[0],
         'accounts': '\n  '.join(xmpp_accounts),
-      }
+      })
     raise SystemExit(1)
 
 def am_prepared_cb(am, result, account_suffix):
     try:
         am.prepare_finish(result)
     except GLib.GError as e:
-        print e
+        print(e)
         raise SystemExit(2)
 
     if account_suffix is None:
@@ -413,7 +413,7 @@ def am_prepared_cb(am, result, account_suffix):
     for account in am.dup_valid_accounts():
         if account.get_path_suffix() == account_suffix:
             if account.get_connection() is None:
-                print "%s is not online." % account_suffix
+                print("%s is not online." % account_suffix)
                 raise SystemExit(2)
             else:
                 win = Window(account)
diff --git a/src/addressing-util.c b/src/addressing-util.c
index 9169ec3a8..74701cd0a 100644
--- a/src/addressing-util.c
+++ b/src/addressing-util.c
@@ -358,8 +358,9 @@ gabble_uris_for_handle (TpHandleRepoIface *contact_repo,
     TpHandle contact)
 {
   GPtrArray *uris = g_ptr_array_new ();
+  const gchar * const *scheme;
 
-  for (const gchar * const *scheme = addressable_uri_schemes; *scheme != NULL; scheme++)
+  for (scheme = addressable_uri_schemes; *scheme != NULL; scheme++)
     {
       gchar *uri = gabble_uri_for_handle (contact_repo, *scheme, contact);
 
@@ -378,10 +379,11 @@ gabble_vcard_addresses_for_handle (TpHandleRepoIface *contact_repo,
     TpHandle contact)
 {
   GVariantBuilder builder;
+  const gchar * const *field;
 
   g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{ss}"));
 
-  for (const gchar * const *field = addressable_vcard_fields; *field != NULL; field++)
+  for (field = addressable_vcard_fields; *field != NULL; field++)
     {
       gchar *vcard_address = gabble_vcard_address_for_handle (contact_repo, *field, contact);
 
diff --git a/src/bytestream-factory.c b/src/bytestream-factory.c
index 41401a416..9d9f84cdc 100644
--- a/src/bytestream-factory.c
+++ b/src/bytestream-factory.c
@@ -1517,8 +1517,6 @@ handle_muc_data (GabbleBytestreamFactory *self,
   gchar *room_name;
   const gchar *from;
 
-  priv = GABBLE_BYTESTREAM_FACTORY_GET_PRIVATE (self);
-
   data = wocky_node_get_child_ns (
       wocky_stanza_get_top_node (msg), "data", NS_MUC_BYTESTREAM);
   if (data == NULL)
diff --git a/src/call-stream.c b/src/call-stream.c
index bedc071b5..6546109fb 100644
--- a/src/call-stream.c
+++ b/src/call-stream.c
@@ -396,9 +396,6 @@ gabble_call_stream_update_member_states (GabbleCallStream *self)
   if (state == WOCKY_JINGLE_CONTENT_STATE_REMOVING)
     return;
 
-  local_state = tp_base_call_stream_get_local_sending_state (base);
-  remote_state = tp_base_call_stream_get_remote_sending_state (base, 0);
-
   if (wocky_jingle_content_sending (priv->content))
     {
       if (tp_base_media_call_stream_get_local_sending (bmcs))
diff --git a/src/capabilities.c b/src/capabilities.c
index d3b0ce48e..e6454d74b 100644
--- a/src/capabilities.c
+++ b/src/capabilities.c
@@ -52,6 +52,7 @@ static const Feature self_advertised_features[] =
   { FEATURE_FIXED, NS_JINGLE032 },
 #endif
 
+  { FEATURE_FIXED, NS_DISCO_INFO },
   { FEATURE_FIXED, NS_CHAT_STATES },
   { FEATURE_FIXED, NS_NICK },
   { FEATURE_FIXED, NS_NICK "+notify" },
diff --git a/src/conn-contact-info.c b/src/conn-contact-info.c
index 80be9b84b..59fbcd789 100644
--- a/src/conn-contact-info.c
+++ b/src/conn-contact-info.c
@@ -419,8 +419,10 @@ _return_from_request_contact_info (WockyNode *vcard_node,
 
   if (NULL == vcard_node)
     {
-      GError tp_error = { TP_ERROR, TP_ERROR_NOT_AVAILABLE,
-          vcard_error->message };
+      GError tp_error = { TP_ERROR, TP_ERROR_NOT_AVAILABLE, "" };
+
+      g_assert (vcard_error != NULL);
+      tp_error.message = vcard_error->message;
 
       if (vcard_error->domain == WOCKY_XMPP_ERROR)
         {
diff --git a/src/ft-manager.c b/src/ft-manager.c
index 53804c397..9f1556300 100644
--- a/src/ft-manager.c
+++ b/src/ft-manager.c
@@ -20,7 +20,7 @@
 
 #include "config.h"
 
-#define _BSD_SOURCE
+#define _DEFAULT_SOURCE
 #define _XOPEN_SOURCE /* glibc2 needs this */
 #include <time.h>
 #include <dbus/dbus-glib.h>
diff --git a/src/media-factory.c b/src/media-factory.c
index f5eaf9dc1..8199b8a30 100644
--- a/src/media-factory.c
+++ b/src/media-factory.c
@@ -520,6 +520,8 @@ gabble_media_factory_create_call (TpChannelManager *manager,
   gboolean initial_audio, initial_video;
   const gchar *initial_audio_name, *initial_video_name;
 
+  g_return_val_if_fail (request_properties != NULL, FALSE);
+
   if (tp_strdiff (tp_asv_get_string (request_properties,
           TP_PROP_CHANNEL_CHANNEL_TYPE),
         TP_IFACE_CHANNEL_TYPE_CALL1))
diff --git a/src/muc-channel.c b/src/muc-channel.c
index e465888c5..bebe596cd 100644
--- a/src/muc-channel.c
+++ b/src/muc-channel.c
@@ -264,12 +264,12 @@ static void handle_fill_presence (WockyMuc *muc,
     WockyStanza *stanza,
     gpointer user_data);
 
-static void handle_renamed (GObject *source,
+static void handle_renamed (WockyMuc *muc,
     WockyStanza *stanza,
     guint codes,
     gpointer data);
 
-static void handle_error (GObject *source,
+static void handle_error (WockyMuc *muc,
     WockyStanza *stanza,
     WockyXmppErrorType errtype,
     const GError *error,
@@ -280,7 +280,7 @@ static void handle_join (WockyMuc *muc,
     guint codes,
     gpointer data);
 
-static void handle_parted (GObject *source,
+static void handle_parted (WockyMuc *muc,
     WockyStanza *stanza,
     guint codes,
     const gchar *actor_jid,
@@ -288,7 +288,7 @@ static void handle_parted (GObject *source,
     const gchar *msg,
     gpointer data);
 
-static void handle_left (GObject *source,
+static void handle_left (WockyMuc *muc,
     WockyStanza *stanza,
     guint codes,
     WockyMucMember *who,
@@ -297,21 +297,21 @@ static void handle_left (GObject *source,
     const gchar *msg,
     gpointer data);
 
-static void handle_presence (GObject *source,
+static void handle_presence (WockyMuc *source,
     WockyStanza *stanza,
     guint codes,
     WockyMucMember *who,
     gpointer data);
 
-static void handle_perms (GObject *source,
+static void handle_perms (WockyMuc *source,
     WockyStanza *stanza,
-    GHashTable *code,
+    guint code,
     const gchar *actor,
     const gchar *why,
     gpointer data);
 
 /* signatures for message handlers */
-static void handle_message (GObject *source,
+static void handle_message (WockyMuc *muc,
     WockyStanza *stanza,
     WockyMucMsgType type,
     const gchar *xmpp_id,
@@ -322,7 +322,7 @@ static void handle_message (GObject *source,
     WockyMucMsgState state,
     gpointer data);
 
-static void handle_errmsg (GObject *source,
+static void handle_errmsg (WockyMuc *muc,
     WockyStanza *stanza,
     WockyMucMsgType type,
     const gchar *xmpp_id,
@@ -1899,7 +1899,7 @@ update_permissions (GabbleMucChannel *chan)
 
 /* connect to wocky-muc:SIG_PRESENCE_ERROR */
 static void
-handle_error (GObject *source,
+handle_error (WockyMuc *muc,
     WockyStanza *stanza,
     WockyXmppErrorType errtype,
     const GError *error,
@@ -2374,7 +2374,7 @@ muc_status_codes_to_change_reason (guint codes)
 /* connect to wocky-muc:SIG_PARTED, which we will receive when the MUC tells *
  * us that we have left the channel                                          */
 static void
-handle_parted (GObject *source,
+handle_parted (WockyMuc *wmuc,
     WockyStanza *stanza,
     guint codes,
     const gchar *actor_jid,
@@ -2382,7 +2382,6 @@ handle_parted (GObject *source,
     const gchar *msg,
     gpointer data)
 {
-  WockyMuc *wmuc = WOCKY_MUC (source);
   GabbleMucChannel *gmuc = GABBLE_MUC_CHANNEL (data);
   TpBaseChannel *base = TP_BASE_CHANNEL (gmuc);
   GabbleMucChannelPrivate *priv = gmuc->priv;
@@ -2445,7 +2444,7 @@ handle_parted (GObject *source,
 /* connect to wocky-muc:SIG_LEFT, which we will receive when the MUC informs *
  * us someone [else] has left the channel                                    */
 static void
-handle_left (GObject *source,
+handle_left (WockyMuc *muc,
     WockyStanza *stanza,
     guint codes,
     WockyMucMember *who,
@@ -2498,14 +2497,13 @@ handle_left (GObject *source,
 /* connect to wocky-muc:SIG_PERM_CHANGE, which we will receive when the *
  * MUC informs us our role/affiliation has been altered                 */
 static void
-handle_perms (GObject *source,
+handle_perms (WockyMuc *wmuc,
     WockyStanza *stanza,
-    GHashTable *code,
+    guint code,
     const gchar *actor,
     const gchar *why,
     gpointer data)
 {
-  WockyMuc *wmuc = WOCKY_MUC (source);
   GabbleMucChannel *gmuc = GABBLE_MUC_CHANNEL (data);
   GabbleMucChannelPrivate *priv = gmuc->priv;
   TpHandle myself = TP_GROUP_MIXIN (gmuc)->self_handle;
@@ -2558,12 +2556,11 @@ handle_fill_presence (WockyMuc *muc,
 /* connect to wocky-muc:SIG_NICK_CHANGE, which we will receive when the *
  * MUC informs us our nick has been changed for some reason             */
 static void
-handle_renamed (GObject *source,
+handle_renamed (WockyMuc *wmuc,
     WockyStanza *stanza,
     guint codes,
     gpointer data)
 {
-  WockyMuc *wmuc = WOCKY_MUC (source);
   GabbleMucChannel *gmuc = GABBLE_MUC_CHANNEL (data);
   TpBaseChannel *base = TP_BASE_CHANNEL (gmuc);
   TpHandleRepoIface *contact_repo =
@@ -2699,7 +2696,7 @@ handle_join (WockyMuc *muc,
 /* connect to wocky-muc:SIG_PRESENCE, which is fired for presences that are *
  * NOT our own after the initial roster has been received:                  */
 static void
-handle_presence (GObject *source,
+handle_presence (WockyMuc *muc,
     WockyStanza *stanza,
     guint codes,
     WockyMucMember *who,
@@ -2771,7 +2768,7 @@ handle_presence (GObject *source,
 /* message signal handlers */
 
 static void
-handle_message (GObject *source,
+handle_message (WockyMuc *muc,
     WockyStanza *stanza,
     WockyMucMsgType type,
     const gchar *xmpp_id,
@@ -2788,12 +2785,13 @@ handle_message (GObject *source,
   gboolean from_member = (who != NULL);
 
   TpChannelTextMessageType msg_type;
-  TpHandleRepoIface *repo;
   TpEntityType entity_type;
   TpHandle from;
 
   if (from_member)
     {
+      TpHandleRepoIface *repo;
+
       entity_type = TP_ENTITY_TYPE_CONTACT;
       repo = tp_base_connection_get_handles (conn, entity_type);
       from = tp_handle_ensure (repo, who->from,
@@ -2808,7 +2806,6 @@ handle_message (GObject *source,
   else /* directly from MUC itself */
     {
       entity_type = TP_ENTITY_TYPE_ROOM;
-      repo = tp_base_connection_get_handles (conn, entity_type);
       from = tp_base_channel_get_target_handle (base);
     }
 
@@ -2860,7 +2857,7 @@ handle_message (GObject *source,
 }
 
 static void
-handle_errmsg (GObject *source,
+handle_errmsg (WockyMuc *muc,
     WockyStanza *stanza,
     WockyMucMsgType type,
     const gchar *xmpp_id,
@@ -2877,13 +2874,14 @@ handle_errmsg (GObject *source,
   TpBaseConnection *conn = tp_base_channel_get_connection (base);
   gboolean from_member = (who != NULL);
   TpDeliveryStatus ds = TP_DELIVERY_STATUS_DELIVERED;
-  TpHandleRepoIface *repo = NULL;
   TpEntityType entity_type;
   TpHandle from = 0;
   const gchar *subject;
 
   if (from_member)
     {
+      TpHandleRepoIface *repo;
+
       entity_type = TP_ENTITY_TYPE_CONTACT;
       repo = tp_base_connection_get_handles (conn, entity_type);
       from = tp_handle_ensure (repo, who->from,
@@ -2898,7 +2896,6 @@ handle_errmsg (GObject *source,
   else /* directly from MUC itself */
     {
       entity_type = TP_ENTITY_TYPE_ROOM;
-      repo = tp_base_connection_get_handles (conn, entity_type);
       from = tp_base_channel_get_target_handle (base);
     }
 
diff --git a/src/private-tubes-factory.c b/src/private-tubes-factory.c
index 8f936bb97..1e0310069 100644
--- a/src/private-tubes-factory.c
+++ b/src/private-tubes-factory.c
@@ -715,7 +715,7 @@ gabble_private_tubes_factory_handle_si_tube_request (
     }
 
   /* New tube */
-  tube = new_channel_from_stanza (self, msg, tube_node,
+  new_channel_from_stanza (self, msg, tube_node,
       tube_id, bytestream);
 }
 
@@ -881,7 +881,7 @@ private_tubes_factory_msg_tube_cb (
       return TRUE;
     }
 
-  channel = new_channel_from_stanza (self, msg, node, tube_id, NULL);
+  new_channel_from_stanza (self, msg, node, tube_id, NULL);
 
   return TRUE;
 }
diff --git a/src/tube-stream.c b/src/tube-stream.c
index d253baf72..7b5ad4361 100644
--- a/src/tube-stream.c
+++ b/src/tube-stream.c
@@ -280,6 +280,8 @@ remove_transport (GabbleTubeStream *self,
 {
   GabbleTubeStreamPrivate *priv = self->priv;
 
+  g_return_if_fail (transport != NULL);
+
   DEBUG ("disconnect and remove transport");
   g_signal_handlers_disconnect_matched (transport, G_SIGNAL_MATCH_DATA,
       0, 0, NULL, NULL, self);