Merge branch 'debug-window'

[empathy.git] / src / empathy-debug-window.c

diff --git a/src/empathy-debug-window.c b/src/empathy-debug-window.c
index 12b7eeb38993e1c0fbbd49421e7dba0586182afe..e2f7202e948890ce92bb2aadd44b18c985e1f68e 100644 (file)
--- a/src/empathy-debug-window.c
+++ b/src/empathy-debug-window.c
@@ -284,7 +284,6 @@ debug_window_cm_chooser_changed_cb (GtkComboBox *cm_chooser,
     EmpathyDebugWindow *debug_window)
 {
   EmpathyDebugWindowPriv *priv = GET_PRIV (debug_window);
     EmpathyDebugWindow *debug_window)
 {
   EmpathyDebugWindowPriv *priv = GET_PRIV (debug_window);

-  MissionControl *mc;

   TpDBusDaemon *dbus;
   GError *error = NULL;
   gchar *bus_name;
   TpDBusDaemon *dbus;
   GError *error = NULL;
   gchar *bus_name;


@@ -302,13 +301,11 @@ debug_window_cm_chooser_changed_cb (GtkComboBox *cm_chooser,
       return;
     }
 
       return;
     }
 

-  mc = empathy_mission_control_dup_singleton ();

   dbus = tp_dbus_daemon_dup (&error);
 
   if (error != NULL)
     {
       DEBUG ("Failed at duping the dbus daemon: %s", error->message);
   dbus = tp_dbus_daemon_dup (&error);
 
   if (error != NULL)
     {
       DEBUG ("Failed at duping the dbus daemon: %s", error->message);

-      g_object_unref (mc);

     }
 
   gtk_tree_model_get (GTK_TREE_MODEL (priv->cms), &iter,
     }
 
   gtk_tree_model_get (GTK_TREE_MODEL (priv->cms), &iter,


@@ -344,7 +341,6 @@ debug_window_cm_chooser_changed_cb (GtkComboBox *cm_chooser,
       debug_window_get_messages_cb, debug_window, NULL, NULL);
 
   g_object_unref (dbus);
       debug_window_get_messages_cb, debug_window, NULL, NULL);
 
   g_object_unref (dbus);

-  g_object_unref (mc);

 }
 
 typedef struct
 }
 
 typedef struct