From 956cd913f1542ec212f2cc14a28da5b4f7d2e525 Mon Sep 17 00:00:00 2001 From: Srinivasa Ragavan Date: Wed, 5 Dec 2007 05:40:12 +0000 Subject: ** Added a preference to disable Magic Spacebar. 2007-12-05 Srinivasa Ragavan ** Added a preference to disable Magic Spacebar. * em-folder-browser.c: (html_scroll), (emfb_list_key_press): Check the cfg before invoking Magic Spacebar * em-mailer-prefs.c: (em_mailer_prefs_construct): Preference window handling * em-mailer-prefs.h: * evolution-mail.schemas.in: * mail-config.c: (gconf_magic_spacebar_changed), (mail_config_init), (mail_config_get_enable_magic_spacebar): Add it part of MC. * mail-config.glade: * mail-config.h: svn path=/trunk/; revision=34650 --- mail/em-folder-browser.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'mail/em-folder-browser.c') diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c index 5253101c67..87bf65fd49 100644 --- a/mail/em-folder-browser.c +++ b/mail/em-folder-browser.c @@ -409,7 +409,7 @@ html_scroll (GtkHTML *html, EMFolderBrowser *emfb) { - if (html->binding_handled || orientation != GTK_ORIENTATION_VERTICAL) + if (html->binding_handled || orientation != GTK_ORIENTATION_VERTICAL || !mail_config_get_enable_magic_spacebar ()) return; if (scroll_type == GTK_SCROLL_PAGE_FORWARD) { @@ -1169,7 +1169,7 @@ emfb_list_key_press(ETree *tree, int row, ETreePath path, int col, GdkEvent *ev, switch (ev->key.keyval) { case GDK_space: - if (!emfb->view.preview->caret_mode) { + if (!emfb->view.preview->caret_mode && mail_config_get_enable_magic_spacebar ()) { 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); @@ -1182,7 +1182,7 @@ emfb_list_key_press(ETree *tree, int row, ETreePath path, int col, GdkEvent *ev, em_utils_adjustment_page(gtk_scrolled_window_get_vadjustment((GtkScrolledWindow *)emfb->priv->scroll), TRUE); break; case GDK_BackSpace: - if (!emfb->view.preview->caret_mode) { + if (!emfb->view.preview->caret_mode && mail_config_get_enable_magic_spacebar ()) { 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); @@ -1198,7 +1198,7 @@ emfb_list_key_press(ETree *tree, int row, ETreePath path, int col, GdkEvent *ev, return FALSE; } - if (!folder_choose && !emfb->view.preview->caret_mode) { + if (!folder_choose && !emfb->view.preview->caret_mode && mail_config_get_enable_magic_spacebar ()) { //check for unread messages. if yes .. rewindback to the folder EMFolderTree *emft = g_object_get_data((GObject*)emfb, "foldertree"); switch (ev->key.keyval) { -- cgit v1.2.3