diff options
| author | Not Zed <NotZed@Ximian.com> | 2004-05-18 15:28:10 +0800 |
|---|---|---|
| committer | Michael Zucci <zucchi@src.gnome.org> | 2004-05-18 15:28:10 +0800 |
| commit | 463b3e37eca3fda700e56d8cb306622074468382 (patch) | |
| tree | cced56b308e044cfd51abad197fa0e876578f9f7 /mail/em-folder-selector.c | |
| parent | 7cdc1738998f3c349ce6404f3072834fd974bcd3 (diff) | |
| download | gsoc2013-evolution-463b3e37eca3fda700e56d8cb306622074468382.tar.gz gsoc2013-evolution-463b3e37eca3fda700e56d8cb306622074468382.tar.zst gsoc2013-evolution-463b3e37eca3fda700e56d8cb306622074468382.zip | |
don't emit new mail if its any vfolder, not just vtrash folder. #56350.
2004-05-18 Not Zed <NotZed@Ximian.com>
* mail-folder-cache.c (folder_changed): don't emit new mail if its
any vfolder, not just vtrash folder. #56350.
* em-folder-view.c (emfv_list_done_message_selected): run
enable_menu's to make sure we're up to date. #58352.
** crappy hacks for #58385.
* em-folder-selection-button.c
(em_folder_selection_button_clicked): leave Ok button for this
selection.
* em-folder-selection.c (em_select_folder): added oklabel here too.
* em-folder-selector.c (em_folder_selector_new)
(em_folder_selector_construct, em_folder_selector_create_new):
Added oklabel- text for ok label.
(em_folder_selector_create_new): Set the ok label to Create.
* em-message-browser.c (emmb_set_message): don't mark message seen
if user has disabled auto-mark seen feature. #58629.
* em-format.c (em_format_part): if we have no content-type header,
then we get no mime-type set, so assume text/plain. #58470.
svn path=/trunk/; revision=25951
Diffstat (limited to 'mail/em-folder-selector.c')
| -rw-r--r-- | mail/em-folder-selector.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mail/em-folder-selector.c b/mail/em-folder-selector.c index 88f14705bf..d317635ee1 100644 --- a/mail/em-folder-selector.c +++ b/mail/em-folder-selector.c @@ -218,7 +218,7 @@ folder_activated_cb (EMFolderTree *emft, const char *path, const char *uri, EMFo } void -em_folder_selector_construct (EMFolderSelector *emfs, EMFolderTree *emft, guint32 flags, const char *title, const char *text) +em_folder_selector_construct (EMFolderSelector *emfs, EMFolderTree *emft, guint32 flags, const char *title, const char *text, const char *oklabel) { GtkWidget *label; @@ -236,7 +236,7 @@ em_folder_selector_construct (EMFolderSelector *emfs, EMFolderTree *emft, guint3 } gtk_dialog_add_buttons (GTK_DIALOG (emfs), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); + oklabel?oklabel:GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); gtk_dialog_set_response_sensitive (GTK_DIALOG (emfs), GTK_RESPONSE_OK, FALSE); gtk_dialog_set_default_response (GTK_DIALOG (emfs), GTK_RESPONSE_OK); @@ -260,12 +260,12 @@ em_folder_selector_construct (EMFolderSelector *emfs, EMFolderTree *emft, guint3 } GtkWidget * -em_folder_selector_new (EMFolderTree *emft, guint32 flags, const char *title, const char *text) +em_folder_selector_new (EMFolderTree *emft, guint32 flags, const char *title, const char *text, const char *oklabel) { EMFolderSelector *emfs; emfs = g_object_new (em_folder_selector_get_type (), NULL); - em_folder_selector_construct (emfs, emft, flags, title, text); + em_folder_selector_construct (emfs, emft, flags, title, text, oklabel); return (GtkWidget *) emfs; } @@ -296,7 +296,7 @@ em_folder_selector_create_new (EMFolderTree *emft, guint32 flags, const char *ti flags &= ~EM_FOLDER_SELECTOR_CAN_CREATE; emfs = g_object_new (em_folder_selector_get_type (), NULL); - em_folder_selector_construct (emfs, emft, flags, title, text); + em_folder_selector_construct (emfs, emft, flags, title, text, _("Create")); em_folder_tree_set_excluded(emft, EMFT_EXCLUDE_NOINFERIORS); hbox = gtk_hbox_new (FALSE, 0); |