diff options
| author | Not Zed <NotZed@Ximian.com> | 2005-08-15 11:15:06 +0800 |
|---|---|---|
| committer | Michael Zucci <zucchi@src.gnome.org> | 2005-08-15 11:15:06 +0800 |
| commit | 0df3a787c42602a95529a4f7842150e09a01325a (patch) | |
| tree | 7c5417b5ef60d8b3c0d89f25e25efbb6d1d7ab3e /widgets | |
| parent | 51accbf84466e0c5d229dc4855e355771d74b2f1 (diff) | |
| download | gsoc2013-evolution-0df3a787c42602a95529a4f7842150e09a01325a.tar.gz gsoc2013-evolution-0df3a787c42602a95529a4f7842150e09a01325a.tar.zst gsoc2013-evolution-0df3a787c42602a95529a4f7842150e09a01325a.zip | |
revert dobey's last patch here, it completely broke customisation of the
2005-08-03 Not Zed <NotZed@Ximian.com>
* e-filter-bar.c (build_items): revert dobey's last patch here, it
completely broke customisation of the menu.
svn path=/trunk/; revision=30116
Diffstat (limited to 'widgets')
| -rw-r--r-- | widgets/misc/ChangeLog | 5 | ||||
| -rw-r--r-- | widgets/misc/e-filter-bar.c | 22 |
2 files changed, 16 insertions, 11 deletions
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog index 45ec4f3921..44c79382d2 100644 --- a/widgets/misc/ChangeLog +++ b/widgets/misc/ChangeLog @@ -1,3 +1,8 @@ +2005-08-03 Not Zed <NotZed@Ximian.com> + + * e-filter-bar.c (build_items): revert dobey's last patch here, it + completely broke customisation of the menu. + 2005-08-11 Srinivasa Ragavan <sragavan@novell.com> * e-attachment-bar.[ch] (e_attachment_bar_refresh): Added a function diff --git a/widgets/misc/e-filter-bar.c b/widgets/misc/e-filter-bar.c index 15c2980bc0..f9d4d24ab1 100644 --- a/widgets/misc/e-filter-bar.c +++ b/widgets/misc/e-filter-bar.c @@ -334,6 +334,17 @@ build_items (ESearchBar *esb, ESearchBarItem *items, int type, int *start, GPtrA g_ptr_array_set_size(rules, 0); + /* find a unique starting point for the id's of our items */ + for (i = 0; items[i].id != -1; i++) { + ESearchBarItem dup_item; + + if (items[i].id >= id) + id = items[i].id + 1; + + dup_item_no_subitems (&dup_item, items + i); + g_array_append_vals (menu, &dup_item, 1); + } + *start = id; if (type == 0) { @@ -373,17 +384,6 @@ build_items (ESearchBar *esb, ESearchBarItem *items, int type, int *start, GPtrA g_ptr_array_add (rules, rule); } - /* find a unique starting point for the id's of our items */ - for (i = 0; items[i].id != -1; i++) { - ESearchBarItem dup_item; - - if (items[i].id >= id) - id = items[i].id + 1; - - dup_item_no_subitems (&dup_item, items + i); - g_array_append_vals (menu, &dup_item, 1); - } - /* anything elft in gtksux has gone away, and we need to unref/disconnect from it */ while (gtksux) { GSList *next; |