Attachment 60836 Details for Bug 49338 – 01/15] _tp_dbus_starter_bus_conn: remove

[patch] 01/15] _tp_dbus_starter_bus_conn: remove

0001-_tp_dbus_starter_bus_conn-remove.patch (text/plain), 2.05 KB, created by Simon McVittie on 2012-05-01 06:41:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2012-05-01 06:41:03 UTC

Size: 2.05 KB

patch

obsolete

>From 0cbf101c2c03995a8f9b529f77b102fac5015c25 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Tue, 1 May 2012 12:44:42 +0100
>Subject: [PATCH 01/15] _tp_dbus_starter_bus_conn: remove
>
>There's no longer any need to cache a singleton starter bus connection,
>because the only caller also caches a singleton.
>---
> telepathy-glib/dbus-daemon.c   |    2 +-
> telepathy-glib/dbus-internal.h |    3 ---
> telepathy-glib/dbus.c          |   13 -------------
> 3 files changed, 1 insertion(+), 17 deletions(-)
>
>diff --git a/telepathy-glib/dbus-daemon.c b/telepathy-glib/dbus-daemon.c
>index ef09466..e9b566a 100644
>--- a/telepathy-glib/dbus-daemon.c
>+++ b/telepathy-glib/dbus-daemon.c
>@@ -106,7 +106,7 @@ tp_dbus_daemon_dup (GError **error)
>   if (starter_bus_daemon != NULL)
>     return g_object_ref (starter_bus_daemon);
> 
>-  conn = _tp_dbus_starter_bus_conn (error);
>+  conn = dbus_g_bus_get (DBUS_BUS_STARTER, error);
> 
>   if (conn == NULL)
>     return NULL;
>diff --git a/telepathy-glib/dbus-internal.h b/telepathy-glib/dbus-internal.h
>index fda71b8..ec0378b 100644
>--- a/telepathy-glib/dbus-internal.h
>+++ b/telepathy-glib/dbus-internal.h
>@@ -31,9 +31,6 @@ gboolean _tp_dbus_daemon_get_name_owner (TpDBusDaemon *self, gint timeout_ms,
> 
> void _tp_register_dbus_glib_marshallers (void);
> 
>-DBusGConnection *_tp_dbus_starter_bus_conn (GError **error)
>-  G_GNUC_WARN_UNUSED_RESULT;
>-
> gboolean _tp_dbus_daemon_is_the_shared_one (TpDBusDaemon *self);
> 
> GVariant *_tp_asv_to_vardict (const GHashTable *asv);
>diff --git a/telepathy-glib/dbus.c b/telepathy-glib/dbus.c
>index 2788439..54b4789 100644
>--- a/telepathy-glib/dbus.c
>+++ b/telepathy-glib/dbus.c
>@@ -83,19 +83,6 @@
>  */
> /* (#define + static inline in dbus.h) */
> 
>-DBusGConnection *
>-_tp_dbus_starter_bus_conn (GError **error)
>-{
>-  static DBusGConnection *starter_bus = NULL;
>-
>-  if (starter_bus == NULL)
>-    {
>-      starter_bus = dbus_g_bus_get (DBUS_BUS_STARTER, error);
>-    }
>-
>-  return starter_bus;
>-}
>-
> /**
>  * TpDBusNameType:
>  * @TP_DBUS_NAME_TYPE_UNIQUE: accept unique names like :1.123
>-- 
>1.7.10
>

Actions: View | Splinter Review

Attachments on bug 49338: 60836 | 60837 | 60840 | 60841 | 60842 | 60843 | 60844 | 60845 | 60846 | 60847 | 60848 | 60849 | 60850 | 60851 | 60852

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.