diff options
| author | Not Zed <NotZed@Ximian.com> | 2004-01-30 14:17:31 +0800 |
|---|---|---|
| committer | Michael Zucci <zucchi@src.gnome.org> | 2004-01-30 14:17:31 +0800 |
| commit | a4b5deaad2dd08e78cea7b0e4f8f357bfc19e53b (patch) | |
| tree | fd8a1bc249498ed5fd403a645afda8676ebb0e39 | |
| parent | cc39091f0fc913c5314dafd7461c5ab7e356c7f0 (diff) | |
| download | gsoc2013-evolution-a4b5deaad2dd08e78cea7b0e4f8f357bfc19e53b.tar.gz gsoc2013-evolution-a4b5deaad2dd08e78cea7b0e4f8f357bfc19e53b.tar.zst gsoc2013-evolution-a4b5deaad2dd08e78cea7b0e4f8f357bfc19e53b.zip | |
** See bug #53549, partial fix.
2004-01-30 Not Zed <NotZed@Ximian.com>
** See bug #53549, partial fix.
* em-folder-selector.c (emfs_create_name_activate): only emit the
ok response if the ok button would be active (i.e. entered a valid
path).
** See bug #52992.
* message-list.c (message_list_hide_clear): save the hide state
after its been cleared, so any popup windows inherit it.
(message_list_hide_uids): same.
svn path=/trunk/; revision=24534
| -rw-r--r-- | mail/ChangeLog | 12 | ||||
| -rw-r--r-- | mail/em-folder-selector.c | 10 | ||||
| -rw-r--r-- | mail/em-folder-tree.c | 1 | ||||
| -rw-r--r-- | mail/message-list.c | 4 |
4 files changed, 26 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index afb968ef9b..16e235bfd1 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,17 @@ 2004-01-30 Not Zed <NotZed@Ximian.com> + ** See bug #53549, partial fix. + + * em-folder-selector.c (emfs_create_name_activate): only emit the + ok response if the ok button would be active (i.e. entered a valid + path). + + ** See bug #52992. + + * message-list.c (message_list_hide_clear): save the hide state + after its been cleared, so any popup windows inherit it. + (message_list_hide_uids): same. + ** See bug #53123. * em-folder-tree-model.c (drop_folder): changed to take store and diff --git a/mail/em-folder-selector.c b/mail/em-folder-selector.c index 855de2f174..843ed018cf 100644 --- a/mail/em-folder-selector.c +++ b/mail/em-folder-selector.c @@ -243,7 +243,15 @@ em_folder_selector_new (EMFolderTree *emft, guint32 flags, const char *title, co static void emfs_create_name_activate (GtkEntry *entry, EMFolderSelector *emfs) { - g_signal_emit_by_name (emfs, "response", GTK_RESPONSE_OK); + if (emfs->name_entry->text_length > 0) { + const char *path, *text; + + text = gtk_entry_get_text (emfs->name_entry); + path = em_folder_tree_get_selected_path (emfs->emft); + + if (text && path && !strchr(text, '/')) + g_signal_emit_by_name (emfs, "response", GTK_RESPONSE_OK); + } } GtkWidget * diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c index facf3f697e..baef56e2be 100644 --- a/mail/em-folder-tree.c +++ b/mail/em-folder-tree.c @@ -1299,6 +1299,7 @@ emft_popup_new_folder (GtkWidget *item, EMFolderTree *emft) em_folder_selector_set_selected ((EMFolderSelector *) dialog, emft->priv->selected_uri); g_signal_connect (dialog, "response", G_CALLBACK (emft_popup_new_folder_response), emft); gtk_widget_show (dialog); + /* FIXME: what is this crap, this should go in the folder selector */ gtk_widget_grab_focus ((GtkWidget *) ((EMFolderSelector *)dialog)->name_entry); } diff --git a/mail/message-list.c b/mail/message-list.c index fe3147f70e..17364a43a6 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -2958,6 +2958,8 @@ message_list_hide_uids (MessageList *ml, GPtrArray *uids) } } MESSAGE_LIST_UNLOCK (ml, hide_lock); + /* save this here incase the user pops up another window, so they are consistent */ + save_hide_state(ml); mail_regen_list (ml, ml->search, NULL, NULL); break; } @@ -2984,6 +2986,8 @@ message_list_hide_clear (MessageList *ml) ml->thread_tree = NULL; } + /* save this here incase the user pops up another window, so they are consistent */ + save_hide_state(ml); mail_regen_list (ml, ml->search, NULL, NULL); } |