aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonny Lamb <jonny.lamb@collabora.co.uk>2009-04-24 19:47:14 +0800
committerJonny Lamb <jonny.lamb@collabora.co.uk>2009-04-24 20:13:11 +0800
commit7f6ef434116202d103024c41cf280c2d15b81862 (patch)
tree882649edddff37b943e4f2f416745178a3609475
parent5aff2cd01627715693f777dd69400665cf79dc7a (diff)
downloadgsoc2013-empathy-7f6ef434116202d103024c41cf280c2d15b81862.tar
gsoc2013-empathy-7f6ef434116202d103024c41cf280c2d15b81862.tar.gz
gsoc2013-empathy-7f6ef434116202d103024c41cf280c2d15b81862.tar.bz2
gsoc2013-empathy-7f6ef434116202d103024c41cf280c2d15b81862.tar.lz
gsoc2013-empathy-7f6ef434116202d103024c41cf280c2d15b81862.tar.xz
gsoc2013-empathy-7f6ef434116202d103024c41cf280c2d15b81862.tar.zst
gsoc2013-empathy-7f6ef434116202d103024c41cf280c2d15b81862.zip
Create a straight TpProxy instead of a TpConnection.
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
-rw-r--r--src/empathy-debug-dialog.c19
1 files changed, 7 insertions, 12 deletions
diff --git a/src/empathy-debug-dialog.c b/src/empathy-debug-dialog.c
index 694aff230..d0cbef9fc 100644
--- a/src/empathy-debug-dialog.c
+++ b/src/empathy-debug-dialog.c
@@ -233,7 +233,7 @@ debug_dialog_cm_chooser_changed_cb (GtkComboBox *cm_chooser,
TpDBusDaemon *dbus;
GError *error = NULL;
gchar *bus_name;
- TpConnection *connection;
+ TpProxy *proxy;
GtkTreeIter iter;
if (!gtk_combo_box_get_active_iter (cm_chooser, &iter))
@@ -258,18 +258,13 @@ debug_dialog_cm_chooser_changed_cb (GtkComboBox *cm_chooser,
gtk_tree_model_get (GTK_TREE_MODEL (priv->cms), &iter,
COL_CM_UNIQUE_NAME, &bus_name, -1);
- connection = tp_connection_new (dbus, bus_name, DEBUG_OBJECT_PATH, &error);
+ proxy = g_object_new (TP_TYPE_PROXY,
+ "bus-name", bus_name,
+ "dbus-daemon", dbus,
+ "object-path", DEBUG_OBJECT_PATH,
+ NULL);
g_free (bus_name);
- if (error != NULL)
- {
- DEBUG ("Getting a new TpConnection failed: %s", error->message);
- g_error_free (error);
- g_object_unref (dbus);
- g_object_unref (mc);
- return;
- }
-
gtk_list_store_clear (priv->store);
/* Disable debug signalling */
@@ -286,7 +281,7 @@ debug_dialog_cm_chooser_changed_cb (GtkComboBox *cm_chooser,
if (priv->proxy != NULL)
g_object_unref (priv->proxy);
- priv->proxy = TP_PROXY (connection);
+ priv->proxy = proxy;
tp_proxy_add_interface_by_id (priv->proxy, emp_iface_quark_debug ());