diff options
Diffstat (limited to 'mail')
135 files changed, 312 insertions, 312 deletions
diff --git a/mail/e-attachment-handler-mail.c b/mail/e-attachment-handler-mail.c index 790c7b9c7a..c17c97d8ca 100644 --- a/mail/e-attachment-handler-mail.c +++ b/mail/e-attachment-handler-mail.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/e-attachment-handler-mail.h b/mail/e-attachment-handler-mail.h index da4ff23d89..c62ea99cab 100644 --- a/mail/e-attachment-handler-mail.h +++ b/mail/e-attachment-handler-mail.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/e-mail-attachment-bar.c b/mail/e-mail-attachment-bar.c index 92fc8272f7..e3656e1223 100644 --- a/mail/e-mail-attachment-bar.c +++ b/mail/e-mail-attachment-bar.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/e-mail-attachment-bar.h b/mail/e-mail-attachment-bar.h index e32f6e2ede..38a4a86fae 100644 --- a/mail/e-mail-attachment-bar.h +++ b/mail/e-mail-attachment-bar.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/e-mail-search-bar.c b/mail/e-mail-search-bar.c index 4d555857ca..6dcddaf83b 100644 --- a/mail/e-mail-search-bar.c +++ b/mail/e-mail-search-bar.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/e-mail-search-bar.h b/mail/e-mail-search-bar.h index 7f19e176b7..f4748c77ad 100644 --- a/mail/e-mail-search-bar.h +++ b/mail/e-mail-search-bar.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/e-searching-tokenizer.c b/mail/e-searching-tokenizer.c index e0edb9d389..724cc3b74a 100644 --- a/mail/e-searching-tokenizer.c +++ b/mail/e-searching-tokenizer.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/e-searching-tokenizer.h b/mail/e-searching-tokenizer.h index 37a0048c0c..f96c37ed49 100644 --- a/mail/e-searching-tokenizer.h +++ b/mail/e-searching-tokenizer.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c index fc61cdc84b..2b13e7e015 100644 --- a/mail/em-account-editor.c +++ b/mail/em-account-editor.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -1422,7 +1422,7 @@ emae_refresh_providers(EMAccountEditor *emae, EMAccountEditorService *service) } else { current = g_strdup("imap"); } - + store = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_POINTER); i = 0; @@ -1448,7 +1448,7 @@ emae_refresh_providers(EMAccountEditor *emae, EMAccountEditorService *service) gtk_list_store_append(store, &iter); gtk_list_store_set(store, &iter, 0, provider->name, 1, provider, -1); - + /* find the displayed and set default */ if (i == 0 || (current && strcmp(provider->protocol, current) == 0)) { service->provider = provider; @@ -1480,10 +1480,10 @@ emae_refresh_providers(EMAccountEditor *emae, EMAccountEditorService *service) if (!uri || (url = camel_url_new(uri, NULL)) == NULL) { return; } - + tmp = camel_url_get_param(url, "use_ssl"); if (tmp == NULL) - tmp = "never"; + tmp = "never"; for (i=0;i<num_ssl_options;i++) { if (!strcmp(ssl_options[i].value, tmp)) { gtk_combo_box_set_active(service->use_ssl, i); @@ -2370,7 +2370,7 @@ emae_send_page(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct gtk_box_pack_start((GtkBox*)((GnomeDruidPageStandard *)page)->vbox, w, TRUE, TRUE, 0); w = page; g_object_unref(druidxml); - gnome_druid_append_page((GnomeDruid *)parent, (GnomeDruidPage *)page); + gnome_druid_append_page((GnomeDruid *)parent, (GnomeDruidPage *)page); } else { gtk_notebook_append_page((GtkNotebook *)parent, w, gtk_label_new(_("Sending Email"))); } @@ -2687,7 +2687,7 @@ emae_service_complete(EMAccountEditor *emae, EMAccountEditorService *service) if (CAMEL_PROVIDER_NEEDS(service->provider, CAMEL_URL_PART_HOST)) { if (url->host == NULL || url->host[0] == 0) ok = FALSE; - else + else gtk_entry_set_text(service->hostname, url->host); } /* We only need the user if the service needs auth as well, i think */ @@ -2802,14 +2802,14 @@ emae_check_complete(EConfig *ec, const char *pageid, void *data) } else { g_warning("buz1\n"); } - + } } else if (!strcmp(pageid, "30.send")) { CamelURL *url; char *at, *user; int index; char *uri = (char *)e_account_get_string(emae->account, E_ACCOUNT_TRANSPORT_URL); - + tmp = e_account_get_string(emae->account, E_ACCOUNT_ID_ADDRESS); at = strchr(tmp, '@'); user = g_alloca(at-tmp+1); @@ -2831,8 +2831,8 @@ emae_check_complete(EConfig *ec, const char *pageid, void *data) } else { g_warning("buz2\n"); } - - + + } else if (!strcmp(pageid, "20.receive_options")) { if (emae->priv->source.provider && emae->priv->extra_provider != emae->priv->source.provider) { @@ -3095,5 +3095,5 @@ em_account_editor_construct(EMAccountEditor *emae, EAccount *account, em_account g_signal_connect(emae->editor, "destroy", G_CALLBACK(emae_editor_destroyed), emae); } else { e_config_create_widget((EConfig *)ec); - } + } } diff --git a/mail/em-account-editor.h b/mail/em-account-editor.h index fdd25b8f78..e17236e865 100644 --- a/mail/em-account-editor.h +++ b/mail/em-account-editor.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-account-prefs.c b/mail/em-account-prefs.c index 56bb4ce1df..d2303aa73b 100644 --- a/mail/em-account-prefs.c +++ b/mail/em-account-prefs.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-account-prefs.h b/mail/em-account-prefs.h index c63b9f562e..0dabc8a11a 100644 --- a/mail/em-account-prefs.h +++ b/mail/em-account-prefs.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-composer-prefs.c b/mail/em-composer-prefs.c index c369bdc1e9..8c704a2827 100644 --- a/mail/em-composer-prefs.c +++ b/mail/em-composer-prefs.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -956,7 +956,7 @@ em_composer_prefs_construct (EMComposerPrefs *prefs) spell_setup (prefs); /* Forwards and Replies */ - prefs->forward_style = GTK_COMBO_BOX (glade_xml_get_widget (gui, "comboboxForwardStyle")); + prefs->forward_style = GTK_COMBO_BOX (glade_xml_get_widget (gui, "comboboxForwardStyle")); style = gconf_client_get_int (client, "/apps/evolution/mail/format/forward_style", NULL); gtk_combo_box_set_active (prefs->forward_style, style); g_signal_connect (prefs->forward_style, "changed", G_CALLBACK (style_changed), (gpointer) "/apps/evolution/mail/format/forward_style"); diff --git a/mail/em-composer-prefs.h b/mail/em-composer-prefs.h index 82c6ece51e..2e12c7ffb2 100644 --- a/mail/em-composer-prefs.h +++ b/mail/em-composer-prefs.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c index 9b3dbe6cf9..4ed3e70b8f 100644 --- a/mail/em-composer-utils.c +++ b/mail/em-composer-utils.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -469,7 +469,7 @@ static void composer_set_no_change (EMsgComposer *composer, gboolean drop_undo, gboolean editor_changed) { GtkhtmlEditor *editor; - + g_return_if_fail (composer != NULL); editor = GTKHTML_EDITOR (composer); @@ -662,7 +662,7 @@ create_new_composer (const char *subject, const char *fromuri, gboolean use_defa if (lite) composer = e_msg_composer_lite_new (); else - composer = e_msg_composer_new (); + composer = e_msg_composer_new (); table = e_msg_composer_get_header_table (composer); if (fromuri != NULL) { @@ -773,7 +773,7 @@ edit_message (CamelMimeMessage *message, CamelFolder *drafts, const char *uid) CamelMimePart *mime_part = CAMEL_MIME_PART (message); CamelDataWrapper *mail_text; CamelMultipart *body = camel_multipart_new (); - CamelStream *stream; + CamelStream *stream; CamelMimePart *part; int count1 = 0, string_changed = 0; const char *cur; @@ -863,8 +863,8 @@ edit_message (CamelMimeMessage *message, CamelFolder *drafts, const char *uid) } g_strfreev(temp_str); - } - else + } + else cur++; } @@ -879,7 +879,7 @@ edit_message (CamelMimeMessage *message, CamelFolder *drafts, const char *uid) mail_text = camel_data_wrapper_new (); camel_data_wrapper_set_mime_type_field (mail_text, type); - + camel_stream_printf (stream, "%s", g_strdup(str)); camel_data_wrapper_construct_from_stream (mail_text, stream); @@ -896,10 +896,10 @@ edit_message (CamelMimeMessage *message, CamelFolder *drafts, const char *uid) camel_object_unref (body); } } - + composer = e_msg_composer_new_with_message (message); - - if (em_utils_folder_is_templates(drafts, NULL) == TRUE) + + if (em_utils_folder_is_templates(drafts, NULL) == TRUE) em_composer_utils_setup_callbacks (composer, NULL, NULL, 0, 0, NULL, NULL); else em_composer_utils_setup_callbacks (composer, NULL, NULL, 0, 0, drafts, uid); @@ -925,7 +925,7 @@ em_utils_edit_message (CamelMimeMessage *message, CamelFolder *folder) if (folder) edit_message (message, folder, NULL); else - edit_message (message, NULL, NULL); + edit_message (message, NULL, NULL); } static void @@ -1047,7 +1047,7 @@ forward_attached_cb (CamelFolder *folder, GPtrArray *messages, CamelMimePart *pa if (part) forward_attached (folder, fad->uids, messages, part, subject, fad->fromuri); - + g_free (fad->fromuri); g_free (fad); } @@ -2261,7 +2261,7 @@ em_utils_construct_composer_text (CamelMimeMessage *message, EMFormat *source) char *text, *credits; ssize_t len = 0; gboolean start_bottom = 0; - + credits = attribution_format (ATTRIBUTION, message); text = em_utils_message_to_html (message, credits, EM_FORMAT_QUOTE_CITE, &len, source, start_bottom ? "<BR>" : NULL); diff --git a/mail/em-composer-utils.h b/mail/em-composer-utils.h index bbdb73d9c1..60944cb840 100644 --- a/mail/em-composer-utils.h +++ b/mail/em-composer-utils.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -50,7 +50,7 @@ void em_utils_composer_send_cb(struct _EMsgComposer *composer, gpointer user_dat void em_utils_composer_save_draft_cb(struct _EMsgComposer *composer, gpointer user_data); void em_utils_compose_new_message (const char *fromuri); -struct _EMsgComposer * em_utils_compose_lite_new_message (const char *fromuri); +struct _EMsgComposer * em_utils_compose_lite_new_message (const char *fromuri); /* FIXME: mailto? url? should make up its mind what its called. imho use 'uri' */ void em_utils_compose_new_message_with_mailto (const char *url, const char *fromuri); diff --git a/mail/em-config.c b/mail/em-config.c index 94df437519..160cec851e 100644 --- a/mail/em-config.c +++ b/mail/em-config.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-config.h b/mail/em-config.h index ba19bb1c37..5f895305b0 100644 --- a/mail/em-config.h +++ b/mail/em-config.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-event.c b/mail/em-event.c index 8a027cce98..b415d5f8a0 100644 --- a/mail/em-event.c +++ b/mail/em-event.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-event.h b/mail/em-event.h index 21df1df42d..7c2c4c639d 100644 --- a/mail/em-event.h +++ b/mail/em-event.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-filter-context.c b/mail/em-filter-context.c index b0f82a7dad..a2a699a36f 100644 --- a/mail/em-filter-context.c +++ b/mail/em-filter-context.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-filter-context.h b/mail/em-filter-context.h index 6b2e4f18fd..56f11a3d81 100644 --- a/mail/em-filter-context.h +++ b/mail/em-filter-context.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-filter-editor.c b/mail/em-filter-editor.c index 4a92a65c58..4f68cf47df 100644 --- a/mail/em-filter-editor.c +++ b/mail/em-filter-editor.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -141,7 +141,7 @@ select_source (GtkComboBox *combobox, EMFilterEditor *fe) idx = gtk_combo_box_get_active (combobox); sources = g_object_get_data (G_OBJECT (combobox), "sources"); - + g_return_if_fail (idx >= 0 && idx < g_slist_length (sources)); source = (char *)g_slist_nth (sources, idx); diff --git a/mail/em-filter-editor.h b/mail/em-filter-editor.h index f37536d1ee..8d9926b873 100644 --- a/mail/em-filter-editor.h +++ b/mail/em-filter-editor.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-filter-folder-element.c b/mail/em-filter-folder-element.c index a95a4dd88d..b975b81089 100644 --- a/mail/em-filter-folder-element.c +++ b/mail/em-filter-folder-element.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-filter-folder-element.h b/mail/em-filter-folder-element.h index 8f9a2d8b4e..0d7d3b50b2 100644 --- a/mail/em-filter-folder-element.h +++ b/mail/em-filter-folder-element.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-filter-rule.c b/mail/em-filter-rule.c index 45dd78c708..583f82977c 100644 --- a/mail/em-filter-rule.c +++ b/mail/em-filter-rule.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -496,7 +496,7 @@ more_parts(GtkWidget *button, struct _rule_data *data) adjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (w)); if (adjustment) gtk_adjustment_set_value (adjustment, adjustment->upper); - + } } } diff --git a/mail/em-filter-rule.h b/mail/em-filter-rule.h index 49e71850d6..6ddaddc8d2 100644 --- a/mail/em-filter-rule.h +++ b/mail/em-filter-rule.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-filter-source-element.c b/mail/em-filter-source-element.c index e35871638f..23a1b762cd 100644 --- a/mail/em-filter-source-element.c +++ b/mail/em-filter-source-element.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-filter-source-element.h b/mail/em-filter-source-element.h index 3204b636a0..ac9a1ff911 100644 --- a/mail/em-filter-source-element.h +++ b/mail/em-filter-source-element.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c index 201db814ec..c835a1b593 100644 --- a/mail/em-folder-browser.c +++ b/mail/em-folder-browser.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -1476,8 +1476,8 @@ emfb_edit_select_all(BonoboUIComponent *uid, void *data, const char *path) emfb_expand_all_threads (uid, data, path); - /* The time out below is added so that the execution thread to - expand all conversations threads would've completed. + /* The time out below is added so that the execution thread to + expand all conversations threads would've completed. The timeout 505 is just to ensure that the value is a small delta more than the timeout value in expand_all_threads thread. */ diff --git a/mail/em-folder-browser.h b/mail/em-folder-browser.h index 75dbe975b5..e2c74ecf17 100644 --- a/mail/em-folder-browser.h +++ b/mail/em-folder-browser.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-folder-properties.c b/mail/em-folder-properties.c index 56194b6af9..b0fbfc65d2 100644 --- a/mail/em-folder-properties.c +++ b/mail/em-folder-properties.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -240,7 +240,7 @@ emfp_get_folder_item(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, 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); @@ -254,7 +254,7 @@ emfp_get_folder_item(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, 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); diff --git a/mail/em-folder-properties.h b/mail/em-folder-properties.h index 8bae3848e7..cd58a9eeb4 100644 --- a/mail/em-folder-properties.h +++ b/mail/em-folder-properties.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-folder-selection-button.c b/mail/em-folder-selection-button.c index 9257c57b5d..ce97dcb85d 100644 --- a/mail/em-folder-selection-button.c +++ b/mail/em-folder-selection-button.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-folder-selection-button.h b/mail/em-folder-selection-button.h index e9cd1c2a0e..c0ab32f88e 100644 --- a/mail/em-folder-selection-button.h +++ b/mail/em-folder-selection-button.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-folder-selection.c b/mail/em-folder-selection.c index d56a470153..cfb244c2eb 100644 --- a/mail/em-folder-selection.c +++ b/mail/em-folder-selection.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-folder-selection.h b/mail/em-folder-selection.h index 78cd300410..25c35d254b 100644 --- a/mail/em-folder-selection.h +++ b/mail/em-folder-selection.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-folder-selector.c b/mail/em-folder-selector.c index 3762e05bf2..ae6a8965a4 100644 --- a/mail/em-folder-selector.c +++ b/mail/em-folder-selector.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-folder-selector.h b/mail/em-folder-selector.h index 7b011f588c..12662ae5f7 100644 --- a/mail/em-folder-selector.h +++ b/mail/em-folder-selector.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c index e3a2eda2bc..d90bcbbacb 100644 --- a/mail/em-folder-tree-model.c +++ b/mail/em-folder-tree-model.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-folder-tree-model.h b/mail/em-folder-tree-model.h index 13114c8539..706e3895b3 100644 --- a/mail/em-folder-tree-model.h +++ b/mail/em-folder-tree-model.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c index f773068613..77e62dfbcf 100644 --- a/mail/em-folder-tree.c +++ b/mail/em-folder-tree.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -1700,7 +1700,7 @@ emft_get_folder_info__done (struct _EMFolderTreeGetFolderInfo *m) /* Traverse to the last valid iter */ titer = iter; - while (gtk_tree_model_iter_next((GtkTreeModel *) model, &iter)) + while (gtk_tree_model_iter_next((GtkTreeModel *) model, &iter)) titer = iter; /* Preserve the last valid iter */ iter = titer; diff --git a/mail/em-folder-tree.h b/mail/em-folder-tree.h index b02a4d88cd..e76acf4df1 100644 --- a/mail/em-folder-tree.h +++ b/mail/em-folder-tree.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c index 0555fb76cc..ad60516bb1 100644 --- a/mail/em-folder-utils.c +++ b/mail/em-folder-utils.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -408,8 +408,8 @@ em_folder_utils_delete_folder (CamelFolder *folder) em_utils_show_error_silent (dialog); return; } - - if (mail_folder_cache_get_folder_info_flags (folder, &flags) && (flags & CAMEL_FOLDER_SYSTEM)) + + if (mail_folder_cache_get_folder_info_flags (folder, &flags) && (flags & CAMEL_FOLDER_SYSTEM)) { e_error_run(NULL,"mail:no-delete-special-folder", folder->name, NULL); return; diff --git a/mail/em-folder-utils.h b/mail/em-folder-utils.h index 4d03ce5762..c139a9e74c 100644 --- a/mail/em-folder-utils.h +++ b/mail/em-folder-utils.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c index b19057a720..d0f8289a15 100644 --- a/mail/em-folder-view.c +++ b/mail/em-folder-view.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -168,7 +168,7 @@ static const EMFolderViewEnable emfv_enable_map[] = { { "MessageFilterJunk", EM_POPUP_SELECT_MANY }, { "MessageCopy", EM_POPUP_SELECT_MANY }, { "MessageDelete", EM_POPUP_SELECT_MANY|EM_POPUP_SELECT_DELETE }, - { "MessageDeleteKey", EM_POPUP_SELECT_MANY}, + { "MessageDeleteKey", EM_POPUP_SELECT_MANY}, { "MessageForward", EM_POPUP_SELECT_MANY }, { "MessageForwardAttached", EM_POPUP_SELECT_MANY }, { "MessageForwardInline", EM_POPUP_SELECT_ONE }, @@ -511,7 +511,7 @@ em_folder_view_open_selected(EMFolderView *emfv) } if (em_utils_folder_is_drafts(emfv->folder, emfv->folder_uri) - || em_utils_folder_is_templates(emfv->folder, emfv->folder_uri) + || em_utils_folder_is_templates(emfv->folder, emfv->folder_uri) || em_utils_folder_is_outbox(emfv->folder, emfv->folder_uri)) { em_utils_edit_messages(emfv->folder, uids, TRUE); return uids->len; @@ -884,7 +884,7 @@ emfv_popup_source(EPopup *ep, EPopupItem *pitem, void *data) emmb = (EMMessageBrowser *)em_message_browser_window_new(); em_format_set_session((EMFormat *)((EMFolderView *)emmb)->preview, ((EMFormat *)emfv->preview)->session); - message_list_ensure_message (((EMFolderView *)emmb)->list, uids->pdata[0]); + message_list_ensure_message (((EMFolderView *)emmb)->list, uids->pdata[0]); em_folder_view_set_folder((EMFolderView *)emmb, emfv->folder, emfv->folder_uri); em_format_set_mode((EMFormat *)((EMFolderView *)emmb)->preview, EM_FORMAT_SOURCE); em_folder_view_set_message((EMFolderView *)emmb, uids->pdata[0], FALSE); @@ -1233,7 +1233,7 @@ emfv_popup_label_clear(EPopup *ep, EPopupItem *pitem, void *data) { EMFolderView *emfv = data; GSList *l; - EUtilLabel *label; + EUtilLabel *label; for (l = mail_config_get_labels (); l; l = l->next) { label = l->data; @@ -1365,7 +1365,7 @@ static EPopupItem emfv_popup_items[] = { { E_POPUP_BAR, (gchar *) "90.filter", NULL, NULL, NULL, NULL }, { E_POPUP_SUBMENU, (gchar *) "90.filter.00", (gchar *) N_("Crea_te Rule From Message"), NULL, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY }, - /* Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on. */ + /* Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on. */ { E_POPUP_ITEM, (gchar *) "90.filter.00/00.00", (gchar *) N_("Search Folder based on _Subject"), emfv_popup_vfolder_subject, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY }, { E_POPUP_ITEM, (gchar *) "90.filter.00/00.01", (gchar *) N_("Search Folder based on Se_nder"), emfv_popup_vfolder_sender, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY }, { E_POPUP_ITEM, (gchar *) "90.filter.00/00.02", (gchar *) N_("Search Folder based on _Recipients"), emfv_popup_vfolder_recipients, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY }, @@ -1373,7 +1373,7 @@ static EPopupItem emfv_popup_items[] = { emfv_popup_vfolder_mlist, NULL, NULL, EM_POPUP_SELECT_ONE|EM_POPUP_SELECT_MAILING_LIST|EM_FOLDER_VIEW_SELECT_LISTONLY }, { E_POPUP_BAR, (gchar *) "90.filter.00/10", NULL, NULL, NULL, NULL }, - /* Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on. */ + /* Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on. */ { E_POPUP_ITEM, (gchar *) "90.filter.00/10.00", (gchar *) N_("Filter based on Sub_ject"), emfv_popup_filter_subject, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY }, { E_POPUP_ITEM, (gchar *) "90.filter.00/10.01", (gchar *) N_("Filter based on Sen_der"), emfv_popup_filter_sender, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY }, { E_POPUP_ITEM, (gchar *) "90.filter.00/10.02", (gchar *) N_("Filter based on Re_cipients"), emfv_popup_filter_recipients, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY }, @@ -2610,7 +2610,7 @@ emfv_list_double_click(ETree *tree, gint row, ETreePath path, gint col, GdkEvent /* Ignore double-clicks on columns that handle thier own state */ if (MESSAGE_LIST_COLUMN_IS_ACTIVE (col)) return; - + em_folder_view_open_selected(emfv); } @@ -2931,7 +2931,7 @@ emfv_format_popup_event(EMFormatHTMLDisplay *efhd, GdkEventButton *event, const if (!main_emp) main_emp = emp; } - + if (event == NULL) gtk_menu_popup (menu, NULL, NULL, NULL, NULL, 0, gtk_get_current_event_time()); else diff --git a/mail/em-folder-view.h b/mail/em-folder-view.h index b69a4a1a05..3a7a153131 100644 --- a/mail/em-folder-view.h +++ b/mail/em-folder-view.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-format-hook.c b/mail/em-format-hook.c index 60881396c2..9fec654ae5 100644 --- a/mail/em-format-hook.c +++ b/mail/em-format-hook.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-format-hook.h b/mail/em-format-hook.h index 3665bbf0db..08d99dd63c 100644 --- a/mail/em-format-hook.h +++ b/mail/em-format-hook.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c index 8863bf7f08..8d25923658 100644 --- a/mail/em-format-html-display.c +++ b/mail/em-format-html-display.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -186,13 +186,13 @@ efhd_gtkhtml_realise(GtkHTML *html, EMFormatHTMLDisplay *efhd) r = style->fg[state].red >> 8; g = style->fg[state].green >> 8; - b = style->fg[state].blue >> 8; + b = style->fg[state].blue >> 8; efhd->formathtml.header_colour = ((r<<16) | (g<< 8) | b) & 0xffffff; r = style->bg[state].red >> 8; g = style->bg[state].green >> 8; - b = style->bg[state].blue >> 8; + b = style->bg[state].blue >> 8; efhd->formathtml.body_colour = ((r<<16) | (g<< 8) | b) & 0xffffff; diff --git a/mail/em-format-html-display.h b/mail/em-format-html-display.h index 99234e9c1e..bd0ea0edd3 100644 --- a/mail/em-format-html-display.h +++ b/mail/em-format-html-display.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/em-format-html-print.c b/mail/em-format-html-print.c index 985828d2af..ef1bbb13c4 100644 --- a/mail/em-format-html-print.c +++ b/mail/em-format-html-print.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-format-html-print.h b/mail/em-format-html-print.h index ef25b63033..2abdc82178 100644 --- a/mail/em-format-html-print.h +++ b/mail/em-format-html-print.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) */ diff --git a/mail/em-format-html.c b/mail/em-format-html.c index d0172ea8ef..aa82851bc9 100644 --- a/mail/em-format-html.c +++ b/mail/em-format-html.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -1500,18 +1500,18 @@ efh_format_text_header (EMFormatHTML *emfh, CamelStream *stream, const char *lab const char *fmt, *html; char *mhtml = NULL; gboolean is_rtl; - + if (value == NULL) return; while (*value == ' ') value++; - + if (!(flags & EM_FORMAT_HTML_HEADER_HTML)) html = mhtml = camel_text_to_html (value, emfh->text_html_flags, 0); - else + else html = value; - + is_rtl = gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL; if (emfh->simple_headers) { fmt = "<b>%s</b>: %s<br>"; @@ -1528,7 +1528,7 @@ efh_format_text_header (EMFormatHTML *emfh, CamelStream *stream, const char *lab else fmt = "<tr><th align=\"right\" valign=\"top\" nowrap>%s<b> </b></th><td valign=top>%s</td></tr>"; } else { - + if (flags & EM_FORMAT_HEADER_BOLD) { if (is_rtl) fmt = "<tr><td align=\"right\" valign=\"top\" width=\"100%%\">%2$s</td><th align=\"left\" nowrap>%1$s:<b> </b></th></tr>"; @@ -1667,22 +1667,22 @@ static void canon_header_name (char *name) { char *inptr = name; - + /* canonicalise the header name... first letter is * capitalised and any letter following a '-' also gets * capitalised */ - + if (*inptr >= 'a' && *inptr <= 'z') *inptr -= 0x20; - + inptr++; - + while (*inptr) { if (inptr[-1] == '-' && *inptr >= 'a' && *inptr <= 'z') *inptr -= 0x20; else if (*inptr >= 'A' && *inptr <= 'Z') *inptr += 0x20; - + inptr++; } } @@ -1707,22 +1707,22 @@ efh_format_header(EMFormat *emf, CamelStream *stream, CamelMedium *part, struct break; } } - + label = _(name); - + if (addrspec) { struct _camel_header_address *addrs; GString *html; char *img; - + buf = camel_header_unfold (header->value); if (!(addrs = camel_header_address_decode (buf, emf->charset ? emf->charset : emf->default_charset))) { g_free (buf); return; } - + g_free (buf); - + html = g_string_new(""); img = efh_format_address(efh, html, addrs, (char *)label); @@ -1732,7 +1732,7 @@ efh_format_header(EMFormat *emf, CamelStream *stream, CamelMedium *part, struct flags |= EM_FORMAT_HTML_HEADER_NODEC; g_free (img); } - + camel_header_address_unref(addrs); txt = value = html->str; g_string_free(html, FALSE); @@ -1742,7 +1742,7 @@ efh_format_header(EMFormat *emf, CamelStream *stream, CamelMedium *part, struct buf = camel_header_unfold (header->value); txt = value = camel_header_decode_string (buf, charset); g_free (buf); - + flags |= EM_FORMAT_HEADER_BOLD; } else if (!strcmp(name, "X-evolution-mailer")) { /* pseudo-header */ @@ -1769,7 +1769,7 @@ efh_format_header(EMFormat *emf, CamelStream *stream, CamelMedium *part, struct if (msg_offset) { char buf[256], *html; - + msg_offset += (local.tm_hour * 60) + local.tm_min; if (msg_offset >= (24 * 60) || msg_offset < 0) { /* translators: strftime format for local time equivalent in Date header display, with day */ @@ -1782,27 +1782,27 @@ efh_format_header(EMFormat *emf, CamelStream *stream, CamelMedium *part, struct e_utf8_strftime(buf, sizeof(buf), msg, &local); g_free(msg); } - + html = camel_text_to_html(txt, efh->text_html_flags, 0); txt = value = g_strdup_printf("%s %s", html, buf); g_free(html); flags |= EM_FORMAT_HTML_HEADER_HTML; } - + flags |= EM_FORMAT_HEADER_BOLD; } else if (!strcmp(name, "Newsgroups")) { struct _camel_header_newsgroup *ng, *scan; GString *html; - + buf = camel_header_unfold (header->value); - + if (!(ng = camel_header_newsgroups_decode (buf))) { g_free (buf); return; } - + g_free (buf); - + html = g_string_new(""); scan = ng; while (scan) { @@ -1811,9 +1811,9 @@ efh_format_header(EMFormat *emf, CamelStream *stream, CamelMedium *part, struct if (scan) g_string_append_printf(html, ", "); } - + camel_header_newsgroups_free(ng); - + txt = html->str; g_string_free(html, FALSE); flags |= EM_FORMAT_HEADER_BOLD|EM_FORMAT_HTML_HEADER_HTML; @@ -1826,9 +1826,9 @@ efh_format_header(EMFormat *emf, CamelStream *stream, CamelMedium *part, struct txt = value = camel_header_decode_string (buf, charset); g_free (buf); } - + efh_format_text_header(efh, stream, label, txt, flags); - + g_free (value); g_free (str_field); } @@ -1850,7 +1850,7 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part) char *header_sender = NULL, *header_from = NULL, *name; gboolean mail_from_delegate = FALSE; const char *hdr_charset; - + if (!part) return; @@ -1863,9 +1863,9 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part) "<font color=\"#%06x\">\n" "<table cellpadding=\"0\" width=\"100%%\">", efh->header_colour & 0xffffff); - + hdr_charset = emf->charset ? emf->charset : emf->default_charset; - + header = ((CamelMimePart *)part)->headers; while (header) { if (!g_ascii_strcasecmp (header->name, "Sender")) { @@ -1904,7 +1904,7 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part) header = header->next; } - + if (header_sender && header_from && mail_from_delegate) { camel_stream_printf(stream, "<tr><td><table border=1 width=\"100%%\" cellspacing=2 cellpadding=2><tr>"); if(gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL) @@ -1976,11 +1976,11 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part) have_icon = TRUE; } else if (!face_decoded && face && !g_ascii_strcasecmp (header->name, "Face")) { char *cp = header->value; - + /* Skip over spaces */ while (*cp == ' ') cp++; - + face_header_value = g_base64_decode (cp, &face_header_len); face_header_value = g_realloc (face_header_value, face_header_len + 1); face_header_value[face_header_len] = 0; diff --git a/mail/em-format-html.h b/mail/em-format-html.h index 7cadd5e282..eb8aec96e9 100644 --- a/mail/em-format-html.h +++ b/mail/em-format-html.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-format-quote.c b/mail/em-format-quote.c index 40e69022d1..85249a293c 100644 --- a/mail/em-format-quote.c +++ b/mail/em-format-quote.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -271,22 +271,22 @@ static void canon_header_name (char *name) { char *inptr = name; - + /* canonicalise the header name... first letter is * capitalised and any letter following a '-' also gets * capitalised */ - + if (*inptr >= 'a' && *inptr <= 'z') *inptr -= 0x20; - + inptr++; - + while (*inptr) { if (inptr[-1] == '-' && *inptr >= 'a' && *inptr <= 'z') *inptr -= 0x20; else if (*inptr >= 'A' && *inptr <= 'Z') *inptr += 0x20; - + inptr++; } } @@ -312,24 +312,24 @@ emfq_format_header (EMFormat *emf, CamelStream *stream, CamelMedium *part, const break; } } - + label = _(name); - + if (addrspec) { struct _camel_header_address *addrs; GString *html; if (!(txt = camel_medium_get_header (part, name))) return; - + buf = camel_header_unfold (txt); if (!(addrs = camel_header_address_decode (txt, emf->charset ? emf->charset : emf->default_charset))) { g_free (buf); return; } - + g_free (buf); - + html = g_string_new (""); emfq_format_address (html, addrs); camel_header_address_unref (addrs); @@ -347,15 +347,15 @@ emfq_format_header (EMFormat *emf, CamelStream *stream, CamelMedium *part, const if (!(txt = camel_medium_get_header (part, "x-newsreader"))) if (!(txt = camel_medium_get_header (part, "x-mimeole"))) return; - + txt = value = camel_header_format_ctext (txt, charset); - + label = _("Mailer"); flags |= EM_FORMAT_HEADER_BOLD; } else if (!strcmp (name, "Date") || !strcmp (name, "Resent-Date")) { if (!(txt = camel_medium_get_header (part, name))) return; - + flags |= EM_FORMAT_HEADER_BOLD; } else { txt = camel_medium_get_header (part, name); diff --git a/mail/em-format-quote.h b/mail/em-format-quote.h index 87f0151a50..86d277b26e 100644 --- a/mail/em-format-quote.h +++ b/mail/em-format-quote.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-format.c b/mail/em-format.c index 83f0d4acfe..6b12fedae4 100644 --- a/mail/em-format.c +++ b/mail/em-format.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-format.h b/mail/em-format.h index ce3d522ab0..e2363c2b8e 100644 --- a/mail/em-format.h +++ b/mail/em-format.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-html-stream.c b/mail/em-html-stream.c index daa81d356d..a1615d2d6a 100644 --- a/mail/em-html-stream.c +++ b/mail/em-html-stream.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-html-stream.h b/mail/em-html-stream.h index a8eabdda55..86baa5cfa6 100644 --- a/mail/em-html-stream.h +++ b/mail/em-html-stream.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-icon-stream.c b/mail/em-icon-stream.c index 2e1a7ae2f6..b06145acc0 100644 --- a/mail/em-icon-stream.c +++ b/mail/em-icon-stream.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-icon-stream.h b/mail/em-icon-stream.h index f92bfefb54..321e0cacae 100644 --- a/mail/em-icon-stream.h +++ b/mail/em-icon-stream.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-inline-filter.c b/mail/em-inline-filter.c index f671159369..ffe9f676b3 100644 --- a/mail/em-inline-filter.c +++ b/mail/em-inline-filter.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-inline-filter.h b/mail/em-inline-filter.h index 062a590445..b6bc38502f 100644 --- a/mail/em-inline-filter.h +++ b/mail/em-inline-filter.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-junk-hook.c b/mail/em-junk-hook.c index c4ea8b16f3..f95685e351 100644 --- a/mail/em-junk-hook.c +++ b/mail/em-junk-hook.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-junk-hook.h b/mail/em-junk-hook.h index 70926b2f11..0e467a20bd 100644 --- a/mail/em-junk-hook.h +++ b/mail/em-junk-hook.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-mailer-prefs.c b/mail/em-mailer-prefs.c index bb786752e5..27f27ca721 100644 --- a/mail/em-mailer-prefs.c +++ b/mail/em-mailer-prefs.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -346,7 +346,7 @@ jh_add_cb (GtkWidget *widget, gpointer user_data) gtk_box_pack_start ((GtkBox *)hbox, l2, FALSE, FALSE, 6); gtk_box_pack_start ((GtkBox *)hbox, entry2, FALSE, FALSE, 6); gtk_box_pack_start ((GtkBox *)vbox, hbox, FALSE, FALSE, 6); - + gtk_widget_show_all (vbox); gtk_container_add ((GtkContainer *)((GtkDialog *)dialog)->vbox, vbox); response = gtk_dialog_run ((GtkDialog *)dialog); @@ -355,9 +355,9 @@ jh_add_cb (GtkWidget *widget, gpointer user_data) const char *value = gtk_entry_get_text ((GtkEntry *)entry2); char *tok; GSList *list = gconf_client_get_list (prefs->gconf, "/apps/evolution/mail/junk/custom_header", GCONF_VALUE_STRING, NULL); - + /* FIXME: Validate the values */ - + tok = g_strdup_printf ("%s=%s", name, value); list = g_slist_append (list, tok); gconf_client_set_list (prefs->gconf, "/apps/evolution/mail/junk/custom_header", GCONF_VALUE_STRING, list, NULL); @@ -395,7 +395,7 @@ jh_remove_cb (GtkWidget *widget, gpointer user_data) if (strcmp (test, value) == 0) break; } - + prev = node; node = node->next; } diff --git a/mail/em-mailer-prefs.h b/mail/em-mailer-prefs.h index 3b52d9f40a..10503a8461 100644 --- a/mail/em-mailer-prefs.h +++ b/mail/em-mailer-prefs.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -123,7 +123,7 @@ struct _EMMailerPrefs { struct _GtkToggleButton *check_incoming; struct _GtkToggleButton *empty_junk; struct _GtkComboBox *empty_junk_days; - + struct _GtkToggleButton *sa_local_tests_only; struct _GtkToggleButton *sa_use_daemon; struct _GtkComboBox *default_junk_plugin; diff --git a/mail/em-menu.c b/mail/em-menu.c index fc2e43d455..b504bd3304 100644 --- a/mail/em-menu.c +++ b/mail/em-menu.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-menu.h b/mail/em-menu.h index 08467fefd8..cdcc12bcae 100644 --- a/mail/em-menu.h +++ b/mail/em-menu.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-message-browser.c b/mail/em-message-browser.c index 973708bc2b..9299f3754f 100644 --- a/mail/em-message-browser.c +++ b/mail/em-message-browser.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-message-browser.h b/mail/em-message-browser.h index cf00a74a75..d394adc9ba 100644 --- a/mail/em-message-browser.h +++ b/mail/em-message-browser.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/em-migrate.c b/mail/em-migrate.c index 974c8b97a8..3f5beb3f84 100644 --- a/mail/em-migrate.c +++ b/mail/em-migrate.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -1130,7 +1130,7 @@ em_migrate_setup_progress_dialog (const char *title, const char *desc) gtk_label_set_markup (GTK_LABEL (w), markup); gtk_box_pack_start (GTK_BOX (vbox), w, TRUE, TRUE, 0); g_free (markup); - + w = gtk_label_new (desc); gtk_misc_set_alignment (GTK_MISC (w), 0.0, 0.0); gtk_label_set_line_wrap (GTK_LABEL (w), TRUE); @@ -1139,7 +1139,7 @@ em_migrate_setup_progress_dialog (const char *title, const char *desc) /* Progress bar */ w = gtk_vbox_new (FALSE, 6); gtk_box_pack_start (GTK_BOX (vbox), w, TRUE, TRUE, 0); - + label = GTK_LABEL (gtk_label_new ("")); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0); gtk_label_set_line_wrap (label, TRUE); @@ -2785,7 +2785,7 @@ migrate_folders(CamelStore *store, gboolean is_local, CamelFolderInfo *fi, const tmp = g_strdup_printf ("%s/%s", acc, fi->full_name); em_migrate_set_folder_name (tmp); g_free (tmp); - + progress = (double) (*nth_folder) / total_folders; g_idle_add ((GSourceFunc) update_progress_in_main_thread, &progress); @@ -2823,7 +2823,7 @@ setup_local_store (MailComponent *mc) CamelURL *url; char *tmp; CamelStore *store; - + url = camel_url_new("mbox:", NULL); tmp = g_build_filename (mail_component_peek_base_directory(mc), "local", NULL); camel_url_set_path(url, tmp); @@ -2833,7 +2833,7 @@ setup_local_store (MailComponent *mc) g_free(tmp); return store; - + } struct migrate_folders_to_db_structure { @@ -2844,13 +2844,13 @@ struct migrate_folders_to_db_structure { gboolean done; gboolean is_local_store; }; - + static void migrate_folders_to_db_thread (struct migrate_folders_to_db_structure *migrate_dbs) { int num_of_folders = 0, nth_folder = 0; count_folders (migrate_dbs->info, &num_of_folders); - migrate_folders (migrate_dbs->store, migrate_dbs->is_local_store, migrate_dbs->info, - migrate_dbs->account_name, &(migrate_dbs->ex), &(migrate_dbs->done), + migrate_folders (migrate_dbs->store, migrate_dbs->is_local_store, migrate_dbs->info, + migrate_dbs->account_name, &(migrate_dbs->ex), &(migrate_dbs->done), &nth_folder, num_of_folders); } @@ -2877,7 +2877,7 @@ migrate_to_db() "patient while Evolution migrates your folders...")); store = setup_local_store (component); - info = camel_store_get_folder_info (store, NULL, CAMEL_STORE_FOLDER_INFO_RECURSIVE|CAMEL_STORE_FOLDER_INFO_FAST|CAMEL_STORE_FOLDER_INFO_SUBSCRIBED, NULL); + info = camel_store_get_folder_info (store, NULL, CAMEL_STORE_FOLDER_INFO_RECURSIVE|CAMEL_STORE_FOLDER_INFO_FAST|CAMEL_STORE_FOLDER_INFO_SUBSCRIBED, NULL); if (info) { GThread *thread; @@ -2885,7 +2885,7 @@ migrate_to_db() if (g_str_has_suffix (((CamelService *)store)->url->path, ".evolution/mail/local")) migrate_dbs.is_local_store = TRUE; - else + else migrate_dbs.is_local_store = FALSE; camel_exception_init (&migrate_dbs.ex); migrate_dbs.account_name = _("On This Computer"); @@ -2941,7 +2941,7 @@ migrate_to_db() g_object_unref (iter); em_migrate_close_progress_dialog (); } - + int em_migrate (const char *evolution_dir, int major, int minor, int revision, CamelException *ex) diff --git a/mail/em-migrate.h b/mail/em-migrate.h index c755ef9b39..238f4fda1c 100644 --- a/mail/em-migrate.h +++ b/mail/em-migrate.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-network-prefs.c b/mail/em-network-prefs.c index 01fbd87547..b0c51ed863 100644 --- a/mail/em-network-prefs.c +++ b/mail/em-network-prefs.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -76,7 +76,7 @@ GType em_network_prefs_get_type (void) { static GType type = 0; - + if (!type) { static const GTypeInfo info = { sizeof (EMNetworkPrefsClass), @@ -87,10 +87,10 @@ em_network_prefs_get_type (void) 0, (GInstanceInitFunc) em_network_prefs_init, }; - + type = g_type_register_static (gtk_vbox_get_type (), "EMNetworkPrefs", &info, 0); } - + return type; } @@ -99,9 +99,9 @@ em_network_prefs_class_init (EMNetworkPrefsClass *klass) { GObjectClass *gobject_class = G_OBJECT_CLASS (klass); GtkObjectClass *object_class = GTK_OBJECT_CLASS (klass); - + parent_class = g_type_class_ref (gtk_vbox_get_type ()); - + object_class->destroy = em_network_prefs_destroy; gobject_class->finalize = em_network_prefs_finalise; } @@ -116,7 +116,7 @@ static void em_network_prefs_finalise (GObject *obj) { d(g_print ("Network preferences finalize is called\n")); - + /* do something here */ G_OBJECT_CLASS (parent_class)->finalize (obj); } @@ -133,7 +133,7 @@ static void toggle_button_toggled (GtkToggleButton *toggle, EMNetworkPrefs *prefs) { const char *key; - + key = g_object_get_data ((GObject *) toggle, "key"); gconf_client_set_bool (prefs->gconf, key, gtk_toggle_button_get_active (toggle), NULL); if (toggle == prefs->use_auth) { @@ -149,13 +149,13 @@ static void toggle_button_init (EMNetworkPrefs *prefs, GtkToggleButton *toggle, const char *key) { gboolean bool; - + bool = gconf_client_get_bool (prefs->gconf, key, NULL); gtk_toggle_button_set_active (toggle, bool); - + g_object_set_data ((GObject *) toggle, "key", (void *) key); g_signal_connect (toggle, "toggled", G_CALLBACK (toggle_button_toggled), prefs); - + if (!gconf_client_key_is_writable (prefs->gconf, key, NULL)) gtk_widget_set_sensitive ((GtkWidget *) toggle, FALSE); } @@ -176,9 +176,9 @@ emnp_set_sensitiveness (EMNetworkPrefs *prefs, NetworkConfigProxyType type, gboo gtk_widget_set_sensitive ((GtkWidget *) prefs->auto_proxy_url, sensitivity); d(g_print ("Setting sensitivity of autoconfig to: %d\n", sensitivity)); } else -#endif +#endif if (type == NETWORK_PROXY_MANUAL) { - gboolean state; + gboolean state; gtk_widget_set_sensitive ((GtkWidget *) prefs->http_host, sensitivity); gtk_widget_set_sensitive ((GtkWidget *) prefs->https_host, sensitivity); @@ -239,11 +239,11 @@ notify_proxy_type_changed (GtkWidget *widget, EMNetworkPrefs *prefs) emnp_set_sensitiveness (prefs, NETWORK_PROXY_MANUAL, TRUE); } - if (type != NETWORK_PROXY_DIRECT_CONNECTION) + if (type != NETWORK_PROXY_DIRECT_CONNECTION) gconf_client_set_bool (prefs->gconf, GCONF_E_USE_PROXY_KEY, TRUE, NULL); else if (type != NETWORK_PROXY_SYS_SETTINGS) gconf_client_set_bool (prefs->gconf, GCONF_E_USE_PROXY_KEY, FALSE, NULL); - + } static void @@ -253,8 +253,8 @@ widget_entry_changed_cb (GtkWidget *widget, gpointer data) int port = -1; GConfClient *gconf = mail_config_get_gconf_client (); - /* - Do not change the order of comparison - + /* + Do not change the order of comparison - GtkSpinButton is an extended form of GtkEntry */ if (GTK_IS_SPIN_BUTTON (widget)) { @@ -307,9 +307,9 @@ em_network_prefs_construct (EMNetworkPrefs *prefs) gboolean locked; int i, val, port; char *gladefile; - + prefs->gconf = mail_config_get_gconf_client (); - + gladefile = g_build_filename (EVOLUTION_GLADEDIR, "mail-config.glade", NULL); @@ -393,32 +393,32 @@ em_network_prefs_construct (EMNetworkPrefs *prefs) prefs->socks_port = GTK_SPIN_BUTTON (glade_xml_get_widget (gui, "spnSocksPort")); prefs->lbl_socks_host = GTK_LABEL (glade_xml_get_widget (gui, "lblSocksHost")); prefs->lbl_socks_port = GTK_LABEL (glade_xml_get_widget (gui, "lblSocksPort")); - g_signal_connect (prefs->socks_host, "changed", + g_signal_connect (prefs->socks_host, "changed", G_CALLBACK(widget_entry_changed_cb), GCONF_E_SOCKS_HOST_KEY); - g_signal_connect (prefs->socks_port, "value_changed", + g_signal_connect (prefs->socks_port, "value_changed", G_CALLBACK(widget_entry_changed_cb), GCONF_E_SOCKS_PORT_KEY); #endif - + /* Manual proxy options */ - g_signal_connect (prefs->http_host, "changed", + g_signal_connect (prefs->http_host, "changed", G_CALLBACK(widget_entry_changed_cb), (gpointer) GCONF_E_HTTP_HOST_KEY); - g_signal_connect (prefs->https_host, "changed", + g_signal_connect (prefs->https_host, "changed", G_CALLBACK(widget_entry_changed_cb), (gpointer) GCONF_E_HTTPS_HOST_KEY); - g_signal_connect (prefs->ignore_hosts, "changed", + g_signal_connect (prefs->ignore_hosts, "changed", G_CALLBACK(widget_entry_changed_cb), (gpointer) GCONF_E_IGNORE_HOSTS_KEY); - g_signal_connect (prefs->http_port, "value_changed", + g_signal_connect (prefs->http_port, "value_changed", G_CALLBACK(widget_entry_changed_cb), (gpointer) GCONF_E_HTTP_PORT_KEY); - g_signal_connect (prefs->https_port, "value_changed", + g_signal_connect (prefs->https_port, "value_changed", G_CALLBACK(widget_entry_changed_cb), (gpointer) GCONF_E_HTTPS_PORT_KEY); - g_signal_connect (prefs->auth_user, "changed", + g_signal_connect (prefs->auth_user, "changed", G_CALLBACK(widget_entry_changed_cb), (gpointer) GCONF_E_AUTH_USER_KEY); - g_signal_connect (prefs->auth_pwd, "changed", + g_signal_connect (prefs->auth_pwd, "changed", G_CALLBACK(widget_entry_changed_cb), (gpointer) GCONF_E_AUTH_PWD_KEY); @@ -493,9 +493,9 @@ GtkWidget * em_network_prefs_new (void) { EMNetworkPrefs *new; - + new = (EMNetworkPrefs *) g_object_new (em_network_prefs_get_type (), NULL); em_network_prefs_construct (new); - + return (GtkWidget *) new; } diff --git a/mail/em-network-prefs.h b/mail/em-network-prefs.h index 27c4e77685..3d933a7acc 100644 --- a/mail/em-network-prefs.h +++ b/mail/em-network-prefs.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -54,11 +54,11 @@ typedef enum { struct _EMNetworkPrefs { GtkVBox parent_object; - + struct _GConfClient *gconf; - + struct _GladeXML *gui; - + /* Default Behavior */ struct _GtkToggleButton *sys_proxy; struct _GtkToggleButton *no_proxy; @@ -97,9 +97,9 @@ struct _EMNetworkPrefs { struct _EMNetworkPrefsClass { GtkVBoxClass parent_class; - + /* signals */ - + }; GType em_network_prefs_get_type (void); diff --git a/mail/em-popup.c b/mail/em-popup.c index 88aadf7ba7..ad738fca57 100644 --- a/mail/em-popup.c +++ b/mail/em-popup.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -624,7 +624,7 @@ emp_add_vcard (EPopup *ep, EPopupItem *item, void *data) CamelMimePart *part; CamelDataWrapper *content; CamelStreamMem *mem; - + part = ((EMPopupTargetPart *) target)->part; diff --git a/mail/em-popup.h b/mail/em-popup.h index 870055140b..cde903a4ec 100644 --- a/mail/em-popup.h +++ b/mail/em-popup.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-search-context.c b/mail/em-search-context.c index 5bf98614c6..ac03d40a80 100644 --- a/mail/em-search-context.c +++ b/mail/em-search-context.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-search-context.h b/mail/em-search-context.h index 3df5c1d577..47dc6ea86a 100644 --- a/mail/em-search-context.h +++ b/mail/em-search-context.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-stripsig-filter.c b/mail/em-stripsig-filter.c index 7dd8a87416..1600eeaed0 100644 --- a/mail/em-stripsig-filter.c +++ b/mail/em-stripsig-filter.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-stripsig-filter.h b/mail/em-stripsig-filter.h index be72cef3df..761d46691f 100644 --- a/mail/em-stripsig-filter.h +++ b/mail/em-stripsig-filter.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-subscribe-editor.c b/mail/em-subscribe-editor.c index fa68af1776..25c447d62e 100644 --- a/mail/em-subscribe-editor.c +++ b/mail/em-subscribe-editor.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -112,7 +112,7 @@ struct _EMSubscribeNode { typedef struct _MailMsgListNode MailMsgListNode; struct _MailMsgListNode { - EDListNode node; + EDListNode node; MailMsg *msg; }; @@ -265,7 +265,7 @@ sub_subscribe_folder (EMSubscribe *sub, EMSubscribeNode *node, int state, const d(printf("running subscribe folder '%s'\n", spath)); mail_msg_unordered_push (m); } else { - msgListNode = g_malloc0(sizeof(MailMsgListNode)); + msgListNode = g_malloc0(sizeof(MailMsgListNode)); msgListNode->msg = (MailMsg *) m; d(printf("queueing subscribe folder '%s'\n", spath)); e_dlist_addtail(&sub->subscribe, (EDListNode *)msgListNode); @@ -357,7 +357,7 @@ sub_folderinfo_exec (struct _emse_folderinfo_msg *m) if (m->seq == m->sub->seq) { camel_operation_register(m->base.cancel); - m->info = camel_store_get_folder_info(m->sub->store, m->node?m->node->info->full_name:pub_full_name, + m->info = camel_store_get_folder_info(m->sub->store, m->node?m->node->info->full_name:pub_full_name, CAMEL_STORE_FOLDER_INFO_NO_VIRTUAL | CAMEL_STORE_FOLDER_INFO_SUBSCRIPTION_LIST, &m->base.ex); camel_operation_unregister(m->base.cancel); } @@ -560,7 +560,7 @@ static void sub_destroy(GtkWidget *w, EMSubscribe *sub) { struct _zsubscribe_msg *m; - MailMsgListNode *msgListNode; + MailMsgListNode *msgListNode; d(printf("subscribe closed\n")); sub->cancel = TRUE; diff --git a/mail/em-subscribe-editor.h b/mail/em-subscribe-editor.h index aa9c9a2c2d..36710ec0c5 100644 --- a/mail/em-subscribe-editor.h +++ b/mail/em-subscribe-editor.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/em-sync-stream.c b/mail/em-sync-stream.c index 311c2e1b7a..138932cfc7 100644 --- a/mail/em-sync-stream.c +++ b/mail/em-sync-stream.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-sync-stream.h b/mail/em-sync-stream.h index af513e9594..fc687fa462 100644 --- a/mail/em-sync-stream.h +++ b/mail/em-sync-stream.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-utils.c b/mail/em-utils.c index 958864647d..ba180e5011 100644 --- a/mail/em-utils.c +++ b/mail/em-utils.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -648,12 +648,12 @@ em_utils_save_messages (GtkWidget *parent, CamelFolder *folder, GPtrArray *uids) info = camel_folder_get_message_info (folder, uids->pdata[0]); if (info) { filename = g_strdup (camel_message_info_subject (info)); - e_filename_make_safe (filename); + e_filename_make_safe (filename); camel_message_info_free (info); } filesel = e_file_get_save_filesel (parent, _("Save Message..."), filename, GTK_FILE_CHOOSER_ACTION_SAVE); - if (filename) + if (filename) g_free (filename); camel_object_ref(folder); @@ -1386,15 +1386,15 @@ em_utils_folder_is_templates (CamelFolder *folder, const char *uri) if (folder == mail_component_get_folder (NULL, MAIL_COMPONENT_FOLDER_TEMPLATES)) return TRUE; - + if (uri == NULL) return FALSE; - + accounts = mail_config_get_accounts(); iter = e_list_get_iterator ((EList *)accounts); while (e_iterator_is_valid (iter)) { account = (EAccount *)e_iterator_get (iter); - + if (account->templates_folder_uri) { templates_uri = em_uri_to_camel (account->templates_folder_uri); if (camel_store_folder_uri_equal (folder->parent_store, templates_uri, uri)) { @@ -1404,15 +1404,15 @@ em_utils_folder_is_templates (CamelFolder *folder, const char *uri) } g_free (templates_uri); } - + e_iterator_next (iter); } - + g_object_unref (iter); - + return is; } - + /** * em_utils_folder_is_drafts: * @folder: folder diff --git a/mail/em-utils.h b/mail/em-utils.h index d64c411a5f..1b60205168 100644 --- a/mail/em-utils.h +++ b/mail/em-utils.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-vfolder-context.c b/mail/em-vfolder-context.c index 88c97b0a0f..e317b5cabf 100644 --- a/mail/em-vfolder-context.c +++ b/mail/em-vfolder-context.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-vfolder-context.h b/mail/em-vfolder-context.h index 50ce239fb6..7f17f4e2b4 100644 --- a/mail/em-vfolder-context.h +++ b/mail/em-vfolder-context.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-vfolder-editor.c b/mail/em-vfolder-editor.c index b0614d937f..dcc6f03e75 100644 --- a/mail/em-vfolder-editor.c +++ b/mail/em-vfolder-editor.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-vfolder-editor.h b/mail/em-vfolder-editor.h index bbdb6ffce8..58bcd566a1 100644 --- a/mail/em-vfolder-editor.h +++ b/mail/em-vfolder-editor.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-vfolder-rule.c b/mail/em-vfolder-rule.c index bddb08f75e..03f46afff8 100644 --- a/mail/em-vfolder-rule.c +++ b/mail/em-vfolder-rule.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-vfolder-rule.h b/mail/em-vfolder-rule.h index bc6a330c4b..9274c94b5c 100644 --- a/mail/em-vfolder-rule.h +++ b/mail/em-vfolder-rule.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/importers/elm-importer.c b/mail/importers/elm-importer.c index 156c8d08cb..39bfd7bc3f 100644 --- a/mail/importers/elm-importer.c +++ b/mail/importers/elm-importer.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/importers/evolution-mbox-importer.c b/mail/importers/evolution-mbox-importer.c index 2943772b68..f42afec151 100644 --- a/mail/importers/evolution-mbox-importer.c +++ b/mail/importers/evolution-mbox-importer.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/importers/mail-importer.c b/mail/importers/mail-importer.c index 44db11fb56..29a2dddd97 100644 --- a/mail/importers/mail-importer.c +++ b/mail/importers/mail-importer.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/importers/mail-importer.h b/mail/importers/mail-importer.h index c01c3ab51f..f108967ebc 100644 --- a/mail/importers/mail-importer.h +++ b/mail/importers/mail-importer.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/importers/pine-importer.c b/mail/importers/pine-importer.c index e040a4060e..3a4e6d9cc1 100644 --- a/mail/importers/pine-importer.c +++ b/mail/importers/pine-importer.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/mail-autofilter.c b/mail/mail-autofilter.c index eb8caa78d9..53a0411f08 100644 --- a/mail/mail-autofilter.c +++ b/mail/mail-autofilter.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * Authors: * Michael Zucchi <notzed@ximian.com> diff --git a/mail/mail-autofilter.h b/mail/mail-autofilter.h index bae8bd8313..c12539a9d2 100644 --- a/mail/mail-autofilter.h +++ b/mail/mail-autofilter.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/mail-component-factory.c b/mail/mail-component-factory.c index 04d44e9725..268f0b5e3c 100644 --- a/mail/mail-component-factory.c +++ b/mail/mail-component-factory.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/mail-component.c b/mail/mail-component.c index 2fd85ec5a5..698cc940f8 100644 --- a/mail/mail-component.c +++ b/mail/mail-component.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -1317,7 +1317,7 @@ mail_component_init (MailComponent *component) priv->mail_sync_in_progress = 0; if (g_getenv("CAMEL_FLUSH_CHANGES")) priv->mail_sync_id = g_timeout_add_seconds (mail_config_get_sync_timeout (), call_mail_sync, component); - else + else priv->mail_sync_id = 0; } diff --git a/mail/mail-component.h b/mail/mail-component.h index c1215c61c4..9af5caa40f 100644 --- a/mail/mail-component.h +++ b/mail/mail-component.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/mail-config-factory.c b/mail/mail-config-factory.c index 74c05ec8fc..f89383580c 100644 --- a/mail/mail-config-factory.c +++ b/mail/mail-config-factory.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/mail-config-factory.h b/mail/mail-config-factory.h index f3a4b5fd29..430058364e 100644 --- a/mail/mail-config-factory.h +++ b/mail/mail-config-factory.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/mail-config.c b/mail/mail-config.c index 62f6ba6eb3..bcf8dd7854 100644 --- a/mail/mail-config.c +++ b/mail/mail-config.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -423,7 +423,7 @@ mail_config_init (void) config->gconf, key, func, &config->error_time, NULL, NULL); config->error_time = - gconf_client_get_int (config->gconf, key, NULL); + gconf_client_get_int (config->gconf, key, NULL); key = "/apps/evolution/mail/display/error_level"; func = (GConfClientNotifyFunc) gconf_int_value_changed; @@ -431,7 +431,7 @@ mail_config_init (void) config->gconf, key, func, &config->error_level, NULL, NULL); config->error_level = - gconf_client_get_int (config->gconf, key, NULL); + gconf_client_get_int (config->gconf, key, NULL); key = "/apps/evolution/mail/display/force_message_limit"; func = (GConfClientNotifyFunc) gconf_bool_value_changed; @@ -678,7 +678,7 @@ mail_config_get_address_count (void) guint mail_config_get_error_timeout (void) -{ +{ if (!config) mail_config_init (); @@ -687,7 +687,7 @@ mail_config_get_error_timeout (void) guint mail_config_get_error_level (void) -{ +{ if (!config) mail_config_init (); @@ -1206,7 +1206,7 @@ mail_config_reload_junk_headers (void) /* It automatically sets in the session */ if (config == NULL) mail_config_init (); - else + else gconf_jh_check_changed (config->gconf, 0, NULL, config); } diff --git a/mail/mail-config.h b/mail/mail-config.h index 81f245170e..aea5c5da94 100644 --- a/mail/mail-config.h +++ b/mail/mail-config.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/mail-crypto.c b/mail/mail-crypto.c index d7350eaa2a..f484e0a5d8 100644 --- a/mail/mail-crypto.c +++ b/mail/mail-crypto.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/mail-crypto.h b/mail/mail-crypto.h index dbe1e6f86b..a6ba393bf7 100644 --- a/mail/mail-crypto.h +++ b/mail/mail-crypto.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c index ed3d583927..a84dfcbf74 100644 --- a/mail/mail-folder-cache.c +++ b/mail/mail-folder-cache.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -1045,7 +1045,7 @@ int mail_note_get_folder_from_uri(const char *uri, CamelFolder **folderp) return fi.fi != NULL; } -gboolean +gboolean mail_folder_cache_get_folder_info_flags (CamelFolder *folder, int *flags) { char *uri = mail_tools_folder_to_url (folder); @@ -1061,7 +1061,7 @@ mail_folder_cache_get_folder_info_flags (CamelFolder *folder, int *flags) if (flags) { if (fi.fi) { *flags = fi.fi->flags; - } + } } UNLOCK(info_lock); diff --git a/mail/mail-folder-cache.h b/mail/mail-folder-cache.h index c0f7e866cf..932f5c3f78 100644 --- a/mail/mail-folder-cache.h +++ b/mail/mail-folder-cache.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/mail-mt.c b/mail/mail-mt.c index 6388a56938..ed7e257fba 100644 --- a/mail/mail-mt.c +++ b/mail/mail-mt.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) */ diff --git a/mail/mail-mt.h b/mail/mail-mt.h index b95620a000..ed23c3beeb 100644 --- a/mail/mail-mt.h +++ b/mail/mail-mt.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/mail-ops.c b/mail/mail-ops.c index d2183dd7e3..4f310db812 100644 --- a/mail/mail-ops.c +++ b/mail/mail-ops.c @@ -1,5 +1,5 @@ /* - * mail-ops.c: callbacks for the mail toolbar/menus + * mail-ops.c: callbacks for the mail toolbar/menus * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -721,7 +721,7 @@ send_queue_exec (struct _send_queue_msg *m) camel_operation_register (m->cancel); else camel_operation_register (m->base.cancel); - + if (!m->cancel) camel_operation_start (NULL, _("Sending message")); @@ -783,7 +783,7 @@ send_queue_exec (struct _send_queue_msg *m) camel_folder_sync (sent_folder, FALSE, &ex); camel_exception_clear (&ex); } - + if (!m->cancel) camel_operation_end (NULL); @@ -791,7 +791,7 @@ send_queue_exec (struct _send_queue_msg *m) camel_operation_unregister (m->cancel); else camel_operation_unregister (m->base.cancel); - + } static void @@ -2463,7 +2463,7 @@ prepare_offline_exec (struct _set_offline_msg *m) } else if (CAMEL_IS_OFFLINE_STORE (m->store)) { camel_offline_store_prepare_for_offline (CAMEL_OFFLINE_STORE (m->store), &m->base.ex); - } + } } static void diff --git a/mail/mail-ops.h b/mail/mail-ops.h index df92df4e32..39905fb06c 100644 --- a/mail/mail-ops.h +++ b/mail/mail-ops.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index 655f1dbf72..be834bb0d3 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -416,7 +416,7 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destinati g_object_unref (iter); /* Check to see if we have to send any mails --- if we don't, don't display the SMTP row in the table */ - if (outbox && destination + if (outbox && destination && (camel_folder_get_message_count(outbox) - camel_folder_get_deleted_message_count(outbox)) == 0) num_sources--; @@ -545,7 +545,7 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destinati e_event_emit ((EEvent *)em_event_peek (), "mail.sendreceive", (EEventTarget *) target); /* Skip displaying the SMTP row if we've got no outbox, destination or unsent mails */ - if (outbox && destination + if (outbox && destination && (camel_folder_get_message_count(outbox) - camel_folder_get_deleted_message_count(outbox)) != 0) { info = g_hash_table_lookup (data->active, SEND_URI_KEY); if (info == NULL) { @@ -1196,7 +1196,7 @@ mail_send (void) info->status_label = NULL; info->uri = g_strdup (transport->url); info->keep_on_server = FALSE; - info->cancel = NULL; + info->cancel = NULL; info->cancel_button = NULL; info->data = data; info->state = SEND_ACTIVE; diff --git a/mail/mail-send-recv.h b/mail/mail-send-recv.h index 4fc4e991ec..a31abe79ed 100644 --- a/mail/mail-send-recv.h +++ b/mail/mail-send-recv.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/mail-session.c b/mail/mail-session.c index 03277b4b6f..d9e34ccff4 100644 --- a/mail/mail-session.c +++ b/mail/mail-session.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/mail-session.h b/mail/mail-session.h index a2a5e9706f..60d6b9ab2a 100644 --- a/mail/mail-session.h +++ b/mail/mail-session.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/mail-signature-editor.c b/mail/mail-signature-editor.c index daee1db92c..401f26feed 100644 --- a/mail/mail-signature-editor.c +++ b/mail/mail-signature-editor.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/mail-signature-editor.h b/mail/mail-signature-editor.h index 649504be18..82c786c90e 100644 --- a/mail/mail-signature-editor.h +++ b/mail/mail-signature-editor.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/mail-tools.c b/mail/mail-tools.c index 7278829501..a256e7e107 100644 --- a/mail/mail-tools.c +++ b/mail/mail-tools.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/mail-tools.h b/mail/mail-tools.h index 794c1d4735..1590636e5c 100644 --- a/mail/mail-tools.h +++ b/mail/mail-tools.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/mail-types.h b/mail/mail-types.h index 1873dc8d00..6acbeaf43a 100644 --- a/mail/mail-types.h +++ b/mail/mail-types.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c index d6b20580b2..aab8625807 100644 --- a/mail/mail-vfolder.c +++ b/mail/mail-vfolder.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/mail-vfolder.h b/mail/mail-vfolder.h index b0f684e721..002541371f 100644 --- a/mail/mail-vfolder.h +++ b/mail/mail-vfolder.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/message-list.c b/mail/message-list.c index f9a0e9259b..09f080cae0 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -2609,7 +2609,7 @@ clear_tree (MessageList *ml, gboolean tfree) ml->tree_root = e_tree_memory_node_insert (E_TREE_MEMORY(etm), NULL, 0, NULL); if (tfree) - e_tree_model_rebuilt (E_TREE_MODEL(etm)); + e_tree_model_rebuilt (E_TREE_MODEL(etm)); #ifdef TIMEIT gettimeofday(&end, NULL); diff = end.tv_sec * 1000 + end.tv_usec/1000; @@ -3573,7 +3573,7 @@ message_list_get_uids(MessageList *ml) ml, g_ptr_array_new() }; - + e_tree_path_foreach(ml->tree, ml_getselected_cb, &data); if (ml->folder && data.uids->len) @@ -3589,11 +3589,11 @@ message_list_get_selected(MessageList *ml) ml, g_ptr_array_new() }; - + e_tree_selected_path_foreach(ml->tree, ml_getselected_cb, &data); if (ml->folder && data.uids->len) - camel_folder_sort_uids (ml->folder, data.uids); + camel_folder_sort_uids (ml->folder, data.uids); return data.uids; } @@ -4282,7 +4282,7 @@ regen_list_done (struct _regen_list_msg *m) if (m->last_row >= e_table_model_row_count (E_TABLE_MODEL (etta))) m->last_row = e_table_model_row_count (E_TABLE_MODEL (etta)) - 1; - + if (m->last_row >= 0) { ETreePath path; diff --git a/mail/message-list.h b/mail/message-list.h index 15dae0fcb7..4d0866fe20 100644 --- a/mail/message-list.h +++ b/mail/message-list.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/message-tag-editor.c b/mail/message-tag-editor.c index 71d2ae41c8..d3a1d15bfe 100644 --- a/mail/message-tag-editor.c +++ b/mail/message-tag-editor.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/message-tag-editor.h b/mail/message-tag-editor.h index 019c7e2e63..30d3ec1e9b 100644 --- a/mail/message-tag-editor.h +++ b/mail/message-tag-editor.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/message-tag-followup.c b/mail/message-tag-followup.c index 46b6268cc3..827fc6813a 100644 --- a/mail/message-tag-followup.c +++ b/mail/message-tag-followup.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/message-tag-followup.h b/mail/message-tag-followup.h index 4b18865d89..5c229fe36e 100644 --- a/mail/message-tag-followup.h +++ b/mail/message-tag-followup.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: |