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;
}
-
-
+/* currently unused */
+#if 0
static void
on_account_enable_toggled (GtkCellRendererToggle *cell_renderer, gchar *path,
ModestAccountView *self)
modest_account_mgr_set_enabled (priv->account_mgr, account_name, !enabled);
g_free (account_name);
}
+#endif
+static void
+on_account_default_toggled (GtkCellRendererToggle *cell_renderer, gchar *path,
+ ModestAccountView *self)
+{
+ printf ("debug: on_account_default_toggled\n");
+ gboolean is_default = gtk_cell_renderer_toggle_get_active (cell_renderer);
+ printf ("debug: is_default: %d\n", is_default);
+ if (is_default) {
+ /* Do not allow an account to be marked non-default.
+ * Only allow this to be changed by setting another account to default: */
+ gtk_cell_renderer_toggle_set_active (cell_renderer, TRUE);
+ return;
+ }
+
+ ModestAccountViewPrivate *priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(self);
+ GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW(self));
+
+ GtkTreeIter iter;
+ if (!gtk_tree_model_get_iter_from_string (model, &iter, path)) {
+ g_printerr ("modest: cannot find iterator\n");
+ return;
+ }
+
+ gchar *account_name = NULL;
+ gtk_tree_model_get (model, &iter, MODEST_ACCOUNT_VIEW_NAME_COLUMN, &account_name,
+ -1);
+
+ /* toggle: */
+ if (is_default) {
+ printf ("debug2: is_default: %d\n", is_default);
+ /* TODO: Will the model will be updated */
+ modest_account_mgr_set_default_account (priv->account_mgr, account_name);
+ }
+
+ /* toggle: */
+ if (is_default)
+ modest_account_mgr_set_default_account (priv->account_mgr, account_name);
+
+ g_free (account_name);
+}
void
bold_if_default_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
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 ();
- /* the is_enabled column */
- g_object_set (G_OBJECT(toggle_renderer), "activatable", TRUE,"radio", FALSE, NULL);
- g_signal_connect (G_OBJECT(toggle_renderer), "toggled", G_CALLBACK(on_account_enable_toggled),
- self);
+ /* the is_default column */
+ g_object_set (G_OBJECT(toggle_renderer), "activatable", TRUE, "radio", FALSE, NULL);
+ printf("debug: connecting to toggled signal.\n");
gtk_tree_view_append_column (GTK_TREE_VIEW(self),
gtk_tree_view_column_new_with_attributes (
- _("Enabled"), toggle_renderer,
- "active", MODEST_ACCOUNT_VIEW_IS_ENABLED_COLUMN, NULL));
+ _(" mcen_ti_default"), toggle_renderer,
+ "active", MODEST_ACCOUNT_VIEW_IS_DEFAULT_COLUMN, NULL));
+
+ /* Disable the Maemo GtkTreeView::allow-checkbox-mode Maemo modification,
+ * which causes the model column to be updated automatically when the row is clicked.
+ * Making this the default in Maemo's GTK+ is obviously a bug:
+ * https://maemo.org/bugzilla/show_bug.cgi?id=146
+ *
+ * This also stops the application's own signal handler from being called,
+ * though unsetting the Maemo properties does not seem to fix that:
+ */
+ g_object_set(G_OBJECT(self), "allow-checkbox-mode", FALSE, NULL);
+ g_object_set(G_OBJECT(toggle_renderer), "checkbox-mode", FALSE, NULL);
+ g_signal_connect (G_OBJECT(toggle_renderer), "toggled", G_CALLBACK(on_account_default_toggled),
+ self);
/* account name */
- column = gtk_tree_view_column_new_with_attributes (_("Account"), text_renderer,"text",
+ 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_cell_data_func(column, text_renderer, bold_if_default_cell_data,
- NULL, NULL);
-
- /* account type */
- column = gtk_tree_view_column_new_with_attributes (_("Type"), text_renderer,"text",
- MODEST_ACCOUNT_VIEW_PROTO_COLUMN, NULL);
- gtk_tree_view_append_column (GTK_TREE_VIEW(self),column);
+ gtk_tree_view_append_column (GTK_TREE_VIEW(self), column);
gtk_tree_view_column_set_cell_data_func(column, text_renderer, bold_if_default_cell_data,
NULL, NULL);
/* last update for this account */
- column = gtk_tree_view_column_new_with_attributes (_("Last update"), text_renderer,"text",
+ 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_cell_data_func(column, text_renderer, bold_if_default_cell_data,
NULL, NULL);
+
+ /* Show the column headers,
+ * which does not seem to be the default on Maemo.
+ */
+ gtk_tree_view_set_headers_visible (GTK_TREE_VIEW(self), TRUE);
- 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;
projects / modest / blobdiff