From e3c8aaf705a14f7db408781cf1332cd7d67e4da4 Mon Sep 17 00:00:00 2001 From: Jonny Lamb Date: Thu, 4 Jun 2009 22:45:21 +0100 Subject: Free a GError after use. Signed-off-by: Jonny Lamb --- src/empathy-debug-dialog.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/empathy-debug-dialog.c b/src/empathy-debug-dialog.c index 3819fd29c..0d724b8d8 100644 --- a/src/empathy-debug-dialog.c +++ b/src/empathy-debug-dialog.c @@ -464,6 +464,7 @@ debug_dialog_list_connection_names_cb (const gchar * const *names, if (error2 != NULL) { DEBUG ("Failed to dup TpDBusDaemon."); + g_error_free (error2); return; } -- cgit v1.2.3 From 2c8c5507c716c4a3ed236037697ef0fa11b99fa3 Mon Sep 17 00:00:00 2001 From: Jonny Lamb Date: Thu, 4 Jun 2009 22:45:46 +0100 Subject: Don't unref widgets twice. Signed-off-by: Jonny Lamb --- src/empathy-debug-dialog.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/empathy-debug-dialog.c b/src/empathy-debug-dialog.c index 0d724b8d8..2f3c822fd 100644 --- a/src/empathy-debug-dialog.c +++ b/src/empathy-debug-dialog.c @@ -1195,12 +1195,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); -- cgit v1.2.3 From d25cf54e8cc0dd24731cc528881a8863b30321b8 Mon Sep 17 00:00:00 2001 From: Jonny Lamb Date: Thu, 4 Jun 2009 22:46:22 +0100 Subject: Don't display an empty treeview if there are no connections on opening. Signed-off-by: Jonny Lamb --- src/empathy-debug-dialog.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/empathy-debug-dialog.c b/src/empathy-debug-dialog.c index 2f3c822fd..f6fe6e8b2 100644 --- a/src/empathy-debug-dialog.c +++ b/src/empathy-debug-dialog.c @@ -962,7 +962,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)); @@ -1127,15 +1126,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 = FALSE; - priv->view_visible = TRUE; + 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; -- cgit v1.2.3