X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-connection-specific-smtp-window.c;h=90870195b305e664123e3a1d94184e989cda35d6;hb=c4c7c252c246777b850efa995641031e0c2e8a22;hp=e310913154a466e2cc847f4020bcb64523149409;hpb=36a53691f4ab6f64a17e19e24776c08d92a5acb1;p=modest

diff --git a/src/hildon2/modest-connection-specific-smtp-window.c b/src/hildon2/modest-connection-specific-smtp-window.c
index e310913..9087019 100644
--- a/src/hildon2/modest-connection-specific-smtp-window.c
+++ b/src/hildon2/modest-connection-specific-smtp-window.c
@@ -33,12 +33,16 @@
 #include "widgets/modest-ui-constants.h"
 
 #include <modest-runtime.h>
+
+#if MODEST_HAVE_CONIC
 #include <tny-maemo-conic-device.h>
+#endif
 
 #include <gtk/gtktreeview.h>
 #include <gtk/gtkcellrenderertext.h>
 #include <gtk/gtkliststore.h>
-#include <hildon/hildon-pannable-area.h>
+#include <modest-scrollable.h>
+#include <modest-toolkit-factory.h>
 #include <hildon/hildon-gtk.h>
 #include <gtk/gtkbutton.h>
 #include <gtk/gtkhbox.h>
@@ -65,7 +69,7 @@ struct _ModestConnectionSpecificSmtpWindowPrivate
 	GtkTreeView *treeview;
 	GtkTreeModel *model;
 	GtkWidget *no_connection_label;
-	GtkWidget *pannable;
+	GtkWidget *scrollable;
 	ModestAccountMgr *account_manager;
 };
 
@@ -166,11 +170,10 @@ modest_connection_specific_smtp_window_fill_with_connections (ModestConnectionSp
 							      ModestAccountMgr *account_manager)
 {
 	gboolean empty = TRUE;
-#ifdef MODEST_HAVE_CONIC
 	ModestConnectionSpecificSmtpWindowPrivate *priv = 
 		CONNECTION_SPECIFIC_SMTP_WINDOW_GET_PRIVATE (self);
 	priv->account_manager = account_manager;
-	
+#ifdef MODEST_HAVE_CONIC
 	GtkListStore *liststore = GTK_LIST_STORE (priv->model);
 	
 	TnyDevice *device = modest_runtime_get_device ();
@@ -233,17 +236,17 @@ modest_connection_specific_smtp_window_fill_with_connections (ModestConnectionSp
 #endif /*MODEST_HAVE_CONIC */
 
 	GtkWidget *child;
-	child = gtk_bin_get_child (GTK_BIN (priv->pannable));
+	child = gtk_bin_get_child (GTK_BIN (priv->scrollable));
 	if (child) {
-		gtk_container_remove (GTK_CONTAINER (priv->pannable), child);
+		gtk_container_remove (GTK_CONTAINER (priv->scrollable), child);
 	}
 
 	if (empty) {
-		hildon_pannable_area_add_with_viewport (HILDON_PANNABLE_AREA (priv->pannable), 
-							priv->no_connection_label);
+		modest_scrollable_add_with_viewport (MODEST_SCROLLABLE (priv->scrollable), 
+						     priv->no_connection_label);
 		gtk_widget_show (priv->no_connection_label);
 	} else {
-		gtk_container_add (GTK_CONTAINER (priv->pannable), GTK_WIDGET (priv->treeview));
+		gtk_container_add (GTK_CONTAINER (priv->scrollable), GTK_WIDGET (priv->treeview));
 		gtk_widget_show (GTK_WIDGET (priv->treeview));
 	}
 }
@@ -397,14 +400,13 @@ modest_connection_specific_smtp_window_init (ModestConnectionSpecificSmtpWindow
 	gtk_widget_show (label);
 	gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
 
-	/* Put the treeview in a pannable and add it to the box: */
-	priv->pannable = hildon_pannable_area_new ();
+	/* Put the treeview in a scrollable and add it to the box: */
+	priv->scrollable = modest_toolkit_factory_create_scrollable (modest_runtime_get_toolkit_factory ());
 	align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
 	gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 0, MODEST_MARGIN_DOUBLE, 0);
-	g_object_set (G_OBJECT (priv->pannable), "initial-hint", TRUE, NULL);
-	gtk_widget_show (priv->pannable);
+	gtk_widget_show (priv->scrollable);
 	gtk_widget_show (align);
-	gtk_container_add (GTK_CONTAINER (align), GTK_WIDGET (priv->pannable));
+	gtk_container_add (GTK_CONTAINER (align), GTK_WIDGET (priv->scrollable));
 	gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (align), TRUE, TRUE, 0);
 	gtk_widget_show (vbox);