priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(obj);
priv->account_mgr = NULL;
+ priv->sig1 = 0;
+ priv->sig2 = 0;
}
static void
priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(obj);
if (priv->account_mgr) {
+ if (priv->sig1)
+ g_signal_handler_disconnect (priv->account_mgr, priv->sig1);
+
+ if (priv->sig2)
+ g_signal_handler_disconnect (priv->account_mgr, priv->sig2);
+
g_object_unref (G_OBJECT(priv->account_mgr));
priv->account_mgr = NULL;
}
gtk_list_store_clear (model);
cursor = account_names = modest_account_mgr_account_names (account_mgr);
+
+ if(account_names == NULL)
+ {
+ printf ("debug: modest_account_mgr_account_names() returned NULL\n");
+ }
while (cursor) {
gchar *account_name;
/* don't display accounts without stores */
if (account_data->store_account) {
-
+
+ GtkTreeIter iter;
time_t last_updated;
gchar *last_updated_string;
last_updated_string = g_strdup (_("Never"));
gtk_list_store_insert_with_values (
- model, NULL, 0,
+ model, &iter, 0,
MODEST_ACCOUNT_VIEW_NAME_COLUMN, account_name,
MODEST_ACCOUNT_VIEW_DISPLAY_NAME_COLUMN, account_data->display_name,
MODEST_ACCOUNT_VIEW_IS_ENABLED_COLUMN, account_data->is_enabled,
NULL);
}
-
static void
init_view (ModestAccountView *self)
{
);
gtk_tree_view_set_model (GTK_TREE_VIEW(self), GTK_TREE_MODEL(model));
+ g_object_unref (G_OBJECT (model));
toggle_renderer = gtk_cell_renderer_toggle_new ();
text_renderer = gtk_cell_renderer_text_new ();
gtk_tree_view_column_set_cell_data_func(column, text_renderer, bold_if_default_cell_data,
NULL, NULL);
- g_signal_connect (G_OBJECT(priv->account_mgr),"account_removed",
+ priv->sig1 = g_signal_connect (G_OBJECT(priv->account_mgr),"account_removed",
G_CALLBACK(on_account_removed), self);
- g_signal_connect (G_OBJECT(priv->account_mgr), "account_changed",
+ priv->sig2 = g_signal_connect (G_OBJECT(priv->account_mgr), "account_changed",
G_CALLBACK(on_account_changed), self);
}
obj = g_object_new(MODEST_TYPE_ACCOUNT_VIEW, NULL);
priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(obj);
- g_object_ref (G_OBJECT(account_mgr));
+ g_object_ref (G_OBJECT (account_mgr));
priv->account_mgr = account_mgr;
init_view (MODEST_ACCOUNT_VIEW (obj));
- update_account_view (account_mgr, MODEST_ACCOUNT_VIEW(obj));
+ update_account_view (account_mgr, MODEST_ACCOUNT_VIEW (obj));
- return MODEST_ACCOUNT_VIEW(obj);
+ return MODEST_ACCOUNT_VIEW (obj);
}
-const gchar *
+gchar *
modest_account_view_get_selected_account (ModestAccountView *self)
{
- const gchar *account_name = NULL;
+ gchar *account_name = NULL;
GtkTreeSelection *sel;
GtkTreeModel *model;
GtkTreeIter iter;
sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self));
if (gtk_tree_selection_get_selected (sel, &model, &iter)) {
- gtk_tree_model_get (model, &iter, MODEST_ACCOUNT_VIEW_NAME_COLUMN, &account_name,
- -1);
+ gtk_tree_model_get (model, &iter,
+ MODEST_ACCOUNT_VIEW_NAME_COLUMN,
+ &account_name, -1);
}
return account_name;