X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-folder-view.c;h=770fb2a2e7bc87661fa1a3907e3787d31a2241d1;hp=f278b8bc6fcbb7733916132f272ad31dfa6d9eff;hb=f42dcfb53f942ace9efab748723d358498e78344;hpb=59f7322a82048968cbcf2822130ac9f24dee8b7f

diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c
index f278b8b..770fb2a 100644
--- a/src/widgets/modest-folder-view.c
+++ b/src/widgets/modest-folder-view.c
@@ -737,7 +737,7 @@ text_cell_data  (GtkTreeViewColumn *column,
 
 	/* Convert INBOX */
 	if (type == TNY_FOLDER_TYPE_INBOX &&
-	    !g_ascii_strcasecmp (fname, "Inbox")) {
+	    g_str_has_suffix (fname, "Inbox")) {
 		g_free (item_name);
 		item_name = g_strdup (_("mcen_me_folder_inbox"));
 	}
@@ -2374,7 +2374,7 @@ modest_folder_view_update_model (ModestFolderView *self,
 						self,
 						NULL);
 
-	GtkTreeModel *old_tny_model;
+	GtkTreeModel *old_tny_model = NULL;
 	if (get_inner_models (self, NULL, NULL, &old_tny_model)) {
 		if (priv->signal_handlers > 0) {
 			priv->signal_handlers = modest_signal_mgr_disconnect (priv->signal_handlers,
@@ -2394,7 +2394,7 @@ modest_folder_view_update_model (ModestFolderView *self,
 	priv->signal_handlers = modest_signal_mgr_connect (priv->signal_handlers,
 							   G_OBJECT (model),
 							   "activity-changed",
-							   G_CALLBACK (on_activity_changed), 
+							   G_CALLBACK (on_activity_changed),
 							   self);
 #endif