diff options
| author | Vincent Untz <vuntz@gnome.org> | 2007-05-28 11:18:03 +0000 |
|---|---|---|
| committer | Vincent Untz <vuntz@src.gnome.org> | 2007-05-28 11:18:03 +0000 |
| commit | 7bff11d6e30354c97b3ea7555b9cdda723274eaa (patch) | |
| tree | 739bf48e14c57f3cac3eb8003614269330867e9e | |
| parent | 2a28b974c0d117bf45fa17e46a99dc9eb56cc6c7 (diff) | |
| download | libwnck-7bff11d6e30354c97b3ea7555b9cdda723274eaa.tar.gz | |
Backport from HEAD.
2007-05-28 Vincent Untz <vuntz@gnome.org>
Backport from HEAD.
* libwnck/tasklist.c: (wnck_tasklist_size_request): remove some
useless code, and also make sure we have size hints that make sense
when there's no window in always group mode
Should fix bug #440625
svn path=/branches/gnome-2-18/; revision=1266
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | libwnck/tasklist.c | 7 |
2 files changed, 12 insertions, 4 deletions
@@ -2,6 +2,15 @@ Backport from HEAD. + * libwnck/tasklist.c: (wnck_tasklist_size_request): remove some + useless code, and also make sure we have size hints that make sense + when there's no window in always group mode + Should fix bug #440625 + +2007-05-28 Vincent Untz <vuntz@gnome.org> + + Backport from HEAD. + * libwnck-1.0.pc.in: * libwnck-1.0-uninstalled.pc.in: require libstartup-notification-1.0 when we compile the library with sn diff --git a/libwnck/tasklist.c b/libwnck/tasklist.c index 848e9f2..87d7a2c 100644 --- a/libwnck/tasklist.c +++ b/libwnck/tasklist.c @@ -1200,11 +1200,9 @@ wnck_tasklist_size_request (GtkWidget *widget, val = n_cols * tasklist->priv->max_button_width; if (val >= lowest_range) { /* Overlaps old range */ + g_assert (array->len > 0); lowest_range = n_cols * grouping_limit; - if (array->len > 0) - g_array_index(array, int, array->len-1) = lowest_range; - else - g_array_insert_val (array, 0, lowest_range); + g_array_index(array, int, array->len-1) = lowest_range; } else { @@ -1228,6 +1226,7 @@ wnck_tasklist_size_request (GtkWidget *widget, { val = 0; g_array_insert_val (array, 0, val); + g_array_insert_val (array, 0, val); } if (tasklist->priv->size_hints) |