Merge branch 'debugger'

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

diff --git a/src/empathy-debug-dialog.c b/src/empathy-debug-dialog.c
index 3819fd29c5fefc33a9c520b239c0e1e3702e66b7..cd0d925f9447be22af68f68212cfa32354073471 100644 (file)
--- a/src/empathy-debug-dialog.c
+++ b/src/empathy-debug-dialog.c
@@ -430,8 +430,6 @@ debug_dialog_get_name_owner_cb (TpDBusDaemon *proxy,
           COL_CM_NAME, data->cm_name,
           COL_CM_UNIQUE_NAME, out,
           -1);
-
-      gtk_combo_box_set_active (GTK_COMBO_BOX (priv->cm_chooser), 0);
     }
 
 OUT:
@@ -464,6 +462,7 @@ debug_dialog_list_connection_names_cb (const gchar * const *names,
   if (error2 != NULL)
     {
       DEBUG ("Failed to dup TpDBusDaemon.");
+      g_error_free (error2);
       return;
     }
 
@@ -567,6 +566,7 @@ debug_dialog_fill_cm_chooser (EmpathyDebugDialog *debug_dialog)
 {
   EmpathyDebugDialogPriv *priv = GET_PRIV (debug_dialog);
   GError *error = NULL;
+  GtkTreeIter iter;
 
   priv->dbus = tp_dbus_daemon_dup (&error);
 
@@ -577,6 +577,15 @@ debug_dialog_fill_cm_chooser (EmpathyDebugDialog *debug_dialog)
       return;
     }
 
+  /* Add empathy */
+  gtk_list_store_append (priv->cms, &iter);
+  gtk_list_store_set (priv->cms, &iter,
+      COL_CM_NAME, "empathy",
+      COL_CM_UNIQUE_NAME, "org.gnome.Empathy",
+      -1);
+  gtk_combo_box_set_active (GTK_COMBO_BOX (priv->cm_chooser), 0);
+
+  /* Add CMs to list */
   tp_list_connection_names (priv->dbus, debug_dialog_list_connection_names_cb,
       debug_dialog, NULL, NULL);
 
@@ -961,7 +970,6 @@ debug_dialog_constructor (GType type,
   gtk_widget_show (GTK_WIDGET (item));
   gtk_container_add (GTK_CONTAINER (item), priv->cm_chooser);
   gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
-  debug_dialog_fill_cm_chooser (EMPATHY_DEBUG_DIALOG (object));
   g_signal_connect (priv->cm_chooser, "changed",
       G_CALLBACK (debug_dialog_cm_chooser_changed_cb), object);
   gtk_widget_show (GTK_WIDGET (priv->cm_chooser));
@@ -1126,15 +1134,18 @@ debug_dialog_constructor (GType type,
   gtk_container_add (GTK_CONTAINER (priv->scrolled_win), priv->view);
 
   gtk_widget_show (priv->scrolled_win);
-  gtk_box_pack_start (GTK_BOX (vbox), priv->scrolled_win, TRUE, TRUE, 0);
 
   /* Not supported label */
   priv->not_supported_label = g_object_ref (gtk_label_new (
           _("The selected connection manager does not support the remote "
               "debugging extension.")));
   gtk_widget_show (priv->not_supported_label);
+  gtk_box_pack_start (GTK_BOX (vbox), priv->not_supported_label, TRUE, TRUE, 0);
 
-  priv->view_visible = TRUE;
+  priv->view_visible = FALSE;
+
+  debug_dialog_set_toolbar_sensitivity (EMPATHY_DEBUG_DIALOG (object), FALSE);
+  debug_dialog_fill_cm_chooser (EMPATHY_DEBUG_DIALOG (object));
   gtk_widget_show (GTK_WIDGET (object));
 
   return object;
@@ -1194,12 +1205,6 @@ debug_dialog_dispose (GObject *object)
   if (priv->store != NULL)
     g_object_unref (priv->store);
 
-  if (priv->scrolled_win != NULL)
-    g_object_unref (priv->scrolled_win);
-
-  if (priv->view != NULL)
-    g_object_unref (priv->view);
-
   if (priv->name_owner_changed_signal != NULL)
     tp_proxy_signal_connection_disconnect (priv->name_owner_changed_signal);