From d88e794ded5fc1ea72af2a3d0ec4c46442a992cf Mon Sep 17 00:00:00 2001 From: Rodney Dawes Date: Fri, 13 May 2005 21:29:28 +0000 Subject: Add profiler so that it gets disted properly 2005-05-13 Rodney Dawes * plugins/Makefile.am (DIST_SUBDIRS): Add profiler so that it gets disted properly 2005-05-13 Rodney Dawes * Makefile.am: Add new em-folder-utils.[ch] abstraction * em-folder-browser.c: Update for new menu layout Add new methods to handle the actions that were previously only available from the context menu when right-clicking on a folder * em-folder-selector.c (emfs_response): Just call emfu_folder_create if the user wants to create a new folder in the selector dialog (em_folder_selector_get_selected_path): Clean up the code to fix a couple potential crashes * em-folder-tree.[ch]: Add methods to get pointers to a CamelFolder or CamelFolderInfo object for the selected item in the tree Add a method to get a pointer to an EMFolderTreeModelStoreInfo object for the selected store in the tree Move folder operations out into em-folder-utils.[ch] so that they are abstracted from the tree and can be used by methods other than the internal context menu * em-folder-utils.[ch]: Move the folder operations code to here * em-folder-view.c: Update for the new menu layout Fix Mark as Read/Unread in the context menu to only show up in the list * mail-component.c (create_item): Just call emfu_folder_create here when the user requests to create a new folder from the New toolbar item 2005-05-13 Rodney Dawes * org-gnome-mailing-list-actions.xml: Update for the new menu layout 2005-05-13 Rodney Dawes * org-gnome-plugin-manager.xml: Update for new menu layout 2005-05-13 Rodney Dawes * org-gnome-save-attachments.xml: Update for new menu layout 2005-05-13 Rodney Dawes * e-shell-window.c (setup_widgets): Update for the new menu layout by putting the "component" switching items under the "Tools" menu 2005-05-13 Rodney Dawes * *.xml: Update to the new menu layout 2005-05-13 Rodney Dawes * e-filter-bar.[ch]: Update for the new menu layout svn path=/trunk/; revision=29354 --- widgets/misc/ChangeLog | 4 ++++ widgets/misc/e-filter-bar.c | 22 +++++++++++----------- widgets/misc/e-filter-bar.h | 4 ++-- 3 files changed, 17 insertions(+), 13 deletions(-) (limited to 'widgets/misc') 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 + + * e-filter-bar.[ch]: Update for the new menu layout + 2005-05-12 Shreyas Srinivasan * 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 -- cgit v1.2.3