summaryrefslogtreecommitdiffstats
path: root/xfce/app/xfce4-panel/patches/020-fix-action-plugin-no-icon-segfault.patch
blob: 844b98bd192c949ffca2ff887886d8cdca998704 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
--- xfce4-panel-4.4.2.orig/plugins/actions/actions.c	2008-09-17 18:52:37.000000000 +0200
+++ xfce4-panel-4.4.2/plugins/actions/actions.c	2008-09-17 19:44:58.000000000 +0200
@@ -138,19 +138,28 @@
             gtk_widget_set_size_request (GTK_WIDGET (plugin), -1, -1);  
                 
             pb = actions_load_icon (ACTION_LOCK, width);
-            gtk_image_set_from_pixbuf (GTK_IMAGE (action->image1), pb);
-            g_object_unref (G_OBJECT (pb));
+            if (pb)
+            {
+                gtk_image_set_from_pixbuf (GTK_IMAGE (action->image1), pb);
+                g_object_unref (G_OBJECT (pb));
+            }
             
             pb = actions_load_icon (ACTION_QUIT, width);
-            gtk_image_set_from_pixbuf (GTK_IMAGE (action->image2), pb);
-            g_object_unref (G_OBJECT (pb));           
+            if (pb)
+            {
+                gtk_image_set_from_pixbuf (GTK_IMAGE (action->image2), pb);
+                g_object_unref (G_OBJECT (pb));
+            }
             break;
             
         case ACTION_QUIT:
         case ACTION_LOCK:
             pb = actions_load_icon (action->type, width);
-            gtk_image_set_from_pixbuf (GTK_IMAGE (action->image1), pb);
-            g_object_unref (G_OBJECT (pb));
+            if (pb)
+            {
+                gtk_image_set_from_pixbuf (GTK_IMAGE (action->image1), pb);
+                g_object_unref (G_OBJECT (pb));
+            }
             gtk_widget_set_size_request (GTK_WIDGET (plugin), size, size);
             break;
     }