diff options
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | configure.ac | 3 | ||||
-rw-r--r-- | docs/reference/Makefile.am | 12 | ||||
-rw-r--r-- | docs/reference/telepathy-glib-docs.sgml | 2 | ||||
-rw-r--r-- | telepathy-glib/account-request.c | 18 | ||||
-rwxr-xr-x | tests/all-errors-documented.py | 2 | ||||
-rw-r--r-- | tests/dbus/connection-error.c | 12 | ||||
-rw-r--r-- | tools/c-constants-gen.py | 2 | ||||
-rw-r--r-- | tools/glib-client-gen.py | 2 | ||||
-rw-r--r-- | tools/glib-client-marshaller-gen.py | 2 | ||||
-rw-r--r-- | tools/glib-errors-check-gen.py | 2 | ||||
-rw-r--r-- | tools/glib-errors-str-gen.py | 2 | ||||
-rw-r--r-- | tools/glib-ginterface-gen.py | 2 | ||||
-rw-r--r-- | tools/glib-gtypes-generator.py | 2 | ||||
-rw-r--r-- | tools/glib-interfaces-gen.py | 2 | ||||
-rw-r--r-- | tools/gobject-foo.py | 2 | ||||
-rw-r--r-- | tools/make-version-script.py | 2 | ||||
-rw-r--r-- | tools/manager-file.py | 2 | ||||
-rw-r--r-- | tools/xincludator.py | 2 |
19 files changed, 41 insertions, 34 deletions
diff --git a/Makefile.am b/Makefile.am index ed1c2410d..5f61f2742 100644 --- a/Makefile.am +++ b/Makefile.am @@ -37,7 +37,7 @@ check-valgrind: maintainer-upload-release: _maintainer-upload-release-local _maintainer-upload-release-local: _maintainer-upload-release-check rsync -rvzPp --chmod=Dg+s,ug+rwX,o=rX $(builddir)/docs/reference/html/ \ - telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/doc/telepathy-glib/ + telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/doc/telepathy-glib-0.24.x/ BRANCH = $(shell sh tools/git-which-branch.sh misc | tr -d '\n' | tr -C "[:alnum:]" _) UPLOAD_BRANCH_TO = people.freedesktop.org:public_html/telepathy-glib diff --git a/configure.ac b/configure.ac index e3b2bb698..9b19c5c0f 100644 --- a/configure.ac +++ b/configure.ac @@ -117,7 +117,8 @@ TP_COMPILER_WARNINGS([ERROR_CFLAGS], [test "x$enable_fatal_warnings" = xyes], format-security \ init-self], [missing-field-initializers \ - unused-parameter]) + unused-parameter \ + deprecated-declarations]) AC_SUBST([ERROR_CFLAGS]) # these aren't really error flags but they serve a similar purpose for us - diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am index 982359646..16ede12d0 100644 --- a/docs/reference/Makefile.am +++ b/docs/reference/Makefile.am @@ -142,14 +142,6 @@ check-local: echo "$$file missing from telepathy-glib-docs.sgml"; \ err=1; \ fi; \ - done; \ - case $(enable_fatal_warnings)/$$err in \ - (yes/1) \ - echo "Documentation check failed" >&2; \ - exit $$err; \ - ;; \ - (*) \ - exit 0; \ - ;; \ - esac + done endif +# ... but don't fail on incomplete documentation, this is a stable branch diff --git a/docs/reference/telepathy-glib-docs.sgml b/docs/reference/telepathy-glib-docs.sgml index 8037ab9a2..73b0fecb0 100644 --- a/docs/reference/telepathy-glib-docs.sgml +++ b/docs/reference/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/telepathy-glib/account-request.c b/telepathy-glib/account-request.c index 4b79b1b49..e1afdc922 100644 --- a/telepathy-glib/account-request.c +++ b/telepathy-glib/account-request.c @@ -1340,9 +1340,13 @@ 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)); - if (self->priv->result != NULL) + priv = self->priv; + + if (priv->result != NULL) { g_simple_async_report_error_in_idle (G_OBJECT (self), callback, user_data, @@ -1352,7 +1356,7 @@ tp_account_request_create_account_async (TpAccountRequest *self, return; } - if (self->priv->created) + if (priv->created) { g_simple_async_report_error_in_idle (G_OBJECT (self), callback, user_data, @@ -1361,12 +1365,12 @@ tp_account_request_create_account_async (TpAccountRequest *self, return; } - self->priv->result = g_simple_async_result_new (G_OBJECT (self), callback, - user_data, tp_account_request_create_account_async); + 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 (self->priv->account_manager, - -1, self->priv->cm_name, self->priv->proto_name, self->priv->display_name, - self->priv->parameters, self->priv->properties, + 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_account_request_create_account_cb, NULL, NULL, G_OBJECT (self)); } diff --git a/tests/all-errors-documented.py b/tests/all-errors-documented.py index 911dc7695..ae66df55f 100755 --- a/tests/all-errors-documented.py +++ b/tests/all-errors-documented.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/python # Check if all the errors have been added to # docs/reference/telepathy-glib-sections.txt diff --git a/tests/dbus/connection-error.c b/tests/dbus/connection-error.c index 146eca1ca..bf8ecaf8a 100644 --- a/tests/dbus/connection-error.c +++ b/tests/dbus/connection-error.c @@ -214,7 +214,11 @@ test_registered_error (Test *test, "com.example.DomainSpecificError"); g_assert (asv != NULL); - g_clear_error (&error); + 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; } static void @@ -366,7 +370,11 @@ test_detailed_error (Test *test, g_assert (ok); g_assert_cmpint (bees, ==, 2342); - g_clear_error (&error); + 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; } int diff --git a/tools/c-constants-gen.py b/tools/c-constants-gen.py index 9467e4368..a08afee06 100644 --- a/tools/c-constants-gen.py +++ b/tools/c-constants-gen.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/python 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 ea4197e31..b7edbc0d3 100644 --- a/tools/glib-client-gen.py +++ b/tools/glib-client-gen.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/python # glib-client-gen.py: "I Can't Believe It's Not dbus-binding-tool" # diff --git a/tools/glib-client-marshaller-gen.py b/tools/glib-client-marshaller-gen.py index 2d0a6e350..cd9823bdf 100644 --- a/tools/glib-client-marshaller-gen.py +++ b/tools/glib-client-marshaller-gen.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/python import sys import xml.dom.minidom diff --git a/tools/glib-errors-check-gen.py b/tools/glib-errors-check-gen.py index 80bbefebd..3cc8a5afb 100644 --- a/tools/glib-errors-check-gen.py +++ b/tools/glib-errors-check-gen.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/python import sys import xml.dom.minidom diff --git a/tools/glib-errors-str-gen.py b/tools/glib-errors-str-gen.py index 67d7fb024..ddb1e16b7 100644 --- a/tools/glib-errors-str-gen.py +++ b/tools/glib-errors-str-gen.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/python import sys import xml.dom.minidom diff --git a/tools/glib-ginterface-gen.py b/tools/glib-ginterface-gen.py index b7b0ffb44..c0ce20ddc 100644 --- a/tools/glib-ginterface-gen.py +++ b/tools/glib-ginterface-gen.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/python # glib-ginterface-gen.py: service-side interface generator # diff --git a/tools/glib-gtypes-generator.py b/tools/glib-gtypes-generator.py index 05f026c51..1477bd37b 100644 --- a/tools/glib-gtypes-generator.py +++ b/tools/glib-gtypes-generator.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/python # 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 7d68b3546..b67d7b4f0 100644 --- a/tools/glib-interfaces-gen.py +++ b/tools/glib-interfaces-gen.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/python from sys import argv, stdout, stderr import xml.dom.minidom diff --git a/tools/gobject-foo.py b/tools/gobject-foo.py index 34120b60c..a2abd7667 100644 --- a/tools/gobject-foo.py +++ b/tools/gobject-foo.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/python # gobject-foo.py: generate standard GObject type macros etc. # diff --git a/tools/make-version-script.py b/tools/make-version-script.py index 72b2fdedb..4ced849fe 100644 --- a/tools/make-version-script.py +++ b/tools/make-version-script.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/python """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 aaa794657..e1b51a616 100644 --- a/tools/manager-file.py +++ b/tools/manager-file.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/python # 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 d63389e4b..f9ed49ce4 100644 --- a/tools/xincludator.py +++ b/tools/xincludator.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/python import sys from sys import argv, stdout, stderr |