From: Jose Dapena Paz <jdapena@igalia.com>
Date: Wed, 25 Nov 2009 16:35:06 +0000 (+0100)
Subject: Build fix in hildon2
X-Git-Tag: jdapena-ppa-3.90.4-modest0~201
X-Git-Url: http://git.maemo.org/git/?a=commitdiff_plain;h=a317330da3f666b8dadf8333b69e0d201a12c12b;p=modest

Build fix in hildon2
---

diff --git a/src/widgets/Makefile.am b/src/widgets/Makefile.am
index 0cc2131..5960485 100644
--- a/src/widgets/Makefile.am
+++ b/src/widgets/Makefile.am
@@ -10,6 +10,7 @@ INCLUDES=\
 	$(MODEST_HILDON_HELP_CFLAGS)    \
 	$(MODEST_MOZEMBED_CFLAGS) \
 	$(MODEST_WPEDITOR_CFLAGS)           \
+	$(MODEST_LIBCONIC_CFLAGS)	    \
 	$(MODEST_HILDON_NOTIFY_CFLAGS) \
 	-I ${top_srcdir}/src/$(MODEST_TOOLKIT_DIR) \
 	-I ${top_srcdir}/src \
@@ -170,4 +171,5 @@ LDADD = \
 	$(MODEST_MOZEMBED_LIBS)                         \
 	$(MODEST_WPEDITOR_LIBS) \
 	$(MODEST_PLATFORM_LIBS)				\
+	$(MODEST_LIBCONIC_LIBS) \
 	$(MODEST_TOOLKIT_LIBS) 
diff --git a/src/widgets/modest-account-view.c b/src/widgets/modest-account-view.c
index 34483fe..08f875f 100644
--- a/src/widgets/modest-account-view.c
+++ b/src/widgets/modest-account-view.c
@@ -739,30 +739,6 @@ typedef struct
 		const gchar *account_name;
 } ForEachData;
 
-static gboolean
-on_model_foreach_select_account(GtkTreeModel *model, 
-	GtkTreePath *path, GtkTreeIter *iter, gpointer user_data)
-{
-	ForEachData *state = (ForEachData*)(user_data);
-	
-	/* Select the item if it has the matching account name: */
-	gchar *this_account_name = NULL;
-	gtk_tree_model_get (model, iter, 
-		MODEST_ACCOUNT_VIEW_NAME_COLUMN, &this_account_name, 
-		-1); 
-	if(this_account_name && state->account_name 
-		&& (strcmp (this_account_name, state->account_name) == 0)) {
-		
-		GtkTreeSelection *selection = 
-			gtk_tree_view_get_selection (GTK_TREE_VIEW (state->self));
-		gtk_tree_selection_select_iter (selection, iter);
-		
-		return TRUE; /* Stop walking the tree. */
-	}
-	
-	return FALSE; /* Keep walking the tree. */
-}
-
 static void 
 modest_account_view_select_account (ModestAccountView *account_view, 
 				    const gchar* account_name)
diff --git a/src/widgets/modest-connection-specific-smtp-edit-window.c b/src/widgets/modest-connection-specific-smtp-edit-window.c
index 4c57484..0d32636 100644
--- a/src/widgets/modest-connection-specific-smtp-edit-window.c
+++ b/src/widgets/modest-connection-specific-smtp-edit-window.c
@@ -44,6 +44,7 @@
 
 #ifdef MODEST_TOOLKIT_HILDON2
 #include <hildon/hildon.h>
+#include <modest-number-editor.h>
 #endif
 
 #include <glib/gi18n.h>