From aec33928b7b77fe64b0afdf13b5db126e7f5dfac Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 26 Apr 2010 08:36:24 -0400 Subject: Adapt to Camel API changes. --- mail/em-folder-properties.c | 234 ++++++++++++-------------------------------- 1 file changed, 63 insertions(+), 171 deletions(-) (limited to 'mail/em-folder-properties.c') diff --git a/mail/em-folder-properties.c b/mail/em-folder-properties.c index 57753b8055..529472b47a 100644 --- a/mail/em-folder-properties.c +++ b/mail/em-folder-properties.c @@ -31,6 +31,8 @@ #include +#include + #include "em-folder-properties.h" #include "em-config.h" @@ -42,11 +44,6 @@ struct _prop_data { gpointer object; - CamelArgV *argv; - GtkWidget **widgets; - - GSList *properties; - gchar *name; gint total; gint unread; EMConfig *config; @@ -64,57 +61,15 @@ emfp_dialog_response (GtkWidget *dialog, gint response, struct _prop_data *prop_ gtk_widget_destroy (dialog); } -static void -emfp_commit(EConfig *ec, GSList *items, gpointer data) -{ - struct _prop_data *prop_data = data; - CamelArgV *argv = prop_data->argv; - gint i; - - for (i = 0; i < argv->argc; i++) { - CamelArg *arg = &argv->argv[i]; - - switch (arg->tag & CAMEL_ARG_TYPE) { - case CAMEL_ARG_BOO: - arg->ca_int = gtk_toggle_button_get_active ((GtkToggleButton *) prop_data->widgets[i]); - break; - case CAMEL_ARG_STR: - g_free (arg->ca_str); - arg->ca_str = (gchar *) gtk_entry_get_text ((GtkEntry *) prop_data->widgets[i]); - break; - case CAMEL_ARG_INT: - arg->ca_int = gtk_spin_button_get_value_as_int ((GtkSpinButton *) prop_data->widgets[i]); - break; - case CAMEL_ARG_DBL: - arg->ca_double = gtk_spin_button_get_value ((GtkSpinButton *) prop_data->widgets[i]); - break; - default: - g_warning ("This shouldn't be reached\n"); - break; - } - } - - camel_object_setv (prop_data->object, NULL, argv); -} - static void emfp_free(EConfig *ec, GSList *items, gpointer data) { struct _prop_data *prop_data = data; - gint i; g_slist_free(items); - for (i = 0; i < prop_data->argv->argc; i++) { - if ((prop_data->argv->argv[i].tag & CAMEL_ARG_TYPE) == CAMEL_ARG_STR) - g_free (prop_data->argv->argv[i].ca_str); - } - - camel_object_free (prop_data->object, CAMEL_FOLDER_PROPERTIES, prop_data->properties); - camel_object_free (prop_data->object, CAMEL_FOLDER_NAME, prop_data->name); - + camel_object_state_write (prop_data->object); g_object_unref (prop_data->object); - g_free (prop_data->argv); camel_folder_quota_info_free (prop_data->quota); @@ -151,15 +106,17 @@ add_numbered_row (GtkTable *table, gint row, const gchar *description, const gch static GtkWidget * emfp_get_folder_item(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data) { - GtkWidget *w, *table, *label; + GObjectClass *class; + GParamSpec **properties; + GtkWidget *widget, *table; struct _prop_data *prop_data = data; - gint row = 0, i; - GSList *l; + guint ii, n_properties; + gint row = 0; if (old) return old; - table = gtk_table_new (g_slist_length (prop_data->properties) + 2, 2, FALSE); + table = gtk_table_new (2, 2, FALSE); gtk_table_set_row_spacings ((GtkTable *) table, 6); gtk_table_set_col_spacings ((GtkTable *) table, 12); gtk_widget_show (table); @@ -200,74 +157,39 @@ emfp_get_folder_item(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidge } } - /* setup the ui with the values retrieved */ - l = prop_data->properties; - i = 0; - while (l) { - CamelProperty *prop = l->data; - - switch (prop->tag & CAMEL_ARG_TYPE) { - case CAMEL_ARG_BOO: - w = gtk_check_button_new_with_label (prop->description); - gtk_toggle_button_set_active ((GtkToggleButton *) w, prop_data->argv->argv[i].ca_int != 0); - gtk_widget_show (w); - gtk_table_attach ((GtkTable *) table, w, 0, 2, row, row + 1, GTK_FILL | GTK_EXPAND, 0, 0, 0); - prop_data->widgets[i] = w; - break; - case CAMEL_ARG_STR: - label = gtk_label_new (prop->description); - gtk_misc_set_alignment ((GtkMisc *) label, 0.0, 0.5); - gtk_widget_show (label); - gtk_table_attach ((GtkTable *) table, label, 0, 1, row, row + 1, GTK_FILL, 0, 0, 0); - - w = gtk_entry_new (); - gtk_widget_show (w); - if (prop_data->argv->argv[i].ca_str) { - gtk_entry_set_text ((GtkEntry *) w, prop_data->argv->argv[i].ca_str); - camel_object_free (prop_data->object, prop_data->argv->argv[i].tag, prop_data->argv->argv[i].ca_str); - prop_data->argv->argv[i].ca_str = NULL; - } - gtk_table_attach ((GtkTable *) table, w, 1, 2, row, row + 1, GTK_FILL | GTK_EXPAND, 0, 0, 0); - prop_data->widgets[i] = w; - break; - case CAMEL_ARG_INT: - label = gtk_label_new (prop->description); - gtk_misc_set_alignment ((GtkMisc *) label, 0.0, 0.5); - gtk_widget_show (label); - gtk_table_attach ((GtkTable *) table, label, 0, 1, row, row + 1, GTK_FILL, 0, 0, 0); - - w = gtk_spin_button_new_with_range (G_MININT, G_MAXINT, 1.0); - gtk_spin_button_set_value ((GtkSpinButton *) w, (double) prop_data->argv->argv[i].ca_int); - gtk_spin_button_set_numeric ((GtkSpinButton *) w, TRUE); - gtk_spin_button_set_digits ((GtkSpinButton *) w, 0); - gtk_widget_show (w); - gtk_table_attach ((GtkTable *) table, w, 1, 2, row, row + 1, GTK_FILL | GTK_EXPAND, 0, 0, 0); - prop_data->widgets[i] = w; - break; - case CAMEL_ARG_DBL: - label = gtk_label_new (prop->description); - gtk_misc_set_alignment ((GtkMisc *) label, 0.0, 0.5); - gtk_widget_show (label); - gtk_table_attach ((GtkTable *) table, label, 0, 1, row, row + 1, GTK_FILL, 0, 0, 0); - - w = gtk_spin_button_new_with_range (G_MININT, G_MAXINT, 1.0); - gtk_spin_button_set_value ((GtkSpinButton *) w, prop_data->argv->argv[i].ca_double); - gtk_spin_button_set_numeric ((GtkSpinButton *) w, TRUE); - gtk_spin_button_set_digits ((GtkSpinButton *) w, 2); - gtk_widget_show (w); - gtk_table_attach ((GtkTable *) table, w, 1, 2, row, row + 1, GTK_FILL | GTK_EXPAND, 0, 0, 0); - prop_data->widgets[i] = w; - break; - default: - g_warning ("This shouldn't be reached\n"); - break; + class = G_OBJECT_GET_CLASS (prop_data->object); + properties = g_object_class_list_properties (class, &n_properties); + + for (ii = 0; ii < n_properties; ii++) { + const gchar *blurb; + + if ((properties[ii]->flags & CAMEL_PARAM_PERSISTENT) == 0) + continue; + + blurb = g_param_spec_get_blurb (properties[ii]); + + switch (properties[ii]->value_type) { + case G_TYPE_BOOLEAN: + widget = gtk_check_button_new_with_label (blurb); + e_mutual_binding_new ( + prop_data->object, + properties[ii]->name, + widget, "active"); + gtk_widget_show (widget); + gtk_table_attach ( + GTK_TABLE (table), widget, + 0, 2, row, row + 1, + GTK_FILL | GTK_EXPAND, 0, 0, 0); + row++; + break; + default: + g_warn_if_reached (); + break; } - - row++; - l = l->next; - i++; } + g_free (properties); + return table; } @@ -291,39 +213,38 @@ emfp_dialog_got_folder_quota (CamelFolder *folder, GtkWidget *content_area; struct _prop_data *prop_data; GSList *l; - gint32 count, i,deleted; + gint32 i,deleted; EMConfig *ec; EMConfigTargetFolder *target; EShellWindow *shell_window; EShellView *shell_view; - CamelArgGetV *arggetv; - CamelArgV *argv; CamelStore *local_store; + CamelStore *parent_store; gboolean hide_deleted; GConfClient *gconf; - CamelStore *store; + const gchar *name; if (folder == NULL) return; - store = folder->parent_store; - shell_view = E_SHELL_VIEW (data); shell_window = e_shell_view_get_shell_window (shell_view); local_store = e_mail_local_get_store (); + parent_store = camel_folder_get_parent_store (folder); prop_data = g_malloc0 (sizeof (*prop_data)); - prop_data->object = folder; - g_object_ref (folder); + prop_data->object = g_object_ref (folder); prop_data->quota = camel_folder_quota_info_clone (quota); /* Get number of VISIBLE and DELETED messages, instead of TOTAL messages. VISIBLE+DELETED gives the correct count that matches the label below the Send & Receive button */ - camel_object_get (folder, NULL, CAMEL_FOLDER_PROPERTIES, &prop_data->properties, CAMEL_FOLDER_NAME, &prop_data->name, - CAMEL_FOLDER_VISIBLE, &prop_data->total, CAMEL_FOLDER_UNREAD, &prop_data->unread, CAMEL_FOLDER_DELETED, &deleted, NULL); + name = camel_folder_get_name (folder); + prop_data->total = folder->summary->visible_count; + prop_data->unread = folder->summary->unread_count; + deleted = folder->summary->deleted_count; gconf = mail_config_get_gconf_client (); hide_deleted = !gconf_client_get_bool(gconf, "/apps/evolution/mail/display/show_deleted", NULL); @@ -331,7 +252,7 @@ emfp_dialog_got_folder_quota (CamelFolder *folder, /* Do the calculation only for those accounts that support VTRASHes */ - if (store->flags & CAMEL_STORE_VTRASH) { + if (parent_store->flags & CAMEL_STORE_VTRASH) { if (CAMEL_IS_VTRASH_FOLDER(folder)) prop_data->total += deleted; else if (!hide_deleted && deleted > 0) @@ -341,17 +262,16 @@ emfp_dialog_got_folder_quota (CamelFolder *folder, /* * If the ffolder is junk folder, get total number of mails. */ - if (store->flags & CAMEL_STORE_VJUNK) { - camel_object_get (folder, NULL, CAMEL_FOLDER_TOTAL, &prop_data->total, NULL); - } - - if (store == local_store - && (!strcmp(prop_data->name, "Drafts") - || !strcmp(prop_data->name, "Templates") - || !strcmp(prop_data->name, "Inbox") - || !strcmp(prop_data->name, "Outbox") - || !strcmp(prop_data->name, "Sent"))) { - emfp_items[EMFP_FOLDER_SECTION].label = _(prop_data->name); + if (parent_store->flags & CAMEL_STORE_VJUNK) + prop_data->total = camel_folder_summary_count (folder->summary); + + if (parent_store == local_store + && (!strcmp (name, "Drafts") + || !strcmp (name, "Templates") + || !strcmp (name, "Inbox") + || !strcmp (name, "Outbox") + || !strcmp (name, "Sent"))) { + emfp_items[EMFP_FOLDER_SECTION].label = gettext (name); if (!emfp_items_translated) { for (i = 0; i < G_N_ELEMENTS (emfp_items); i++) { if (emfp_items[i].label) @@ -359,43 +279,15 @@ emfp_dialog_got_folder_quota (CamelFolder *folder, } emfp_items_translated = TRUE; } - } else if (!strcmp(prop_data->name, "INBOX")) + } else if (!strcmp (name, "INBOX")) emfp_items[EMFP_FOLDER_SECTION].label = _("Inbox"); else - emfp_items[EMFP_FOLDER_SECTION].label = prop_data->name; - - count = g_slist_length (prop_data->properties); - - prop_data->widgets = g_malloc0 (sizeof (prop_data->widgets[0]) * count); - - /* build an arggetv/argv to retrieve/store the results */ - argv = g_malloc0 (sizeof (*argv) + (count - CAMEL_ARGV_MAX) * sizeof (argv->argv[0])); - argv->argc = count; - arggetv = g_malloc0 (sizeof (*arggetv) + (count - CAMEL_ARGV_MAX) * sizeof (arggetv->argv[0])); - arggetv->argc = count; - - i = 0; - l = prop_data->properties; - while (l) { - CamelProperty *prop = l->data; - - argv->argv[i].tag = prop->tag; - arggetv->argv[i].tag = prop->tag; - arggetv->argv[i].ca_ptr = &argv->argv[i].ca_ptr; - - l = l->next; - i++; - } - - camel_object_getv (prop_data->object, NULL, arggetv); - g_free (arggetv); - prop_data->argv = argv; + emfp_items[EMFP_FOLDER_SECTION].label = (gchar *) name; dialog = gtk_dialog_new_with_buttons ( _("Folder Properties"), GTK_WINDOW (shell_window), GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); + GTK_STOCK_CLOSE, GTK_RESPONSE_OK, NULL); gtk_window_set_default_size ((GtkWindow *) dialog, 192, 160); gtk_widget_ensure_style (dialog); @@ -416,7 +308,7 @@ emfp_dialog_got_folder_quota (CamelFolder *folder, l = NULL; for (i = 0; i < G_N_ELEMENTS (emfp_items); i++) l = g_slist_prepend(l, &emfp_items[i]); - e_config_add_items((EConfig *)ec, l, emfp_commit, NULL, emfp_free, prop_data); + e_config_add_items((EConfig *)ec, l, NULL, NULL, emfp_free, prop_data); target = em_config_target_new_folder(ec, folder, folder_uri); e_config_set_target((EConfig *)ec, (EConfigTarget *)target); -- cgit v1.2.3