diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-05-26 22:58:25 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-05-26 22:58:25 +0800 |
| commit | 0cf607076dfc2c481ca1164a04cecdb0661e6bd0 (patch) | |
| tree | 81b3c9a19871ba9777b1d4c4178308edff2087a0 | |
| parent | f8730610042229f275a5a294df4c2eb5f225118e (diff) | |
| download | gsoc2013-evolution-0cf607076dfc2c481ca1164a04cecdb0661e6bd0.tar.gz gsoc2013-evolution-0cf607076dfc2c481ca1164a04cecdb0661e6bd0.tar.zst gsoc2013-evolution-0cf607076dfc2c481ca1164a04cecdb0661e6bd0.zip | |
Fix compiler warnings in mail.
39 files changed, 419 insertions, 403 deletions
diff --git a/art/empty.xpm b/art/empty.xpm index aca06618b1..b6d9e9bada 100644 --- a/art/empty.xpm +++ b/art/empty.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * empty_xpm[] = { +static const gchar *empty_xpm[] = { "16 16 2 1", " c None", ". c #FFFFFF", diff --git a/e-util/e-bconf-map.h b/e-util/e-bconf-map.h index e6e16de6d4..dfd015ec65 100644 --- a/e-util/e-bconf-map.h +++ b/e-util/e-bconf-map.h @@ -45,9 +45,9 @@ enum { }; typedef struct _e_bconf_map { - char *from; - char *to; - int type; + const gchar *from; + const gchar *to; + gint type; struct _e_bconf_map *child; } e_bconf_map_t; diff --git a/mail/Makefile.am b/mail/Makefile.am index d66eb6f944..e1b0da9475 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -4,7 +4,6 @@ mailincludedir = $(privincludedir)/mail INCLUDES = \ -I$(top_srcdir)/widgets \ - -I$(top_srcdir)/widgets/e-text \ -I$(top_srcdir)/widgets/misc \ -I$(top_srcdir) \ -I$(top_srcdir)/mail \ diff --git a/mail/e-attachment-handler-mail.c b/mail/e-attachment-handler-mail.c index df4c0a9e3e..790c7b9c7a 100644 --- a/mail/e-attachment-handler-mail.c +++ b/mail/e-attachment-handler-mail.c @@ -52,8 +52,8 @@ static const gchar *ui = /* Note: Do not use the info field. */ static GtkTargetEntry target_table[] = { - { "message/rfc822", 0, 0 }, - { "x-uid-list", 0, 0 } + { (gchar *) "message/rfc822", 0, 0 }, + { (gchar *) "x-uid-list", 0, 0 } }; static void diff --git a/mail/e-searching-tokenizer.c b/mail/e-searching-tokenizer.c index 3d98cdeb4f..e0edb9d389 100644 --- a/mail/e-searching-tokenizer.c +++ b/mail/e-searching-tokenizer.c @@ -154,7 +154,8 @@ loop: /* note: our tags of interest are 7 bit ascii, only, no need to do any fancy utf8 stuff */ /* tags should be upper case if this list gets longer than 10 entries, consider binary search */ -static char *ignored_tags[] = { "B", "I", "FONT", "TT", "EM", /* and more? */}; +static const gchar *ignored_tags[] = { + "B", "I", "FONT", "TT", "EM", /* and more? */}; static int ignore_tag (const char *tag) @@ -937,7 +938,7 @@ static struct _searcher * search_info_to_searcher(struct _search_info *si) { char *tags, *tage; - char *col; + const gchar *col; if (si->strv->len == 0) return NULL; diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c index 991add424d..fc61cdc84b 100644 --- a/mail/em-account-editor.c +++ b/mail/em-account-editor.c @@ -187,7 +187,7 @@ typedef struct _EMAccountEditorPrivate { } EMAccountEditorPrivate; static void emae_refresh_authtype(EMAccountEditor *emae, EMAccountEditorService *service); -static void em_account_editor_construct(EMAccountEditor *emae, EAccount *account, em_account_editor_t type, char *id); +static void em_account_editor_construct(EMAccountEditor *emae, EAccount *account, em_account_editor_t type, const gchar *id); static void emae_account_folder_changed(EMFolderSelectionButton *folder, EMAccountEditor *emae); static GtkVBoxClass *emae_parent; @@ -267,7 +267,7 @@ em_account_editor_get_type(void) * * Return value: **/ -EMAccountEditor *em_account_editor_new(EAccount *account, em_account_editor_t type, char *id) +EMAccountEditor *em_account_editor_new(EAccount *account, em_account_editor_t type, const gchar *id) { EMAccountEditor *emae = g_object_new(em_account_editor_get_type(), NULL); @@ -299,8 +299,8 @@ EMAccountEditor *em_account_editor_new_for_pages(EAccount *account, em_account_e /* ********************************************************************** */ static struct { - char *label; - char *value; + const gchar *label; + const gchar *value; } ssl_options[] = { /* Translators: This string is a "Use secure connection" option for the Mailer. It will not use an encrypted connection. */ @@ -774,7 +774,7 @@ emae_setup_receipt_policy (EMAccountEditor *emae, GladeXML *xml) EAccountReceiptPolicy current = emae->account->receipt_policy; static struct { EAccountReceiptPolicy policy; - char *label; + const gchar *label; } receipt_policies[] = { { E_ACCOUNT_RECEIPT_NEVER, N_("Never") }, { E_ACCOUNT_RECEIPT_ALWAYS, N_("Always") }, @@ -1072,34 +1072,34 @@ static struct _provider_host_info emae_transport_host_info[] = { i.e. the receiving (source) service, and the sending (transport) service. It is used throughout the following code to drive each page */ static struct _service_info { - int account_uri_key; - int save_passwd_key; + gint account_uri_key; + gint save_passwd_key; - char *frame; - char *type_dropdown; + const gchar *frame; + const gchar *type_dropdown; - char *container; - char *description; - char *hostname; - char *hostlabel; - char *username; - char *userlabel; - char *path; - char *pathlabel; - char *pathentry; + const gchar *container; + const gchar *description; + const gchar *hostname; + const gchar *hostlabel; + const gchar *username; + const gchar *userlabel; + const gchar *path; + const gchar *pathlabel; + const gchar *pathentry; - char *security_frame; - char *ssl_hbox; - char *use_ssl; - char *ssl_disabled; + const gchar *security_frame; + const gchar *ssl_hbox; + const gchar *use_ssl; + const gchar *ssl_disabled; - char *needs_auth; - char *auth_frame; + const gchar *needs_auth; + const gchar *auth_frame; - char *authtype; - char *authtype_check; + const gchar *authtype; + const gchar *authtype_check; - char *remember_password; + const gchar *remember_password; struct _provider_host_info *host_info; } emae_service_info[CAMEL_NUM_PROVIDER_TYPES] = { @@ -1402,7 +1402,8 @@ emae_refresh_providers(EMAccountEditor *emae, EMAccountEditorService *service) int active = 0, i; struct _service_info *info = &emae_service_info[service->type]; const char *uri = e_account_get_string(account, info->account_uri_key); - char *current = NULL, *tmp; + const char *tmp; + char *current = NULL; CamelURL *url; dropdown = service->providers; @@ -1480,7 +1481,7 @@ emae_refresh_providers(EMAccountEditor *emae, EMAccountEditorService *service) return; } - tmp = (char *)camel_url_get_param(url, "use_ssl"); + tmp = camel_url_get_param(url, "use_ssl"); if (tmp == NULL) tmp = "never"; for (i=0;i<num_ssl_options;i++) { @@ -1756,8 +1757,8 @@ emae_setup_service(EMAccountEditor *emae, EMAccountEditorService *service, Glade /* do not re-order these, the order is used by various code to look up emae->priv->identity_entries[] */ static struct { - char *name; - int item; + const gchar *name; + gint item; } emae_identity_entries[] = { { "management_name", E_ACCOUNT_NAME }, { "identity_full_name", E_ACCOUNT_ID_NAME }, @@ -2520,34 +2521,34 @@ emae_widget_glade(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, str /* plugin meta-data for "org.gnome.evolution.mail.config.accountEditor" */ static EMConfigItem emae_editor_items[] = { - { E_CONFIG_BOOK, "", }, - { E_CONFIG_PAGE, "00.identity", "vboxIdentityBorder", emae_identity_page }, - { E_CONFIG_SECTION, "00.identity/00.name", "account_vbox", emae_widget_glade }, - { E_CONFIG_SECTION_TABLE, "00.identity/10.required", "identity_required_table", emae_widget_glade }, - { E_CONFIG_SECTION_TABLE, "00.identity/20.info", "identity_optional_table", emae_widget_glade }, - - { E_CONFIG_PAGE, "10.receive", "vboxSourceBorder", emae_receive_page }, - { E_CONFIG_SECTION_TABLE, "10.receive/00.type", "source_type_table", emae_widget_glade }, - { E_CONFIG_SECTION_TABLE, "10.receive/10.config", "table4", emae_widget_glade }, - { E_CONFIG_SECTION, "10.receive/20.security", "vbox181", emae_widget_glade }, - { E_CONFIG_SECTION, "10.receive/30.auth", "vbox179", emae_widget_glade }, - - /* Most sections for this is auto-generated fromt the camel config */ - { E_CONFIG_PAGE, "20.receive_options", N_("Receiving Options"), }, - { E_CONFIG_SECTION_TABLE, "20.receive_options/10.mailcheck", N_("Checking for New Messages"), }, - { E_CONFIG_ITEM_TABLE, "20.receive_options/10.mailcheck/00.autocheck", NULL, emae_receive_options_item, }, - - { E_CONFIG_PAGE, "30.send", "vboxTransportBorder", emae_send_page }, - { E_CONFIG_SECTION_TABLE, "30.send/00.type", "transport_type_table", emae_widget_glade }, - { E_CONFIG_SECTION, "30.send/10.config", "vbox12", emae_widget_glade }, - { E_CONFIG_SECTION, "30.send/20.security", "vbox183", emae_widget_glade }, - { E_CONFIG_SECTION, "30.send/30.auth", "vbox61", emae_widget_glade }, - - { E_CONFIG_PAGE, "40.defaults", "vboxFoldersBorder", emae_defaults_page }, - { E_CONFIG_SECTION, "40.defaults/00.folders", "vbox184", emae_widget_glade }, - { E_CONFIG_SECTION_TABLE, "40.defaults/10.composing", "table8", emae_widget_glade }, - - { E_CONFIG_PAGE, "50.security", "vboxSecurityBorder", emae_security_page }, + { E_CONFIG_BOOK, (gchar *) "" }, + { E_CONFIG_PAGE, (gchar *) "00.identity", (gchar *) "vboxIdentityBorder", emae_identity_page }, + { E_CONFIG_SECTION, (gchar *) "00.identity/00.name", (gchar *) "account_vbox", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "00.identity/10.required", (gchar *) "identity_required_table", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "00.identity/20.info", (gchar *) "identity_optional_table", emae_widget_glade }, + + { E_CONFIG_PAGE, (gchar *) "10.receive", (gchar *) "vboxSourceBorder", emae_receive_page }, + { E_CONFIG_SECTION_TABLE, (gchar *) "10.receive/00.type", (gchar *) "source_type_table", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "10.receive/10.config", (gchar *) "table4", emae_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "10.receive/20.security", (gchar *) "vbox181", emae_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "10.receive/30.auth", (gchar *) "vbox179", emae_widget_glade }, + + /* Most sections for this is auto-generated from the camel config */ + { E_CONFIG_PAGE, (gchar *) "20.receive_options", (gchar *) N_("Receiving Options"), }, + { E_CONFIG_SECTION_TABLE, (gchar *) "20.receive_options/10.mailcheck", (gchar *) N_("Checking for New Messages"), }, + { E_CONFIG_ITEM_TABLE, (gchar *) "20.receive_options/10.mailcheck/00.autocheck", NULL, emae_receive_options_item, }, + + { E_CONFIG_PAGE, (gchar *) "30.send", (gchar *) "vboxTransportBorder", emae_send_page }, + { E_CONFIG_SECTION_TABLE, (gchar *) "30.send/00.type", (gchar *) "transport_type_table", emae_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "30.send/10.config", (gchar *) "vbox12", emae_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "30.send/20.security", (gchar *) "vbox183", emae_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "30.send/30.auth", (gchar *) "vbox61", emae_widget_glade }, + + { E_CONFIG_PAGE, (gchar *) "40.defaults", (gchar *) "vboxFoldersBorder", emae_defaults_page }, + { E_CONFIG_SECTION, (gchar *) "40.defaults/00.folders", (gchar *) "vbox184", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "40.defaults/10.composing", (gchar *) "table8", emae_widget_glade }, + + { E_CONFIG_PAGE, (gchar *) "50.security", (gchar *) "vboxSecurityBorder", emae_security_page }, /* 1x1 table(!) not vbox: { E_CONFIG_SECTION, "50.security/00.gpg", "table19", emae_widget_glade }, */ /* table not vbox: { E_CONFIG_SECTION, "50.security/10.smime", "smime_table", emae_widget_glade }, */ { 0 }, @@ -2613,34 +2614,34 @@ emae_widget_druid_glade(EConfig *ec, EConfigItem *item, struct _GtkWidget *paren /* plugin meta-data for "org.gnome.evolution.mail.config.accountDruid" */ static EMConfigItem emae_druid_items[] = { - { E_CONFIG_DRUID, "", }, - { E_CONFIG_PAGE_START, "0.start", "start_page", emae_widget_druid_glade }, + { E_CONFIG_DRUID, (gchar *) "" }, + { E_CONFIG_PAGE_START, (gchar *) "0.start", (gchar *) "start_page", emae_widget_druid_glade }, - { E_CONFIG_PAGE, "00.identity", "vboxIdentityBorder", emae_identity_page }, - { E_CONFIG_SECTION, "00.identity/00.name", "account_vbox", emae_widget_glade }, - { E_CONFIG_SECTION_TABLE, "00.identity/10.required", "identity_required_table", emae_widget_glade }, - { E_CONFIG_SECTION_TABLE, "00.identity/20.info", "identity_optional_table", emae_widget_glade }, + { E_CONFIG_PAGE, (gchar *) "00.identity", (gchar *) "vboxIdentityBorder", emae_identity_page }, + { E_CONFIG_SECTION, (gchar *) "00.identity/00.name", (gchar *) "account_vbox", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "00.identity/10.required", (gchar *) "identity_required_table", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "00.identity/20.info", (gchar *) "identity_optional_table", emae_widget_glade }, - { E_CONFIG_PAGE, "10.receive", "vboxSourceBorder", emae_receive_page }, - { E_CONFIG_SECTION_TABLE, "10.receive/00.type", "source_type_table", emae_widget_glade }, - { E_CONFIG_SECTION_TABLE, "10.receive/10.config", "table4", emae_widget_glade }, - { E_CONFIG_SECTION, "10.receive/20.security", "vbox181", emae_widget_glade }, - { E_CONFIG_SECTION, "10.receive/30.auth", "vbox179", emae_widget_glade }, + { E_CONFIG_PAGE, (gchar *) "10.receive", (gchar *) "vboxSourceBorder", emae_receive_page }, + { E_CONFIG_SECTION_TABLE, (gchar *) "10.receive/00.type", (gchar *) "source_type_table", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "10.receive/10.config", (gchar *) "table4", emae_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "10.receive/20.security", (gchar *) "vbox181", emae_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "10.receive/30.auth", (gchar *) "vbox179", emae_widget_glade }, /* Most sections for this is auto-generated fromt the camel config */ - { E_CONFIG_PAGE, "20.receive_options", N_("Receiving Options"), }, - { E_CONFIG_SECTION_TABLE, "20.receive_options/10.mailcheck", N_("Checking for New Messages"), }, - { E_CONFIG_ITEM_TABLE, "20.receive_options/10.mailcheck/00.autocheck", NULL, emae_receive_options_item, }, + { E_CONFIG_PAGE, (gchar *) "20.receive_options", (gchar *) N_("Receiving Options"), }, + { E_CONFIG_SECTION_TABLE, (gchar *) "20.receive_options/10.mailcheck", (gchar *) N_("Checking for New Messages"), }, + { E_CONFIG_ITEM_TABLE, (gchar *) "20.receive_options/10.mailcheck/00.autocheck", NULL, emae_receive_options_item, }, - { E_CONFIG_PAGE, "30.send", "vboxTransportBorder", emae_send_page }, - { E_CONFIG_SECTION_TABLE, "30.send/00.type", "transport_type_table", emae_widget_glade }, - { E_CONFIG_SECTION, "30.send/10.config", "vbox12", emae_widget_glade }, - { E_CONFIG_SECTION, "30.send/20.security", "vbox183", emae_widget_glade }, - { E_CONFIG_SECTION, "30.send/30.auth", "vbox61", emae_widget_glade }, + { E_CONFIG_PAGE, (gchar *) "30.send", (gchar *) "vboxTransportBorder", emae_send_page }, + { E_CONFIG_SECTION_TABLE, (gchar *) "30.send/00.type", (gchar *) "transport_type_table", emae_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "30.send/10.config", (gchar *) "vbox12", emae_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "30.send/20.security", (gchar *) "vbox183", emae_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "30.send/30.auth", (gchar *) "vbox61", emae_widget_glade }, - { E_CONFIG_PAGE, "40.management", "management_frame", emae_management_page }, + { E_CONFIG_PAGE, (gchar *) "40.management", (gchar *) "management_frame", emae_management_page }, - { E_CONFIG_PAGE_FINISH, "999.end", "finish_page", emae_widget_druid_glade }, + { E_CONFIG_PAGE_FINISH, (gchar *) "999.end", (gchar *) "finish_page", emae_widget_druid_glade }, { 0 }, }; static gboolean emae_druid_items_translated = FALSE; @@ -2714,11 +2715,11 @@ enum { AOL }; struct _server_prefill { - char *key; - char *recv; - char *send; - char *proto; - char *ssl; + const gchar *key; + const gchar *recv; + const gchar *send; + const gchar *proto; + const gchar *ssl; } mail_servers [] = { {"gmail", "imap.gmail.com", "smtp.gmail.com", "imap", "always"}, {"yahoo", "pop3.yahoo.com", "smtp.yahoo.com", "pop", "never"}, @@ -2873,8 +2874,9 @@ emae_check_complete(EConfig *ec, const char *pageid, void *data) && ((tmp = e_account_get_string(emae->account, E_ACCOUNT_ID_REPLY_TO)) == NULL || tmp[0] == 0 || is_email(tmp)); - if (!ok) + if (!ok) { d(printf("identity incomplete\n")); + } } if (ok && (pageid == NULL || !strcmp(pageid, "10.receive"))) { @@ -2882,8 +2884,9 @@ emae_check_complete(EConfig *ec, const char *pageid, void *data) emae_refresh_providers(emae, &emae->priv->source); } ok = emae_service_complete(emae, &emae->priv->source); - if (!ok) + if (!ok) { d(printf("receive page incomplete\n")); + } } if (ok && (pageid == NULL || !strcmp(pageid, "30.send"))) { @@ -2891,8 +2894,9 @@ emae_check_complete(EConfig *ec, const char *pageid, void *data) emae_refresh_providers(emae, &emae->priv->transport); } ok = emae_service_complete(emae, &emae->priv->transport); - if (!ok) + if (!ok) { d(printf("send page incomplete\n")); + } } if (ok && (pageid == NULL || !strcmp(pageid, "40.management"))) { @@ -2900,8 +2904,9 @@ emae_check_complete(EConfig *ec, const char *pageid, void *data) && tmp[0] && ((ea = mail_config_get_account_by_name(tmp)) == NULL || ea == emae->original); - if (!ok) + if (!ok) { d(printf("management page incomplete\n")); + } } return ok; @@ -2973,7 +2978,7 @@ emae_editor_destroyed(GtkWidget *dialog, EMAccountEditor *emae) } static void -em_account_editor_construct(EMAccountEditor *emae, EAccount *account, em_account_editor_t type, char *id) +em_account_editor_construct(EMAccountEditor *emae, EAccount *account, em_account_editor_t type, const gchar *id) { EMAccountEditorPrivate *gui = emae->priv; int i, index; diff --git a/mail/em-account-editor.h b/mail/em-account-editor.h index 41da661089..fdd25b8f78 100644 --- a/mail/em-account-editor.h +++ b/mail/em-account-editor.h @@ -66,7 +66,7 @@ struct _EMAccountEditorClass { GType em_account_editor_get_type(void); -EMAccountEditor *em_account_editor_new(struct _EAccount *account, em_account_editor_t type, char *id); +EMAccountEditor *em_account_editor_new(struct _EAccount *account, em_account_editor_t type, const char *id); EMAccountEditor *em_account_editor_new_for_pages(struct _EAccount *account, em_account_editor_t type, char *id, struct _GtkWidget **pages); void em_account_editor_commit (EMAccountEditor *emae); void em_account_editor_check (EMAccountEditor *emae, const char *page); diff --git a/mail/em-composer-prefs.c b/mail/em-composer-prefs.c index d9f3718cb0..c369bdc1e9 100644 --- a/mail/em-composer-prefs.c +++ b/mail/em-composer-prefs.c @@ -762,16 +762,16 @@ emcp_widget_glade (EConfig *ec, /* plugin meta-data */ static EMConfigItem emcp_items[] = { - { E_CONFIG_BOOK, "", "composer_toplevel", emcp_widget_glade }, - { E_CONFIG_PAGE, "00.general", "vboxGeneral", emcp_widget_glade }, - { E_CONFIG_SECTION, "00.general/00.behavior", "vboxBehavior", emcp_widget_glade }, - { E_CONFIG_SECTION, "00.general/10.alerts", "vboxAlerts", emcp_widget_glade }, - { E_CONFIG_PAGE, "10.signatures", "vboxSignatures", emcp_widget_glade }, + { E_CONFIG_BOOK, (gchar *) "", (gchar *) "composer_toplevel", emcp_widget_glade }, + { E_CONFIG_PAGE, (gchar *) "00.general", (gchar *) "vboxGeneral", emcp_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "00.general/00.behavior", (gchar *) "vboxBehavior", emcp_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "00.general/10.alerts", (gchar *) "vboxAlerts", emcp_widget_glade }, + { E_CONFIG_PAGE, (gchar *) "10.signatures", (gchar *) "vboxSignatures", emcp_widget_glade }, /* signature/signatures and signature/preview parts not usable */ - { E_CONFIG_PAGE, "20.spellcheck", "vboxSpellChecking", emcp_widget_glade }, - { E_CONFIG_SECTION, "20.spellcheck/00.languages", "vbox178", emcp_widget_glade }, - { E_CONFIG_SECTION, "20.spellcheck/00.options", "vboxOptions", emcp_widget_glade }, + { E_CONFIG_PAGE, (gchar *) "20.spellcheck", (gchar *) "vboxSpellChecking", emcp_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "20.spellcheck/00.languages", (gchar *) "vbox178", emcp_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "20.spellcheck/00.options", (gchar *) "vboxOptions", emcp_widget_glade }, }; static void @@ -959,12 +959,12 @@ em_composer_prefs_construct (EMComposerPrefs *prefs) 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), "/apps/evolution/mail/format/forward_style"); + g_signal_connect (prefs->forward_style, "changed", G_CALLBACK (style_changed), (gpointer) "/apps/evolution/mail/format/forward_style"); prefs->reply_style = GTK_COMBO_BOX (glade_xml_get_widget (gui, "comboboxReplyStyle")); style = gconf_client_get_int (client, "/apps/evolution/mail/format/reply_style", NULL); gtk_combo_box_set_active (prefs->reply_style, reply_style_new_order (style, TRUE)); - g_signal_connect (prefs->reply_style, "changed", G_CALLBACK (style_changed), "/apps/evolution/mail/format/reply_style"); + g_signal_connect (prefs->reply_style, "changed", G_CALLBACK (style_changed), (gpointer) "/apps/evolution/mail/format/reply_style"); /* Signatures */ dialog = (GtkDialog *) gtk_dialog_new (); diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c index 79dae420e8..9b3dbe6cf9 100644 --- a/mail/em-composer-utils.c +++ b/mail/em-composer-utils.c @@ -1802,7 +1802,10 @@ guess_account (CamelMimeMessage *message, CamelFolder *folder) EAccount *account = NULL; const char *tmp; int i, j; - char *types[2] = { CAMEL_RECIPIENT_TYPE_TO, CAMEL_RECIPIENT_TYPE_CC }; + const gchar *types[2] = { + CAMEL_RECIPIENT_TYPE_TO, + CAMEL_RECIPIENT_TYPE_CC + }; /* check for newsgroup header */ if (folder diff --git a/mail/em-filter-editor.h b/mail/em-filter-editor.h index b0ee632779..f37536d1ee 100644 --- a/mail/em-filter-editor.h +++ b/mail/em-filter-editor.h @@ -40,8 +40,8 @@ typedef struct _EMFilterEditorClass EMFilterEditorClass; typedef struct _EMFilterSource EMFilterSource; struct _EMFilterSource { - char *source; - char *name; + const gchar *source; + const gchar *name; }; struct _EMFilterEditor { diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c index 0a68c1921a..201db814ec 100644 --- a/mail/em-folder-browser.c +++ b/mail/em-folder-browser.c @@ -136,7 +136,7 @@ struct _EMFolderBrowserPrivate { typedef struct EMFBSearchBarItem { ESearchBarItem search; - char *image; + const gchar *image; } EMFBSearchBarItem; static void emfb_activate(EMFolderView *emfv, BonoboUIComponent *uic, int state); @@ -191,7 +191,7 @@ static ESearchBarItem emfb_search_items[] = { E_FILTERBAR_SAVE, E_FILTERBAR_EDIT, { NULL, 0, 0 }, - { N_("C_reate Search Folder From Search..."), ESB_SAVE, 0}, + { (gchar *) N_("C_reate Search Folder From Search..."), ESB_SAVE, 0}, { NULL, -1, 0 } }; @@ -216,24 +216,22 @@ enum { /* Options for View */ static EMFBSearchBarItem emfb_view_items[] = { - {{ N_("All Messages"), VIEW_ALL_MESSAGES, 0 }, NULL}, - {{ N_("Unread Messages"), VIEW_UNREAD_MESSAGES, 0 }, "mail-unread"}, + {{ (gchar *) N_("All Messages"), VIEW_ALL_MESSAGES, 0 }, NULL}, + {{ (gchar *) N_("Unread Messages"), VIEW_UNREAD_MESSAGES, 0 }, "mail-unread"}, {{ NULL, 0, 0 }, NULL}, - {{ N_("No Label"),VIEW_NO_LABEL, 0 }, NULL}, + {{ (gchar *) N_("No Label"),VIEW_NO_LABEL, 0 }, NULL}, {{ NULL, -1, 0 }, NULL} }; /* TODO: Following options should be customizable */ static EMFBSearchBarItem temp_view_items[] = { {{ NULL, 0, 0 }, NULL}, - {{ N_("Read Messages"), VIEW_READ_MESSAGES, 0 }, "mail-read"}, - {{ N_("Recent Messages"), VIEW_RECENT_MESSAGES, 0 }, NULL}, - {{ N_("Last 5 Days' Messages"), VIEW_LAST_FIVE_DAYS, 0 }, NULL}, - {{ N_("Messages with Attachments"), VIEW_WITH_ATTACHMENTS, 0 }, "mail-attachment"}, - {{ N_("Important Messages"), VIEW_MESSAGES_MARKED_AS_IMPORTANT, 0}, "emblem-important"}, - {{ N_("Messages Not Junk"), VIEW_NOT_JUNK, 0 }, "mail-mark-notjunk"}, -/* { NULL, 0, NULL }, */ -/* { N_("Customize"), NOT_IMPLEMENTED, NULL }, */ + {{ (gchar *) N_("Read Messages"), VIEW_READ_MESSAGES, 0 }, "mail-read"}, + {{ (gchar *) N_("Recent Messages"), VIEW_RECENT_MESSAGES, 0 }, NULL}, + {{ (gchar *) N_("Last 5 Days' Messages"), VIEW_LAST_FIVE_DAYS, 0 }, NULL}, + {{ (gchar *) N_("Messages with Attachments"), VIEW_WITH_ATTACHMENTS, 0 }, "mail-attachment"}, + {{ (gchar *) N_("Important Messages"), VIEW_MESSAGES_MARKED_AS_IMPORTANT, 0}, "emblem-important"}, + {{ (gchar *) N_("Messages Not Junk"), VIEW_NOT_JUNK, 0 }, "mail-mark-notjunk"}, {{ NULL, -1, 0 }, NULL} }; @@ -915,10 +913,10 @@ emfb_search_config_search(EFilterBar *efb, FilterRule *rule, int id, const char e_mail_search_bar_changed (search_bar); } -static char * +static const gchar * get_view_query (ESearchBar *esb, CamelFolder *folder, const char *folder_uri) { - char *view_sexp = NULL; + const gchar *view_sexp = NULL; gint id; GtkWidget *menu_item; char *tag; @@ -1135,7 +1133,8 @@ emfb_search_search_activated(ESearchBar *esb, EMFolderBrowser *emfb) { EMFolderView *emfv = (EMFolderView *) emfb; EFilterBar *efb = (EFilterBar *)esb; - char *search_state = NULL, *view_sexp, *folder_uri=NULL; + const gchar *view_sexp; + char *search_state = NULL, *folder_uri=NULL; char *word = NULL, *storeuri = NULL, *search_word = NULL; gint id, i; CamelFolder *folder; @@ -1324,7 +1323,6 @@ emfb_search_search_activated(ESearchBar *esb, EMFolderBrowser *emfb) g_free (word); g_free (search_word); - g_free (view_sexp); camel_exception_free (ex); } @@ -2013,7 +2011,7 @@ static void emfb_set_search_folder(EMFolderView *emfv, CamelFolder *folder, const char *uri) { EMFolderBrowser *emfb = (EMFolderBrowser *) emfv; - char *state; + const gchar *state; message_list_freeze(emfv->list); diff --git a/mail/em-folder-properties.c b/mail/em-folder-properties.c index 89cf3c7070..56194b6af9 100644 --- a/mail/em-folder-properties.c +++ b/mail/em-folder-properties.c @@ -279,10 +279,10 @@ emfp_get_folder_item(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, #define EMFP_FOLDER_SECTION (2) static EMConfigItem emfp_items[] = { - { E_CONFIG_BOOK, "", NULL }, - { E_CONFIG_PAGE, "00.general", N_("General") }, - { E_CONFIG_SECTION, "00.general/00.folder", NULL /* set by code */ }, - { E_CONFIG_ITEM, "00.general/00.folder/00.info", NULL, emfp_get_folder_item }, + { E_CONFIG_BOOK, (gchar *) "", NULL }, + { E_CONFIG_PAGE, (gchar *) "00.general", (gchar *) N_("General") }, + { E_CONFIG_SECTION, (gchar *) "00.general/00.folder", NULL /* set by code */ }, + { E_CONFIG_ITEM, (gchar *) "00.general/00.folder/00.info", NULL, emfp_get_folder_item }, }; static gboolean emfp_items_translated = FALSE; diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c index 94b5e4f0bc..e3a2eda2bc 100644 --- a/mail/em-folder-tree-model.c +++ b/mail/em-folder-tree-model.c @@ -96,6 +96,8 @@ enum { LAST_SIGNAL }; +extern CamelStore *vfolder_store; + static guint signals[LAST_SIGNAL] = { 0, }; static GtkTreeStoreClass *parent_class = NULL; @@ -186,7 +188,6 @@ em_folder_tree_model_class_init (EMFolderTreeModelClass *klass) static int sort_cb (GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer user_data) { - extern CamelStore *vfolder_store; char *aname, *bname; CamelStore *store; gboolean is_store; diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c index 14313385b4..f773068613 100644 --- a/mail/em-folder-tree.c +++ b/mail/em-folder-tree.c @@ -134,15 +134,15 @@ enum DndDropType { }; static GtkTargetEntry drag_types[] = { - { "x-folder", 0, DND_DRAG_TYPE_FOLDER }, - { "text/uri-list", 0, DND_DRAG_TYPE_TEXT_URI_LIST }, + { (gchar *) "x-folder", 0, DND_DRAG_TYPE_FOLDER }, + { (gchar *) "text/uri-list", 0, DND_DRAG_TYPE_TEXT_URI_LIST }, }; static GtkTargetEntry drop_types[] = { - { "x-uid-list" , 0, DND_DROP_TYPE_UID_LIST }, - { "x-folder", 0, DND_DROP_TYPE_FOLDER }, - { "message/rfc822", 0, DND_DROP_TYPE_MESSAGE_RFC822 }, - { "text/uri-list", 0, DND_DROP_TYPE_TEXT_URI_LIST }, + { (gchar *) "x-uid-list" , 0, DND_DROP_TYPE_UID_LIST }, + { (gchar *) "x-folder", 0, DND_DROP_TYPE_FOLDER }, + { (gchar *) "message/rfc822", 0, DND_DROP_TYPE_MESSAGE_RFC822 }, + { (gchar *) "text/uri-list", 0, DND_DROP_TYPE_TEXT_URI_LIST }, }; static GdkAtom drag_atoms[NUM_DRAG_TYPES]; @@ -151,6 +151,7 @@ static GdkAtom drop_atoms[NUM_DROP_TYPES]; static guint signals[LAST_SIGNAL] = { 0 }; extern CamelSession *session; +extern CamelStore *vfolder_store; static void em_folder_tree_class_init (EMFolderTreeClass *klass); static void em_folder_tree_init (EMFolderTree *emft); @@ -529,7 +530,6 @@ emft_expand_node (EMFolderTreeModel *model, const char *key, EMFolderTree *emft) { struct _EMFolderTreePrivate *priv = emft->priv; struct _EMFolderTreeModelStoreInfo *si; - extern CamelStore *vfolder_store; GtkTreeRowReference *row; GtkTreePath *path; EAccount *account; @@ -923,12 +923,12 @@ emft_drop_popup_cancel(EPopup *ep, EPopupItem *item, void *data) } static EPopupItem emft_drop_popup_menu[] = { - { E_POPUP_ITEM, "00.emc.00", N_("_Copy to Folder"), emft_drop_popup_copy, NULL, NULL, 1 }, - { E_POPUP_ITEM, "00.emc.01", N_("_Move to Folder"), emft_drop_popup_move, NULL, NULL, 1 }, - { E_POPUP_ITEM, "00.emc.02", N_("_Copy"), emft_drop_popup_copy, NULL, "folder-copy", 2 }, - { E_POPUP_ITEM, "00.emc.03", N_("_Move"), emft_drop_popup_move, NULL, "folder-move", 2 }, - { E_POPUP_BAR, "10.emc" }, - { E_POPUP_ITEM, "99.emc.00", N_("Cancel _Drag"), emft_drop_popup_cancel, NULL, "dialog-cancel", 0 }, + { E_POPUP_ITEM, (gchar *) "00.emc.00", (gchar *) N_("_Copy to Folder"), emft_drop_popup_copy, NULL, NULL, 1 }, + { E_POPUP_ITEM, (gchar *) "00.emc.01", (gchar *) N_("_Move to Folder"), emft_drop_popup_move, NULL, NULL, 1 }, + { E_POPUP_ITEM, (gchar *) "00.emc.02", (gchar *) N_("_Copy"), emft_drop_popup_copy, NULL, (gchar *) "folder-copy", 2 }, + { E_POPUP_ITEM, (gchar *) "00.emc.03", (gchar *) N_("_Move"), emft_drop_popup_move, NULL, (gchar *) "folder-move", 2 }, + { E_POPUP_BAR, (gchar *) "10.emc" }, + { E_POPUP_ITEM, (gchar *) "99.emc.00", (gchar *) N_("Cancel _Drag"), emft_drop_popup_cancel, NULL, (gchar *) "dialog-cancel", 0 }, }; static void @@ -2042,25 +2042,25 @@ static EPopupItem emft_popup_items[] = { { E_POPUP_BAR, "10.emc" }, #endif /* FIXME: need to disable for nochildren folders */ - { E_POPUP_ITEM, "10.emc.00", N_("_New Folder..."), emft_popup_new_folder, NULL, "folder-new", 0, EM_POPUP_FOLDER_INFERIORS }, + { E_POPUP_ITEM, (gchar *) "10.emc.00", (gchar *) N_("_New Folder..."), emft_popup_new_folder, NULL, (gchar *) "folder-new", 0, EM_POPUP_FOLDER_INFERIORS }, - { E_POPUP_ITEM, "10.emc.05", N_("_Copy..."), emft_popup_copy, NULL, "folder-copy", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT }, - { E_POPUP_ITEM, "10.emc.06", N_("_Move..."), emft_popup_move, NULL, "folder-move", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE }, + { E_POPUP_ITEM, (gchar *) "10.emc.05", (gchar *) N_("_Copy..."), emft_popup_copy, NULL, (gchar *) "folder-copy", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT }, + { E_POPUP_ITEM, (gchar *) "10.emc.06", (gchar *) N_("_Move..."), emft_popup_move, NULL, (gchar *) "folder-move", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE }, /* FIXME: need to disable for undeletable folders */ - { E_POPUP_BAR, "20.emc" }, - { E_POPUP_ITEM, "20.emc.01", N_("_Delete"), emft_popup_delete_folder, NULL, "edit-delete", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE }, + { E_POPUP_BAR, (gchar *) "20.emc" }, + { E_POPUP_ITEM, (gchar *) "20.emc.01", (gchar *) N_("_Delete"), emft_popup_delete_folder, NULL, (gchar *) "edit-delete", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE }, - { E_POPUP_BAR, "30.emc" }, - { E_POPUP_ITEM, "30.emc.02", N_("_Rename..."), emft_popup_rename_folder, NULL, NULL, 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE }, - { E_POPUP_ITEM, "30.emc.03", N_("Re_fresh"), emft_popup_refresh_folder, NULL, "view-refresh", EM_POPUP_FOLDER_NONSTATIC, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT}, - { E_POPUP_ITEM, "30.emc.04", N_("Fl_ush Outbox"), emft_popup_flush_outbox, NULL, "mail-send", EM_POPUP_FOLDER_OUTBOX, 0 }, + { E_POPUP_BAR, (gchar *) "30.emc" }, + { E_POPUP_ITEM, (gchar *) "30.emc.02", (gchar *) N_("_Rename..."), emft_popup_rename_folder, NULL, NULL, 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE }, + { E_POPUP_ITEM, (gchar *) "30.emc.03", (gchar *) N_("Re_fresh"), emft_popup_refresh_folder, NULL, (gchar *) "view-refresh", EM_POPUP_FOLDER_NONSTATIC, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT}, + { E_POPUP_ITEM, (gchar *) "30.emc.04", (gchar *) N_("Fl_ush Outbox"), emft_popup_flush_outbox, NULL, (gchar *) "mail-send", EM_POPUP_FOLDER_OUTBOX, 0 }, - { E_POPUP_BAR, "99.emc" }, - { E_POPUP_ITEM, "99.emc.00", N_("_Properties"), emft_popup_properties, NULL, "document-properties", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT } + { E_POPUP_BAR, (gchar *) "99.emc" }, + { E_POPUP_ITEM, (gchar *) "99.emc.00", (gchar *) N_("_Properties"), emft_popup_properties, NULL, (gchar *) "document-properties", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT } }; -static EPopupItem trash_popup_item = {E_POPUP_ITEM, "30.emc.05", N_("_Empty Trash"), emft_popup_empty_trash,NULL,NULL, 1, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT}; +static EPopupItem trash_popup_item = {E_POPUP_ITEM, (gchar *) "30.emc.05", (gchar *) N_("_Empty Trash"), emft_popup_empty_trash,NULL,NULL, 1, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT}; static void emft_popup_free(EPopup *ep, GSList *items, void *data) @@ -2162,7 +2162,7 @@ emft_popup (EMFolderTree *emft, GdkEvent *event) item->type = E_POPUP_TOGGLE | E_POPUP_ACTIVE; else item->type = E_POPUP_TOGGLE & ~E_POPUP_ACTIVE; - item->path = "99.emc.99"; + item->path = (gchar *) "99.emc.99"; item->label = _("_Unread Search Folder"); item->activate = emft_popup_uvfolder; item->visible = EM_POPUP_FOLDER_SELECT; diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c index 05dcdc7363..0555fb76cc 100644 --- a/mail/em-folder-utils.c +++ b/mail/em-folder-utils.c @@ -268,7 +268,7 @@ emfu_copy_folder_selected (const char *uri, void *data) { struct _copy_folder_data *cfd = data; CamelStore *fromstore = NULL, *tostore = NULL; - char *tobase = NULL; + const gchar *tobase = NULL; CamelException ex; CamelURL *url; diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c index a433323bb2..b19057a720 100644 --- a/mail/em-folder-view.c +++ b/mail/em-folder-view.c @@ -241,6 +241,8 @@ enum { LAST_SIGNAL }; +extern CamelSession *session; + static guint signals[LAST_SIGNAL]; static void emfv_selection_get(GtkWidget *widget, GtkSelectionData *data, guint info, guint time_stamp, EMFolderView *emfv); @@ -259,7 +261,6 @@ emfv_init(GObject *o) { EMFolderView *emfv = (EMFolderView *)o; struct _EMFolderViewPrivate *p; - extern CamelSession *session; gtk_box_set_homogeneous (GTK_BOX (emfv), FALSE); @@ -1322,61 +1323,61 @@ EMFV_POPUP_AUTO_TYPE(filter_type_current, emfv_popup_filter_mlist, AUTO_MLIST) /* TODO: Move some of these to be 'standard' menu's */ static EPopupItem emfv_popup_items[] = { - { E_POPUP_ITEM, "00.emfv.00", N_("_Copy"), emfv_popup_copy_text, NULL, "edit-copy", EM_FOLDER_VIEW_SELECT_DISPLAY|EM_FOLDER_VIEW_SELECT_SELECTION }, + { E_POPUP_ITEM, (gchar *) "00.emfv.00", (gchar *) N_("_Copy"), emfv_popup_copy_text, NULL, (gchar *) "edit-copy", EM_FOLDER_VIEW_SELECT_DISPLAY|EM_FOLDER_VIEW_SELECT_SELECTION }, - { E_POPUP_BAR, "10.emfv", NULL, NULL, NULL, NULL }, + { E_POPUP_BAR, (gchar *) "10.emfv", NULL, NULL, NULL, NULL }, - { E_POPUP_ITEM, "10.emfv.00", N_("_Reply to Sender"), emfv_popup_reply_sender, NULL, "mail-reply-sender", EM_POPUP_SELECT_ONE }, - { E_POPUP_ITEM, "10.emfv.01", N_("Reply to _All"), emfv_popup_reply_all, NULL, "mail-reply-all", EM_POPUP_SELECT_ONE }, - { E_POPUP_ITEM, "10.emfv.02", N_("_Forward"), emfv_popup_forward, NULL, "mail-forward", EM_POPUP_SELECT_MANY }, + { E_POPUP_ITEM, (gchar *) "10.emfv.00", (gchar *) N_("_Reply to Sender"), emfv_popup_reply_sender, NULL, (gchar *) "mail-reply-sender", EM_POPUP_SELECT_ONE }, + { E_POPUP_ITEM, (gchar *) "10.emfv.01", (gchar *) N_("Reply to _All"), emfv_popup_reply_all, NULL, (gchar *) "mail-reply-all", EM_POPUP_SELECT_ONE }, + { E_POPUP_ITEM, (gchar *) "10.emfv.02", (gchar *) N_("_Forward"), emfv_popup_forward, NULL, (gchar *) "mail-forward", EM_POPUP_SELECT_MANY }, - { E_POPUP_BAR, "20.emfv", NULL, NULL, NULL, NULL }, + { E_POPUP_BAR, (gchar *) "20.emfv", NULL, NULL, NULL, NULL }, /* EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone */ - { E_POPUP_ITEM, "20.emfv.00", N_("_Edit as New Message..."), emfv_popup_edit, NULL, NULL, EM_POPUP_SELECT_ONE }, - { E_POPUP_ITEM, "20.emfv.01", N_("_Save As..."), emfv_popup_saveas, NULL, "document-save-as", EM_POPUP_SELECT_MANY }, - { E_POPUP_ITEM, "20.emfv.02", N_("_Print..."), emfv_popup_print, NULL, "document-print", EM_POPUP_SELECT_ONE }, - - { E_POPUP_BAR, "40.emfv", NULL, NULL, NULL, NULL }, - { E_POPUP_ITEM, "40.emfv.00", N_("_Delete"), emfv_popup_delete, NULL, "edit-delete", EM_POPUP_SELECT_DELETE|EM_FOLDER_VIEW_SELECT_LISTONLY }, - { E_POPUP_ITEM, "40.emfv.01", N_("U_ndelete"), emfv_popup_undelete, NULL, NULL, EM_POPUP_SELECT_UNDELETE|EM_FOLDER_VIEW_SELECT_LISTONLY }, - { E_POPUP_ITEM, "40.emfv.02", N_("_Move to Folder..."), emfv_popup_move, NULL, "mail-move", EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY }, - { E_POPUP_ITEM, "40.emfv.03", N_("_Copy to Folder..."), emfv_popup_copy, NULL, "mail-copy", EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY }, - - { E_POPUP_BAR, "50.emfv", NULL, NULL, NULL, NULL }, - { E_POPUP_ITEM, "50.emfv.00", N_("Mar_k as Read"), emfv_popup_mark_read, NULL, "mail-mark-read", EM_POPUP_SELECT_MARK_READ|EM_FOLDER_VIEW_SELECT_LISTONLY }, - { E_POPUP_ITEM, "50.emfv.01", N_("Mark as _Unread"), emfv_popup_mark_unread, NULL, "mail-mark-unread", EM_POPUP_SELECT_MARK_UNREAD|EM_FOLDER_VIEW_SELECT_LISTONLY }, - { E_POPUP_ITEM, "50.emfv.02", N_("Mark as _Important"), emfv_popup_mark_important, NULL, "mail-mark-important", EM_POPUP_SELECT_MARK_IMPORTANT|EM_FOLDER_VIEW_SELECT_LISTONLY }, - { E_POPUP_ITEM, "50.emfv.03", N_("Mark as Un_important"), emfv_popup_mark_unimportant, NULL, NULL, EM_POPUP_SELECT_MARK_UNIMPORTANT|EM_FOLDER_VIEW_SELECT_LISTONLY }, - { E_POPUP_ITEM, "50.emfv.04", N_("Mark as _Junk"), emfv_popup_mark_junk, NULL, "mail-mark-junk", EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY|EM_POPUP_SELECT_JUNK }, - { E_POPUP_ITEM, "50.emfv.05", N_("Mark as _Not Junk"), emfv_popup_mark_nojunk, NULL, "mail-mark-notjunk", EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY|EM_POPUP_SELECT_NOT_JUNK }, - { E_POPUP_ITEM, "50.emfv.06", N_("Mark for Follo_w Up..."), emfv_popup_flag_followup, NULL, "stock_mail-flag-for-followup", EM_POPUP_SELECT_FLAG_FOLLOWUP|EM_FOLDER_VIEW_SELECT_LISTONLY }, - - { E_POPUP_SUBMENU, "60.label.00", N_("_Label"), NULL, NULL, NULL, EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY }, - { E_POPUP_ITEM, "60.label.00/00.label", N_("_None"), emfv_popup_label_clear, NULL, NULL, EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY }, - { E_POPUP_BAR, "60.label.00/00.label.00", NULL, NULL, NULL, NULL }, - { E_POPUP_BAR, "60.label.00/01.label", NULL, NULL, NULL, NULL }, - { E_POPUP_ITEM, "60.label.00/01.label.00", N_("_New Label"), emfv_popup_label_new, NULL, NULL, EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY }, - - { E_POPUP_BAR, "70.emfv.06", NULL, NULL, NULL, NULL }, - - { E_POPUP_ITEM, "70.emfv.07", N_("Fla_g Completed"), emfv_popup_flag_completed, NULL, "stock_mail-flag-for-followup-done", EM_POPUP_SELECT_FLAG_COMPLETED|EM_FOLDER_VIEW_SELECT_LISTONLY }, - { E_POPUP_ITEM, "70.emfv.08", N_("Cl_ear Flag"), emfv_popup_flag_clear, NULL, NULL, EM_POPUP_SELECT_FLAG_CLEAR|EM_FOLDER_VIEW_SELECT_LISTONLY }, - - { E_POPUP_BAR, "90.filter", NULL, NULL, NULL, NULL }, - { E_POPUP_SUBMENU, "90.filter.00", N_("Crea_te Rule From Message"), NULL, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY }, + { E_POPUP_ITEM, (gchar *) "20.emfv.00", (gchar *) N_("_Edit as New Message..."), emfv_popup_edit, NULL, NULL, EM_POPUP_SELECT_ONE }, + { E_POPUP_ITEM, (gchar *) "20.emfv.01", (gchar *) N_("_Save As..."), emfv_popup_saveas, NULL, (gchar *) "document-save-as", EM_POPUP_SELECT_MANY }, + { E_POPUP_ITEM, (gchar *) "20.emfv.02", (gchar *) N_("_Print..."), emfv_popup_print, NULL, (gchar *) "document-print", EM_POPUP_SELECT_ONE }, + + { E_POPUP_BAR, (gchar *) "40.emfv", NULL, NULL, NULL, NULL }, + { E_POPUP_ITEM, (gchar *) "40.emfv.00", (gchar *) N_("_Delete"), emfv_popup_delete, NULL, (gchar *) "edit-delete", EM_POPUP_SELECT_DELETE|EM_FOLDER_VIEW_SELECT_LISTONLY }, + { E_POPUP_ITEM, (gchar *) "40.emfv.01", (gchar *) N_("U_ndelete"), emfv_popup_undelete, NULL, NULL, EM_POPUP_SELECT_UNDELETE|EM_FOLDER_VIEW_SELECT_LISTONLY }, + { E_POPUP_ITEM, (gchar *) "40.emfv.02", (gchar *) N_("_Move to Folder..."), emfv_popup_move, NULL, (gchar *) "mail-move", EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY }, + { E_POPUP_ITEM, (gchar *) "40.emfv.03", (gchar *) N_("_Copy to Folder..."), emfv_popup_copy, NULL, (gchar *) "mail-copy", EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY }, + + { E_POPUP_BAR, (gchar *) "50.emfv", NULL, NULL, NULL, NULL }, + { E_POPUP_ITEM, (gchar *) "50.emfv.00", (gchar *) N_("Mar_k as Read"), emfv_popup_mark_read, NULL, (gchar *) "mail-mark-read", EM_POPUP_SELECT_MARK_READ|EM_FOLDER_VIEW_SELECT_LISTONLY }, + { E_POPUP_ITEM, (gchar *) "50.emfv.01", (gchar *) N_("Mark as _Unread"), emfv_popup_mark_unread, NULL, (gchar *) "mail-mark-unread", EM_POPUP_SELECT_MARK_UNREAD|EM_FOLDER_VIEW_SELECT_LISTONLY }, + { E_POPUP_ITEM, (gchar *) "50.emfv.02", (gchar *) N_("Mark as _Important"), emfv_popup_mark_important, NULL, (gchar *) "mail-mark-important", EM_POPUP_SELECT_MARK_IMPORTANT|EM_FOLDER_VIEW_SELECT_LISTONLY }, + { E_POPUP_ITEM, (gchar *) "50.emfv.03", (gchar *) N_("Mark as Un_important"), emfv_popup_mark_unimportant, NULL, NULL, EM_POPUP_SELECT_MARK_UNIMPORTANT|EM_FOLDER_VIEW_SELECT_LISTONLY }, + { E_POPUP_ITEM, (gchar *) "50.emfv.04", (gchar *) N_("Mark as _Junk"), emfv_popup_mark_junk, NULL, (gchar *) "mail-mark-junk", EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY|EM_POPUP_SELECT_JUNK }, + { E_POPUP_ITEM, (gchar *) "50.emfv.05", (gchar *) N_("Mark as _Not Junk"), emfv_popup_mark_nojunk, NULL, (gchar *) "mail-mark-notjunk", EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY|EM_POPUP_SELECT_NOT_JUNK }, + { E_POPUP_ITEM, (gchar *) "50.emfv.06", (gchar *) N_("Mark for Follo_w Up..."), emfv_popup_flag_followup, NULL, (gchar *) "stock_mail-flag-for-followup", EM_POPUP_SELECT_FLAG_FOLLOWUP|EM_FOLDER_VIEW_SELECT_LISTONLY }, + + { E_POPUP_SUBMENU, (gchar *) "60.label.00", (gchar *) N_("_Label"), NULL, NULL, NULL, EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY }, + { E_POPUP_ITEM, (gchar *) "60.label.00/00.label", (gchar *) N_("_None"), emfv_popup_label_clear, NULL, NULL, EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY }, + { E_POPUP_BAR, (gchar *) "60.label.00/00.label.00", NULL, NULL, NULL, NULL }, + { E_POPUP_BAR, (gchar *) "60.label.00/01.label", NULL, NULL, NULL, NULL }, + { E_POPUP_ITEM, (gchar *) "60.label.00/01.label.00", (gchar *) N_("_New Label"), emfv_popup_label_new, NULL, NULL, EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY }, + + { E_POPUP_BAR, (gchar *) "70.emfv.06", NULL, NULL, NULL, NULL }, + + { E_POPUP_ITEM, (gchar *) "70.emfv.07", (gchar *) N_("Fla_g Completed"), emfv_popup_flag_completed, NULL, (gchar *) "stock_mail-flag-for-followup-done", EM_POPUP_SELECT_FLAG_COMPLETED|EM_FOLDER_VIEW_SELECT_LISTONLY }, + { E_POPUP_ITEM, (gchar *) "70.emfv.08", (gchar *) N_("Cl_ear Flag"), emfv_popup_flag_clear, NULL, NULL, EM_POPUP_SELECT_FLAG_CLEAR|EM_FOLDER_VIEW_SELECT_LISTONLY }, + + { 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. */ - { E_POPUP_ITEM, "90.filter.00/00.00", N_("Search Folder based on _Subject"), emfv_popup_vfolder_subject, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY }, - { E_POPUP_ITEM, "90.filter.00/00.01", 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, "90.filter.00/00.02", N_("Search Folder based on _Recipients"), emfv_popup_vfolder_recipients, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY }, - { E_POPUP_ITEM, "90.filter.00/00.03", N_("Search Folder based on Mailing _List"), + { 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 }, + { E_POPUP_ITEM, (gchar *) "90.filter.00/00.03", (gchar *) N_("Search Folder based on Mailing _List"), emfv_popup_vfolder_mlist, NULL, NULL, EM_POPUP_SELECT_ONE|EM_POPUP_SELECT_MAILING_LIST|EM_FOLDER_VIEW_SELECT_LISTONLY }, - { E_POPUP_BAR, "90.filter.00/10", NULL, NULL, NULL, NULL }, + { 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. */ - { E_POPUP_ITEM, "90.filter.00/10.00", N_("Filter based on Sub_ject"), emfv_popup_filter_subject, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY }, - { E_POPUP_ITEM, "90.filter.00/10.01", N_("Filter based on Sen_der"), emfv_popup_filter_sender, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY }, - { E_POPUP_ITEM, "90.filter.00/10.02", N_("Filter based on Re_cipients"), emfv_popup_filter_recipients, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY }, - { E_POPUP_ITEM, "90.filter.00/10.03", N_("Filter based on _Mailing List"), + { 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 }, + { E_POPUP_ITEM, (gchar *) "90.filter.00/10.03", (gchar *) N_("Filter based on _Mailing List"), emfv_popup_filter_mlist, NULL, NULL, EM_POPUP_SELECT_ONE|EM_POPUP_SELECT_MAILING_LIST|EM_FOLDER_VIEW_SELECT_LISTONLY }, }; @@ -2730,11 +2731,11 @@ emp_uri_popup_link_copy(EPopup *ep, EPopupItem *pitem, void *data) } static EPopupItem emfv_uri_popups[] = { - { E_POPUP_ITEM, "00.uri.15", N_("_Copy Link Location"), emp_uri_popup_link_copy, NULL, "edit-copy", EM_POPUP_URI_NOT_MAILTO }, + { E_POPUP_ITEM, (gchar *) "00.uri.15", (gchar *) N_("_Copy Link Location"), emp_uri_popup_link_copy, NULL, (gchar *) "edit-copy", EM_POPUP_URI_NOT_MAILTO }, - { E_POPUP_SUBMENU, "99.uri.00", N_("Create _Search Folder"), NULL, NULL, NULL, EM_POPUP_URI_MAILTO }, - { E_POPUP_ITEM, "99.uri.00/00.10", N_("_From this Address"), emp_uri_popup_vfolder_sender, NULL, NULL, EM_POPUP_URI_MAILTO }, - { E_POPUP_ITEM, "99.uri.00/00.00", N_("_To this Address"), emp_uri_popup_vfolder_recipient, NULL, NULL, EM_POPUP_URI_MAILTO }, + { E_POPUP_SUBMENU, (gchar *) "99.uri.00", (gchar *) N_("Create _Search Folder"), NULL, NULL, NULL, EM_POPUP_URI_MAILTO }, + { E_POPUP_ITEM, (gchar *) "99.uri.00/00.10", (gchar *) N_("_From this Address"), emp_uri_popup_vfolder_sender, NULL, NULL, EM_POPUP_URI_MAILTO }, + { E_POPUP_ITEM, (gchar *) "99.uri.00/00.00", (gchar *) N_("_To this Address"), emp_uri_popup_vfolder_recipient, NULL, NULL, EM_POPUP_URI_MAILTO }, }; static void diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c index 1a56f21e48..8863bf7f08 100644 --- a/mail/em-format-html-display.c +++ b/mail/em-format-html-display.c @@ -889,31 +889,31 @@ efhd_image(EMFormatHTML *efh, CamelStream *stream, CamelMimePart *part, EMFormat /* ********************************************************************** */ static EMFormatHandler type_builtin_table[] = { - { "image/gif", (EMFormatFunc)efhd_image }, - { "image/jpeg", (EMFormatFunc)efhd_image }, - { "image/png", (EMFormatFunc)efhd_image }, - { "image/x-png", (EMFormatFunc)efhd_image }, - { "image/tiff", (EMFormatFunc)efhd_image }, - { "image/x-bmp", (EMFormatFunc)efhd_image }, - { "image/bmp", (EMFormatFunc)efhd_image }, - { "image/svg", (EMFormatFunc)efhd_image }, - { "image/x-cmu-raster", (EMFormatFunc)efhd_image }, - { "image/x-ico", (EMFormatFunc)efhd_image }, - { "image/x-portable-anymap", (EMFormatFunc)efhd_image }, - { "image/x-portable-bitmap", (EMFormatFunc)efhd_image }, - { "image/x-portable-graymap", (EMFormatFunc)efhd_image }, - { "image/x-portable-pixmap", (EMFormatFunc)efhd_image }, - { "image/x-xpixmap", (EMFormatFunc)efhd_image }, + { (gchar *) "image/gif", (EMFormatFunc)efhd_image }, + { (gchar *) "image/jpeg", (EMFormatFunc)efhd_image }, + { (gchar *) "image/png", (EMFormatFunc)efhd_image }, + { (gchar *) "image/x-png", (EMFormatFunc)efhd_image }, + { (gchar *) "image/tiff", (EMFormatFunc)efhd_image }, + { (gchar *) "image/x-bmp", (EMFormatFunc)efhd_image }, + { (gchar *) "image/bmp", (EMFormatFunc)efhd_image }, + { (gchar *) "image/svg", (EMFormatFunc)efhd_image }, + { (gchar *) "image/x-cmu-raster", (EMFormatFunc)efhd_image }, + { (gchar *) "image/x-ico", (EMFormatFunc)efhd_image }, + { (gchar *) "image/x-portable-anymap", (EMFormatFunc)efhd_image }, + { (gchar *) "image/x-portable-bitmap", (EMFormatFunc)efhd_image }, + { (gchar *) "image/x-portable-graymap", (EMFormatFunc)efhd_image }, + { (gchar *) "image/x-portable-pixmap", (EMFormatFunc)efhd_image }, + { (gchar *) "image/x-xpixmap", (EMFormatFunc)efhd_image }, /* This is where one adds those busted, non-registered types, that some idiot mailer writers out there decide to pull out of their proverbials at random. */ - { "image/jpg", (EMFormatFunc)efhd_image }, - { "image/pjpeg", (EMFormatFunc)efhd_image }, + { (gchar *) "image/jpg", (EMFormatFunc)efhd_image }, + { (gchar *) "image/pjpeg", (EMFormatFunc)efhd_image }, - { "x-evolution/message/prefix", (EMFormatFunc)efhd_message_prefix }, - { "x-evolution/message/post-header", (EMFormatFunc)efhd_message_add_bar } + { (gchar *) "x-evolution/message/prefix", (EMFormatFunc)efhd_message_prefix }, + { (gchar *) "x-evolution/message/post-header", (EMFormatFunc)efhd_message_add_bar } }; static void @@ -1079,11 +1079,11 @@ efhd_image_unfit(EPopup *ep, EPopupItem *item, void *data) } static EPopupItem efhd_menu_items[] = { - { E_POPUP_BAR, "05.display", }, - { E_POPUP_ITEM, "05.display.00", N_("_View Inline"), efhd_attachment_show }, - { E_POPUP_ITEM, "05.display.00", N_("_Hide"), efhd_attachment_show }, - { E_POPUP_ITEM, "05.display.01", N_("_Fit to Width"), efhd_image_fit, NULL, NULL, EM_POPUP_PART_IMAGE }, - { E_POPUP_ITEM, "05.display.01", N_("Show _Original Size"), efhd_image_unfit, NULL, NULL, EM_POPUP_PART_IMAGE }, + { E_POPUP_BAR, (gchar *) "05.display" }, + { E_POPUP_ITEM, (gchar *) "05.display.00", (gchar *) N_("_View Inline"), efhd_attachment_show }, + { E_POPUP_ITEM, (gchar *) "05.display.00", (gchar *) N_("_Hide"), efhd_attachment_show }, + { E_POPUP_ITEM, (gchar *) "05.display.01", (gchar *) N_("_Fit to Width"), efhd_image_fit, NULL, NULL, EM_POPUP_PART_IMAGE }, + { E_POPUP_ITEM, (gchar *) "05.display.01", (gchar *) N_("Show _Original Size"), efhd_image_unfit, NULL, NULL, EM_POPUP_PART_IMAGE }, }; static void @@ -1343,7 +1343,7 @@ efhd_attachment_image(EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObjec GdkPixbuf *pixbuf; GtkTargetEntry drag_types[] = { { NULL, 0, 0 }, - { "text/uri-list", 0, 1 }, + { (gchar *) "text/uri-list", 0, 1 }, }; char *simple_type; diff --git a/mail/em-format-html.c b/mail/em-format-html.c index 6d116a69ba..d0172ea8ef 100644 --- a/mail/em-format-html.c +++ b/mail/em-format-html.c @@ -1176,40 +1176,40 @@ efh_image(EMFormatHTML *efh, CamelStream *stream, CamelMimePart *part, EMFormatH } static EMFormatHandler type_builtin_table[] = { - { "image/gif", (EMFormatFunc)efh_image }, - { "image/jpeg", (EMFormatFunc)efh_image }, - { "image/png", (EMFormatFunc)efh_image }, - { "image/x-png", (EMFormatFunc)efh_image }, - { "image/tiff", (EMFormatFunc)efh_image }, - { "image/x-bmp", (EMFormatFunc)efh_image }, - { "image/bmp", (EMFormatFunc)efh_image }, - { "image/svg", (EMFormatFunc)efh_image }, - { "image/x-cmu-raster", (EMFormatFunc)efh_image }, - { "image/x-ico", (EMFormatFunc)efh_image }, - { "image/x-portable-anymap", (EMFormatFunc)efh_image }, - { "image/x-portable-bitmap", (EMFormatFunc)efh_image }, - { "image/x-portable-graymap", (EMFormatFunc)efh_image }, - { "image/x-portable-pixmap", (EMFormatFunc)efh_image }, - { "image/x-xpixmap", (EMFormatFunc)efh_image }, - { "text/enriched", (EMFormatFunc)efh_text_enriched }, - { "text/plain", (EMFormatFunc)efh_text_plain }, - { "text/html", (EMFormatFunc)efh_text_html }, - { "text/richtext", (EMFormatFunc)efh_text_enriched }, - { "text/*", (EMFormatFunc)efh_text_plain }, - { "message/external-body", (EMFormatFunc)efh_message_external }, - { "message/delivery-status", (EMFormatFunc)efh_message_deliverystatus }, - { "multipart/related", (EMFormatFunc)efh_multipart_related }, + { (gchar *) "image/gif", (EMFormatFunc)efh_image }, + { (gchar *) "image/jpeg", (EMFormatFunc)efh_image }, + { (gchar *) "image/png", (EMFormatFunc)efh_image }, + { (gchar *) "image/x-png", (EMFormatFunc)efh_image }, + { (gchar *) "image/tiff", (EMFormatFunc)efh_image }, + { (gchar *) "image/x-bmp", (EMFormatFunc)efh_image }, + { (gchar *) "image/bmp", (EMFormatFunc)efh_image }, + { (gchar *) "image/svg", (EMFormatFunc)efh_image }, + { (gchar *) "image/x-cmu-raster", (EMFormatFunc)efh_image }, + { (gchar *) "image/x-ico", (EMFormatFunc)efh_image }, + { (gchar *) "image/x-portable-anymap", (EMFormatFunc)efh_image }, + { (gchar *) "image/x-portable-bitmap", (EMFormatFunc)efh_image }, + { (gchar *) "image/x-portable-graymap", (EMFormatFunc)efh_image }, + { (gchar *) "image/x-portable-pixmap", (EMFormatFunc)efh_image }, + { (gchar *) "image/x-xpixmap", (EMFormatFunc)efh_image }, + { (gchar *) "text/enriched", (EMFormatFunc)efh_text_enriched }, + { (gchar *) "text/plain", (EMFormatFunc)efh_text_plain }, + { (gchar *) "text/html", (EMFormatFunc)efh_text_html }, + { (gchar *) "text/richtext", (EMFormatFunc)efh_text_enriched }, + { (gchar *) "text/*", (EMFormatFunc)efh_text_plain }, + { (gchar *) "message/external-body", (EMFormatFunc)efh_message_external }, + { (gchar *) "message/delivery-status", (EMFormatFunc)efh_message_deliverystatus }, + { (gchar *) "multipart/related", (EMFormatFunc)efh_multipart_related }, /* This is where one adds those busted, non-registered types, that some idiot mailer writers out there decide to pull out of their proverbials at random. */ - { "image/jpg", (EMFormatFunc)efh_image }, - { "image/pjpeg", (EMFormatFunc)efh_image }, + { (gchar *) "image/jpg", (EMFormatFunc)efh_image }, + { (gchar *) "image/pjpeg", (EMFormatFunc)efh_image }, /* special internal types */ - { "x-evolution/message/rfc822", (EMFormatFunc)efh_format_message } + { (gchar *) "x-evolution/message/rfc822", (EMFormatFunc)efh_format_message } }; static void @@ -1547,7 +1547,7 @@ efh_format_text_header (EMFormatHTML *emfh, CamelStream *stream, const char *lab g_free(mhtml); } -static char *addrspec_hdrs[] = { +static const gchar *addrspec_hdrs[] = { "Sender", "From", "Reply-To", "To", "Cc", "Bcc", "Resent-Sender", "Resent-From", "Resent-Reply-To", "Resent-To", "Resent-Cc", "Resent-Bcc", NULL @@ -1967,7 +1967,7 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part) if (!use_header) use_header = header; - xmailer.name = "X-Evolution-Mailer"; + xmailer.name = (gchar *) "X-Evolution-Mailer"; xmailer.value = use_header->value; mailer_shown = TRUE; diff --git a/mail/em-format-quote.c b/mail/em-format-quote.c index 49c546863a..40e69022d1 100644 --- a/mail/em-format-quote.c +++ b/mail/em-format-quote.c @@ -197,7 +197,7 @@ emfq_format_text_header (EMFormatQuote *emfq, CamelStream *stream, const char *l g_free (mhtml); } -static char *addrspec_hdrs[] = { +static const gchar *addrspec_hdrs[] = { "Sender", "From", "Reply-To", "To", "Cc", "Bcc", "Resent-Sender", "Resent-from", "Resent-Reply-To", "Resent-To", "Resent-cc", "Resent-Bcc", NULL @@ -548,18 +548,18 @@ emfq_ignore(EMFormat *emf, CamelStream *stream, CamelMimePart *part, EMFormatHan } static EMFormatHandler type_builtin_table[] = { - { "text/plain",(EMFormatFunc)emfq_text_plain }, - { "text/enriched",(EMFormatFunc)emfq_text_enriched }, - { "text/richtext",(EMFormatFunc)emfq_text_enriched }, - { "text/html",(EMFormatFunc)emfq_text_html }, -/* { "multipart/related",(EMFormatFunc)emfq_multipart_related },*/ - { "message/external-body", (EMFormatFunc)emfq_ignore }, - { "multipart/appledouble", (EMFormatFunc)emfq_ignore }, + { (gchar *) "text/plain", (EMFormatFunc)emfq_text_plain }, + { (gchar *) "text/enriched", (EMFormatFunc)emfq_text_enriched }, + { (gchar *) "text/richtext", (EMFormatFunc)emfq_text_enriched }, + { (gchar *) "text/html", (EMFormatFunc)emfq_text_html }, +/* { (gchar *) "multipart/related",(EMFormatFunc)emfq_multipart_related },*/ + { (gchar *) "message/external-body", (EMFormatFunc)emfq_ignore }, + { (gchar *) "multipart/appledouble", (EMFormatFunc)emfq_ignore }, /* internal evolution types */ - { "x-evolution/evolution-rss-feed", (EMFormatFunc)emfq_text_html }, - { "x-evolution/message/rfc822", (EMFormatFunc)emfq_format_message }, - { "x-evolution/message/prefix", (EMFormatFunc)emfq_format_message_prefix }, + { (gchar *) "x-evolution/evolution-rss-feed", (EMFormatFunc)emfq_text_html }, + { (gchar *) "x-evolution/message/rfc822", (EMFormatFunc)emfq_format_message }, + { (gchar *) "x-evolution/message/prefix", (EMFormatFunc)emfq_format_message_prefix }, }; static void diff --git a/mail/em-format.c b/mail/em-format.c index 826ef11b63..b2360bb2fc 100644 --- a/mail/em-format.c +++ b/mail/em-format.c @@ -85,6 +85,8 @@ enum { EMF_LAST_SIGNAL }; +extern CamelSession *session; + static guint emf_signals[EMF_LAST_SIGNAL]; static GObjectClass *emf_parent; @@ -220,7 +222,7 @@ em_format_class_add_handler(EMFormatClass *emfc, EMFormatHandler *info) { d(printf("adding format handler to '%s' '%s'\n", g_type_name_from_class((GTypeClass *)emfc), info->mime_type)); info->old = g_hash_table_lookup(emfc->type_handlers, info->mime_type); - g_hash_table_insert(emfc->type_handlers, info->mime_type, info); + g_hash_table_insert(emfc->type_handlers, (gpointer) info->mime_type, info); } struct _class_handlers { @@ -274,7 +276,7 @@ em_format_class_remove_handler(EMFormatClass *emfc, EMFormatHandler *info) if (current == info) { current = info->old; if (current) - g_hash_table_insert(emfc->type_handlers, current->mime_type, current); + g_hash_table_insert(emfc->type_handlers, (gpointer) current->mime_type, current); else g_hash_table_remove(emfc->type_handlers, info->mime_type); } else { @@ -1213,7 +1215,6 @@ emf_application_xpkcs7mime(EMFormat *emf, CamelStream *stream, CamelMimePart *pa { CamelCipherContext *context; CamelException *ex; - extern CamelSession *session; CamelMimePart *opart; CamelCipherValidity *valid; struct _EMFormatCache *emfc; @@ -1494,8 +1495,9 @@ emf_multipart_related(EMFormat *emf, CamelStream *stream, CamelMimePart *part, c if (puri->func == emf_write_related) { g_string_printf(emf->part_id, "%s", puri->part_id); em_format_part(emf, stream, puri->part); - } else + } else { d(printf("unreferenced uri generated by format code: %s\n", puri->uri?puri->uri:puri->cid)); + } } puri = purin; purin = purin->next; @@ -1732,28 +1734,28 @@ emf_inlinepgp_encrypted(EMFormat *emf, CamelStream *stream, CamelMimePart *ipart static EMFormatHandler type_builtin_table[] = { #ifdef ENABLE_SMIME - { "application/x-pkcs7-mime", (EMFormatFunc)emf_application_xpkcs7mime, EM_FORMAT_HANDLER_INLINE_DISPOSITION }, + { (gchar *) "application/x-pkcs7-mime", (EMFormatFunc)emf_application_xpkcs7mime, EM_FORMAT_HANDLER_INLINE_DISPOSITION }, #endif - { "multipart/alternative", emf_multipart_alternative }, - { "multipart/appledouble", emf_multipart_appledouble }, - { "multipart/encrypted", emf_multipart_encrypted }, - { "multipart/mixed", emf_multipart_mixed }, - { "multipart/signed", emf_multipart_signed }, - { "multipart/related", emf_multipart_related }, - { "multipart/*", emf_multipart_mixed }, - { "message/rfc822", emf_message_rfc822, EM_FORMAT_HANDLER_INLINE }, - { "message/news", emf_message_rfc822, EM_FORMAT_HANDLER_INLINE }, - { "message/delivery-status", emf_message_deliverystatus }, - { "message/*", emf_message_rfc822, EM_FORMAT_HANDLER_INLINE }, + { (gchar *) "multipart/alternative", emf_multipart_alternative }, + { (gchar *) "multipart/appledouble", emf_multipart_appledouble }, + { (gchar *) "multipart/encrypted", emf_multipart_encrypted }, + { (gchar *) "multipart/mixed", emf_multipart_mixed }, + { (gchar *) "multipart/signed", emf_multipart_signed }, + { (gchar *) "multipart/related", emf_multipart_related }, + { (gchar *) "multipart/*", emf_multipart_mixed }, + { (gchar *) "message/rfc822", emf_message_rfc822, EM_FORMAT_HANDLER_INLINE }, + { (gchar *) "message/news", emf_message_rfc822, EM_FORMAT_HANDLER_INLINE }, + { (gchar *) "message/delivery-status", emf_message_deliverystatus }, + { (gchar *) "message/*", emf_message_rfc822, EM_FORMAT_HANDLER_INLINE }, /* Insert brokenly-named parts here */ #ifdef ENABLE_SMIME - { "application/pkcs7-mime", (EMFormatFunc)emf_application_xpkcs7mime, EM_FORMAT_HANDLER_INLINE_DISPOSITION }, + { (gchar *) "application/pkcs7-mime", (EMFormatFunc)emf_application_xpkcs7mime, EM_FORMAT_HANDLER_INLINE_DISPOSITION }, #endif /* internal types */ - { "application/x-inlinepgp-signed", (EMFormatFunc)emf_inlinepgp_signed }, - { "application/x-inlinepgp-encrypted", (EMFormatFunc)emf_inlinepgp_encrypted }, + { (gchar *) "application/x-inlinepgp-signed", (EMFormatFunc)emf_inlinepgp_signed }, + { (gchar *) "application/x-inlinepgp-encrypted", (EMFormatFunc)emf_inlinepgp_encrypted }, }; static void @@ -1762,5 +1764,5 @@ emf_builtin_init(EMFormatClass *klass) int i; for (i=0;i<sizeof(type_builtin_table)/sizeof(type_builtin_table[0]);i++) - g_hash_table_insert(klass->type_handlers, type_builtin_table[i].mime_type, &type_builtin_table[i]); + g_hash_table_insert(klass->type_handlers, (gpointer) type_builtin_table[i].mime_type, &type_builtin_table[i]); } diff --git a/mail/em-format.h b/mail/em-format.h index f11e73937a..ce3d522ab0 100644 --- a/mail/em-format.h +++ b/mail/em-format.h @@ -85,7 +85,7 @@ typedef enum _em_format_mode_t { * **/ struct _EMFormatHandler { - char *mime_type; + gchar *mime_type; EMFormatFunc handler; guint32 flags; diff --git a/mail/em-mailer-prefs.c b/mail/em-mailer-prefs.c index 9784f480b8..bb786752e5 100644 --- a/mail/em-mailer-prefs.c +++ b/mail/em-mailer-prefs.c @@ -388,7 +388,7 @@ jh_remove_cb (GtkWidget *widget, gpointer user_data) while (node) { char *test; int len = strlen (name); - test = strncmp (node->data, name, len) == 0 ? node->data+len:NULL; + test = strncmp (node->data, name, len) == 0 ? (gchar *) node->data+len:NULL; if (test) { test++; @@ -1020,22 +1020,22 @@ emmp_widget_glade(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, str /* plugin meta-data */ static EMConfigItem emmp_items[] = { - { E_CONFIG_BOOK, "", "preferences_toplevel", emmp_widget_glade }, - { E_CONFIG_PAGE, "00.general", "vboxGeneral", emmp_widget_glade }, - { E_CONFIG_SECTION, "00.general/00.fonts", "vboxMessageFonts", emmp_widget_glade }, - { E_CONFIG_SECTION, "00.general/10.display", "vboxMessageDisplay", emmp_widget_glade }, - { E_CONFIG_SECTION, "00.general/20.delete", "vboxDeletingMail", emmp_widget_glade }, - { E_CONFIG_SECTION, "00.general/30.newmail", "vboxNewMailNotify", emmp_widget_glade }, - { E_CONFIG_PAGE, "10.html", "vboxHtmlMail", emmp_widget_glade }, - { E_CONFIG_SECTION, "10.html/00.general", "vbox173", emmp_widget_glade }, - { E_CONFIG_SECTION, "10.html/10.images", "vbox190", emmp_widget_glade }, - { E_CONFIG_PAGE, "20.labels", "frameColours", emmp_widget_glade }, + { E_CONFIG_BOOK, (gchar *) "", (gchar *) "preferences_toplevel", emmp_widget_glade }, + { E_CONFIG_PAGE, (gchar *) "00.general", (gchar *) "vboxGeneral", emmp_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "00.general/00.fonts", (gchar *) "vboxMessageFonts", emmp_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "00.general/10.display", (gchar *) "vboxMessageDisplay", emmp_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "00.general/20.delete", (gchar *) "vboxDeletingMail", emmp_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "00.general/30.newmail", (gchar *) "vboxNewMailNotify", emmp_widget_glade }, + { E_CONFIG_PAGE, (gchar *) "10.html", (gchar *) "vboxHtmlMail", emmp_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "10.html/00.general", (gchar *) "vbox173", emmp_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "10.html/10.images", (gchar *) "vbox190", emmp_widget_glade }, + { E_CONFIG_PAGE, (gchar *) "20.labels", (gchar *) "frameColours", emmp_widget_glade }, /* this is a table, so we can't use it { E_CONFIG_SECTION, "20.labels/00.labels", "tableColours", emmp_widget_glade }, */ - { E_CONFIG_PAGE, "30.headers", "vboxHeaderTab", emmp_widget_glade }, + { E_CONFIG_PAGE, (gchar *) "30.headers", (gchar *) "vboxHeaderTab", emmp_widget_glade }, /* no subvbox for section { E_CONFIG_PAGE, "30.headers/00.headers", "vbox199", emmp_widget_glade }, */ - { E_CONFIG_PAGE, "40.junk", "vbox161", emmp_widget_glade }, + { E_CONFIG_PAGE, (gchar *) "40.junk", (gchar *) "vbox161", emmp_widget_glade }, /* no subvbox for section { E_CONFIG_SECTION, "40.junk/00.general", xxx, emmp_widget_glade } */ - { E_CONFIG_SECTION, "40.junk/10.options", "vbox204", emmp_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "40.junk/10.options", (gchar *) "vbox204", emmp_widget_glade }, }; static void @@ -1261,7 +1261,7 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs) prefs->font_fixed = GTK_FONT_BUTTON (glade_xml_get_widget (gui, "FontFixed")); gtk_font_button_set_font_name (prefs->font_fixed, font); g_free (font); - g_object_set_data ((GObject *) prefs->font_fixed, "key", "/apps/evolution/mail/display/fonts/monospace"); + g_object_set_data ((GObject *) prefs->font_fixed, "key", (gpointer) "/apps/evolution/mail/display/fonts/monospace"); g_signal_connect (prefs->font_fixed, "font-set", G_CALLBACK (font_changed), prefs); if (!gconf_client_key_is_writable (prefs->gconf, "/apps/evolution/mail/display/fonts/monospace", NULL)) gtk_widget_set_sensitive ((GtkWidget *) prefs->font_fixed, FALSE); @@ -1270,7 +1270,7 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs) prefs->font_variable = GTK_FONT_BUTTON (glade_xml_get_widget (gui, "FontVariable")); gtk_font_button_set_font_name (prefs->font_variable, font); g_free (font); - g_object_set_data ((GObject *) prefs->font_variable, "key", "/apps/evolution/mail/display/fonts/variable"); + g_object_set_data ((GObject *) prefs->font_variable, "key", (gpointer) "/apps/evolution/mail/display/fonts/variable"); g_signal_connect (prefs->font_variable, "font-set", G_CALLBACK (font_changed), prefs); if (!gconf_client_key_is_writable (prefs->gconf, "/apps/evolution/mail/display/fonts/variable", NULL)) gtk_widget_set_sensitive ((GtkWidget *) prefs->font_variable, FALSE); diff --git a/mail/em-migrate.c b/mail/em-migrate.c index 315ed208f0..974c8b97a8 100644 --- a/mail/em-migrate.c +++ b/mail/em-migrate.c @@ -359,7 +359,7 @@ parse_lsub (const char *lsub, char *dir_sep) static int comp; static regex_t pat; regmatch_t match[3]; - char *m = "^\\* LSUB \\([^)]*\\) \"?([^\" ]+)\"? \"?(.*)\"?$"; + const gchar *m = "^\\* LSUB \\([^)]*\\) \"?([^\" ]+)\"? \"?(.*)\"?$"; if (!comp) { if (regcomp (&pat, m, REG_EXTENDED|REG_ICASE) == -1) { @@ -952,8 +952,8 @@ static e_gconf_map_list_t gconf_remap_list[] = { }; static struct { - char *label; - char *colour; + const gchar *label; + const gchar *colour; } label_default[5] = { { N_("Important"), "#EF2929" }, /* red */ { N_("Work"), "#F57900" }, /* orange */ @@ -1285,7 +1285,7 @@ get_local_et_expanded (const char *dirname) static char * get_local_store_uri (const char *dirname, char **namep, int *indexp) { - char *protocol, *name, *metadata, *tmp; + gchar *name, *protocol, *metadata, *tmp; int index; struct stat st; xmlNodePtr node; @@ -1296,8 +1296,8 @@ get_local_store_uri (const char *dirname, char **namep, int *indexp) /* in 1.4, any errors are treated as defaults, this function cannot fail */ /* defaults */ - name = "mbox"; - protocol = "mbox"; + name = (gchar *) "mbox"; + protocol = (gchar *) "mbox"; index = TRUE; if (stat (metadata, &st) == -1 || !S_ISREG (st.st_mode)) @@ -1555,7 +1555,7 @@ em_migrate_folder(EMMigrateSession *session, const char *dirname, const char *fu /* Manually copy local mbox files, its much faster */ if (!strncmp (uri, "mbox:", 5)) { - static char *meta_ext[] = { ".summary", ".ibex.index", ".ibex.index.data" }; + static const gchar *meta_ext[] = { ".summary", ".ibex.index", ".ibex.index.data" }; size_t slen, dlen; FILE *fp; char *p; diff --git a/mail/em-network-prefs.c b/mail/em-network-prefs.c index ef711ac251..01fbd87547 100644 --- a/mail/em-network-prefs.c +++ b/mail/em-network-prefs.c @@ -271,9 +271,9 @@ widget_entry_changed_cb (GtkWidget *widget, gpointer data) /* plugin meta-data */ static EMConfigItem emnp_items[] = { - { E_CONFIG_BOOK, "", "network_preferences_toplevel", emnp_widget_glade }, - { E_CONFIG_PAGE, "00.general", "vboxGeneral", emnp_widget_glade }, - { E_CONFIG_SECTION, "00.general/00.proxy", "frameProxy", emnp_widget_glade }, + { E_CONFIG_BOOK, (gchar *) "", (gchar *) "network_preferences_toplevel", emnp_widget_glade }, + { E_CONFIG_PAGE, (gchar *) "00.general", (gchar *) "vboxGeneral", emnp_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "00.general/00.proxy", (gchar *) "frameProxy", emnp_widget_glade }, }; static void @@ -401,19 +401,26 @@ em_network_prefs_construct (EMNetworkPrefs *prefs) /* Manual proxy options */ g_signal_connect (prefs->http_host, "changed", - G_CALLBACK(widget_entry_changed_cb), GCONF_E_HTTP_HOST_KEY); + G_CALLBACK(widget_entry_changed_cb), + (gpointer) GCONF_E_HTTP_HOST_KEY); g_signal_connect (prefs->https_host, "changed", - G_CALLBACK(widget_entry_changed_cb), GCONF_E_HTTPS_HOST_KEY); + G_CALLBACK(widget_entry_changed_cb), + (gpointer) GCONF_E_HTTPS_HOST_KEY); g_signal_connect (prefs->ignore_hosts, "changed", - G_CALLBACK(widget_entry_changed_cb), GCONF_E_IGNORE_HOSTS_KEY); + G_CALLBACK(widget_entry_changed_cb), + (gpointer) GCONF_E_IGNORE_HOSTS_KEY); g_signal_connect (prefs->http_port, "value_changed", - G_CALLBACK(widget_entry_changed_cb), GCONF_E_HTTP_PORT_KEY); + G_CALLBACK(widget_entry_changed_cb), + (gpointer) GCONF_E_HTTP_PORT_KEY); g_signal_connect (prefs->https_port, "value_changed", - G_CALLBACK(widget_entry_changed_cb), GCONF_E_HTTPS_PORT_KEY); + G_CALLBACK(widget_entry_changed_cb), + (gpointer) GCONF_E_HTTPS_PORT_KEY); g_signal_connect (prefs->auth_user, "changed", - G_CALLBACK(widget_entry_changed_cb), GCONF_E_AUTH_USER_KEY); + G_CALLBACK(widget_entry_changed_cb), + (gpointer) GCONF_E_AUTH_USER_KEY); g_signal_connect (prefs->auth_pwd, "changed", - G_CALLBACK(widget_entry_changed_cb), GCONF_E_AUTH_PWD_KEY); + G_CALLBACK(widget_entry_changed_cb), + (gpointer) GCONF_E_AUTH_PWD_KEY); gtk_toggle_button_set_active (prefs->manual_proxy, val == NETWORK_PROXY_MANUAL); g_signal_connect (prefs->sys_proxy, "toggled", G_CALLBACK (notify_proxy_type_changed), prefs); diff --git a/mail/em-popup.c b/mail/em-popup.c index 192ab7ac7b..88aadf7ba7 100644 --- a/mail/em-popup.c +++ b/mail/em-popup.c @@ -491,17 +491,17 @@ emp_part_popup_forward (EPopup *ep, EPopupItem *item, void *data) } static EMPopupItem emp_standard_object_popups[] = { - { E_POPUP_ITEM, "00.part.00", N_("_Save As..."), emp_part_popup_saveas, NULL, "document-save-as", 0 }, - { E_POPUP_ITEM, "00.part.10", N_("Set as _Background"), emp_part_popup_set_background, NULL, NULL, EM_POPUP_PART_IMAGE }, - { E_POPUP_BAR, "10.part", NULL, NULL, NULL, NULL, EM_POPUP_PART_MESSAGE }, - { E_POPUP_ITEM, "10.part.00", N_("_Reply to sender"), emp_part_popup_reply_sender, NULL, "mail-reply-sender" , EM_POPUP_PART_MESSAGE }, - { E_POPUP_ITEM, "10.part.01", N_("Reply to _List"), emp_part_popup_reply_list, NULL, NULL, EM_POPUP_PART_MESSAGE}, - { E_POPUP_ITEM, "10.part.03", N_("Reply to _All"), emp_part_popup_reply_all, NULL, "mail-reply-all", EM_POPUP_PART_MESSAGE}, - { E_POPUP_BAR, "20.part", NULL, NULL, NULL, NULL, EM_POPUP_PART_MESSAGE }, - { E_POPUP_ITEM, "20.part.00", N_("_Forward"), emp_part_popup_forward, NULL, "mail-forward", EM_POPUP_PART_MESSAGE }, + { E_POPUP_ITEM, (gchar *) "00.part.00", (gchar *) N_("_Save As..."), emp_part_popup_saveas, NULL, (gchar *) "document-save-as", 0 }, + { E_POPUP_ITEM, (gchar *) "00.part.10", (gchar *) N_("Set as _Background"), emp_part_popup_set_background, NULL, NULL, EM_POPUP_PART_IMAGE }, + { E_POPUP_BAR, (gchar *) "10.part", NULL, NULL, NULL, NULL, EM_POPUP_PART_MESSAGE }, + { E_POPUP_ITEM, (gchar *) "10.part.00", (gchar *) N_("_Reply to sender"), emp_part_popup_reply_sender, NULL, (gchar *) "mail-reply-sender" , EM_POPUP_PART_MESSAGE }, + { E_POPUP_ITEM, (gchar *) "10.part.01", (gchar *) N_("Reply to _List"), emp_part_popup_reply_list, NULL, NULL, EM_POPUP_PART_MESSAGE}, + { E_POPUP_ITEM, (gchar *) "10.part.03", (gchar *) N_("Reply to _All"), emp_part_popup_reply_all, NULL, (gchar *) "mail-reply-all", EM_POPUP_PART_MESSAGE}, + { E_POPUP_BAR, (gchar *) "20.part", NULL, NULL, NULL, NULL, EM_POPUP_PART_MESSAGE }, + { E_POPUP_ITEM, (gchar *) "20.part.00", (gchar *) N_("_Forward"), emp_part_popup_forward, NULL, (gchar *) "mail-forward", EM_POPUP_PART_MESSAGE }, }; -static const EPopupItem emp_standard_part_apps_bar = { E_POPUP_BAR, "99.object" }; +static const EPopupItem emp_standard_part_apps_bar = { E_POPUP_BAR, (gchar *) "99.object" }; /* ********************************************************************** */ @@ -542,9 +542,9 @@ emp_uri_popup_address_add(EPopup *ep, EPopupItem *item, void *data) } static EPopupItem emp_standard_uri_popups[] = { - { E_POPUP_ITEM, "00.uri.00", N_("_Open Link in Browser"), emp_uri_popup_link_open, NULL, NULL, EM_POPUP_URI_HTTP }, - { E_POPUP_ITEM, "00.uri.10", N_("_Send New Message To..."), emp_uri_popup_address_send, NULL, "mail-message-new", EM_POPUP_URI_MAILTO }, - { E_POPUP_ITEM, "00.uri.20", N_("_Add to Address Book"), emp_uri_popup_address_add, NULL, "contact-new", EM_POPUP_URI_MAILTO }, + { E_POPUP_ITEM, (gchar *) "00.uri.00", (gchar *) N_("_Open Link in Browser"), emp_uri_popup_link_open, NULL, NULL, EM_POPUP_URI_HTTP }, + { E_POPUP_ITEM, (gchar *) "00.uri.10", (gchar *) N_("_Send New Message To..."), emp_uri_popup_address_send, NULL, (gchar *) "mail-message-new", EM_POPUP_URI_MAILTO }, + { E_POPUP_ITEM, (gchar *) "00.uri.20", (gchar *) N_("_Add to Address Book"), emp_uri_popup_address_add, NULL, (gchar *) "contact-new", EM_POPUP_URI_MAILTO }, }; /* ********************************************************************** */ @@ -743,11 +743,11 @@ emp_standard_menu_factory(EPopup *emp, void *data) item = g_malloc0 (sizeof (*item)); item->type = E_POPUP_ITEM; - item->path = "00.00.vcf.00"; /* make it first item */ + item->path = (gchar *) "00.00.vcf.00"; /* make it first item */ item->label = _("_Add to Address Book"); item->activate = emp_add_vcard; item->user_data = NULL; - item->image = "contact-new"; + item->image = (gchar *) "contact-new"; e_popup_add_items (emp, g_slist_append (NULL, item), NULL, NULL, NULL); } diff --git a/mail/em-subscribe-editor.c b/mail/em-subscribe-editor.c index 9842e32d0e..fa68af1776 100644 --- a/mail/em-subscribe-editor.c +++ b/mail/em-subscribe-editor.c @@ -210,8 +210,9 @@ sub_folder_done (struct _zsubscribe_msg *m) gtk_tree_model_get(model, &iter, 0, &subscribed, 2, &node, -1); if (node == m->node) gtk_tree_store_set((GtkTreeStore *)model, &iter, 0, issub, -1); - else + else { d(printf("node mismatch, or subscribe state changed failed\n")); + } } /* queue any further ones, or if out, update the ui */ diff --git a/mail/em-vfolder-rule.c b/mail/em-vfolder-rule.c index a777faaefe..bddb08f75e 100644 --- a/mail/em-vfolder-rule.c +++ b/mail/em-vfolder-rule.c @@ -260,7 +260,7 @@ xml_encode(FilterRule *fr) node = FILTER_RULE_CLASS(parent_class)->xml_encode(fr); g_return_val_if_fail (node != NULL, NULL); - g_return_val_if_fail (vr->with >= 0 && vr->with < sizeof(with_names)/sizeof(with_names[0]), NULL); + g_return_val_if_fail (vr->with < sizeof(with_names)/sizeof(with_names[0]), NULL); set = xmlNewNode(NULL, (const unsigned char *)"sources"); xmlAddChild(node, set); @@ -383,7 +383,7 @@ static void source_add(GtkWidget *widget, struct _source_data *data); static void source_remove(GtkWidget *widget, struct _source_data *data); static struct { - char *name; + const gchar *name; GCallback func; } edit_buttons[] = { { "source_add", G_CALLBACK(source_add) }, @@ -430,7 +430,7 @@ select_source_with_changed(GtkWidget *widget, struct _source_data *data) break; } - if ( with < EM_VFOLDER_RULE_WITH_SPECIFIC || with > EM_VFOLDER_RULE_WITH_LOCAL ) + if (with > EM_VFOLDER_RULE_WITH_LOCAL ) with = 0; gtk_widget_set_sensitive (data->source_selector, !with ); diff --git a/mail/importers/Makefile.am b/mail/importers/Makefile.am index 25b5648949..9029d705a0 100644 --- a/mail/importers/Makefile.am +++ b/mail/importers/Makefile.am @@ -8,8 +8,6 @@ INCLUDES = -I.. \ -I$(srcdir)/.. \ -I$(top_srcdir) \ -DG_LOG_DOMAIN=\"evolution-mail-importer\" \ - -I$(top_srcdir)/addressbook/backend \ - -I$(top_builddir)/addressbook/backend \ -DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \ $(IMPORTERS_CFLAGS) diff --git a/mail/importers/mail-importer.h b/mail/importers/mail-importer.h index 4144deba98..c01c3ab51f 100644 --- a/mail/importers/mail-importer.h +++ b/mail/importers/mail-importer.h @@ -85,7 +85,7 @@ int mail_importer_import_mbox(const char *path, const char *folderuri, struct _C void mail_importer_import_mbox_sync(const char *path, const char *folderuri, struct _CamelOperation *cancel); struct _MailImporterSpecial { - char *orig, *new; + const gchar *orig, *new; }; typedef struct _MailImporterSpecial MailImporterSpecial; diff --git a/mail/mail-component.c b/mail/mail-component.c index 7d7547cb53..2fd85ec5a5 100644 --- a/mail/mail-component.c +++ b/mail/mail-component.c @@ -104,6 +104,8 @@ static void view_changed_timeout_remove (EComponentView *component_view); #define MAIL_COMPONENT_DEFAULT(mc) if (mc == NULL) mc = mail_component_peek(); +extern int camel_application_is_exiting; + #define PARENT_TYPE evolution_component_get_type () static BonoboObjectClass *parent_class = NULL; const char *x_mailer = "Evolution " VERSION SUB_VERSION " " VERSION_COMMENT; @@ -158,7 +160,7 @@ struct _MailComponentPrivate { /* indexed by _mail_component_folder_t */ static struct { - char *name; + const gchar *name; char *uri; CamelFolder *folder; } mc_default_folders[] = { @@ -863,7 +865,6 @@ impl_quit(PortableServer_Servant servant, CORBA_Environment *ev) mail_config_prune_proxies (); switch (mc->priv->quit_state) { case MC_QUIT_START: { - extern int camel_application_is_exiting; int now = time(NULL)/60/60/24, days; gboolean empty_junk; @@ -925,20 +926,20 @@ impl__get_userCreatableItems (PortableServer_Servant servant, CORBA_Environment CORBA_sequence_set_release (list, FALSE); - list->_buffer[0].id = "message"; + list->_buffer[0].id = (char *) "message"; list->_buffer[0].description = _("New Mail Message"); list->_buffer[0].menuDescription = (char *) C_("New", "_Mail Message"); list->_buffer[0].tooltip = _("Compose a new mail message"); list->_buffer[0].menuShortcut = 'm'; - list->_buffer[0].iconName = "mail-message-new"; + list->_buffer[0].iconName = (char *) "mail-message-new"; list->_buffer[0].type = GNOME_Evolution_CREATABLE_OBJECT; - list->_buffer[1].id = "folder"; + list->_buffer[1].id = (char *) "folder"; list->_buffer[1].description = _("New Mail Folder"); list->_buffer[1].menuDescription = (char *) C_("New", "Mail _Folder"); list->_buffer[1].tooltip = _("Create a new mail folder"); list->_buffer[1].menuShortcut = '\0'; - list->_buffer[1].iconName = "folder-new"; + list->_buffer[1].iconName = (char *) "folder-new"; list->_buffer[1].type = GNOME_Evolution_CREATABLE_FOLDER; return list; @@ -1102,7 +1103,6 @@ mc_sync_store_done (CamelStore *store, void *data) static void mc_sync_store (gpointer key, gpointer value, gpointer user_data) { - extern int camel_application_is_exiting; MailComponent *mc = (MailComponent *) user_data; mc->priv->mail_sync_in_progress++; @@ -1116,7 +1116,6 @@ mc_sync_store (gpointer key, gpointer value, gpointer user_data) static gboolean call_mail_sync (gpointer user_data) { - extern int camel_application_is_exiting; MailComponent *mc = (MailComponent *)user_data; if (camel_application_is_exiting) diff --git a/mail/mail-config.c b/mail/mail-config.c index 5fa562e399..62f6ba6eb3 100644 --- a/mail/mail-config.c +++ b/mail/mail-config.c @@ -105,10 +105,11 @@ typedef struct { gboolean scripts_disabled; } MailConfig; +extern int camel_header_param_encode_filenames_in_rfc_2047; + static MailConfig *config = NULL; static guint config_write_timeout = 0; - void mail_config_save_accounts (void) { @@ -251,8 +252,6 @@ static void gconf_outlook_filenames_changed (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer user_data) { - extern int camel_header_param_encode_filenames_in_rfc_2047; - g_return_if_fail (client != NULL); /* pass option to the camel */ @@ -992,12 +991,13 @@ mail_config_uri_renamed (GCompareFunc uri_cmp, const char *old, const char *new) EIterator *iter; int i, work = 0; char *oldname, *newname; - char *cachenames[] = { "config/hidestate-", - "config/et-expanded-", - "config/et-header-", - "*views/current_view-", - "*views/custom_view-", - NULL }; + const gchar *cachenames[] = { + "config/hidestate-", + "config/et-expanded-", + "config/et-header-", + "*views/current_view-", + "*views/custom_view-", + NULL }; iter = e_list_get_iterator ((EList *) config->accounts); while (e_iterator_is_valid (iter)) { diff --git a/mail/mail-ops.c b/mail/mail-ops.c index 24628a5f91..d2183dd7e3 100644 --- a/mail/mail-ops.c +++ b/mail/mail-ops.c @@ -97,7 +97,7 @@ struct _fetch_mail_msg { char *source_uri; - void (*done)(char *source, void *data); + void (*done)(const char *source, void *data); void *data; }; @@ -400,7 +400,7 @@ void mail_fetch_mail (const char *source, int keep, const char *type, CamelOperation *cancel, CamelFilterGetFolderFunc get_folder, void *get_data, CamelFilterStatusFunc *status, void *status_data, - void (*done)(char *source, void *data), void *data) + void (*done)(const char *source, void *data), void *data) { struct _fetch_mail_msg *m; struct _filter_mail_msg *fm; @@ -429,13 +429,13 @@ mail_fetch_mail (const char *source, int keep, const char *type, CamelOperation /* sending stuff */ /* ** SEND MAIL *********************************************************** */ -static char *normal_recipients[] = { +static const gchar *normal_recipients[] = { CAMEL_RECIPIENT_TYPE_TO, CAMEL_RECIPIENT_TYPE_CC, CAMEL_RECIPIENT_TYPE_BCC }; -static char *resent_recipients[] = { +static const gchar *resent_recipients[] = { CAMEL_RECIPIENT_TYPE_RESENT_TO, CAMEL_RECIPIENT_TYPE_RESENT_CC, CAMEL_RECIPIENT_TYPE_RESENT_BCC @@ -665,7 +665,7 @@ struct _send_queue_msg { CamelFilterStatusFunc *status; void *status_data; - void (*done)(char *destination, void *data); + void (*done)(const char *destination, void *data); void *data; }; @@ -832,7 +832,7 @@ mail_send_queue(CamelFolder *queue, const char *destination, const char *type, CamelOperation *cancel, CamelFilterGetFolderFunc get_folder, void *get_data, CamelFilterStatusFunc *status, void *status_data, - void (*done)(char *destination, void *data), void *data) + void (*done)(const char *destination, void *data), void *data) { struct _send_queue_msg *m; diff --git a/mail/mail-ops.h b/mail/mail-ops.h index 9ee3899242..df92df4e32 100644 --- a/mail/mail-ops.h +++ b/mail/mail-ops.h @@ -135,14 +135,14 @@ void mail_send_queue (CamelFolder *queue, const char *destination, const char *type, CamelOperation *cancel, CamelFilterGetFolderFunc get_folder, void *get_data, CamelFilterStatusFunc *status, void *status_data, - void (*done)(char *destination, void *data), + void (*done)(const char *destination, void *data), void *data); void mail_fetch_mail (const char *source, int keep, const char *type, CamelOperation *cancel, CamelFilterGetFolderFunc get_folder, void *get_data, CamelFilterStatusFunc *status, void *status_data, - void (*done)(char *source, void *data), + void (*done)(const char *source, void *data), void *data); void mail_filter_folder (CamelFolder *source_folder, GPtrArray *uids, diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index 0b81fca5ed..655f1dbf72 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -559,7 +559,7 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destinati info->state = SEND_ACTIVE; info->timeout_id = g_timeout_add (STATUS_TIMEOUT, operation_status_timeout, info); - g_hash_table_insert (data->active, SEND_URI_KEY, info); + g_hash_table_insert (data->active, (gpointer) SEND_URI_KEY, info); list = g_list_prepend (list, info); } else if (info->timeout_id == 0) info->timeout_id = g_timeout_add (STATUS_TIMEOUT, operation_status_timeout, info); @@ -673,7 +673,7 @@ receive_status (CamelFilterDriver *driver, enum camel_filter_status_t status, in /* when receive/send is complete */ static void -receive_done (char *uri, void *data) +receive_done (const gchar *uri, void *data) { struct _send_info *info = data; @@ -1204,7 +1204,7 @@ mail_send (void) d(printf("Adding new info %p\n", info)); - g_hash_table_insert (data->active, SEND_URI_KEY, info); + g_hash_table_insert (data->active, (gpointer) SEND_URI_KEY, info); /* todo, store the folder in info? */ outbox_folder = mail_component_get_folder(NULL, MAIL_COMPONENT_FOLDER_OUTBOX); diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c index 5ba3f17427..d6b20580b2 100644 --- a/mail/mail-vfolder.c +++ b/mail/mail-vfolder.c @@ -966,8 +966,9 @@ vfolder_load_storage(void) if (rule->name) { d(printf("rule added: %s\n", rule->name)); context_rule_added((RuleContext *)context, rule); - } else + } else { d(printf("invalid rule (%p) encountered: rule->name is NULL\n", rule)); + } } g_free(storeuri); diff --git a/mail/message-list.c b/mail/message-list.c index 1fc0a9a09a..f9a0e9259b 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -114,7 +114,7 @@ struct _MessageListPrivate { }; static struct { - char *target; + const gchar *target; GdkAtom atom; guint32 actions; } ml_drag_info[] = { @@ -131,15 +131,15 @@ enum { /* What we send */ static GtkTargetEntry ml_drag_types[] = { - { "x-uid-list", 0, DND_X_UID_LIST }, - { "text/uri-list", 0, DND_TEXT_URI_LIST }, + { (gchar *) "x-uid-list", 0, DND_X_UID_LIST }, + { (gchar *) "text/uri-list", 0, DND_TEXT_URI_LIST }, }; /* What we accept */ static GtkTargetEntry ml_drop_types[] = { - { "x-uid-list", 0, DND_X_UID_LIST }, - { "message/rfc822", 0, DND_MESSAGE_RFC822 }, - { "text/uri-list", 0, DND_TEXT_URI_LIST }, + { (gchar *) "x-uid-list", 0, DND_X_UID_LIST }, + { (gchar *) "message/rfc822", 0, DND_MESSAGE_RFC822 }, + { (gchar *) "text/uri-list", 0, DND_TEXT_URI_LIST }, }; /* @@ -214,8 +214,8 @@ enum { static guint message_list_signals [LAST_SIGNAL] = {0, }; static struct { - char *icon_name; - GdkPixbuf *pixbuf; + const gchar *icon_name; + GdkPixbuf *pixbuf; } states_pixmaps[] = { { "mail-unread", NULL }, { "mail-read", NULL }, @@ -1189,7 +1189,7 @@ sanitize_recipients (const gchar *string) char **name; if (!string || !*string) - return ""; + return (gchar *) ""; gstring = g_string_new (""); @@ -2102,10 +2102,10 @@ ml_drop_popup_cancel(EPopup *ep, EPopupItem *item, void *data) } static EPopupItem ml_drop_popup_menu[] = { - { E_POPUP_ITEM, "00.emc.02", N_("_Copy"), ml_drop_popup_copy, NULL, "folder-copy", 0 }, - { E_POPUP_ITEM, "00.emc.03", N_("_Move"), ml_drop_popup_move, NULL, "folder-move", 0 }, - { E_POPUP_BAR, "10.emc" }, - { E_POPUP_ITEM, "99.emc.00", N_("Cancel _Drag"), ml_drop_popup_cancel, NULL, NULL, 0 }, + { E_POPUP_ITEM, (gchar *) "00.emc.02", (gchar *) N_("_Copy"), ml_drop_popup_copy, NULL, (gchar *) "folder-copy", 0 }, + { E_POPUP_ITEM, (gchar *) "00.emc.03", (gchar *) N_("_Move"), ml_drop_popup_move, NULL, (gchar *) "folder-move", 0 }, + { E_POPUP_BAR, (gchar *) "10.emc" }, + { E_POPUP_ITEM, (gchar *) "99.emc.00", (gchar *) N_("Cancel _Drag"), ml_drop_popup_cancel, NULL, NULL, 0 }, }; static void @@ -3993,7 +3993,7 @@ regen_list_exec (struct _regen_list_msg *m) CamelMessageInfo *info; ETreePath cursor; int i; - char *expr = NULL; + gchar *expr = NULL; if (m->folder != m->ml->folder) return; @@ -4014,13 +4014,13 @@ regen_list_exec (struct _regen_list_msg *m) expr = alloca(strlen(m->search) + 92); sprintf(expr, "(and (match-all (and (not (system-flag \"deleted\")) (not (system-flag \"junk\"))))\n %s)", m->search); } else - expr = "(match-all (and (not (system-flag \"deleted\")) (not (system-flag \"junk\"))))"; + expr = (gchar *) "(match-all (and (not (system-flag \"deleted\")) (not (system-flag \"junk\"))))"; } else { if (m->search) { expr = alloca(strlen(m->search) + 64); sprintf(expr, "(and (match-all (not (system-flag \"deleted\")))\n %s)", m->search); } else - expr = "(match-all (not (system-flag \"deleted\")))"; + expr = (gchar *) "(match-all (not (system-flag \"deleted\")))"; } } else { if (m->hidejunk) { @@ -4028,7 +4028,7 @@ regen_list_exec (struct _regen_list_msg *m) expr = alloca(strlen(m->search) + 64); sprintf(expr, "(and (match-all (not (system-flag \"junk\")))\n %s)", m->search); } else - expr = "(match-all (not (system-flag \"junk\")))"; + expr = (gchar *) "(match-all (not (system-flag \"junk\")))"; } else { expr = m->search; } diff --git a/mail/message-tag-followup.c b/mail/message-tag-followup.c index 2ddd372257..46b6268cc3 100644 --- a/mail/message-tag-followup.c +++ b/mail/message-tag-followup.c @@ -51,7 +51,7 @@ static void set_tag_list (MessageTagEditor *editor, CamelTag *tags); #define DEFAULT_FLAG 2 /* Follow-Up */ -static char *available_flags[] = { +static const gchar *available_flags[] = { N_("Call"), N_("Do Not Forward"), N_("Follow-Up"), diff --git a/widgets/table/e-table-extras.c b/widgets/table/e-table-extras.c index c2b23f6c3f..107739e5bf 100644 --- a/widgets/table/e-table-extras.c +++ b/widgets/table/e-table-extras.c @@ -204,7 +204,7 @@ e_table_extras_add_cell (ETableExtras *extras, ECell * e_table_extras_get_cell (ETableExtras *extras, - char *id) + const gchar *id) { return g_hash_table_lookup(extras->cells, id); } diff --git a/widgets/table/e-table-extras.h b/widgets/table/e-table-extras.h index e096e516f4..a7efcd8225 100644 --- a/widgets/table/e-table-extras.h +++ b/widgets/table/e-table-extras.h @@ -57,7 +57,7 @@ void e_table_extras_add_cell (ETableExtras *extras, const gchar *id, ECell *cell); ECell *e_table_extras_get_cell (ETableExtras *extras, - char *id); + const gchar *id); void e_table_extras_add_compare (ETableExtras *extras, const gchar *id, |