[Goodies-commits] r1447 - xfce4-clipman-plugin/trunk/panel-plugin

[Nick Schermer]

Author: nick
Date: 2006-06-14 20:29:10 +0000 (Wed, 14 Jun 2006)
New Revision: 1447

Modified:
   xfce4-clipman-plugin/trunk/panel-plugin/clipman.c
Log:
* Use g_object_unref (G_OBJECT (...))


Modified: xfce4-clipman-plugin/trunk/panel-plugin/clipman.c
===================================================================
--- xfce4-clipman-plugin/trunk/panel-plugin/clipman.c	2006-06-14 20:14:45 UTC (rev 1446)
+++ xfce4-clipman-plugin/trunk/panel-plugin/clipman.c	2006-06-14 20:29:10 UTC (rev 1447)
@@ -962,7 +962,7 @@
     g_ptr_array_free (clipman->clips, TRUE);
 
     gtk_tooltips_set_tip (clipman->tooltip, clipman->button, NULL, NULL);
-    g_object_unref (clipman->tooltip);
+    g_object_unref (G_OBJECT (clipman->tooltip));
     
     gtk_widget_destroy (clipman->icon);
     gtk_widget_destroy (clipman->button);
@@ -986,8 +986,8 @@
 
     gtk_widget_set_size_request (clipman->button, wsize, wsize);
     
-    size = wsize - 2 - 2 * MAX (clipman->button->style->xthickness,
-                                clipman->button->style->ythickness);
+    size = wsize - 2 - (2 * MAX (clipman->button->style->xthickness,
+                                 clipman->button->style->ythickness));
     
     if (size < 1)
         size = 1;
@@ -995,12 +995,13 @@
     if (clipman->icon)
         gtk_widget_destroy (clipman->icon);
     
-    pb = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (), "gtk-paste", size , 0, NULL);
+    pb = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
+                                   "gtk-paste", size , 0, NULL);
     clipman->icon = gtk_image_new_from_pixbuf (pb);
+    g_object_unref (G_OBJECT (pb));
+    
     gtk_widget_show (clipman->icon);
     gtk_container_add (GTK_CONTAINER (clipman->button), clipman->icon);
-    
-    g_object_unref (pb);
 
     return TRUE;
 }