From b55aa154e636237fc7ffbb488bda864cb7c2f650 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 22 Mar 2015 11:45:19 -0400 Subject: [PATCH] mount operation: Minor formatting cleanup The pattern for g_object_add_weak_pointer calls is to have the same expression in both arguments. --- gtk/gtkmountoperation.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/gtk/gtkmountoperation.c b/gtk/gtkmountoperation.c index 89a0882f60..4d7a87b0a4 100644 --- a/gtk/gtkmountoperation.c +++ b/gtk/gtkmountoperation.c @@ -1436,13 +1436,10 @@ create_show_processes_dialog (GtkMountOperation *op, gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0); if (secondary != NULL) - { - s = g_strdup_printf ("%s\n\n%s", primary, secondary); - } + s = g_strdup_printf ("%s\n\n%s", primary, secondary); else - { - s = g_strdup_printf ("%s", primary); - } + s = g_strdup_printf ("%s", primary); + g_free (primary); label = gtk_label_new (NULL); gtk_label_set_markup (GTK_LABEL (label), s); @@ -1518,8 +1515,8 @@ create_show_processes_dialog (GtkMountOperation *op, priv->process_list_store = list_store; priv->process_tree_view = tree_view; /* set pointers to NULL when dialog goes away */ - g_object_add_weak_pointer (G_OBJECT (list_store), (gpointer *) &priv->process_list_store); - g_object_add_weak_pointer (G_OBJECT (tree_view), (gpointer *) &priv->process_tree_view); + g_object_add_weak_pointer (G_OBJECT (priv->process_list_store), (gpointer *) &priv->process_list_store); + g_object_add_weak_pointer (G_OBJECT (priv->process_tree_view), (gpointer *) &priv->process_tree_view); g_object_unref (list_store); g_object_ref (op);