From 0923dc42fa64f6ef53c827bd6acf154c4c2a2264 Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Fri, 25 May 2001 20:53:26 +0000 Subject: Disable Resend on non-Sent folder FolderBrowsers. Thanks to Wayne Davis 2001-05-25 Jeffrey Stedfast * folder-browser-factory.c (control_activate): Disable Resend on non-Sent folder FolderBrowsers. Thanks to Wayne Davis for this patch. svn path=/trunk/; revision=10000 --- mail/ChangeLog | 4 ++++ mail/folder-browser-factory.c | 12 ++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/mail/ChangeLog b/mail/ChangeLog index 930617b985..e675707991 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,9 @@ 2001-05-25 Jeffrey Stedfast + * folder-browser-factory.c (control_activate): Disable Resend on + non-Sent folder FolderBrowsers. Thanks to Wayne Davis for this + patch. + * component-factory.c (xfer_folder): This code should be correct now. Still waiting on the shell to do it's job of creating the metadata xml file in the destination folder though. diff --git a/mail/folder-browser-factory.c b/mail/folder-browser-factory.c index 31ee715eff..10ee464636 100644 --- a/mail/folder-browser-factory.c +++ b/mail/folder-browser-factory.c @@ -258,11 +258,15 @@ control_activate (BonoboControl *control, } else { state = mail_config_get_hide_deleted(); } - bonobo_ui_component_set_prop(uic, "/commands/HideDeleted", "state", state?"1":"0", NULL); - bonobo_ui_component_add_listener(uic, "HideDeleted", folder_browser_toggle_hide_deleted, folder_browser); + bonobo_ui_component_set_prop (uic, "/commands/HideDeleted", "state", state ? "1" : "0", NULL); + bonobo_ui_component_add_listener (uic, "HideDeleted", folder_browser_toggle_hide_deleted, + folder_browser); /* FIXME: this kind of bypasses bonobo but seems the only way when we change components */ - folder_browser_toggle_hide_deleted(uic, "", Bonobo_UIComponent_STATE_CHANGED, state?"1":"0", folder_browser); - + folder_browser_toggle_hide_deleted (uic, "", Bonobo_UIComponent_STATE_CHANGED, + state ? "1" : "0", folder_browser); + if (fb->folder && !folder_browser_is_sent (fb)) + bonobo_ui_component_set_prop (uic, "/commands/MessageResend", "sensitive", "0", NULL); + folder_browser_setup_view_menus (fb, uic); folder_browser_setup_property_menu (fb, uic); -- cgit v1.2.3