diff options
Diffstat (limited to 'widgets')
| -rw-r--r-- | widgets/misc/ChangeLog | 4 | ||||
| -rw-r--r-- | widgets/misc/e-filter-bar.c | 22 | ||||
| -rw-r--r-- | widgets/misc/e-filter-bar.h | 4 |
3 files changed, 17 insertions, 13 deletions
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog index 09626a62a5..5e714f5bc5 100644 --- a/widgets/misc/ChangeLog +++ b/widgets/misc/ChangeLog @@ -1,3 +1,7 @@ +2005-05-13 Rodney Dawes <dobey@novell.com> + + * e-filter-bar.[ch]: Update for the new menu layout + 2005-05-12 Shreyas Srinivasan <sshreyas@novell.com> * e-send-options.c : Fixed #272005 diff --git a/widgets/misc/e-filter-bar.c b/widgets/misc/e-filter-bar.c index f9d4d24ab1..15c2980bc0 100644 --- a/widgets/misc/e-filter-bar.c +++ b/widgets/misc/e-filter-bar.c @@ -334,17 +334,6 @@ 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) { @@ -384,6 +373,17 @@ 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; diff --git a/widgets/misc/e-filter-bar.h b/widgets/misc/e-filter-bar.h index c15343d86f..4b85a36d79 100644 --- a/widgets/misc/e-filter-bar.h +++ b/widgets/misc/e-filter-bar.h @@ -91,14 +91,14 @@ enum { #define E_FILTERBAR_SAVE { N_("_Save Search..."), E_FILTERBAR_SAVE_ID, NULL } #define E_FILTERBAR_EDIT { N_("_Edit Saved Searches..."), E_FILTERBAR_EDIT_ID, NULL } -#define E_FILTERBAR_ADVANCED { N_("_Advanced..."), E_FILTERBAR_ADVANCED_ID, NULL } +#define E_FILTERBAR_ADVANCED { N_("_Advanced Search..."), E_FILTERBAR_ADVANCED_ID, NULL } #define E_FILTERBAR_SEPARATOR { NULL, 0, NULL } #ifdef JUST_FOR_TRANSLATORS const char * strings[] = { N_("_Save Search..."), N_("_Edit Saved Searches..."), - N_("_Advanced...") + N_("_Advanced Search...") }; #endif |