From: Javier Jardón Date: Tue, 29 Sep 2009 16:51:32 +0000 (+0200) Subject: Remove Hildon 0.x conditional code because Hildon 0.x is not available in Diablo... X-Git-Tag: 3.1.11~6 X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=97b8abd58253731cfab9e6eba29a126a2fcc6df1 Remove Hildon 0.x conditional code because Hildon 0.x is not available in Diablo neither in Fremantle Fixes NB#141120 --- diff --git a/src/dbus_api/modest-dbus-callbacks.c b/src/dbus_api/modest-dbus-callbacks.c index 2b34ff8..7a5ecd1 100644 --- a/src/dbus_api/modest-dbus-callbacks.c +++ b/src/dbus_api/modest-dbus-callbacks.c @@ -47,13 +47,8 @@ #include #include #include -#ifdef MODEST_HAVE_HILDON0_WIDGETS -#include -#include -#else #include #include -#endif #include #ifdef MODEST_TOOLKIT_HILDON2 diff --git a/src/hildon2/modest-easysetup-wizard-dialog.h b/src/hildon2/modest-easysetup-wizard-dialog.h index ca075dc..3912005 100644 --- a/src/hildon2/modest-easysetup-wizard-dialog.h +++ b/src/hildon2/modest-easysetup-wizard-dialog.h @@ -39,11 +39,7 @@ #include #endif -#ifdef MODEST_HAVE_HILDON0_WIDGETS -#include -#else #include -#endif /*MODEST_HAVE_HILDON0_WIDGETS*/ G_BEGIN_DECLS diff --git a/src/hildon2/modest-maemo-utils.c b/src/hildon2/modest-maemo-utils.c index dd71fcf..7bc19a7 100644 --- a/src/hildon2/modest-maemo-utils.c +++ b/src/hildon2/modest-maemo-utils.c @@ -235,20 +235,12 @@ modest_maemo_utils_setup_images_filechooser (GtkFileChooser *chooser) /* Set the images mime filter */ file_filter = gtk_file_filter_new (); -#ifdef MODEST_HAVE_HILDON0_WIDGETS - image_mimetypes_list = osso_mime_get_mime_types_for_category (OSSO_MIME_CATEGORY_IMAGES); -#else image_mimetypes_list = hildon_mime_get_mime_types_for_category (HILDON_MIME_CATEGORY_IMAGES); -#endif for (node = image_mimetypes_list; node != NULL; node = g_list_next (node)) { gtk_file_filter_add_mime_type (file_filter, node->data); } gtk_file_chooser_set_filter (chooser, file_filter); -#ifdef MODEST_HAVE_HILDON0_WIDGETS - osso_mime_types_list_free (image_mimetypes_list); -#else hildon_mime_types_list_free (image_mimetypes_list); -#endif } diff --git a/src/hildon2/modest-msg-edit-window.c b/src/hildon2/modest-msg-edit-window.c index b7d2d78..4beebdb 100644 --- a/src/hildon2/modest-msg-edit-window.c +++ b/src/hildon2/modest-msg-edit-window.c @@ -70,15 +70,8 @@ #include "modest-msg-edit-window-ui-dimming.h" #include "modest-hildon-includes.h" -#ifdef MODEST_HAVE_HILDON0_WIDGETS -#include -#endif #include "widgets/modest-msg-edit-window-ui.h" -#ifdef MODEST_HAVE_HILDON0_WIDGETS -#include -#else #include -#endif #include #include "modest-maemo-utils.h" #include @@ -2198,61 +2191,7 @@ text_buffer_refresh_attributes (WPTextBuffer *buffer, ModestMsgEditWindow *windo } -#ifdef MODEST_HILDON_VERSION_0 -void -modest_msg_edit_window_select_color (ModestMsgEditWindow *window) -{ - - WPTextBufferFormat *buffer_format = g_new0 (WPTextBufferFormat, 1); - ModestMsgEditWindowPrivate *priv; - GtkWidget *dialog = NULL; - gint response; - GdkColor *new_color = NULL; - - priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); - wp_text_buffer_get_attributes (WP_TEXT_BUFFER (priv->text_buffer), buffer_format, FALSE); - - dialog = hildon_color_selector_new (GTK_WINDOW (window)); - hildon_color_selector_set_color (HILDON_COLOR_SELECTOR (dialog), &(buffer_format->color)); - g_free (buffer_format); - - if (gtk_dialog_run (GTK_DIALOG (dialog) == GTK_RESPONSE_OK)) { - new_color = hildon_color_selector_get_color (HILDON_COLOR_SELECTOR (dialog)); - if (new_color != NULL) { - wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FORECOLOR, - (gpointer) new_color); - } - } - gtk_widget_destroy (dialog); -} - - -void -modest_msg_edit_window_select_background_color (ModestMsgEditWindow *window) -{ - - ModestMsgEditWindowPrivate *priv; - GtkWidget *dialog = NULL; - gint response; - GdkColor *old_color = NULL; - const GdkColor *new_color = NULL; - - priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); - old_color = (GdkColor*)wp_text_buffer_get_background_color (WP_TEXT_BUFFER (priv->text_buffer)); - - dialog = hildon_color_selector_new (GTK_WINDOW (window)); - hildon_color_selector_set_color (HILDON_COLOR_SELECTOR (dialog),(GdkColor*)old_color); - - if (gtk_dialog_run (GTK_DIALOG (dialog) == GTK_RESPONSE_OK)) { - new_color = hildon_color_selector_get_color (HILDON_COLOR_SELECTOR (dialog)); - if (new_color != NULL) - wp_text_buffer_set_background_color (WP_TEXT_BUFFER (priv->text_buffer), new_color); - } - gtk_widget_destroy (dialog); - -} -#else void modest_msg_edit_window_select_color (ModestMsgEditWindow *window) { @@ -2300,9 +2239,6 @@ modest_msg_edit_window_select_background_color (ModestMsgEditWindow *window) gtk_widget_destroy (dialog); } -#endif /*!MODEST_HILDON_VERSION_0*/ - - static TnyStream* create_stream_for_uri (const gchar* uri) @@ -2778,19 +2714,12 @@ modest_msg_edit_window_color_button_change (ModestMsgEditWindow *window, ModestMsgEditWindowPrivate *priv; GdkColor *new_color; priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); - -#ifdef MODEST_HAVE_HILDON0_WIDGETS - new_color = hildon_color_button_get_color (HILDON_COLOR_BUTTON (priv->font_color_button)); -#else - GdkColor col; - hildon_color_button_get_color (HILDON_COLOR_BUTTON(priv->font_color_button), &col); - new_color = &col; -#endif /*#ifdef MODEST_HAVE_HILDON0_WIDGETS*/ + + hildon_color_button_get_color (HILDON_COLOR_BUTTON(priv->font_color_button), new_color); wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FORECOLOR, (gpointer) new_color); - - gtk_window_set_focus (GTK_WINDOW (window), priv->msg_body); + gtk_window_set_focus (GTK_WINDOW (window), priv->msg_body); } static void diff --git a/src/maemo/easysetup/modest-easysetup-wizard-dialog.h b/src/maemo/easysetup/modest-easysetup-wizard-dialog.h index ca075dc..3912005 100644 --- a/src/maemo/easysetup/modest-easysetup-wizard-dialog.h +++ b/src/maemo/easysetup/modest-easysetup-wizard-dialog.h @@ -39,11 +39,7 @@ #include #endif -#ifdef MODEST_HAVE_HILDON0_WIDGETS -#include -#else #include -#endif /*MODEST_HAVE_HILDON0_WIDGETS*/ G_BEGIN_DECLS diff --git a/src/maemo/modest-hildon-includes.h b/src/maemo/modest-hildon-includes.h index 1f7b41d..c62b484 100644 --- a/src/maemo/modest-hildon-includes.h +++ b/src/maemo/modest-hildon-includes.h @@ -58,21 +58,6 @@ k * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, #include #endif /*MODEST_HILDON_NOTIFY*/ -#if MODEST_HILDON_API == 0 -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#else - #if MODEST_HILDON_API >= 1 #include #include @@ -87,9 +72,7 @@ k * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, #include #include #include - -#endif /*__MODEST_HAVE_HILDON1_WIDGETS*/ -#endif /*__MODEST_HAVE_HILDON0_WIDGETS_*/ +#endif /* MODEST_HILDON_API >= 1 */ /* backward compatibility... */ diff --git a/src/maemo/modest-maemo-global-settings-dialog.c b/src/maemo/modest-maemo-global-settings-dialog.c index a62f9b9..64fc50f 100644 --- a/src/maemo/modest-maemo-global-settings-dialog.c +++ b/src/maemo/modest-maemo-global-settings-dialog.c @@ -444,27 +444,15 @@ on_range_error (HildonNumberEditor *editor, gint new_val; switch (type) { -#ifdef MODEST_HAVE_HILDON0_WIDGETS - case MAXIMUM_VALUE_EXCEED: -#else case HILDON_NUMBER_EDITOR_ERROR_MAXIMUM_VALUE_EXCEED: -#endif msg = g_strdup_printf (dgettext("hildon-libs", "ckct_ib_maximum_value"), MSG_SIZE_MAX_VAL); new_val = MSG_SIZE_MAX_VAL; break; -#ifdef MODEST_HAVE_HILDON0_WIDGETS - case MINIMUM_VALUE_EXCEED: -#else case HILDON_NUMBER_EDITOR_ERROR_MINIMUM_VALUE_EXCEED: -#endif msg = g_strdup_printf (dgettext("hildon-libs", "ckct_ib_minimum_value"), MSG_SIZE_MIN_VAL); new_val = MSG_SIZE_MIN_VAL; break; -#ifdef MODEST_HAVE_HILDON0_WIDGETS - case ERRONEOUS_VALUE: -#else case HILDON_NUMBER_EDITOR_ERROR_ERRONEOUS_VALUE: -#endif msg = g_strdup_printf (dgettext("hildon-libs", "ckct_ib_set_a_value_within_range"), MSG_SIZE_MIN_VAL, MSG_SIZE_MAX_VAL); diff --git a/src/maemo/modest-maemo-security-options-view.c b/src/maemo/modest-maemo-security-options-view.c index 19e0853..4c880f6 100644 --- a/src/maemo/modest-maemo-security-options-view.c +++ b/src/maemo/modest-maemo-security-options-view.c @@ -38,13 +38,8 @@ #include "widgets/modest-serversecurity-combo-box.h" #include "widgets/modest-secureauth-combo-box.h" #include "maemo/easysetup/modest-easysetup-servertype-combo-box.h" -#ifdef MODEST_HAVE_HILDON0_WIDGETS -#include -#include -#else #include #include -#endif /*MODEST_HAVE_HILDON0_WIDGETS*/ #define PORT_MIN 1 #define PORT_MAX 65535 diff --git a/src/maemo/modest-maemo-utils.c b/src/maemo/modest-maemo-utils.c index 28f73e1..0c06395 100644 --- a/src/maemo/modest-maemo-utils.c +++ b/src/maemo/modest-maemo-utils.c @@ -210,21 +210,12 @@ modest_maemo_utils_setup_images_filechooser (GtkFileChooser *chooser) /* Set the images mime filter */ file_filter = gtk_file_filter_new (); -#ifdef MODEST_HAVE_HILDON0_WIDGETS - image_mimetypes_list = osso_mime_get_mime_types_for_category (OSSO_MIME_CATEGORY_IMAGES); -#else image_mimetypes_list = hildon_mime_get_mime_types_for_category (HILDON_MIME_CATEGORY_IMAGES); -#endif for (node = image_mimetypes_list; node != NULL; node = g_list_next (node)) { gtk_file_filter_add_mime_type (file_filter, node->data); } gtk_file_chooser_set_filter (chooser, file_filter); -#ifdef MODEST_HAVE_HILDON0_WIDGETS - osso_mime_types_list_free (image_mimetypes_list); -#else hildon_mime_types_list_free (image_mimetypes_list); -#endif - } void diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c index ce89897..d6bdc1f 100644 --- a/src/maemo/modest-main-window.c +++ b/src/maemo/modest-main-window.c @@ -1813,14 +1813,12 @@ static gchar * get_gray_color_markup (GtkWidget *styled_widget) { gchar *gray_color_markup = NULL; -#ifndef MODEST_HAVE_HILDON0_WIDGETS /* Obtain the secondary text color. We need a realized widget, that's why we get styled_widget from outside */ GdkColor color; if (gtk_style_lookup_color (styled_widget->style, "SecondaryTextColor", &color)) gray_color_markup = modest_text_utils_get_color_string (&color); -#endif /*MODEST_HAVE_HILDON0_WIDGETS*/ - + if (!gray_color_markup) gray_color_markup = g_strdup ("#BBBBBB"); diff --git a/src/maemo/modest-msg-edit-window.c b/src/maemo/modest-msg-edit-window.c index 5354a71..126454d 100644 --- a/src/maemo/modest-msg-edit-window.c +++ b/src/maemo/modest-msg-edit-window.c @@ -67,15 +67,8 @@ #include "modest-msg-edit-window-ui-dimming.h" #include "modest-hildon-includes.h" -#ifdef MODEST_HAVE_HILDON0_WIDGETS -#include -#endif #include "widgets/modest-msg-edit-window-ui.h" -#ifdef MODEST_HAVE_HILDON0_WIDGETS -#include -#else #include -#endif #include #include "modest-maemo-utils.h" @@ -2020,62 +2013,8 @@ text_buffer_refresh_attributes (WPTextBuffer *buffer, ModestMsgEditWindow *windo } -#ifdef MODEST_HILDON_VERSION_0 -void -modest_msg_edit_window_select_color (ModestMsgEditWindow *window) -{ - - WPTextBufferFormat *buffer_format = g_new0 (WPTextBufferFormat, 1); - ModestMsgEditWindowPrivate *priv; - GtkWidget *dialog = NULL; - gint response; - GdkColor *new_color = NULL; - - priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); - wp_text_buffer_get_attributes (WP_TEXT_BUFFER (priv->text_buffer), buffer_format, FALSE); - - dialog = hildon_color_selector_new (GTK_WINDOW (window)); - hildon_color_selector_set_color (HILDON_COLOR_SELECTOR (dialog), &(buffer_format->color)); - g_free (buffer_format); - - if (gtk_dialog_run (GTK_DIALOG (dialog) == GTK_RESPONSE_OK)) { - new_color = hildon_color_selector_get_color (HILDON_COLOR_SELECTOR (dialog)); - if (new_color != NULL) { - wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FORECOLOR, - (gpointer) new_color); - } - } - gtk_widget_destroy (dialog); -} - void -modest_msg_edit_window_select_background_color (ModestMsgEditWindow *window) -{ - - ModestMsgEditWindowPrivate *priv; - GtkWidget *dialog = NULL; - gint response; - GdkColor *old_color = NULL; - const GdkColor *new_color = NULL; - - priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); - old_color = (GdkColor*)wp_text_buffer_get_background_color (WP_TEXT_BUFFER (priv->text_buffer)); - - dialog = hildon_color_selector_new (GTK_WINDOW (window)); - hildon_color_selector_set_color (HILDON_COLOR_SELECTOR (dialog),(GdkColor*)old_color); - - if (gtk_dialog_run (GTK_DIALOG (dialog) == GTK_RESPONSE_OK)) { - new_color = hildon_color_selector_get_color (HILDON_COLOR_SELECTOR (dialog)); - if (new_color != NULL) - wp_text_buffer_set_background_color (WP_TEXT_BUFFER (priv->text_buffer), new_color); - } - gtk_widget_destroy (dialog); - -} - -#else -void modest_msg_edit_window_select_color (ModestMsgEditWindow *window) { @@ -2122,9 +2061,6 @@ modest_msg_edit_window_select_background_color (ModestMsgEditWindow *window) gtk_widget_destroy (dialog); } -#endif /*!MODEST_HILDON_VERSION_0*/ - - static TnyStream* create_stream_for_uri (const gchar* uri) @@ -2524,13 +2460,7 @@ modest_msg_edit_window_color_button_change (ModestMsgEditWindow *window, GdkColor *new_color; priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); -#ifdef MODEST_HAVE_HILDON0_WIDGETS - new_color = hildon_color_button_get_color (HILDON_COLOR_BUTTON (priv->font_color_button)); -#else - GdkColor col; - hildon_color_button_get_color (HILDON_COLOR_BUTTON(priv->font_color_button), &col); - new_color = &col; -#endif /*#ifdef MODEST_HAVE_HILDON0_WIDGETS*/ + hildon_color_button_get_color (HILDON_COLOR_BUTTON(priv->font_color_button), new_color); wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FORECOLOR, (gpointer) new_color); diff --git a/src/modest-tny-account.c b/src/modest-tny-account.c index 7128471..f183b3b 100644 --- a/src/modest-tny-account.c +++ b/src/modest-tny-account.c @@ -50,12 +50,8 @@ #include #include #ifndef MODEST_TOOLKIT_GTK -#if MODEST_HILDON_API == 0 -#include -#else #include #endif -#endif /* we need these dummy functions, or tinymail will complain */ static gchar * get_pass_dummy (TnyAccount *account, const gchar *prompt, gboolean *cancel); diff --git a/src/widgets/modest-account-view.c b/src/widgets/modest-account-view.c index 3544f54..b5bed2c 100644 --- a/src/widgets/modest-account-view.c +++ b/src/widgets/modest-account-view.c @@ -610,10 +610,6 @@ init_view (ModestAccountView *self) * * djcb: indeed, they have been removed for post-bora, i added the ifdefs... */ -#ifdef MODEST_HAVE_HILDON0_WIDGETS - g_object_set(G_OBJECT(self), "allow-checkbox-mode", FALSE, NULL); - g_object_set(G_OBJECT(toggle_renderer), "checkbox-mode", FALSE, NULL); -#endif /* MODEST_HAVE_HILDON0_WIDGETS */ priv->sig_handlers = modest_signal_mgr_connect (priv->sig_handlers, diff --git a/src/widgets/modest-global-settings-dialog.c b/src/widgets/modest-global-settings-dialog.c index 18ffb9a..62f34c8 100644 --- a/src/widgets/modest-global-settings-dialog.c +++ b/src/widgets/modest-global-settings-dialog.c @@ -48,11 +48,7 @@ #include "widgets/modest-combo-box.h" #endif #ifndef MODEST_TOOLKIT_GTK -#if MODEST_HILDON_API == 0 -#include -#else #include -#endif /*MODEST_HILDON_API = 0*/ #endif /* include other impl specific header files */ diff --git a/src/widgets/modest-window.h b/src/widgets/modest-window.h index 3084d2b..aee502d 100644 --- a/src/widgets/modest-window.h +++ b/src/widgets/modest-window.h @@ -50,19 +50,12 @@ G_BEGIN_DECLS typedef GtkWindow ModestWindowParent; typedef GtkWindowClass ModestWindowParentClass; #else -#if MODEST_HILDON_API == 0 -#include -#else #ifdef MODEST_TOOLKIT_HILDON2 #include -#else -#include -#endif -#endif /*MODEST_HILDON_API == 0*/ -#ifdef MODEST_TOOLKIT_HILDON2 typedef HildonStackableWindow ModestWindowParent; typedef HildonStackableWindowClass ModestWindowParentClass; #else +#include typedef HildonWindow ModestWindowParent; typedef HildonWindowClass ModestWindowParentClass; #endif diff --git a/src/widgets/modest-wizard-dialog.c b/src/widgets/modest-wizard-dialog.c index 930090a..e5eb272 100644 --- a/src/widgets/modest-wizard-dialog.c +++ b/src/widgets/modest-wizard-dialog.c @@ -55,11 +55,7 @@ #endif #ifndef MODEST_TOOLKIT_GTK -#if MODEST_HILDON_API == 0 -#include -#else #include -#endif /*MODEST_HILDON_API == 0*/ #endif /*!MODEST_TOOLKIT_GTK*/ #include "modest-wizard-dialog.h" @@ -265,16 +261,11 @@ init (ModestWizardDialog *wizard_dialog) #ifdef MODEST_TOOLKIT_GTK priv->image = gtk_image_new_from_stock (GTK_STOCK_PREFERENCES, GTK_ICON_SIZE_DIALOG); #else /*MODEST_TOOLKIT_GTK*/ -#if MODEST_HILDON_API == 0 - priv->image = gtk_image_new_from_icon_name ("qgn_widg_wizard", - HILDON_ICON_SIZE_WIDG_WIZARD); -#else static int icon_size = 0; if (!icon_size) icon_size = gtk_icon_size_register("modest_wizard", 50, 50); priv->image = gtk_image_new_from_icon_name ("qgn_widg_wizard", icon_size); -#endif /*MODEST_HILDON_API == 0*/ #endif /*!MODEST_TOOLKIT_GTK*/ #endif /*MODEST_TOOLKIT_HILDON2 */ /* Default values for user provided properties */