diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/em-filter-editor.c | 10 | ||||
| -rw-r--r-- | mail/em-vfolder-rule.c | 31 | ||||
| -rw-r--r-- | mail/mail-config.h | 38 |
3 files changed, 51 insertions, 28 deletions
diff --git a/mail/em-filter-editor.c b/mail/em-filter-editor.c index 667ee085be..4a0527d934 100644 --- a/mail/em-filter-editor.c +++ b/mail/em-filter-editor.c @@ -167,10 +167,12 @@ em_filter_editor_construct (EMFilterEditor *fe, GtkWidget *combobox; gint i; GtkTreeViewColumn *column; + GtkTreeModel *model; GSList *sources = NULL; - combobox = e_builder_get_widget (builder, "filter_source_combobox"); - gtk_list_store_clear (GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (combobox)))); + combobox = e_builder_get_widget (builder, "filter_source_combobox"); + model = gtk_combo_box_get_model (GTK_COMBO_BOX (combobox)); + gtk_list_store_clear (GTK_LIST_STORE (model)); for (i = 0; source_names[i].source; i++) { gtk_combo_box_append_text (GTK_COMBO_BOX (combobox), source_names[i].name); @@ -182,7 +184,9 @@ em_filter_editor_construct (EMFilterEditor *fe, g_object_set_data_full (G_OBJECT (combobox), "sources", sources, free_sources); gtk_widget_show (combobox); - e_rule_editor_construct ((ERuleEditor *) fe, (ERuleContext *) fc, builder, source_names[0].source, _("_Filter Rules")); + e_rule_editor_construct ( + (ERuleEditor *) fe, (ERuleContext *) fc, + builder, source_names[0].source, _("_Filter Rules")); /* Show the Enabled column, we support it here */ column = gtk_tree_view_get_column (GTK_TREE_VIEW (E_RULE_EDITOR (fe)->list), 0); diff --git a/mail/em-vfolder-rule.c b/mail/em-vfolder-rule.c index e32d319eac..9ecca7b60b 100644 --- a/mail/em-vfolder-rule.c +++ b/mail/em-vfolder-rule.c @@ -220,7 +220,8 @@ validate(EFilterRule *fr, EAlert **alert) /* We have to have at least one source set in the "specific" case. Do not translate this string! */ - if (((EMVFolderRule *)fr)->with == EM_VFOLDER_RULE_WITH_SPECIFIC && ((EMVFolderRule *)fr)->sources == NULL) { + if (((EMVFolderRule *)fr)->with == EM_VFOLDER_RULE_WITH_SPECIFIC && + ((EMVFolderRule *)fr)->sources == NULL) { if (alert) *alert = e_alert_new ("mail:vfolder-no-source", NULL); return 0; @@ -394,8 +395,11 @@ static struct { static void set_sensitive(struct _source_data *data) { - gtk_widget_set_sensitive((GtkWidget *)data->buttons[BUTTON_ADD], TRUE); - gtk_widget_set_sensitive((GtkWidget *)data->buttons[BUTTON_REMOVE], data->current != NULL); + gtk_widget_set_sensitive ( + GTK_WIDGET (data->buttons[BUTTON_ADD]), TRUE); + gtk_widget_set_sensitive ( + GTK_WIDGET (data->buttons[BUTTON_REMOVE]), + data->current != NULL); } static void @@ -621,18 +625,27 @@ get_widget(EFilterRule *fr, ERuleContext *rc) g_signal_connect(data->list, "cursor-changed", G_CALLBACK(select_source), data); rb = (GtkRadioButton *)e_builder_get_widget (builder, "local_rb"); - g_signal_connect (GTK_WIDGET(rb), "toggled", G_CALLBACK(select_source_with_changed), data); + g_signal_connect ( + rb, "toggled", + G_CALLBACK (select_source_with_changed), data); rb = (GtkRadioButton *)e_builder_get_widget (builder, "remote_rb"); - g_signal_connect (GTK_WIDGET(rb), "toggled", G_CALLBACK(select_source_with_changed), data); + g_signal_connect ( + rb, "toggled", + G_CALLBACK (select_source_with_changed), data); rb = (GtkRadioButton *)e_builder_get_widget (builder, "local_and_remote_rb"); - g_signal_connect (GTK_WIDGET(rb), "toggled", G_CALLBACK(select_source_with_changed), data); + g_signal_connect ( + rb, "toggled", + G_CALLBACK (select_source_with_changed), data); - rb = (GtkRadioButton *)e_builder_get_widget (builder, "specific_rb"); - g_signal_connect (GTK_WIDGET(rb), "toggled", G_CALLBACK(select_source_with_changed), data); + rb = (GtkRadioButton *) e_builder_get_widget (builder, "specific_rb"); + g_signal_connect ( + rb, "toggled", + G_CALLBACK (select_source_with_changed), data); - data->source_selector = (GtkWidget *)e_builder_get_widget (builder, "source_selector"); + data->source_selector = (GtkWidget *) + e_builder_get_widget (builder, "source_selector"); rb = g_slist_nth_data(gtk_radio_button_get_group (rb), vr->with); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (rb), TRUE); diff --git a/mail/mail-config.h b/mail/mail-config.h index 4b67fbd222..eee2958a1e 100644 --- a/mail/mail-config.h +++ b/mail/mail-config.h @@ -66,35 +66,41 @@ typedef enum { MAIL_CONFIG_XMAILER_RUPERT_APPROVED = 4 } MailConfigXMailerDisplayStyle; +GType evolution_mail_config_get_type (void); + /* Configuration */ -void mail_config_init (void); -void mail_config_write (void); +void mail_config_init (void); +void mail_config_write (void); -GConfClient *mail_config_get_gconf_client (void); +GConfClient * mail_config_get_gconf_client (void); /* General Accessor functions */ -void mail_config_service_set_save_passwd (EAccountService *service, gboolean save_passwd); +void mail_config_service_set_save_passwd + (EAccountService *service, + gboolean save_passwd); /* accounts */ -EAccount *mail_config_get_account_by_source_url (const gchar *url); -EAccount *mail_config_get_account_by_transport_url (const gchar *url); +EAccount * mail_config_get_account_by_source_url + (const gchar *url); +EAccount * mail_config_get_account_by_transport_url + (const gchar *url); -gint mail_config_get_address_count (void); +gint mail_config_get_address_count (void); -EAccountService *mail_config_get_default_transport (void); +EAccountService * + mail_config_get_default_transport (void); /* static utility functions */ -gchar *mail_config_folder_to_cachename (CamelFolder *folder, const gchar *prefix); -gchar *mail_config_folder_to_safe_url (CamelFolder *folder); - -gint mail_config_get_sync_timeout (void); +gchar * mail_config_folder_to_cachename (CamelFolder *folder, + const gchar *prefix); +gchar * mail_config_folder_to_safe_url (CamelFolder *folder); -void mail_config_reload_junk_headers (void); -gboolean mail_config_get_lookup_book (void); -gboolean mail_config_get_lookup_book_local_only (void); +gint mail_config_get_sync_timeout (void); -GType evolution_mail_config_get_type (void); +void mail_config_reload_junk_headers (void); +gboolean mail_config_get_lookup_book (void); +gboolean mail_config_get_lookup_book_local_only (void); G_END_DECLS |