summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--telepathy-glib/account-request.c18
-rwxr-xr-xtests/all-errors-documented.py2
-rw-r--r--tests/dbus/connection-error.c12
-rw-r--r--tools/c-constants-gen.py2
-rw-r--r--tools/glib-client-gen.py2
-rw-r--r--tools/glib-client-marshaller-gen.py2
-rw-r--r--tools/glib-errors-check-gen.py2
-rw-r--r--tools/glib-errors-str-gen.py2
-rw-r--r--tools/glib-ginterface-gen.py2
-rw-r--r--tools/glib-gtypes-generator.py2
-rw-r--r--tools/glib-interfaces-gen.py2
-rw-r--r--tools/gobject-foo.py2
-rw-r--r--tools/make-version-script.py2
-rw-r--r--tools/manager-file.py2
-rw-r--r--tools/xincludator.py2
15 files changed, 22 insertions, 34 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));
}
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/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
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
View Lorry Controller Status