diff options
| author | Stefano Karapetsas <[email protected]> | 2014-06-25 12:33:16 +0200 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2014-06-25 12:33:16 +0200 |
| commit | d2f003d2583af2ae9c526bb55bfe675fccf20f04 (patch) | |
| tree | 483aa0b8f2cebcda54481055d2aadce8b6ee3313 | |
| parent | e036725df40fb3e47615b20c74b9e836906a2a74 (diff) | |
| parent | 551983e0fa42ee207f136e64ca4a8dea545bb57a (diff) | |
| download | mate-netbook-d2f003d2583af2ae9c526bb55bfe675fccf20f04.tar.bz2 mate-netbook-d2f003d2583af2ae9c526bb55bfe675fccf20f04.tar.xz | |
Merge pull request #10 from daschuer/allocation_null
Check for allocation = NULL. This fixes a segfault during applet load
| -rw-r--r-- | mate-window-picker-applet/task-item.c | 4 | ||||
| -rw-r--r-- | mate-window-picker-applet/task-title.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/mate-window-picker-applet/task-item.c b/mate-window-picker-applet/task-item.c index cafcb2c..366dea0 100644 --- 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 index 546e331..e81dfd3 100644 --- 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, |