Merge branch 'master' into next

Conflicts:
	Makefile.am
	NEWS
	configure.ac
	docs/reference/Makefile.am
	tools/glib-client-marshaller-gen.py

17 files changed, 30 insertions, 36 deletions

diff --git a/docs/reference/telepathy-glib/telepathy-glib-docs.sgml b/docs/reference/telepathy-glib/telepathy-glib-docs.sgml
index 253e68f4a..402515065 100644
--- a/docs/reference/telepathy-glib/telepathy-glib-docs.sgml
+++ b/docs/reference/telepathy-glib/telepathy-glib-docs.sgml
@@ -10,6 +10,8 @@
       This manual documents telepathy-glib version &tpglibversion;.
       The latest development version of this documentation can be found here:
       <ulink role="online-location" url="http://telepathy.freedesktop.org/doc/telepathy-glib/">online copy of the telepathy-glib API Reference Manual</ulink>.
+      The latest version in this stable branch can be found here:
+      <ulink role="online-location" url="http://telepathy.freedesktop.org/doc/telepathy-glib-0.24.x/">online copy of the telepathy-glib 0.24.x API Reference Manual</ulink>.
     </releaseinfo>
   </bookinfo>
 
diff --git a/examples/cm/contactlist/contact-list.c b/examples/cm/contactlist/contact-list.c
index 3a5ca8501..932a1810b 100644
--- a/examples/cm/contactlist/contact-list.c
+++ b/examples/cm/contactlist/contact-list.c
@@ -838,8 +838,12 @@ receive_auth_request (ExampleContactList *self,
       g_message ("From server: %s has cancelled their publish request",
           tp_handle_inspect (self->priv->contact_repo, contact));
 
-      d->publish = FALSE;
-      d->pre_approved = FALSE;
+      if (d)
+        {
+          d->publish = FALSE;
+          d->pre_approved = FALSE;
+        }
+
       g_hash_table_remove (self->priv->publish_requests,
           GUINT_TO_POINTER (contact));
       tp_handle_set_add (self->priv->cancelled_publish_requests, contact);
diff --git a/telepathy-glib/account-request.c b/telepathy-glib/account-request.c
index 1e349fec7..dccaa3664 100644
--- a/telepathy-glib/account-request.c
+++ b/telepathy-glib/account-request.c
@@ -1349,13 +1349,9 @@ tp_account_request_create_account_async (TpAccountRequest *self,
     GAsyncReadyCallback callback,
     gpointer user_data)
 {
-  TpAccountRequestPrivate *priv = self->priv;
-
   g_return_if_fail (TP_IS_ACCOUNT_REQUEST (self));
 
-  priv = self->priv;
-
-  if (priv->result != NULL)
+  if (self->priv->result != NULL)
     {
       g_simple_async_report_error_in_idle (G_OBJECT (self),
           callback, user_data,
@@ -1365,7 +1361,7 @@ tp_account_request_create_account_async (TpAccountRequest *self,
       return;
     }
 
-  if (priv->created)
+  if (self->priv->created)
     {
       g_simple_async_report_error_in_idle (G_OBJECT (self),
           callback, user_data,
@@ -1374,12 +1370,12 @@ tp_account_request_create_account_async (TpAccountRequest *self,
       return;
     }
 
-  priv->result = g_simple_async_result_new (G_OBJECT (self), callback, user_data,
-      tp_account_request_create_account_async);
+  self->priv->result = g_simple_async_result_new (G_OBJECT (self), callback,
+      user_data, tp_account_request_create_account_async);
 
-  tp_cli_account_manager_call_create_account (priv->account_manager,
-      -1, priv->cm_name, priv->proto_name, priv->display_name,
-      priv->parameters, priv->properties,
+  tp_cli_account_manager_call_create_account (self->priv->account_manager,
+      -1, self->priv->cm_name, self->priv->proto_name, self->priv->display_name,
+      self->priv->parameters, self->priv->properties,
       tp_account_request_create_account_cb, NULL, NULL, G_OBJECT (self));
 }
 
diff --git a/telepathy-glib/base-client.c b/telepathy-glib/base-client.c
index e975b0acb..61d4511a5 100644
--- a/telepathy-glib/base-client.c
+++ b/telepathy-glib/base-client.c
@@ -2319,7 +2319,7 @@ _tp_base_client_add_request (TpSvcClientInterfaceRequests *iface,
 {
   TpBaseClient *self = TP_BASE_CLIENT (iface);
   TpChannelRequest *request;
-  TpAccount *account;
+  TpAccount *account = NULL;
   GError *error = NULL;
   channel_request_prepare_account_ctx *ctx;
   GArray *account_features;
diff --git a/tests/all-errors-documented.py b/tests/all-errors-documented.py
index 3fa53fdbf..235b18f22 100755
--- a/tests/all-errors-documented.py
+++ b/tests/all-errors-documented.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 # Check if all the errors have been added to
 # docs/reference/telepathy-glib/telepathy-glib-sections.txt
 
diff --git a/tests/dbus/connection-error.c b/tests/dbus/connection-error.c
index 16fd4ce9c..fb57f7173 100644
--- a/tests/dbus/connection-error.c
+++ b/tests/dbus/connection-error.c
@@ -152,11 +152,7 @@ test_registered_error (Test *test,
   g_variant_unref (asv);
   g_free (str);
 
-  g_assert_cmpstr (g_quark_to_string (error->domain), ==,
-      g_quark_to_string (example_com_error_quark ()));
-  g_assert_cmpuint (error->code, ==, DOMAIN_SPECIFIC_ERROR);
-  g_error_free (error);
-  error = NULL;
+  g_clear_error (&error);
 }
 
 static void
@@ -283,11 +279,7 @@ test_detailed_error (Test *test,
   g_assert (ok);
   g_assert_cmpint (bees, ==, 2342);
 
-  g_assert_cmpstr (g_quark_to_string (error->domain), ==,
-      g_quark_to_string (example_com_error_quark ()));
-  g_assert_cmpuint (error->code, ==, DOMAIN_SPECIFIC_ERROR);
-  g_error_free (error);
-  error = NULL;
+  g_clear_error (&error);
 }
 
 int
diff --git a/tools/c-constants-gen.py b/tools/c-constants-gen.py
index 2b92dc6d9..4880d676b 100644
--- a/tools/c-constants-gen.py
+++ b/tools/c-constants-gen.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 
 from sys import argv, stdout, stderr
 import xml.dom.minidom
diff --git a/tools/glib-client-gen.py b/tools/glib-client-gen.py
index bc117c5d8..b8dd64e69 100644
--- a/tools/glib-client-gen.py
+++ b/tools/glib-client-gen.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 
 # glib-client-gen.py: "I Can't Believe It's Not dbus-binding-tool"
 #
diff --git a/tools/glib-errors-check-gen.py b/tools/glib-errors-check-gen.py
index 3cc8a5afb..80bbefebd 100644
--- a/tools/glib-errors-check-gen.py
+++ b/tools/glib-errors-check-gen.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 
 import sys
 import xml.dom.minidom
diff --git a/tools/glib-errors-str-gen.py b/tools/glib-errors-str-gen.py
index ddb1e16b7..67d7fb024 100644
--- a/tools/glib-errors-str-gen.py
+++ b/tools/glib-errors-str-gen.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 
 import sys
 import xml.dom.minidom
diff --git a/tools/glib-ginterface-gen.py b/tools/glib-ginterface-gen.py
index 184476dda..ebab04063 100644
--- a/tools/glib-ginterface-gen.py
+++ b/tools/glib-ginterface-gen.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 
 # glib-ginterface-gen.py: service-side interface generator
 #
diff --git a/tools/glib-gtypes-generator.py b/tools/glib-gtypes-generator.py
index 1477bd37b..05f026c51 100644
--- a/tools/glib-gtypes-generator.py
+++ b/tools/glib-gtypes-generator.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 
 # Generate GLib GInterfaces from the Telepathy specification.
 # The master copy of this program is in the telepathy-glib repository -
diff --git a/tools/glib-interfaces-gen.py b/tools/glib-interfaces-gen.py
index b67d7b4f0..7d68b3546 100644
--- a/tools/glib-interfaces-gen.py
+++ b/tools/glib-interfaces-gen.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 
 from sys import argv, stdout, stderr
 import xml.dom.minidom
diff --git a/tools/gobject-foo.py b/tools/gobject-foo.py
index a2abd7667..34120b60c 100644
--- a/tools/gobject-foo.py
+++ b/tools/gobject-foo.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 
 # gobject-foo.py: generate standard GObject type macros etc.
 #
diff --git a/tools/make-version-script.py b/tools/make-version-script.py
index 47042d069..8eb15fc07 100644
--- a/tools/make-version-script.py
+++ b/tools/make-version-script.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 
 """Construct a GNU ld or Debian dpkg version-script from a set of
 RFC822-style symbol lists.
diff --git a/tools/manager-file.py b/tools/manager-file.py
index d6eda0651..e1ff60e9e 100644
--- a/tools/manager-file.py
+++ b/tools/manager-file.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 
 # manager-file.py: generate .manager files and TpCMParamSpec arrays from the
 # same data (should be suitable for all connection managers that don't have
diff --git a/tools/xincludator.py b/tools/xincludator.py
index f9ed49ce4..d63389e4b 100644
--- a/tools/xincludator.py
+++ b/tools/xincludator.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 
 import sys
 from sys import argv, stdout, stderr