From 812d9dd2ea320a212ebd25eb4c6c61f730e71cdd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sergio=20Villar=20Sen=C3=ADn?= Date: Fri, 4 Dec 2009 16:50:59 +0100 Subject: [PATCH] Fixed several invalid #ifdef statements --- src/modest-init.c | 9 ++++----- src/modest-platform.h | 4 ++-- src/modest-tny-account.c | 6 +++--- src/widgets/modest-global-settings-dialog.c | 2 -- src/widgets/modest-gtkhtml-mime-part-view.c | 7 ------- src/widgets/modest-recpt-editor.c | 5 ++--- src/widgets/modest-ui-constants.h | 1 + src/widgets/modest-wizard-dialog.c | 4 ++-- 8 files changed, 14 insertions(+), 24 deletions(-) diff --git a/src/modest-init.c b/src/modest-init.c index f911ea7..56a9e7c 100644 --- a/src/modest-init.c +++ b/src/modest-init.c @@ -53,11 +53,10 @@ #include #include #include "modest-text-utils.h" - -#ifndef MODEST_TOOLKIT_GTK +#include +#ifdef MODEST_TOOLKIT_HILDON2 #include "modest-hildon-includes.h" #endif -#include static gboolean init_header_columns (ModestConf *conf, gboolean overwrite); static gboolean init_default_account_maybe (ModestAccountMgr *acc_mgr); @@ -636,7 +635,7 @@ init_stock_icons (void) gint i; static GtkStockItem items[] = { -#ifndef MODEST_TOOLKIT_GTK +#ifdef MODEST_TOOLKIT_HILDON2 { MODEST_STOCK_SORT, "sort mail", 0, 0, NULL }, { MODEST_STOCK_REFRESH, "refresh mail", 0, 0, NULL }, #endif /*MODEST_TOOLKIT_GTK*/ @@ -650,7 +649,7 @@ init_stock_icons (void) }; static gchar *items_names [] = { -#ifndef MODEST_TOOLKIT_GTK +#ifdef MODEST_TOOLKIT_HILDON2 MODEST_TOOLBAR_ICON_SORT, MODEST_TOOLBAR_ICON_REFRESH, #endif /*MODEST_TOOLKIT_GTK*/ diff --git a/src/modest-platform.h b/src/modest-platform.h index d9fc19e..e1684f5 100644 --- a/src/modest-platform.h +++ b/src/modest-platform.h @@ -34,7 +34,7 @@ #include "widgets/modest-window.h" #include "widgets/modest-folder-view.h" #include "widgets/modest-sort-criterium-view.h" -#ifndef MODEST_TOOLKIT_GTK +#ifdef MODEST_PLATFORM_MAEMO #include #endif @@ -542,7 +542,7 @@ void modest_platform_run_header_details_dialog (GtkWindow *parent_window, **/ void modest_platform_on_runtime_initialized (); -#ifndef MODEST_TOOLKIT_GTK +#ifdef MODEST_PLATFORM_MAEMO /** * modest_platform_get_osso_context: * diff --git a/src/modest-tny-account.c b/src/modest-tny-account.c index f183b3b..67d8532 100644 --- a/src/modest-tny-account.c +++ b/src/modest-tny-account.c @@ -49,7 +49,7 @@ #include #include #include -#ifndef MODEST_TOOLKIT_GTK +#ifdef MODEST_TOOLKIT_HILDON2 #include #endif @@ -593,7 +593,7 @@ typedef struct -#ifndef MODEST_TOOLKIT_GTK +#ifdef MODEST_PLATFORM_MAEMO /* Gets the memory card name: */ static void on_modest_file_system_info (HildonFileSystemInfoHandle *handle, @@ -634,7 +634,7 @@ on_modest_file_system_info (HildonFileSystemInfoHandle *handle, void modest_tny_account_get_mmc_account_name (TnyStoreAccount* self, ModestTnyAccountGetMmcAccountNameCallback callback, gpointer user_data) { -#ifndef MODEST_TOOLKIT_GTK +#ifdef MODEST_PLATFORM_MAEMO /* Just use the path for the single memory card, * rather than try to figure out the path to the specific card by * looking at the maildir URI: diff --git a/src/widgets/modest-global-settings-dialog.c b/src/widgets/modest-global-settings-dialog.c index 345211b..4adc371 100644 --- a/src/widgets/modest-global-settings-dialog.c +++ b/src/widgets/modest-global-settings-dialog.c @@ -40,8 +40,6 @@ #include "modest-platform.h" #ifdef MODEST_TOOLKIT_HILDON2 #include "modest-hildon-includes.h" -#endif -#ifndef MODEST_TOOLKIT_GTK #include #endif /* include other impl specific header files */ diff --git a/src/widgets/modest-gtkhtml-mime-part-view.c b/src/widgets/modest-gtkhtml-mime-part-view.c index a47c522..37b97bc 100644 --- a/src/widgets/modest-gtkhtml-mime-part-view.c +++ b/src/widgets/modest-gtkhtml-mime-part-view.c @@ -287,13 +287,6 @@ modest_gtkhtml_mime_part_view_init (ModestGtkhtmlMimePartView *self) gtk_html_set_caret_mode (GTK_HTML(self), FALSE); gtk_html_set_blocking (GTK_HTML(self), TRUE); gtk_html_set_images_blocking (GTK_HTML(self), TRUE); - /* We don't need this for Hildon2 as this widget will be most - likely inside scrollable area */ -#ifndef MODEST_TOOLKIT_HILDON2 -#ifndef MODEST_TOOLKIT_GTK - gtk_html_set_auto_panning (GTK_HTML (self), TRUE); -#endif -#endif #ifdef MODEST_TOOLKIT_HILDON2 #ifdef HAVE_GTK_HTML_SET_MAX_IMAGE_SIZE diff --git a/src/widgets/modest-recpt-editor.c b/src/widgets/modest-recpt-editor.c index 637581d..f86060d 100644 --- a/src/widgets/modest-recpt-editor.c +++ b/src/widgets/modest-recpt-editor.c @@ -42,10 +42,9 @@ #include #include -/* FIXNE: we should have no maemo-deps in widgets/ */ -#ifndef MODEST_TOOLKIT_GTK +#ifdef MODEST_TOOLKIT_HILDON2 #include "modest-hildon-includes.h" -#endif /*!MODEST_TOOLKIT_GTK*/ +#endif #define RECPT_BUTTON_WIDTH_HILDON2 118 diff --git a/src/widgets/modest-ui-constants.h b/src/widgets/modest-ui-constants.h index 7236c4e..aba36e3 100644 --- a/src/widgets/modest-ui-constants.h +++ b/src/widgets/modest-ui-constants.h @@ -57,6 +57,7 @@ #define MODEST_MARGIN_DOUBLE 12 #define MODEST_MARGIN_TRIPLE 18 #define MODEST_DIALOG_WINDOW_MAX_HEIGHT 394 +#define MODEST_EDITABLE_SIZE 0 #endif #define MODEST_SECONDARY_COLOR "grey" #else /* MODEST_TOOLKIT_GTK */ diff --git a/src/widgets/modest-wizard-dialog.c b/src/widgets/modest-wizard-dialog.c index 018ce38..c2792d1 100644 --- a/src/widgets/modest-wizard-dialog.c +++ b/src/widgets/modest-wizard-dialog.c @@ -47,9 +47,9 @@ #include #endif -#ifndef MODEST_TOOLKIT_GTK +#ifdef MODEST_TOOLKIT_HILDON2 #include -#endif /*!MODEST_TOOLKIT_GTK*/ +#endif #include "modest-wizard-dialog.h" #include "modest-debug.h" -- 1.7.9.5