From 1880685e4cf1116dee132915f9e545d8e5d2ad31 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Thu, 8 May 2014 15:18:27 +0200 Subject: stop hardcoding python's path in .py scripts https://bugs.freedesktop.org/show_bug.cgi?id=76495 --- tests/all-errors-documented.py | 2 +- tools/c-constants-gen.py | 2 +- tools/glib-client-gen.py | 2 +- tools/glib-client-marshaller-gen.py | 2 +- tools/glib-errors-check-gen.py | 2 +- tools/glib-errors-str-gen.py | 2 +- tools/glib-ginterface-gen.py | 2 +- tools/glib-gtypes-generator.py | 2 +- tools/glib-interfaces-gen.py | 2 +- tools/gobject-foo.py | 2 +- tools/make-version-script.py | 2 +- tools/manager-file.py | 2 +- tools/xincludator.py | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/all-errors-documented.py b/tests/all-errors-documented.py index ae66df55f..911dc7695 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-sections.txt diff --git a/tools/c-constants-gen.py b/tools/c-constants-gen.py index a08afee06..9467e4368 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 b7edbc0d3..ea4197e31 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-client-marshaller-gen.py b/tools/glib-client-marshaller-gen.py index cd9823bdf..2d0a6e350 100644 --- a/tools/glib-client-marshaller-gen.py +++ b/tools/glib-client-marshaller-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-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 c0ce20ddc..b7b0ffb44 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 4ced849fe..72b2fdedb 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 e1b51a616..aaa794657 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 -- cgit v1.2.1 From 93d10077e2ff5c629e6ca6eed2d4ed801eb964ad Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Wed, 21 May 2014 10:49:37 +0200 Subject: account-request: remove useless 'priv' variable https://bugs.freedesktop.org/show_bug.cgi?id=79006 --- telepathy-glib/account-request.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/telepathy-glib/account-request.c b/telepathy-glib/account-request.c index e1afdc922..4b79b1b49 100644 --- a/telepathy-glib/account-request.c +++ b/telepathy-glib/account-request.c @@ -1340,13 +1340,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, @@ -1356,7 +1352,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, @@ -1365,12 +1361,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)); } -- cgit v1.2.1 From e01067b4cb9b31e562b656e3af32e26b46fcb36f Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Wed, 21 May 2014 10:54:22 +0200 Subject: test-connection-error: don't check errors twice We are already using g_assert_error() to check those. https://bugs.freedesktop.org/show_bug.cgi?id=79006 --- tests/dbus/connection-error.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/tests/dbus/connection-error.c b/tests/dbus/connection-error.c index bf8ecaf8a..146eca1ca 100644 --- a/tests/dbus/connection-error.c +++ b/tests/dbus/connection-error.c @@ -214,11 +214,7 @@ test_registered_error (Test *test, "com.example.DomainSpecificError"); g_assert (asv != NULL); - 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 @@ -370,11 +366,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 -- cgit v1.2.1 From e79273e710e7c045542ff856f31ab6edbb29d5a8 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 17 Sep 2014 11:53:26 +0100 Subject: Revert "Disable warnings about deprecated functions for stable branch" This reverts commit d622628afac82b057fde9315cbb6e1cf022a3f3e. --- configure.ac | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 564622a41..5c07d4143 100644 --- a/configure.ac +++ b/configure.ac @@ -117,8 +117,7 @@ TP_COMPILER_WARNINGS([ERROR_CFLAGS], [test "x$enable_fatal_warnings" = xyes], format-security \ init-self], [missing-field-initializers \ - unused-parameter \ - deprecated-declarations]) + unused-parameter]) AC_SUBST([ERROR_CFLAGS]) # these aren't really error flags but they serve a similar purpose for us - -- cgit v1.2.1 From 6d399eaec1ab6381c57a371320528fda5d2e3e7c Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 17 Sep 2014 11:53:35 +0100 Subject: Revert "Don't check documentation completeness in this stable branch" This reverts commit 0273bfb815ef74115d614f5e5f04e013374f7a01. --- docs/reference/Makefile.am | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am index 16ede12d0..982359646 100644 --- a/docs/reference/Makefile.am +++ b/docs/reference/Makefile.am @@ -142,6 +142,14 @@ check-local: echo "$$file missing from telepathy-glib-docs.sgml"; \ err=1; \ fi; \ - done + done; \ + case $(enable_fatal_warnings)/$$err in \ + (yes/1) \ + echo "Documentation check failed" >&2; \ + exit $$err; \ + ;; \ + (*) \ + exit 0; \ + ;; \ + esac endif -# ... but don't fail on incomplete documentation, this is a stable branch -- cgit v1.2.1 From 7494959b21e00acfc853728a230cb9dd55e46df5 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 17 Sep 2014 11:53:44 +0100 Subject: Revert "Upload documentation to the 0.24.x location" This reverts commit fb9e80acf4504706a9a52c9bca735362dd5411c7. --- Makefile.am | 2 +- docs/reference/telepathy-glib-docs.sgml | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 5f61f2742..ed1c2410d 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-0.24.x/ + telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/doc/telepathy-glib/ 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/docs/reference/telepathy-glib-docs.sgml b/docs/reference/telepathy-glib-docs.sgml index 73b0fecb0..8037ab9a2 100644 --- a/docs/reference/telepathy-glib-docs.sgml +++ b/docs/reference/telepathy-glib-docs.sgml @@ -10,8 +10,6 @@ This manual documents telepathy-glib version &tpglibversion;. The latest development version of this documentation can be found here: online copy of the telepathy-glib API Reference Manual. - The latest version in this stable branch can be found here: - online copy of the telepathy-glib 0.24.x API Reference Manual. -- cgit v1.2.1