From 06bb4741c58b5ca7634c9a07b052bd0a57d9cc37 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sergio=20Villar=20Sen=C3=ADn?= Date: Wed, 2 Dec 2009 19:01:31 +0100 Subject: [PATCH] Removed some G_CRITICALS --- src/widgets/modest-header-window.c | 4 ++++ src/widgets/modest-msg-view-window.c | 11 +++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/widgets/modest-header-window.c b/src/widgets/modest-header-window.c index 4531218..160ac7d 100644 --- a/src/widgets/modest-header-window.c +++ b/src/widgets/modest-header-window.c @@ -433,6 +433,7 @@ folder_refreshed_cb (ModestMailOperation *mail_op, update_view (MODEST_HEADER_WINDOW (user_data), NULL); } +#ifdef MAEMO_CHANGES static gboolean tap_and_hold_query_cb (GtkWidget *header_view, GdkEvent *event, @@ -478,6 +479,7 @@ tap_and_hold_query_cb (GtkWidget *header_view, return FALSE; } +#endif static void delete_header (GtkWindow *parent, @@ -648,8 +650,10 @@ create_header_view (ModestWindow *self, TnyFolder *folder) gtk_widget_show_all (priv->csm_menu); /* Connect signals */ +#ifdef MAEMO_CHANGES g_signal_connect ((GObject *) header_view, "tap-and-hold-query", G_CALLBACK (tap_and_hold_query_cb), self); +#endif g_signal_connect ((GObject *) delete_item, "activate", G_CALLBACK (on_delete_csm_activated), self); g_signal_connect ((GObject *) mark_read_item, "activate", diff --git a/src/widgets/modest-msg-view-window.c b/src/widgets/modest-msg-view-window.c index d7e3872..cae371e 100644 --- a/src/widgets/modest-msg-view-window.c +++ b/src/widgets/modest-msg-view-window.c @@ -75,6 +75,10 @@ #include #endif +#ifdef MODEST_TOOLKIT_HILDON2 +#include +#endif + #define MYDOCS_ENV "MYDOCSDIR" #define DOCS_FOLDER ".documents" @@ -2421,8 +2425,11 @@ modest_msg_view_window_show_toolbar (ModestWindow *self, parent_priv->toolbar = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar"); - /* We don't use HILDON_ICON_SIZE_FINGER in order to avoid the ifdef here */ - gtk_toolbar_set_icon_size (GTK_TOOLBAR (parent_priv->toolbar), gtk_icon_size_from_name ("hildon-finger")); +#ifdef MODEST_TOOLKIT_HILDON2 + gtk_toolbar_set_icon_size (GTK_TOOLBAR (parent_priv->toolbar), HILDON_ICON_SIZE_FINGER); +#else + gtk_toolbar_set_icon_size (GTK_TOOLBAR (parent_priv->toolbar), GTK_ICON_SIZE_LARGE_TOOLBAR); +#endif gtk_widget_set_no_show_all (parent_priv->toolbar, TRUE); priv->next_toolitem = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarMessageNext"); -- 1.7.9.5