Remove Hildon 0.x conditional code because Hildon 0.x is not available in Diablo...

https://bugs.maemo.org/show_bug.cgi?id=5242

diff --git a/src/dbus_api/modest-dbus-callbacks.c b/src/dbus_api/modest-dbus-callbacks.c
index a471577..667409a 100644 (file)
--- a/src/dbus_api/modest-dbus-callbacks.c
+++ b/src/dbus_api/modest-dbus-callbacks.c
@@ -47,13 +47,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <glib/gstdio.h>
-#ifdef MODEST_HAVE_HILDON0_WIDGETS
-#include <hildon-widgets/hildon-program.h>
-#include <libgnomevfs/gnome-vfs-mime-utils.h>
-#else
 #include <hildon/hildon-program.h>
 #include <libgnomevfs/gnome-vfs-mime.h>
-#endif
 #include <tny-fs-stream.h>
 
 #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 (file)
--- a/src/hildon2/modest-easysetup-wizard-dialog.h
+++ b/src/hildon2/modest-easysetup-wizard-dialog.h
@@ -39,11 +39,7 @@
 #include <config.h>
 #endif
 
-#ifdef MODEST_HAVE_HILDON0_WIDGETS
-#include <hildon-widgets/hildon-caption.h>
-#else
 #include <hildon/hildon-caption.h>
-#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 2eec6da..2479395 100644 (file)
--- 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 37fa92d..1323d6d 100644 (file)
--- 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 <hildon-widgets/hildon-color-chooser.h>
-#endif
 #include "widgets/modest-msg-edit-window-ui.h"
-#ifdef MODEST_HAVE_HILDON0_WIDGETS
-#include <libgnomevfs/gnome-vfs-mime-utils.h>
-#else
 #include <libgnomevfs/gnome-vfs-mime.h>
-#endif
 #include <modest-utils.h>
 #include "modest-maemo-utils.h"
 #include <modest-ui-constants.h>
@@ -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/modest-tny-account.c b/src/modest-tny-account.c
index 7128471..f183b3b 100644 (file)
--- a/src/modest-tny-account.c
+++ b/src/modest-tny-account.c
@@ -50,12 +50,8 @@
 #include <modest-debug.h>
 #include <string.h>
 #ifndef MODEST_TOOLKIT_GTK
-#if MODEST_HILDON_API == 0
-#include <hildon-widgets/hildon-file-system-info.h>
-#else
 #include <hildon/hildon-file-system-info.h>
 #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 abfce39..c8ebff7 100644 (file)
--- a/src/widgets/modest-account-view.c
+++ b/src/widgets/modest-account-view.c
@@ -607,10 +607,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 41c6e9f..47434fe 100644 (file)
--- a/src/widgets/modest-global-settings-dialog.c
+++ b/src/widgets/modest-global-settings-dialog.c
@@ -45,11 +45,7 @@
 #include "widgets/modest-combo-box.h"
 #endif
 #ifndef MODEST_TOOLKIT_GTK
-#if MODEST_HILDON_API == 0
-#include <hildon-widgets/hildon-number-editor.h>
-#else
 #include <hildon/hildon-number-editor.h>
-#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 d3b2f70..cb61b69 100644 (file)
--- a/src/widgets/modest-window.h
+++ b/src/widgets/modest-window.h
@@ -49,19 +49,12 @@ G_BEGIN_DECLS
 typedef GtkWindow      ModestWindowParent;
 typedef GtkWindowClass ModestWindowParentClass;
 #else
-#if MODEST_HILDON_API == 0
-#include <hildon-widgets/hildon-window.h>
-#else
 #ifdef MODEST_TOOLKIT_HILDON2
 #include <hildon/hildon-stackable-window.h>
-#else
-#include <hildon/hildon-window.h>
-#endif
-#endif /*MODEST_HILDON_API == 0*/
-#ifdef MODEST_TOOLKIT_HILDON2
 typedef HildonStackableWindow      ModestWindowParent;
 typedef HildonStackableWindowClass ModestWindowParentClass;
 #else
+#include <hildon/hildon-window.h>
 typedef HildonWindow      ModestWindowParent;
 typedef HildonWindowClass ModestWindowParentClass;
 #endif

diff --git a/src/widgets/modest-wizard-dialog.c b/src/widgets/modest-wizard-dialog.c
index 0deda90..018ce38 100644 (file)
--- a/src/widgets/modest-wizard-dialog.c
+++ b/src/widgets/modest-wizard-dialog.c
@@ -48,11 +48,7 @@
 #endif
 
 #ifndef MODEST_TOOLKIT_GTK
-#if MODEST_HILDON_API == 0
-#include <hildon-widgets/hildon-defines.h>
-#else
 #include <hildon/hildon-defines.h>
-#endif /*MODEST_HILDON_API == 0*/
 #endif /*!MODEST_TOOLKIT_GTK*/
 
 #include "modest-wizard-dialog.h"
@@ -258,16 +254,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 */