[Xfce4-commits] r26473 - xfdesktop/branches/xfce_4_4/menueditor

[Jean-François Wauthy]

Author: pollux
Date: 2007-12-14 07:50:17 +0000 (Fri, 14 Dec 2007)
New Revision: 26473

Modified:
   xfdesktop/branches/xfce_4_4/menueditor/menueditor-main-window.c
Log:
unref icon only if it has been initialized (bug #3747)

Modified: xfdesktop/branches/xfce_4_4/menueditor/menueditor-main-window.c
===================================================================
--- xfdesktop/branches/xfce_4_4/menueditor/menueditor-main-window.c	2007-12-13 23:24:18 UTC (rev 26472)
+++ xfdesktop/branches/xfce_4_4/menueditor/menueditor-main-window.c	2007-12-14 07:50:17 UTC (rev 26473)
@@ -213,7 +213,7 @@
 
   g_free (priv->menu_file_name);
   
-  if (G_LIKELY (dummy_icon != NULL)) {
+  if (G_LIKELY (G_IS_OBJECT (dummy_icon))) {
 	g_object_unref (dummy_icon);
 	dummy_icon = NULL;
   }
@@ -255,8 +255,10 @@
   
   /* Set default icon */
   icon = xfce_themed_icon_load ("xfce4-menueditor", 48);
-  gtk_window_set_icon (GTK_WINDOW (mainwin), icon);
-  g_object_unref (icon);
+  if (G_LIKELY (G_IS_OBJECT (icon))) {
+    gtk_window_set_icon (GTK_WINDOW (mainwin), icon);
+    g_object_unref (icon);
+  }
 
   /* create ui manager */
   priv->action_group = gtk_action_group_new ("menueditor-main-window");
@@ -871,7 +873,7 @@
       
       menueditor_main_window_set_menu_modified (window);
     
-      if (G_LIKELY (G_IS_OBJECT (new_icon)))
+      if (G_IS_OBJECT (new_icon))
         g_object_unref (new_icon);
       g_free (new_name);
       g_free (new_command);
@@ -1305,7 +1307,7 @@
   gtk_widget_destroy (dialog);
 
   xfce_about_info_free (info);
-  if (G_LIKELY (icon != NULL))
+  if (G_LIKELY (G_IS_OBJECT (icon)))
     g_object_unref (G_OBJECT (icon));
 }
 
@@ -1550,7 +1552,7 @@
                         COLUMN_OPTION_1, icon ? attribute_values[m] : "",
                         COLUMN_OPTION_2, in_terminal ? "true" : "false",
                         COLUMN_OPTION_3, start_notify ? "true" : "false", -1);
-    if (icon)
+    if (G_IS_OBJECT (icon))
       g_object_unref (icon);
   }
   else if (!strcmp (element_name, "menu")) {
@@ -1571,7 +1573,7 @@
                         COLUMN_NAME, name,
                         COLUMN_COMMAND, "",
                         COLUMN_HIDDEN, hidden, COLUMN_OPTION_1, icon ? attribute_values[j] : "", COLUMN_TYPE, MENU, -1);
-    if (icon)
+    if (G_IS_OBJECT (icon))
       g_object_unref (icon);
 
 	parent = g_new0 (GtkTreeIter, 1);
@@ -1608,7 +1610,7 @@
                         COLUMN_HIDDEN, hidden,
                         COLUMN_TYPE, BUILTIN,
                         COLUMN_OPTION_1, icon ? attribute_values[k] : "", COLUMN_OPTION_2, "builtin", -1);
-    if (icon)
+    if (G_IS_OBJECT (icon))
       g_object_unref (icon);
   }
   else if (!strcmp (element_name, "title")) {
@@ -1626,7 +1628,7 @@
                         COLUMN_ICON, icon ? icon : dummy_icon,
                         COLUMN_NAME, name, COLUMN_HIDDEN, hidden, COLUMN_TYPE, TITLE, COLUMN_OPTION_1,
                         icon ? attribute_values[j] : "", -1);
-    if (icon)
+    if (G_IS_OBJECT (icon))
       g_object_unref (icon);
   }
   else if (!strcmp (element_name, "include")) {