Merge lp:~jassmith/window-picker-applet/pixbuf-fix into lp:window-picker-applet

[Jason Smith]

[Jason Smith (jassmith)]

Fixes minor issues and bugs related to icons

[lp:~jassmith/window-picker-applet/pixbuf-fix]

93. By Jason Smith <jason@t500> on 2009-08-27

src/task-item.c : fix memory leak

[Neil J. Patel (njpatel)]

Looks good. Approved.

review: Approve

=== modified file 'src/task-item.c'
--- src/task-item.c	2009-08-27 06:01:52 +0000
+++ src/task-item.c	2009-08-27 17:52:25 +0000
@@ -261,8 +261,8 @@
       gdk_pixbuf_get_width (pbuf) != size &&
       gdk_pixbuf_get_height (pbuf) != size)
   {
-  	g_object_unref (pbuf);
-  	pbuf = NULL;
+    g_object_unref (pbuf);
+    pbuf = NULL;
   }
   
   if (active)
@@ -286,8 +286,6 @@
                                (area.x + (area.width - gdk_pixbuf_get_width (pbuf)) / 2), 
                                (area.y + (area.height - gdk_pixbuf_get_height (pbuf)) / 2));
   
-  g_object_unref (pbuf);
-  
   if (!priv->mouse_over && wnck_window_or_transient_needs_attention (priv->window)) /* urgent */
   {
     GTimeVal current_time;
@@ -443,6 +441,23 @@
   task_item_set_visibility (item);
 }
 
+static void on_window_icon_changed (WnckWindow *window, TaskItem *item)
+{
+  TaskItemPrivate *priv;
+  
+  g_return_if_fail (TASK_IS_ITEM (item));
+  
+  priv = item->priv;
+  
+  if (GDK_IS_PIXBUF (priv->pixbuf))
+  {
+    g_object_unref (priv->pixbuf);
+    priv->pixbuf = NULL;
+  }
+  
+  gtk_widget_queue_draw (GTK_WIDGET (item));
+}
+
 static void
 on_screen_active_window_changed (WnckScreen    *screen,
                                  WnckWindow    *old_window,
@@ -653,6 +668,8 @@
   		    G_CALLBACK (on_window_workspace_changed), item);
   g_signal_connect (window, "state-changed",
                     G_CALLBACK (on_window_state_changed), item);
+  g_signal_connect (window, "icon-changed",
+                    G_CALLBACK (on_window_icon_changed), item);
   
   g_signal_connect (item, "button-release-event",
                     G_CALLBACK (on_task_item_button_released), item);