[gimp] app: clean up size group code in the preferences dialog

[Michael Natterer <mitch src gnome org>]

commit 0efa00932b19243861cd3fad9a6028de5295ac0e
Author: Michael Natterer <mitch gimp org>
Date:   Fri Dec 7 12:11:25 2018 +0100

    app: clean up size group code in the preferences dialog

 app/dialogs/preferences-dialog.c | 43 +++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 23 deletions(-)
---
diff --git a/app/dialogs/preferences-dialog.c b/app/dialogs/preferences-dialog.c
index 015d25b5cc..51fe30a95a 100644
--- a/app/dialogs/preferences-dialog.c
+++ b/app/dialogs/preferences-dialog.c
@@ -1202,9 +1202,6 @@ prefs_dialog_new (Gimp       *gimp,
                            _("Maximum _filesize for thumbnailing:"),
                            GTK_GRID (grid), 1, size_group);
 
-  g_object_unref (size_group);
-  size_group = NULL;
-
   /*  Document History  */
   vbox2 = prefs_frame_new (_("Document History"), GTK_CONTAINER (vbox), FALSE);
 
@@ -1212,6 +1209,8 @@ prefs_dialog_new (Gimp       *gimp,
                           _("Keep record of used files in the Recent Documents list"),
                           GTK_BOX (vbox2));
 
+  g_clear_object (&size_group);
+
 
   /***************/
   /*  Debugging  */
@@ -1244,12 +1243,11 @@ prefs_dialog_new (Gimp       *gimp,
   vbox2 = prefs_frame_new (_("Bug Reporting"),
                            GTK_CONTAINER (vbox), FALSE);
 
-  size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
   grid = prefs_grid_new (GTK_CONTAINER (vbox2));
 
   button = prefs_enum_combo_box_add (object, "debug-policy", 0, 0,
                                      _("Debug _policy:"),
-                                     GTK_GRID (grid), 0, size_group);
+                                     GTK_GRID (grid), 0, NULL);
 
   /* Check existence of gdb or lldb to activate the preference, as a
    * good hint of its prerequisite, unless backtrace() API exists, in
@@ -1459,7 +1457,7 @@ prefs_dialog_new (Gimp       *gimp,
                                      _("Show advanced color options"),
                                      GTK_BOX (vbox2));
 
-    g_object_unref (size_group);
+    g_clear_object (&size_group);
 
     g_object_unref (store);
   }
@@ -1577,7 +1575,8 @@ prefs_dialog_new (Gimp       *gimp,
                       config);
   }
 
-  g_object_unref (size_group);
+  g_clear_object (&size_group);
+
 
   /****************/
   /*  Playground  */
@@ -1661,6 +1660,7 @@ prefs_dialog_new (Gimp       *gimp,
                             GTK_GRID (grid), 0, size_group);
 
   g_object_unref (size_group);
+
   size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
 
   /*  Global Brush, Pattern, ...  */
@@ -1689,8 +1689,7 @@ prefs_dialog_new (Gimp       *gimp,
                                     GIMP_ICON_TOOL_MOVE,
                                     GTK_BOX (vbox2), size_group);
 
-  g_object_unref (size_group);
-  size_group = NULL;
+  g_clear_object (&size_group);
 
 
   /*******************/
@@ -1801,13 +1800,13 @@ prefs_dialog_new (Gimp       *gimp,
 
   prefs_enum_combo_box_add (object, "layer-preview-size", 0, 0,
                             _("_Default layer & channel preview size:"),
-                            GTK_GRID (grid), 0, size_group);
+                            GTK_GRID (grid), 0, NULL);
   prefs_enum_combo_box_add (object, "undo-preview-size", 0, 0,
                             _("_Undo preview size:"),
-                            GTK_GRID (grid), 1, size_group);
+                            GTK_GRID (grid), 1, NULL);
   prefs_enum_combo_box_add (object, "navigation-preview-size", 0, 0,
                             _("Na_vigation preview size:"),
-                            GTK_GRID (grid), 2, size_group);
+                            GTK_GRID (grid), 2, NULL);
 
   /* Keyboard Shortcuts */
   vbox2 = prefs_frame_new (_("Keyboard Shortcuts"),
@@ -2081,6 +2080,7 @@ prefs_dialog_new (Gimp       *gimp,
                             GTK_BOX (vbox2));
   }
 
+
   /*************************/
   /*  Interface / Toolbox  */
   /*************************/
@@ -2115,8 +2115,7 @@ prefs_dialog_new (Gimp       *gimp,
                                     GIMP_ICON_IMAGE,
                                     GTK_BOX (vbox2), size_group);
 
-  g_object_unref (size_group);
-  size_group = NULL;
+  g_clear_object (&size_group);
 
   /* Tool Editor */
   vbox2 = prefs_frame_new (_("Tools Configuration"),
@@ -2447,7 +2446,7 @@ prefs_dialog_new (Gimp       *gimp,
   gtk_box_pack_start (GTK_BOX (vbox2), editor, FALSE, FALSE, 0);
   gtk_widget_show (editor);
 
-  g_object_unref (size_group);
+  g_clear_object (&size_group);
 
 
   /*****************************/
@@ -2591,8 +2590,7 @@ prefs_dialog_new (Gimp       *gimp,
                     G_CALLBACK (prefs_search_clear_callback),
                     gimp);
 
-  g_object_unref (size_group);
-  size_group = NULL;
+  g_clear_object (&size_group);
 
 
   /*************************/
@@ -2719,8 +2717,7 @@ prefs_dialog_new (Gimp       *gimp,
                     G_CALLBACK (prefs_resolution_calibrate_callback),
                     entry);
 
-  g_object_unref (size_group);
-  size_group = NULL;
+  g_clear_object (&size_group);
 
 
   /***********************************/
@@ -2741,7 +2738,7 @@ prefs_dialog_new (Gimp       *gimp,
 
   prefs_enum_combo_box_add (object, "dock-window-hint", 0, 0,
                             _("Hint for _docks and toolbox:"),
-                            GTK_GRID (grid), 1, size_group);
+                            GTK_GRID (grid), 1, NULL);
 
   vbox2 = prefs_frame_new (_("Focus"),
                            GTK_CONTAINER (vbox), FALSE);
@@ -2853,8 +2850,7 @@ prefs_dialog_new (Gimp       *gimp,
                             _("Pointer _handedness:"),
                             GTK_GRID (grid), 1, NULL);
 
-  g_object_unref (size_group);
-  size_group = NULL;
+  g_clear_object (&size_group);
 
 
   /********************************/
@@ -3002,6 +2998,7 @@ prefs_dialog_new (Gimp       *gimp,
       }
   }
 
+
   /******************************/
   /*  Image Windows / Snapping  */
   /******************************/
@@ -3029,7 +3026,7 @@ prefs_dialog_new (Gimp       *gimp,
 
   prefs_spin_button_add (object, "snap-distance", 1.0, 5.0, 0,
                          _("_Snapping distance:"),
-                         GTK_GRID (grid), 0, size_group);
+                         GTK_GRID (grid), 0, NULL);
 
 
   /*******************/