aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSrinivasa Ragavan <sragavan@src.gnome.org>2007-07-02 22:57:07 +0800
committerSrinivasa Ragavan <sragavan@src.gnome.org>2007-07-02 22:57:07 +0800
commit971aaa66106d9cec061b05d0401197473afcd7f0 (patch)
tree8c53694244100cd18954f478c1df1de854ac7022
parent4672dd71dd65019e47a69d130e6951d9908a0f05 (diff)
downloadgsoc2013-evolution-971aaa66106d9cec061b05d0401197473afcd7f0.tar
gsoc2013-evolution-971aaa66106d9cec061b05d0401197473afcd7f0.tar.gz
gsoc2013-evolution-971aaa66106d9cec061b05d0401197473afcd7f0.tar.bz2
gsoc2013-evolution-971aaa66106d9cec061b05d0401197473afcd7f0.tar.lz
gsoc2013-evolution-971aaa66106d9cec061b05d0401197473afcd7f0.tar.xz
gsoc2013-evolution-971aaa66106d9cec061b05d0401197473afcd7f0.tar.zst
gsoc2013-evolution-971aaa66106d9cec061b05d0401197473afcd7f0.zip
Magic spacebar works only under non-caret mode.
svn path=/trunk/; revision=33739
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/em-folder-browser.c24
2 files changed, 18 insertions, 11 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 894aa7addd..b08aaa1b75 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-02 Srinivasa Ragavan <sragavan@novell.com>
+
+ * em-folder-browser.c: (emfb_list_key_press): Magic space bar works
+ only under non-caret mode.
+
2007-07-02 Wang Xin <jedy.wang@sun.com>
Fixes #450820.
diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c
index b25e92bb75..b34fc45c28 100644
--- a/mail/em-folder-browser.c
+++ b/mail/em-folder-browser.c
@@ -1172,24 +1172,26 @@ emfb_list_key_press(ETree *tree, int row, ETreePath path, int col, GdkEvent *ev,
switch (ev->key.keyval) {
case GDK_space:
- state = gtk_html_command(((EMFormatHTML *)((EMFolderView *) emfb)->preview)->html, "scroll-forward");
- if (!state)
- folder_choose = message_list_select(((EMFolderView *) emfb)->list, MESSAGE_LIST_SELECT_NEXT, 0, CAMEL_MESSAGE_SEEN);
-
- //em_utils_adjustment_page(gtk_scrolled_window_get_vadjustment((GtkScrolledWindow *)emfb->priv->scroll), TRUE);
+ if (!emfb->view.preview->caret_mode) {
+ state = gtk_html_command(((EMFormatHTML *)((EMFolderView *) emfb)->preview)->html, "scroll-forward");
+ if (!state)
+ folder_choose = message_list_select(((EMFolderView *) emfb)->list, MESSAGE_LIST_SELECT_NEXT, 0, CAMEL_MESSAGE_SEEN);
+ } else
+ em_utils_adjustment_page(gtk_scrolled_window_get_vadjustment((GtkScrolledWindow *)emfb->priv->scroll), TRUE);
break;
case GDK_BackSpace:
- state = gtk_html_command(((EMFormatHTML *)((EMFolderView *) emfb)->preview)->html, "scroll-backward");
- if (!state)
- folder_choose = message_list_select(((EMFolderView *) emfb)->list, MESSAGE_LIST_SELECT_PREVIOUS, 0, CAMEL_MESSAGE_SEEN);
-
- //em_utils_adjustment_page(gtk_scrolled_window_get_vadjustment((GtkScrolledWindow *)emfb->priv->scroll), FALSE);
+ if (!emfb->view.preview->caret_mode) {
+ state = gtk_html_command(((EMFormatHTML *)((EMFolderView *) emfb)->preview)->html, "scroll-backward");
+ if (!state)
+ folder_choose = message_list_select(((EMFolderView *) emfb)->list, MESSAGE_LIST_SELECT_PREVIOUS, 0, CAMEL_MESSAGE_SEEN);
+ } else
+ em_utils_adjustment_page(gtk_scrolled_window_get_vadjustment((GtkScrolledWindow *)emfb->priv->scroll), FALSE);
break;
default:
return FALSE;
}
- if (!folder_choose) {
+ if (!folder_choose && !emfb->view.preview->caret_mode) {
EMFolderTree *emft = g_object_get_data((GObject*)emfb, "foldertree");
em_folder_tree_select_next_path (emft);
gtk_widget_grab_focus ((GtkWidget *)((EMFolderView *) emfb)->list);