diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-06-27 05:09:11 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-06-27 05:09:11 +0800 |
| commit | 99126d46e61ce19a72acb3dd8498729b025339ec (patch) | |
| tree | d6875173b896e9a742a6207a5a1a6f2c2c7c56ec /mail | |
| parent | ce37d56d0b42f88549e45920df29a06fdce3ce95 (diff) | |
| download | gsoc2013-evolution-99126d46e61ce19a72acb3dd8498729b025339ec.tar.gz gsoc2013-evolution-99126d46e61ce19a72acb3dd8498729b025339ec.tar.zst gsoc2013-evolution-99126d46e61ce19a72acb3dd8498729b025339ec.zip | |
Partial fix for bug #587014.
Cursor now moves to the correct row, but row is not selected.
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/e-mail-reader.c | 2 | ||||
| -rw-r--r-- | mail/em-folder-browser.c | 40 |
2 files changed, 21 insertions, 21 deletions
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c index 6d680aebe1..346344cfc4 100644 --- a/mail/e-mail-reader.c +++ b/mail/e-mail-reader.c @@ -1784,7 +1784,7 @@ mail_reader_message_selected_timeout_cb (EMailReader *reader) cursor_uid = message_list->cursor_uid; format_uid = EM_FORMAT (html_display)->uid; - if (cursor_uid != NULL) { + if (message_list->last_sel_single) { if (g_strcmp0 (cursor_uid, format_uid) != 0) mail_get_messagex ( message_list->folder, cursor_uid, diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c index f1c8bdc72f..be0b076a44 100644 --- a/mail/em-folder-browser.c +++ b/mail/em-folder-browser.c @@ -215,25 +215,25 @@ static ESearchBarItem emfb_search_scope_items[] = { static EMFolderViewClass *emfb_parent; -static void -html_scroll (GtkHTML *html, - GtkOrientation orientation, - GtkScrollType scroll_type, - gfloat position, - EMFolderBrowser *emfb) - -{ - if (html->binding_handled || orientation != GTK_ORIENTATION_VERTICAL || !mail_config_get_enable_magic_spacebar ()) - return; - - if (scroll_type == GTK_SCROLL_PAGE_FORWARD) { - gtk_widget_grab_focus ((GtkWidget *)((EMFolderView *) emfb)->list); - message_list_select(((EMFolderView *) emfb)->list, MESSAGE_LIST_SELECT_NEXT, 0, CAMEL_MESSAGE_SEEN); - } else if (scroll_type == GTK_SCROLL_PAGE_BACKWARD) { - gtk_widget_grab_focus ((GtkWidget *)((EMFolderView *) emfb)->list); - message_list_select(((EMFolderView *) emfb)->list, MESSAGE_LIST_SELECT_NEXT, 0, CAMEL_MESSAGE_SEEN); - } -} +//static void +//html_scroll (GtkHTML *html, +// GtkOrientation orientation, +// GtkScrollType scroll_type, +// gfloat position, +// EMFolderBrowser *emfb) +// +//{ +// if (html->binding_handled || orientation != GTK_ORIENTATION_VERTICAL || !mail_config_get_enable_magic_spacebar ()) +// return; +// +// if (scroll_type == GTK_SCROLL_PAGE_FORWARD) { +// gtk_widget_grab_focus ((GtkWidget *)((EMFolderView *) emfb)->list); +// message_list_select(((EMFolderView *) emfb)->list, MESSAGE_LIST_SELECT_NEXT, 0, CAMEL_MESSAGE_SEEN); +// } else if (scroll_type == GTK_SCROLL_PAGE_BACKWARD) { +// gtk_widget_grab_focus ((GtkWidget *)((EMFolderView *) emfb)->list); +// message_list_select(((EMFolderView *) emfb)->list, MESSAGE_LIST_SELECT_NEXT, 0, CAMEL_MESSAGE_SEEN); +// } +//} static void emfb_init(GObject *o) @@ -251,7 +251,7 @@ emfb_init(GObject *o) emfb->view.preview_active = TRUE; emfb->view.list_active = TRUE; - g_signal_connect_after (((EMFormatHTML *)(emfb->view.preview))->html, "scroll", G_CALLBACK (html_scroll), emfb); +// g_signal_connect_after (((EMFormatHTML *)(emfb->view.preview))->html, "scroll", G_CALLBACK (html_scroll), emfb); // g_slist_foreach (emfb->view.ui_files, free_one_ui_file, NULL); // g_slist_free(emfb->view.ui_files); |