From 3de8fd26379fd1065b62fe94001cbd9fa115b5be Mon Sep 17 00:00:00 2001 From: Jose Dapena Paz Date: Thu, 3 Dec 2009 15:31:32 +0100 Subject: [PATCH] Remove scroll with arrows in gtk --- src/widgets/modest-accounts-window.c | 12 ++++++++---- src/widgets/modest-folder-window.c | 11 ++++++++--- src/widgets/modest-mailboxes-window.c | 11 ++++++++--- 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/src/widgets/modest-accounts-window.c b/src/widgets/modest-accounts-window.c index 4ecac47..646cb9b 100644 --- a/src/widgets/modest-accounts-window.c +++ b/src/widgets/modest-accounts-window.c @@ -83,9 +83,11 @@ static void on_row_deleted (GtkTreeModel *tree_model, GtkTreePath *path, gpointer user_data); static void row_count_changed (ModestAccountsWindow *self); +#ifdef MODEST_TOOLKIT_HILDON2 static gboolean on_key_press(GtkWidget *widget, - GdkEventKey *event, - gpointer user_data); + GdkEventKey *event, + gpointer user_data); +#endif static gboolean on_delete_event (GtkWidget *widget, GdkEvent *event, gpointer userdata); @@ -247,9 +249,10 @@ connect_signals (ModestAccountsWindow *self) /* we don't register this in sighandlers, as it should be run * after disconnecting all signals, in destroy stage */ - +#ifdef MODEST_TOOLKIT_HILDON2 g_signal_connect(G_OBJECT(self), "key-press-event", G_CALLBACK(on_key_press), self); +#endif } static ModestWindow * @@ -700,7 +703,7 @@ modest_accounts_window_pre_create (void) } } - +#ifdef MODEST_TOOLKIT_HILDON2 static gboolean on_key_press(GtkWidget *widget, GdkEventKey *event, gpointer user_data) { @@ -727,6 +730,7 @@ on_key_press(GtkWidget *widget, GdkEventKey *event, gpointer user_data) return FALSE; } +#endif static gboolean on_delete_event (GtkWidget *widget, diff --git a/src/widgets/modest-folder-window.c b/src/widgets/modest-folder-window.c index e5c4986..1f62529 100644 --- a/src/widgets/modest-folder-window.c +++ b/src/widgets/modest-folder-window.c @@ -115,9 +115,11 @@ static void on_visible_account_changed (ModestFolderView *folder_view, static void on_account_changed (TnyAccountStore *account_store, TnyAccount *account, gpointer user_data); +#ifdef MODEST_TOOLKIT_HILDON2 static gboolean on_key_press(GtkWidget *widget, - GdkEventKey *event, - gpointer user_data); + GdkEventKey *event, + gpointer user_data); +#endif typedef struct _ModestFolderWindowPrivate ModestFolderWindowPrivate; struct _ModestFolderWindowPrivate { @@ -323,8 +325,10 @@ connect_signals (ModestFolderWindow *self) G_CALLBACK (on_account_changed), self); +#ifdef MODEST_TOOLKIT_HILDON2 g_signal_connect(G_OBJECT(self), "key-press-event", G_CALLBACK(on_key_press), self); +#endif } ModestWindow * @@ -956,7 +960,7 @@ on_account_changed (TnyAccountStore *account_store, update_window_title (MODEST_FOLDER_WINDOW (user_data), account); } - +#ifdef MODEST_TOOLKIT_HILDON2 static gboolean on_key_press(GtkWidget *widget, GdkEventKey *event, gpointer user_data) { @@ -983,3 +987,4 @@ on_key_press(GtkWidget *widget, GdkEventKey *event, gpointer user_data) return FALSE; } +#endif diff --git a/src/widgets/modest-mailboxes-window.c b/src/widgets/modest-mailboxes-window.c index 3c4b846..5c438be 100644 --- a/src/widgets/modest-mailboxes-window.c +++ b/src/widgets/modest-mailboxes-window.c @@ -80,9 +80,11 @@ static void on_queue_changed (ModestMailOperationQueue *queue, static void on_activity_changed (ModestFolderView *view, gboolean activity, ModestMailboxesWindow *folder_window); +#ifdef MODEST_TOOLKIT_HILDON2 static gboolean on_key_press(GtkWidget *widget, - GdkEventKey *event, - gpointer user_data); + GdkEventKey *event, + gpointer user_data); +#endif typedef struct _ModestMailboxesWindowPrivate ModestMailboxesWindowPrivate; struct _ModestMailboxesWindowPrivate { @@ -266,9 +268,11 @@ connect_signals (ModestMailboxesWindow *self) "clicked", G_CALLBACK (modest_ui_actions_on_new_msg), self); +#ifdef MODEST_TOOLKIT_HILDON2 /* connect window keys -> priv->folder_view scroll here? */ g_signal_connect(G_OBJECT(self), "key-press-event", G_CALLBACK(on_key_press), self); +#endif } ModestWindow * @@ -632,7 +636,7 @@ on_activity_changed (ModestFolderView *view, update_progress_hint (self); } - +#ifdef MODEST_TOOLKIT_HILDON2 static gboolean on_key_press(GtkWidget *widget, GdkEventKey *event, gpointer user_data) { @@ -659,3 +663,4 @@ on_key_press(GtkWidget *widget, GdkEventKey *event, gpointer user_data) return FALSE; } +#endif -- 1.7.9.5