Merge pull request #10 from daschuer/allocation_null

Check for allocation = NULL. This fixes a segfault during applet load
mate-desktop · Jun 25, 2014 · d2f003d · d2f003d
2 parents e036725 + 551983e
commit d2f003d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/mate-window-picker-applet/task-item.c b/mate-window-picker-applet/task-item.c
@@ -106,9 +106,11 @@ update_hints (TaskItem *item)
 
   /* Set the minimize hint for the window */
   gtk_widget_get_allocation (widget, allocation);
-  wnck_window_set_icon_geometry (window, x, y,
+  if (allocation) {	
+  	wnck_window_set_icon_geometry (window, x, y,
                                  allocation->width,
                                  allocation->height);
+  }
 }
 
 static gboolean 

diff --git a/mate-window-picker-applet/task-title.c b/mate-window-picker-applet/task-title.c
@@ -407,7 +407,7 @@ on_expose (GtkWidget *eb, GdkEventExpose *event)
   style = gtk_widget_get_style (eb);
   state = gtk_widget_get_state (eb);
 
-  if (state == GTK_STATE_ACTIVE)
+  if (state == GTK_STATE_ACTIVE && allocation)
     gtk_paint_box (style,
 #if GTK_CHECK_VERSION (3, 0, 0)
                  cr,