Remove Hildon1 conditional code from hildon2.

Fixes NB#141490

diff --git a/src/hildon2/modest-maemo-utils.c b/src/hildon2/modest-maemo-utils.c
index 7bc19a7..81d82a1 100644 (file)
--- a/src/hildon2/modest-maemo-utils.c
+++ b/src/hildon2/modest-maemo-utils.c
@@ -244,16 +244,6 @@ modest_maemo_utils_setup_images_filechooser (GtkFileChooser *chooser)
 
 }
 
-void
-modest_maemo_set_thumbable_scrollbar (GtkScrolledWindow *win, 
-                                     gboolean thumbable)
-{
-       g_return_if_fail (GTK_IS_SCROLLED_WINDOW(win));
-#ifdef MODEST_HAVE_HILDON1_WIDGETS             
-       hildon_helper_set_thumb_scrollbar (win, thumbable);
-#endif /* MODEST_HAVE_HILDON1_WIDGETS */
-}
-
 GtkWidget *
 modest_maemo_utils_get_manager_menubar_as_menu (GtkUIManager *manager,
                                                const gchar *item_name)

diff --git a/src/hildon2/modest-maemo-utils.h b/src/hildon2/modest-maemo-utils.h
index 71d909b..f40cf90 100644 (file)
--- a/src/hildon2/modest-maemo-utils.h
+++ b/src/hildon2/modest-maemo-utils.h
@@ -76,16 +76,6 @@ void modest_maemo_utils_setup_images_filechooser (GtkFileChooser *chooser);
 osso_context_t *modest_maemo_utils_get_osso_context (void);
 
 /**
- * modest_maemo_set_thumbable_scrollbar:
- * @win: a scrollable window
- * @thumbable: set it to thumbable (TRUE) or small (FALSE)
- *
- * changes the thumbability of scrollbars in a scrollable window
- */
-void modest_maemo_set_thumbable_scrollbar (GtkScrolledWindow *win, gboolean thumbable);
-
-
-/**
  * modest_maemo_get_osso_context:
  *
  * retrieve the osso context for this application

diff --git a/src/hildon2/modest-main-window.c b/src/hildon2/modest-main-window.c
index aba0ca6..978f7bf 100644 (file)
--- a/src/hildon2/modest-main-window.c
+++ b/src/hildon2/modest-main-window.c
@@ -1685,14 +1685,10 @@ modest_main_window_set_contents_style (ModestMainWindow *self,
        switch (priv->contents_style) {
        case MODEST_MAIN_WINDOW_CONTENTS_STYLE_FOLDERS:
                wrap_in_scrolled_window (priv->contents_widget, GTK_WIDGET (priv->folder_view));
-               modest_maemo_set_thumbable_scrollbar (GTK_SCROLLED_WINDOW(priv->contents_widget),
-                                                     TRUE);
                gtk_widget_grab_focus (GTK_WIDGET (priv->folder_view));
                break;
        case MODEST_MAIN_WINDOW_CONTENTS_STYLE_HEADERS:
                wrap_in_scrolled_window (priv->contents_widget, GTK_WIDGET (priv->header_view));
-               modest_maemo_set_thumbable_scrollbar (GTK_SCROLLED_WINDOW(priv->contents_widget),
-                                                     TRUE);
                gtk_widget_grab_focus (GTK_WIDGET (priv->header_view));
                gtk_widget_show (GTK_WIDGET (priv->header_view));
                break;
@@ -1701,8 +1697,6 @@ modest_main_window_set_contents_style (ModestMainWindow *self,
                break;
        case MODEST_MAIN_WINDOW_CONTENTS_STYLE_EMPTY:
                wrap_in_scrolled_window (priv->contents_widget, GTK_WIDGET (priv->empty_view));
-               modest_maemo_set_thumbable_scrollbar (GTK_SCROLLED_WINDOW(priv->contents_widget),
-                                                     FALSE);
                if (priv->style == MODEST_MAIN_WINDOW_STYLE_SIMPLE)
                        gtk_widget_grab_focus (GTK_WIDGET (priv->empty_view));
                break;