X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-account-view.c;h=be2c956a683f8c674836fdba032731426976a5e7;hp=1f6f3eab9fe424ee7a702447f20c7f10ffe9a8a5;hb=1d8fbbbee8bb4a0f59e3be299c0738328a0cc333;hpb=7929406e046ed92142ff337bd9161e6a16e1d04e

diff --git a/src/widgets/modest-account-view.c b/src/widgets/modest-account-view.c
index 1f6f3ea..be2c956 100644
--- a/src/widgets/modest-account-view.c
+++ b/src/widgets/modest-account-view.c
@@ -174,7 +174,6 @@ get_last_updated_string(ModestAccountMgr* account_mgr, ModestAccountSettings *se
 		else
 			last_updated_string = _("mcen_va_never");
 	} else 	{
-		/* FIXME: There should be a logical name in the UI specs */
 		last_updated_string = _("mcen_va_refreshing");
 	}
 	
@@ -346,25 +345,6 @@ on_account_removed (TnyAccountStore *account_store,
 
 
 static void
-on_account_changed (TnyAccountStore *account_store, 
-		    TnyAccount *account,
-		    gpointer user_data)
-{
-	ModestAccountView *self = NULL;
-	ModestAccountViewPrivate *priv = NULL;
-
-	g_return_if_fail (MODEST_IS_ACCOUNT_VIEW (user_data));
-	g_return_if_fail (account);
-	g_return_if_fail (TNY_IS_ACCOUNT (account));
-
-	self = MODEST_ACCOUNT_VIEW (user_data);
-	priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE (self);
-	
-	/* Update account view */
-/* 	update_account_view (priv->account_mgr, self); */
-}
-
-static void
 on_account_default_toggled (GtkCellRendererToggle *cell_renderer, 
 			    gchar *path,
 			    ModestAccountView *self)
@@ -451,6 +431,8 @@ init_view (ModestAccountView *self)
 
 	toggle_renderer = gtk_cell_renderer_toggle_new ();
 	text_renderer = gtk_cell_renderer_text_new ();
+	g_object_set (G_OBJECT (text_renderer), "ellipsize", PANGO_ELLIPSIZE_END,
+			"ellipsize-set", TRUE, NULL);
 
 	/* the is_default column */
 	g_object_set (G_OBJECT(toggle_renderer), "activatable", TRUE, "radio", TRUE, NULL);
@@ -482,6 +464,7 @@ init_view (ModestAccountView *self)
 	column =  gtk_tree_view_column_new_with_attributes (_("mcen_ti_account"), text_renderer, "text",
 							    MODEST_ACCOUNT_VIEW_DISPLAY_NAME_COLUMN, NULL);
 	gtk_tree_view_append_column (GTK_TREE_VIEW(self), column);
+	gtk_tree_view_column_set_expand (column, TRUE);
 	gtk_tree_view_column_set_cell_data_func(column, text_renderer, bold_if_default_cell_data,
 						NULL, NULL);
 
@@ -489,6 +472,7 @@ init_view (ModestAccountView *self)
 	column =  gtk_tree_view_column_new_with_attributes (_("mcen_ti_lastupdated"), text_renderer,"text",
 							    MODEST_ACCOUNT_VIEW_LAST_UPDATED_COLUMN, NULL);
 	gtk_tree_view_append_column (GTK_TREE_VIEW(self),column);
+	gtk_tree_view_column_set_expand (column, TRUE);
 	gtk_tree_view_column_set_cell_data_func(column, text_renderer, bold_if_default_cell_data,
 						NULL, NULL);
 			
@@ -511,12 +495,6 @@ init_view (ModestAccountView *self)
 					   self);
 	priv->sig_handlers = 
 		modest_signal_mgr_connect (priv->sig_handlers, 
-					   G_OBJECT (modest_runtime_get_account_store ()),
-					   "account_changed",
-					   G_CALLBACK(on_account_changed), 
-					   self);
-	priv->sig_handlers = 
-		modest_signal_mgr_connect (priv->sig_handlers, 
 					   G_OBJECT(priv->account_mgr),
 					   "account_busy_changed",
 					   G_CALLBACK(on_account_busy_changed), 
@@ -634,16 +612,14 @@ modest_account_view_select_account (ModestAccountView *account_view,
 static void
 modest_account_view_select_first_account (ModestAccountView *account_view)
 {
-	GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (account_view));
-	g_return_if_fail (model != NULL);
-
 	GtkTreeIter iter;
-	gtk_tree_model_get_iter_first (model, &iter);
-
-	GtkTreeSelection *selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (account_view));
-	g_return_if_fail (selection != NULL);
+	GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (account_view));
 
-	gtk_tree_selection_select_iter (selection, &iter);
+	if (gtk_tree_model_get_iter_first (model, &iter)) {
+		GtkTreeSelection *selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (account_view));
+	
+		gtk_tree_selection_select_iter (selection, &iter);
+	}
 }
 
 static void