diff options
| author | Not Zed <NotZed@Ximian.com> | 2003-12-02 13:16:22 +0800 |
|---|---|---|
| committer | Michael Zucci <zucchi@src.gnome.org> | 2003-12-02 13:16:22 +0800 |
| commit | 62b482ca293ced476d6f682bd03e34139f4ff5b1 (patch) | |
| tree | c128dc2593b9b32cfaab2888bdabce9002884b59 /mail/em-subscribe-editor.c | |
| parent | 4edfed50a633c889bba97732920760b54279a87e (diff) | |
| download | gsoc2013-evolution-62b482ca293ced476d6f682bd03e34139f4ff5b1.tar gsoc2013-evolution-62b482ca293ced476d6f682bd03e34139f4ff5b1.tar.gz gsoc2013-evolution-62b482ca293ced476d6f682bd03e34139f4ff5b1.tar.bz2 gsoc2013-evolution-62b482ca293ced476d6f682bd03e34139f4ff5b1.tar.lz gsoc2013-evolution-62b482ca293ced476d6f682bd03e34139f4ff5b1.tar.xz gsoc2013-evolution-62b482ca293ced476d6f682bd03e34139f4ff5b1.tar.zst gsoc2013-evolution-62b482ca293ced476d6f682bd03e34139f4ff5b1.zip | |
Added empty_trash prompt key.
2003-12-02 Not Zed <NotZed@Ximian.com>
* evolution-mail.schemas: Added empty_trash prompt key.
* em-utils.c (em_utils_prompt_user): changed to take the gconf
'prompt again' key directly. Fixed callers.
(em_utils_expunge_folder): prompt the user with an expunge
specific message.
(em_utils_empty_trash): have an empty-trash specific message for
prompting confirm.
(emu_confirm_expunge): removed, no longer needed. Bug #38613.
(em_utils_expunge_folder): remove most line feeds, let the label
wrap them.
(em_utils_empty_trash): ditto.
* em-subscribe-editor.c (sub_folder_subscribed): update the ui
selection state after we're done. maybe we should listen on the
model but this is easier. Bug #50861.
* em-message-browser.c (emmb_activate): hook up our own verb list.
(emmb_message_verbs[], emmb_close): implement the close verb.
Bug #51558.
* em-format-html-display.c (efhd_attachment_popup): duh, actually
add the menu list we create. Bug #49902.
* em-format.c (d): turn off debug, committed by accident.
svn path=/trunk/; revision=23562
Diffstat (limited to 'mail/em-subscribe-editor.c')
| -rw-r--r-- | mail/em-subscribe-editor.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/mail/em-subscribe-editor.c b/mail/em-subscribe-editor.c index e00b79ce8c..1fb9066362 100644 --- a/mail/em-subscribe-editor.c +++ b/mail/em-subscribe-editor.c @@ -127,6 +127,7 @@ struct _EMSubscribeNode { static void sub_editor_busy(EMSubscribeEditor *se, int dir); static int sub_queue_fill_level(EMSubscribe *sub, EMSubscribeNode *node); +static void sub_selection_changed(GtkTreeSelection *selection, EMSubscribe *sub); static void sub_node_free(char *key, EMSubscribeNode *node, EMSubscribe *sub) @@ -197,7 +198,7 @@ sub_folder_subscribe (struct _mail_msg *mm) static void sub_folder_subscribed (struct _mail_msg *mm) { - struct _zsubscribe_msg *m = (struct _zsubscribe_msg *) mm; + struct _zsubscribe_msg *m = (struct _zsubscribe_msg *)mm, *next; GtkTreeIter iter; GtkTreeModel *model; EMSubscribeNode *node; @@ -225,11 +226,14 @@ sub_folder_subscribed (struct _mail_msg *mm) d(printf("node mismatch, or subscribe state changed failed\n")); } - /* queue any further ones */ - m = (struct _zsubscribe_msg *)e_dlist_remhead(&m->sub->subscribe); - if (m) { - m->sub->subscribe_id = m->msg.seq; - e_thread_put (mail_thread_new, (EMsg *)m); + /* queue any further ones, or if out, update the ui */ + next = (struct _zsubscribe_msg *)e_dlist_remhead(&m->sub->subscribe); + if (next) { + next->sub->subscribe_id = next->msg.seq; + e_thread_put(mail_thread_new, (EMsg *)next); + } else { + /* should it go off the model instead? */ + sub_selection_changed(gtk_tree_view_get_selection(m->sub->tree), m->sub); } } |