Refactor adding items to menu in hildon2. Now we have method

[modest] / src / widgets / modest-toolkit-factory.c

diff --git a/src/widgets/modest-toolkit-factory.c b/src/widgets/modest-toolkit-factory.c
index 539e4fe..40caf60 100644 (file)
--- a/src/widgets/modest-toolkit-factory.c
+++ b/src/widgets/modest-toolkit-factory.c
@@ -28,7 +28,11 @@
  */
 
 #include <glib/gi18n.h>
+#ifdef MODEST_TOOLKIT_HILDON2
 #include <modest-hildon-pannable-area-scrollable.h>
+#else
+#include <modest-scrolled-window-scrollable.h>
+#endif
 #include "modest-toolkit-factory.h"
 
 static void modest_toolkit_factory_class_init (ModestToolkitFactoryClass *klass);
@@ -44,7 +48,7 @@ G_DEFINE_TYPE    (ModestToolkitFactory,
                  G_TYPE_OBJECT);
 
 ModestToolkitFactory *
-modest_toolkit_factory_new                            (void)
+modest_toolkit_factory_get_instance                            (void)
 {
     GObject* self = g_object_new (MODEST_TYPE_TOOLKIT_FACTORY, NULL);
 
@@ -73,5 +77,9 @@ modest_toolkit_factory_create_scrollable (ModestToolkitFactory *self)
 static GtkWidget *
 modest_toolkit_factory_create_scrollable_default (ModestToolkitFactory *self)
 {
+#ifdef MODEST_TOOLKIT_HILDON2
        return modest_hildon_pannable_area_scrollable_new ();
+#else
+       return modest_scrolled_window_scrollable_new ();
+#endif
 }