diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 8 | ||||
| -rw-r--r-- | mail/component-factory.c | 23 | ||||
| -rw-r--r-- | mail/mail-account-gui.c | 1 |
3 files changed, 31 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index d99879361b..3063ff1ba4 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,11 @@ +2002-09-04 Ettore Perazzoli <ettore@ximian.com> + + * mail-account-gui.c (mail_account_gui_save): Remove unused + variable. + + * component-factory.c (unpopulate_folder_context_menu): New. + (create_component): Pass it to evolution_shell_component_new(). + 2002-09-03 Jeffrey Stedfast <fejj@ximian.com> * folder-browser.c (mark_as_seen_cb): diff --git a/mail/component-factory.c b/mail/component-factory.c index 3102db603b..50202fbce1 100644 --- a/mail/component-factory.c +++ b/mail/component-factory.c @@ -422,6 +422,28 @@ populate_folder_context_menu (EvolutionShellComponent *shell_component, bonobo_ui_component_set_translate (uic, EVOLUTION_SHELL_COMPONENT_POPUP_PLACEHOLDER, popup_xml, NULL); } +static void +unpopulate_folder_context_menu (EvolutionShellComponent *shell_component, + BonoboUIComponent *uic, + const char *physical_uri, + const char *type, + void *closure) +{ + if (strcmp (type, "mail") != 0) + return; + + /* FIXME: handle other types */ + + /* the unmatched test is a bit of a hack but it works */ + if (strncmp(physical_uri, "vfolder:", 8) != 0 + || strstr(physical_uri, "#" CAMEL_UNMATCHED_NAME) != NULL) + return; + + bonobo_ui_component_rm (uic, + EVOLUTION_SHELL_COMPONENT_POPUP_PLACEHOLDER "/ChangeFolderPropertiesPopUp", + NULL); +} + static char * get_dnd_selection (EvolutionShellComponent *shell_component, const char *physical_uri, @@ -976,6 +998,7 @@ create_component (void) remove_folder, xfer_folder, populate_folder_context_menu, + unpopulate_folder_context_menu, get_dnd_selection, request_quit, NULL); diff --git a/mail/mail-account-gui.c b/mail/mail-account-gui.c index d35a3fea57..da7478232f 100644 --- a/mail/mail-account-gui.c +++ b/mail/mail-account-gui.c @@ -1824,7 +1824,6 @@ mail_account_gui_save (MailAccountGui *gui) MailConfigAccount *old_account; CamelProvider *provider = NULL; CamelURL *source_url = NULL, *url; - CamelStore *store = NULL; gboolean is_storage; gboolean enabled; char *new_name; |