diff options
Diffstat (limited to 'plugins')
40 files changed, 178 insertions, 152 deletions
diff --git a/plugins/audio-inline/audio-inline.c b/plugins/audio-inline/audio-inline.c index 67280e54c4..5fa9133d72 100644 --- a/plugins/audio-inline/audio-inline.c +++ b/plugins/audio-inline/audio-inline.c @@ -198,7 +198,7 @@ org_gnome_audio_inline_play_clicked (GtkWidget *button, EMFormatHTMLPObject *pob CamelDataWrapper *data; GError *error = NULL; int argc = 1; - char *argv [] = { "org_gnome_audio_inline", NULL }; + const gchar *argv [] = { "org_gnome_audio_inline", NULL }; /* FIXME this is ugly, we should stream this directly to gstreamer */ po->filename = e_mktemp ("org-gnome-audio-inline-file-XXXXXX"); diff --git a/plugins/backup-restore/backup.c b/plugins/backup-restore/backup.c index 7d3c208a28..7e7cc50461 100644 --- a/plugins/backup-restore/backup.c +++ b/plugins/backup-restore/backup.c @@ -373,7 +373,7 @@ main (int argc, char **argv) g_thread_init (NULL); gtk_init_with_args ( - &argc, &argv, NULL, options, GETTEXT_PACKAGE, &error); + &argc, &argv, NULL, options, (gchar *) GETTEXT_PACKAGE, &error); if (error != NULL) { g_printerr ("%s\n", error->message); g_error_free (error); @@ -401,8 +401,9 @@ main (int argc, char **argv) if (gui_arg && !check_op) { GtkWidget *widget, *container; - char *str = NULL, *txt; - const char *txt2; + const gchar *txt, *txt2; + gchar *str = NULL; + gchar *markup; gtk_window_set_default_icon_name ("evolution"); @@ -454,34 +455,34 @@ main (int argc, char **argv) txt2 = "Should not be here now, really..."; } - txt = g_strconcat ("<b><big>", txt, "</big></b>", NULL); + markup = g_strconcat ("<b><big>", txt, "</big></b>", NULL); widget = gtk_label_new (NULL); gtk_label_set_line_wrap (GTK_LABEL (widget), FALSE); - gtk_label_set_markup (GTK_LABEL (widget), txt); + gtk_label_set_markup (GTK_LABEL (widget), markup); gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.0); gtk_widget_show (widget); - g_free (txt); + g_free (markup); gtk_table_attach (GTK_TABLE (container), widget, 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0); - txt = g_strconcat (txt2, " ", _("This may take a while depending on the amount of data in your account."), NULL); + markup = g_strconcat (txt2, " ", _("This may take a while depending on the amount of data in your account."), NULL); widget = gtk_label_new (NULL); gtk_label_set_line_wrap (GTK_LABEL (widget), TRUE); - gtk_label_set_markup (GTK_LABEL (widget), txt); + gtk_label_set_markup (GTK_LABEL (widget), markup); gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5); gtk_widget_show (widget); - g_free (txt); + g_free (markup); gtk_table_attach (GTK_TABLE (container), widget, 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0); pbar = gtk_progress_bar_new (); if (str) { - txt = g_strconcat ("<i>", str, "</i>", NULL); + markup = g_strconcat ("<i>", str, "</i>", NULL); widget = gtk_label_new (NULL); - gtk_label_set_markup (GTK_LABEL (widget), txt); + gtk_label_set_markup (GTK_LABEL (widget), markup); gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5); - g_free (txt); + g_free (markup); g_free (str); gtk_table_attach (GTK_TABLE (container), widget, 1, 2, 2, 3, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0); gtk_table_set_row_spacing (GTK_TABLE (container), 2, 6); diff --git a/plugins/bbdb/bbdb.c b/plugins/bbdb/bbdb.c index c642dd9130..a2499dfa98 100644 --- a/plugins/bbdb/bbdb.c +++ b/plugins/bbdb/bbdb.c @@ -45,7 +45,6 @@ int e_plugin_lib_enable (EPluginLib *ep, int enable); void bbdb_handle_send (EPlugin *ep, EMEventTargetComposer *target); GtkWidget *bbdb_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data); -GtkWidget *bbdb_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data); /* For internal use */ struct bbdb_stuff { diff --git a/plugins/bbdb/gaimbuddies.c b/plugins/bbdb/gaimbuddies.c index 1a336bc7bb..d0b6b180dd 100644 --- a/plugins/bbdb/gaimbuddies.c +++ b/plugins/bbdb/gaimbuddies.c @@ -56,11 +56,7 @@ typedef struct { char *icon; } GaimBuddy; -/* Defined in bbdb.c */ -EBook *bbdb_open_addressbook (int type); - /* Forward declarations for this file. */ -void bbdb_sync_buddy_list (void); static gboolean bbdb_merge_buddy_to_contact (EBook *book, GaimBuddy *b, EContact *c); static GList *bbdb_get_gaim_buddy_list (void); static char *get_node_text (xmlNodePtr node); diff --git a/plugins/bogo-junk-plugin/bf-junk-filter.c b/plugins/bogo-junk-plugin/bf-junk-filter.c index 848e4f4fb5..8f520bdff9 100644 --- a/plugins/bogo-junk-plugin/bf-junk-filter.c +++ b/plugins/bogo-junk-plugin/bf-junk-filter.c @@ -77,7 +77,7 @@ void *em_junk_bf_validate_binary (EPlugin *ep, EMJunkHookTarget *target); void em_junk_bf_report_junk (EPlugin *ep, EMJunkHookTarget *target); void em_junk_bf_report_non_junk (EPlugin *ep, EMJunkHookTarget *target); void em_junk_bf_commit_reports (EPlugin *ep, EMJunkHookTarget *target); -static gint pipe_to_bogofilter (CamelMimeMessage *msg, gchar **argv, GError **error); +static gint pipe_to_bogofilter (CamelMimeMessage *msg, const gchar **argv, GError **error); /* eplugin stuff */ int e_plugin_lib_enable (EPluginLib *ep, int enable); @@ -93,7 +93,7 @@ init_db () CamelStream *stream = camel_stream_fs_new_with_name (WELCOME_MESSAGE, O_RDONLY, 0); CamelMimeParser *parser = camel_mime_parser_new (); CamelMimeMessage *msg = camel_mime_message_new (); - gchar *argv[] = { + const gchar *argv[] = { em_junk_bf_binary, "-n", NULL, @@ -113,13 +113,13 @@ init_db () argv[2] = "--unicode=yes"; } - pipe_to_bogofilter (msg, argv, NULL); + pipe_to_bogofilter (msg, argv, NULL); camel_object_unref (msg); } static gint -pipe_to_bogofilter (CamelMimeMessage *msg, gchar **argv, GError **error) +pipe_to_bogofilter (CamelMimeMessage *msg, const gchar **argv, GError **error) { GPid child_pid; gint bf_in; @@ -142,7 +142,7 @@ retry: } if (!g_spawn_async_with_pipes (NULL, - argv, + (gchar **) argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_STDOUT_TO_DEV_NULL, @@ -249,7 +249,7 @@ em_junk_bf_check_junk (EPlugin *ep, EMJunkHookTarget *target) CamelMimeMessage *msg = target->m; int rv; - gchar *argv[] = { + const gchar *argv[] = { em_junk_bf_binary, NULL, NULL @@ -273,7 +273,7 @@ em_junk_bf_report_junk (EPlugin *ep, EMJunkHookTarget *target) { CamelMimeMessage *msg = target->m; - gchar *argv[] = { + const gchar *argv[] = { em_junk_bf_binary, "-s", NULL, @@ -294,7 +294,7 @@ em_junk_bf_report_non_junk (EPlugin *ep, EMJunkHookTarget *target) { CamelMimeMessage *msg = target->m; - gchar *argv[] = { + const gchar *argv[] = { em_junk_bf_binary, "-n", NULL, @@ -318,7 +318,7 @@ em_junk_bf_commit_reports (EPlugin *ep, EMJunkHookTarget *target) void * em_junk_bf_validate_binary (EPlugin *ep, EMJunkHookTarget *target) { - return g_file_test (em_junk_bf_binary, G_FILE_TEST_EXISTS) ? "1" : NULL; + return g_file_test (em_junk_bf_binary, G_FILE_TEST_EXISTS) ? (void *) "1" : NULL; } int @@ -374,7 +374,7 @@ org_gnome_bogo_convert_unicode (struct _EPlugin *epl, struct _EConfigHookItemFac check = gtk_check_button_new_with_mnemonic (_("Convert message text to _Unicode")); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), em_junk_bf_unicode); - g_signal_connect (GTK_TOGGLE_BUTTON (check), "toggled", G_CALLBACK (convert_unicode_cb), "/apps/evolution/mail/junk/bogofilter/unicode"); + g_signal_connect (GTK_TOGGLE_BUTTON (check), "toggled", G_CALLBACK (convert_unicode_cb), (gpointer) "/apps/evolution/mail/junk/bogofilter/unicode"); gtk_table_attach((GtkTable *)data->parent, check, 0, 1, i, i+1, 0, 0, 0, 0); gtk_widget_show (check); return (GtkWidget *)check; diff --git a/plugins/email-custom-header/Makefile.am b/plugins/email-custom-header/Makefile.am index 19539907fa..6d3b6b8967 100644 --- a/plugins/email-custom-header/Makefile.am +++ b/plugins/email-custom-header/Makefile.am @@ -3,7 +3,6 @@ INCLUDES = -I. \ -I$(top_srcdir)/widgets \ -I$(top_srcdir)/widgets/misc \ -I$(top_builddir)/mail \ - -I$(top_srcdir)/camel \ -I$(top_builddir)/composer \ $(EVOLUTION_MAIL_CFLAGS) \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c index 85e275f2a0..abfd453197 100644 --- a/plugins/email-custom-header/email-custom-header.c +++ b/plugins/email-custom-header/email-custom-header.c @@ -331,9 +331,9 @@ epech_setup_widgets (CustomHeaderOptionsDialog *mch) gint header_section_id,sub_type_index,row,column,label_row; gint i; gchar *str; - static gchar *security_field = N_("Security:"); + static const gchar *security_field = N_("Security:"); static struct _security_values { - char *value, *str; + const gchar *value, *str; } security_values[] = { { "Personal", N_("Personal") } , { "Unclassified", N_("Unclassified") }, diff --git a/plugins/exchange-operations/exchange-account-setup.c b/plugins/exchange-operations/exchange-account-setup.c index ccfb6afb71..6785585af8 100644 --- a/plugins/exchange-operations/exchange-account-setup.c +++ b/plugins/exchange-operations/exchange-account-setup.c @@ -59,25 +59,25 @@ void org_gnome_exchange_commit (EPlugin *epl, EConfigHookItemFactoryData *data); GtkWidget* org_gnome_exchange_show_folder_size_factory (EPlugin *epl, EConfigHookItemFactoryData *data); CamelServiceAuthType camel_exchange_ntlm_authtype = { - /* i18n: "Secure Password Authentication" is an Outlookism */ - N_("Secure Password"), + /* i18n: "Secure Password Authentication" is an Outlookism */ + (gchar *) N_("Secure Password"), - /* i18n: "NTLM" probably doesn't translate */ - N_("This option will connect to the Exchange server using " - "secure password (NTLM) authentication."), + /* i18n: "NTLM" probably doesn't translate */ + (gchar *) N_("This option will connect to the Exchange server " + "using secure password (NTLM) authentication."), - "NTLM", - TRUE + (gchar *) "NTLM", + TRUE }; CamelServiceAuthType camel_exchange_password_authtype = { - N_("Plaintext Password"), + (gchar *) N_("Plaintext Password"), - N_("This option will connect to the Exchange server using " - "standard plaintext password authentication."), + (gchar *) N_("This option will connect to the Exchange server " + "using standard plaintext password authentication."), - "Basic", - TRUE + (gchar *) "Basic", + TRUE }; diff --git a/plugins/exchange-operations/exchange-config-listener.c b/plugins/exchange-operations/exchange-config-listener.c index 308e73daaf..19d5846aa7 100644 --- a/plugins/exchange-operations/exchange-config-listener.c +++ b/plugins/exchange-operations/exchange-config-listener.c @@ -89,7 +89,7 @@ static void account_changed (EAccountList *account_listener, EAccount *account); static void account_removed (EAccountList *account_listener, EAccount *account); -#if LDEAD +#ifdef LDEAD static void exchange_add_autocompletion_folders (GConfClient *gc_client, ExchangeAccount *account); #endif @@ -229,7 +229,7 @@ add_defaults_for_account (ExchangeConfigListener *config_listener, EAccount *eaccount; gboolean save = FALSE; -#if LDEAD +#ifdef LDEAD exchange_add_autocompletion_folders (config_listener->priv->gconf, account); #endif @@ -1230,7 +1230,7 @@ exchange_config_listener_modify_esource_group_name (ExchangeConfigListener *excl g_object_unref (a_source_list); } -#if LDEAD +#ifdef LDEAD /** * exchange_add_autocompletion_folders: * diff --git a/plugins/exchange-operations/exchange-delegates-user.c b/plugins/exchange-operations/exchange-delegates-user.c index 66a7e71014..635e82ade7 100644 --- a/plugins/exchange-operations/exchange-delegates-user.c +++ b/plugins/exchange-operations/exchange-delegates-user.c @@ -301,12 +301,13 @@ exchange_delegates_user_edit (ExchangeAccount *account, CamelMessageInfo *info; char *self_address, *delegate_mail_subject; char *role_name; - char *role_name_final = ""; + GString *role_name_final; const char *recipient_address; const char *delegate_exchange_dn; const char *msg_part1 = NULL, *msg_part2 = NULL; + role_name_final = g_string_new (""); self_address = g_strdup (exchange_account_get_email_id (account)); @@ -339,11 +340,13 @@ exchange_delegates_user_edit (ExchangeAccount *account, combobox = glade_xml_get_widget (xml, widget_names[i]); role = e_dialog_combo_box_get (combobox, exchange_perm_map); role_name = g_strdup (map_to_full_role_name(role)); - role_name_final = g_strconcat (role_name_final, "<tr><td>" , folder_names_for_display[i], - ":</td><td>", role_name, "</td> </tr>", NULL); + g_string_append_printf ( + role_name_final, + "<tr><td>%s:</td><td>%s</td></tr>", + folder_names_for_display[i], role_name); } - camel_stream_printf (stream, "%s</table>", role_name_final); + camel_stream_printf (stream, "%s</table>", role_name_final->str); if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check)) == TRUE) { /* To translators: This message is included if the delegatee has been given access @@ -360,7 +363,7 @@ exchange_delegates_user_edit (ExchangeAccount *account, "to see my private items.")); camel_data_wrapper_construct_from_stream (delegate_mail_text, stream); g_free (role_name); - g_free (role_name_final); + g_string_free (role_name_final, TRUE); camel_object_unref (stream); part = camel_mime_part_new (); diff --git a/plugins/exchange-operations/exchange-folder-permission.c b/plugins/exchange-operations/exchange-folder-permission.c index ad36853cf1..11d9b84f5e 100644 --- a/plugins/exchange-operations/exchange-folder-permission.c +++ b/plugins/exchange-operations/exchange-folder-permission.c @@ -59,7 +59,7 @@ void org_gnome_exchange_menu_cal_permissions (EPlugin *ep, ECalMenuTargetSelect gchar *selected_exchange_folder_uri = NULL; static EPopupItem popup_items[] = { - { E_POPUP_ITEM, "30.emc.10", N_("Permissions..."), org_folder_permissions_cb, NULL, "folder-new", 0, EM_POPUP_FOLDER_INFERIORS } + { E_POPUP_ITEM, (gchar *) "30.emc.10", (gchar *) N_("Permissions..."), org_folder_permissions_cb, NULL, (gchar *) "folder-new", 0, EM_POPUP_FOLDER_INFERIORS } }; static void diff --git a/plugins/exchange-operations/exchange-folder-subscription.c b/plugins/exchange-operations/exchange-folder-subscription.c index 05229c0838..ab63a5dd3e 100644 --- a/plugins/exchange-operations/exchange-folder-subscription.c +++ b/plugins/exchange-operations/exchange-folder-subscription.c @@ -94,10 +94,10 @@ setup_name_selector (GladeXML *glade_xml, ENameSelector **name_selector_ret) } static void -setup_folder_name_combo (GladeXML *glade_xml, gchar *fname) +setup_folder_name_combo (GladeXML *glade_xml, const gchar *fname) { GtkComboBox *combo; - char *strings[] = { + const gchar *strings[] = { "Calendar", "Inbox", "Contacts", @@ -286,7 +286,7 @@ subscribe_to_folder (GtkWidget *dialog, gint response, gpointer data) } gboolean -create_folder_subscription_dialog (ExchangeAccount *account, gchar *fname) +create_folder_subscription_dialog (ExchangeAccount *account, const gchar *fname) { ENameSelector *name_selector; GladeXML *glade_xml; diff --git a/plugins/exchange-operations/exchange-folder-subscription.h b/plugins/exchange-operations/exchange-folder-subscription.h index 26b4bc3642..f4a329c19a 100644 --- a/plugins/exchange-operations/exchange-folder-subscription.h +++ b/plugins/exchange-operations/exchange-folder-subscription.h @@ -22,6 +22,6 @@ #define __EXCHANGE_FOLDER_SUBSCRIPTION_H__ gboolean -create_folder_subscription_dialog (ExchangeAccount *account, gchar *fname); +create_folder_subscription_dialog (ExchangeAccount *account, const gchar *fname); #endif diff --git a/plugins/exchange-operations/exchange-folder.c b/plugins/exchange-operations/exchange-folder.c index b2b53d1bb3..1c2334e2dc 100644 --- a/plugins/exchange-operations/exchange-folder.c +++ b/plugins/exchange-operations/exchange-folder.c @@ -44,7 +44,7 @@ #include "addressbook/gui/widgets/eab-popup.h" #include "exchange-folder-subscription.h" -void org_gnome_exchange_folder_subscription (EPlugin *ep, EMMenuTargetSelect *target, gchar *fname); +void org_gnome_exchange_folder_subscription (EPlugin *ep, EMMenuTargetSelect *target, const gchar *fname); void org_gnome_exchange_inbox_subscription (EPlugin *ep, EMMenuTargetSelect *target); void org_gnome_exchange_addressbook_subscription (EPlugin *ep, EMMenuTargetSelect *target); void org_gnome_exchange_calendar_subscription (EPlugin *ep, EMMenuTargetSelect *target); @@ -64,7 +64,7 @@ static void exchange_get_folder (char *uri, CamelFolder *folder, void *data); static EPopupItem popup_inbox_items[] = { - { E_POPUP_ITEM, "29.inbox_unsubscribe", N_("Unsubscribe Folder..."), org_gnome_exchange_folder_inbox_unsubscribe, NULL, "folder-new", 0, EM_POPUP_FOLDER_INFERIORS } + { E_POPUP_ITEM, (gchar *) "29.inbox_unsubscribe", (gchar *) N_("Unsubscribe Folder..."), org_gnome_exchange_folder_inbox_unsubscribe, NULL, (gchar *) "folder-new", 0, EM_POPUP_FOLDER_INFERIORS } }; void @@ -233,7 +233,7 @@ org_gnome_exchange_check_inbox_subscribed (EPlugin *ep, EMPopupTargetFolder *tar } static EPopupItem popup_items[] = { - { E_POPUP_ITEM, "29.calendar_unsubscribe", N_("Unsubscribe Folder..."), org_gnome_exchange_folder_unsubscribe, NULL, "folder-new", 0, EM_POPUP_FOLDER_INFERIORS } + { E_POPUP_ITEM, (gchar *) "29.calendar_unsubscribe", (gchar *) N_("Unsubscribe Folder..."), org_gnome_exchange_folder_unsubscribe, NULL, (gchar *) "folder-new", 0, EM_POPUP_FOLDER_INFERIORS } }; void @@ -243,7 +243,7 @@ popup_free (EPopup *ep, GSList *items, void *data) } static EPopupItem popup_ab_items[] = { - { E_POPUP_ITEM, "29.address_book_unsubscribe", N_("Unsubscribe Folder..."), org_gnome_exchange_folder_ab_unsubscribe, NULL, "folder-new", 0, EM_POPUP_FOLDER_INFERIORS } + { E_POPUP_ITEM, (gchar *) "29.address_book_unsubscribe", (gchar *) N_("Unsubscribe Folder..."), org_gnome_exchange_folder_ab_unsubscribe, NULL, (gchar *) "folder-new", 0, EM_POPUP_FOLDER_INFERIORS } }; void @@ -541,7 +541,7 @@ org_gnome_exchange_folder_unsubscribe (EPopup *ep, EPopupItem *p, void *data) void -org_gnome_exchange_folder_subscription (EPlugin *ep, EMMenuTargetSelect *target, gchar *fname) +org_gnome_exchange_folder_subscription (EPlugin *ep, EMMenuTargetSelect *target, const gchar *fname) { ExchangeAccount *account = NULL; gint mode; @@ -573,24 +573,27 @@ org_gnome_exchange_folder_subscription (EPlugin *ep, EMMenuTargetSelect *target, void org_gnome_exchange_calendar_subscription (EPlugin *ep, EMMenuTargetSelect *target) { - gchar *folder_name = N_("Calendar"); + const gchar *folder_name = N_("Calendar"); org_gnome_exchange_folder_subscription (ep, target, folder_name); } + void org_gnome_exchange_addressbook_subscription (EPlugin *ep, EMMenuTargetSelect *target) { - gchar *folder_name = N_("Contacts"); + const gchar *folder_name = N_("Contacts"); org_gnome_exchange_folder_subscription (ep, target, folder_name); } + void org_gnome_exchange_tasks_subscription (EPlugin *ep, EMMenuTargetSelect *target) { - gchar *folder_name = N_("Tasks"); + const gchar *folder_name = N_("Tasks"); org_gnome_exchange_folder_subscription (ep, target, folder_name); } + void org_gnome_exchange_inbox_subscription (EPlugin *ep, EMMenuTargetSelect *target) { - gchar *folder_name = N_("Inbox"); + const gchar *folder_name = N_("Inbox"); org_gnome_exchange_folder_subscription (ep, target, folder_name); } diff --git a/plugins/exchange-operations/exchange-operations.c b/plugins/exchange-operations/exchange-operations.c index 94240c051a..a42e867446 100644 --- a/plugins/exchange-operations/exchange-operations.c +++ b/plugins/exchange-operations/exchange-operations.c @@ -30,24 +30,26 @@ ExchangeConfigListener *exchange_global_config_listener=NULL; -static char *error_ids[] = { "config-error", - "password-weak-error", - "password-change-error", - "password-change-success", - "account-offline", - "password-incorrect", - "account-domain-error", - "account-mailbox-na", - "account-version-error", - "account-wss-error", - "account-no-mailbox", - "account-resolve-error", - "account-connect-error", - "password-expired", - "account-unknown-error", - "account-quota-error", - "account-quota-send-error", - "account-quota-warn" }; +static const gchar *error_ids[] = { + "config-error", + "password-weak-error", + "password-change-error", + "password-change-success", + "account-offline", + "password-incorrect", + "account-domain-error", + "account-mailbox-na", + "account-version-error", + "account-wss-error", + "account-no-mailbox", + "account-resolve-error", + "account-connect-error", + "password-expired", + "account-unknown-error", + "account-quota-error", + "account-quota-send-error", + "account-quota-warn" +}; static void free_exchange_listener (void) diff --git a/plugins/face/Makefile.am b/plugins/face/Makefile.am index 2b6bfdb7be..59cf66e93e 100644 --- a/plugins/face/Makefile.am +++ b/plugins/face/Makefile.am @@ -3,7 +3,6 @@ INCLUDES = -I. \ -I$(top_srcdir)/widgets \ -I$(top_srcdir)/widgets/misc \ -I$(top_builddir)/mail \ - -I$(top_srcdir)/camel \ -I$(top_builddir)/composer \ $(EVOLUTION_MAIL_CFLAGS) \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ diff --git a/plugins/groupwise-account-setup/camel-gw-listener.c b/plugins/groupwise-account-setup/camel-gw-listener.c index 0cee4317a7..fd9091c5c2 100644 --- a/plugins/groupwise-account-setup/camel-gw-listener.c +++ b/plugins/groupwise-account-setup/camel-gw-listener.c @@ -176,7 +176,7 @@ add_esource (const char *conf_key, GwAccountInfo *info, const char *source_name ESource *source; GConfClient* client; GSList *ids, *temp ; - char *source_selection_key; + const gchar *source_selection_key; char *relative_uri; const char *soap_port; const char * use_ssl; @@ -274,7 +274,7 @@ remove_esource (const char *conf_key, const char *group_name, char* source_name, GConfClient* client; GSList *ids; GSList *node_tobe_deleted; - char *source_selection_key; + const gchar *source_selection_key; client = gconf_client_get_default(); list = e_source_list_new_for_gconf (client, conf_key); diff --git a/plugins/groupwise-features/Makefile.am b/plugins/groupwise-features/Makefile.am index 3b0a83021d..c72cc89850 100644 --- a/plugins/groupwise-features/Makefile.am +++ b/plugins/groupwise-features/Makefile.am @@ -6,7 +6,6 @@ INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -I$(top_srcdir)/widgets/misc \ - -I$(top_srcdir)/camel \ -I$(top_builddir)/composer \ -I$(top_builddir)/mail \ $(EVOLUTION_MAIL_CFLAGS) \ diff --git a/plugins/groupwise-features/junk-mail-settings.c b/plugins/groupwise-features/junk-mail-settings.c index 4cee3919f4..cdfffa5e7a 100644 --- a/plugins/groupwise-features/junk-mail-settings.c +++ b/plugins/groupwise-features/junk-mail-settings.c @@ -114,7 +114,7 @@ junk_mail_settings (EPopup *ep, EPopupItem *item, void *data) } static EPopupItem popup_items[] = { -{ E_POPUP_ITEM, "50.emfv.05", N_("Junk Mail Settings..."), junk_mail_settings, NULL, NULL, 0, EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY} + { E_POPUP_ITEM, (gchar *) "50.emfv.05", (gchar *) N_("Junk Mail Settings..."), junk_mail_settings, NULL, NULL, 0, EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY} }; static void diff --git a/plugins/groupwise-features/junk-settings.c b/plugins/groupwise-features/junk-settings.c index bff2abc35a..65eca141c6 100644 --- a/plugins/groupwise-features/junk-settings.c +++ b/plugins/groupwise-features/junk-settings.c @@ -48,7 +48,6 @@ static void free_all(JunkSettings *js); static void get_junk_list (JunkSettings *js); static void disable_clicked (GtkRadioButton *button, JunkSettings *js); static void enable_clicked (GtkRadioButton *button, JunkSettings *js); -GType junk_settings_get_type (void); static GtkVBoxClass *parent_class = NULL; @@ -243,24 +242,32 @@ commit_changes (JunkSettings *js) if (E_IS_GW_CONNECTION (js->cnc)) { if(js->flag_for_ok == 2 && js->enabled){ /* just turn off the bits*/ use_junk = use_pab = use_block = persistence = 0; - if (e_gw_connection_modify_junk_settings (js->cnc, use_junk, use_pab, use_block, persistence) == E_GW_CONNECTION_STATUS_OK); + if (e_gw_connection_modify_junk_settings (js->cnc, use_junk, use_pab, use_block, persistence) == E_GW_CONNECTION_STATUS_OK) { + ; + } } if (js->flag_for_ok == 0 && !js->enabled) { use_block = use_pab =0; use_junk = 1; persistence = 14; /* We are setting the default persistence*/ - if (e_gw_connection_modify_junk_settings (js->cnc, use_junk, use_pab, use_block, persistence) == E_GW_CONNECTION_STATUS_OK); + if (e_gw_connection_modify_junk_settings (js->cnc, use_junk, use_pab, use_block, persistence) == E_GW_CONNECTION_STATUS_OK) { + ; + } } while (new_list) { entry = new_list->data; - if (e_gw_connection_create_junk_entry (js->cnc, entry->match, "email", "junk") == E_GW_CONNECTION_STATUS_OK); + if (e_gw_connection_create_junk_entry (js->cnc, entry->match, "email", "junk") == E_GW_CONNECTION_STATUS_OK) { + ; + } new_list = new_list->next; } while (remove_list) { entry = remove_list->data; - if (e_gw_connection_remove_junk_entry (js->cnc, entry->id) == E_GW_CONNECTION_STATUS_OK); + if (e_gw_connection_remove_junk_entry (js->cnc, entry->id) == E_GW_CONNECTION_STATUS_OK) { + ; + } remove_list = remove_list->next; } diff --git a/plugins/groupwise-features/mail-retract.c b/plugins/groupwise-features/mail-retract.c index 928a780124..6396685cce 100644 --- a/plugins/groupwise-features/mail-retract.c +++ b/plugins/groupwise-features/mail-retract.c @@ -83,8 +83,8 @@ static void retract_mail_settings (EPopup *ep, EPopupItem *item, void *data) } static EPopupItem popup_items[] = { -{ E_POPUP_BAR, "20.emfv.03" }, -{ E_POPUP_ITEM, "20.emfv.04", N_("Retract Mail"), retract_mail_settings, NULL, NULL, 0, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY} + { E_POPUP_BAR, (gchar *) "20.emfv.03" }, + { E_POPUP_ITEM, (gchar *) "20.emfv.04", (gchar *) N_("Retract Mail"), retract_mail_settings, NULL, NULL, 0, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY} }; static void popup_free (EPopup *ep, GSList *items, void *data) diff --git a/plugins/groupwise-features/process-meeting.c b/plugins/groupwise-features/process-meeting.c index bc046c0a05..35057bfad2 100644 --- a/plugins/groupwise-features/process-meeting.c +++ b/plugins/groupwise-features/process-meeting.c @@ -50,9 +50,9 @@ static void on_decline_meeting (EPopup *ep, EPopupItem *pitem, void *data); static void on_resend_meeting (EPopup *ep, EPopupItem *pitem, void *data); static EPopupItem popup_items[] = { -{ E_POPUP_ITEM, "41.accept", N_("Accept"), on_accept_meeting, NULL, GTK_STOCK_APPLY, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_MEETING | E_CAL_POPUP_SELECT_ACCEPTABLE}, -{ E_POPUP_ITEM, "42.accept", N_("Accept Tentatively"), on_accept_meeting_tentative, NULL, GTK_STOCK_DIALOG_QUESTION, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_MEETING | E_CAL_POPUP_SELECT_ACCEPTABLE}, -{ E_POPUP_ITEM, "43.decline", N_("Decline"), on_decline_meeting, NULL, GTK_STOCK_CANCEL, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_MEETING} + { E_POPUP_ITEM, (gchar *) "41.accept", (gchar *) N_("Accept"), on_accept_meeting, NULL, (gchar *) GTK_STOCK_APPLY, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_MEETING | E_CAL_POPUP_SELECT_ACCEPTABLE}, + { E_POPUP_ITEM, (gchar *) "42.accept", (gchar *) N_("Accept Tentatively"), on_accept_meeting_tentative, NULL, (gchar *) GTK_STOCK_DIALOG_QUESTION, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_MEETING | E_CAL_POPUP_SELECT_ACCEPTABLE}, + { E_POPUP_ITEM, (gchar *) "43.decline", (gchar *) N_("Decline"), on_decline_meeting, NULL, (gchar *) GTK_STOCK_CANCEL, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_MEETING} }; static void @@ -319,7 +319,7 @@ typedef struct { } ThreadData; static EPopupItem retract_popup_items[] = { -{ E_POPUP_ITEM, "49.resend", N_("Rese_nd Meeting..."), on_resend_meeting, NULL, GTK_STOCK_EDIT, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_MEETING} + { E_POPUP_ITEM, (gchar *) "49.resend", (gchar *) N_("Rese_nd Meeting..."), on_resend_meeting, NULL, (gchar *) GTK_STOCK_EDIT, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_MEETING} }; void diff --git a/plugins/groupwise-features/proxy-login.c b/plugins/groupwise-features/proxy-login.c index 9811c6fd6d..e7e39ba3d5 100644 --- a/plugins/groupwise-features/proxy-login.c +++ b/plugins/groupwise-features/proxy-login.c @@ -177,7 +177,8 @@ proxy_login_new (void) static int proxy_get_password (EAccount *account, char **user_name, char **password) { - char *uri, *failed_auth, *key, *prompt; + const gchar *failed_auth; + char *uri, *key, *prompt; CamelURL *url; const char *poa_address, *use_ssl = NULL, *soap_port; @@ -221,7 +222,8 @@ proxy_login_get_cnc (EAccount *account, GtkWindow *password_dlg_parrent) { EGwConnection *cnc; CamelURL *url; - char *uri = NULL, *failed_auth = NULL, *key = NULL, *prompt = NULL, *password = NULL; + const gchar *failed_auth; + char *uri = NULL, *key = NULL, *prompt = NULL, *password = NULL; const char *use_ssl = NULL, *soap_port; gboolean remember; @@ -507,7 +509,7 @@ static EPopupItem popup_items[] = { /* To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise * feature by which one person can send/read mails/appointments using another person's identity * without knowing his password, for example if that other person is on vacation */ -{ E_POPUP_ITEM, "20.emc.04", N_("_Proxy Login..."), org_gnome_proxy_account_login, NULL, NULL, 0, EM_POPUP_FOLDER_STORE } + { E_POPUP_ITEM, (gchar *) "20.emc.04", (gchar *) N_("_Proxy Login..."), org_gnome_proxy_account_login, NULL, NULL, 0, EM_POPUP_FOLDER_STORE } }; static void diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c index 60be390eb3..f9588802df 100644 --- a/plugins/groupwise-features/proxy.c +++ b/plugins/groupwise-features/proxy.c @@ -459,7 +459,8 @@ static EGwConnection * proxy_get_cnc (EAccount *account, GtkWindow *parent_window) { EGwConnection *cnc; - char *uri, *failed_auth, *key, *prompt, *password = NULL; + const gchar *failed_auth; + char *uri, *key, *prompt, *password = NULL; CamelURL *url; const char *poa_address, *use_ssl, *soap_port; gboolean remember; diff --git a/plugins/groupwise-features/proxy.h b/plugins/groupwise-features/proxy.h index 8c8d30368c..127b4cfaa0 100644 --- a/plugins/groupwise-features/proxy.h +++ b/plugins/groupwise-features/proxy.h @@ -52,7 +52,6 @@ struct _proxyDialogClass { GType proxy_dialog_get_type (void); proxyDialog *proxy_dialog_new (void); -void proxy_commit(GtkWidget *button, EConfigHookItemFactoryData *data); GtkWidget * org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data); static void proxy_add_account (GtkWidget *button, EAccount *account); static void proxy_remove_account (GtkWidget *button, EAccount *account); diff --git a/plugins/groupwise-features/send-options.c b/plugins/groupwise-features/send-options.c index ed8e6093a2..24dfb1b949 100644 --- a/plugins/groupwise-features/send-options.c +++ b/plugins/groupwise-features/send-options.c @@ -55,7 +55,8 @@ static EGwConnection * get_cnc (GtkWindow *parent_window) { EGwConnection *cnc; - char *uri, *failed_auth, *key, *prompt, *password = NULL; + const gchar *failed_auth; + char *uri, *key, *prompt, *password = NULL; CamelURL *url; const char *poa_address, *use_ssl, *soap_port; gboolean remember; @@ -393,7 +394,9 @@ get_source (ESourceList *list) } static void -add_return_value (EGwSendOptionsReturnNotify track, ESource *source, char *notify) +add_return_value (EGwSendOptionsReturnNotify track, + ESource *source, + const gchar *notify) { char *value; diff --git a/plugins/groupwise-features/share-folder-common.c b/plugins/groupwise-features/share-folder-common.c index 3a850b2a55..8f38f2a23d 100644 --- a/plugins/groupwise-features/share-folder-common.c +++ b/plugins/groupwise-features/share-folder-common.c @@ -337,7 +337,7 @@ new_folder_response (EMFolderSelector *emfs, int response, EMFolderTreeModel *mo } static EPopupItem popup_items[] = { -{ E_POPUP_ITEM, "20.emc.001", N_("New _Shared Folder..."), create_shared_folder, NULL, "folder-new", 0, EM_POPUP_FOLDER_INFERIORS } + { E_POPUP_ITEM, (gchar *) "20.emc.001", (gchar *) N_("New _Shared Folder..."), create_shared_folder, NULL, (gchar *) "folder-new", 0, EM_POPUP_FOLDER_INFERIORS } }; static void @@ -497,7 +497,7 @@ get_cnc (CamelStore *store) } gchar * -get_container_id(EGwConnection *cnc, gchar *fname) +get_container_id(EGwConnection *cnc, const gchar *fname) { GList *container_list = NULL; gchar *id = NULL; diff --git a/plugins/groupwise-features/share-folder.c b/plugins/groupwise-features/share-folder.c index 9b3062b1c3..a48cd10f2c 100644 --- a/plugins/groupwise-features/share-folder.c +++ b/plugins/groupwise-features/share-folder.c @@ -49,7 +49,6 @@ static void free_user_node(EShUsers *user); static void free_node(SharedUser *user); static void free_all(ShareFolder *sf); static SharedUser * find_node(GList *list, gchar *email); -static void free_all(ShareFolder *sf); static void get_container_list (ShareFolder *sf); static void user_selected(GtkTreeSelection *selection, ShareFolder *sf); static void not_shared_clicked (GtkRadioButton *button, ShareFolder *sf); @@ -58,7 +57,6 @@ static void add_clicked(GtkButton *button, ShareFolder *sf); static void remove_clicked(GtkButton *button, ShareFolder *sf); static void not_ok_clicked(GtkButton *button, ShareFolder *sf); static void not_cancel_clicked(GtkButton *button, GtkWidget *window); -static void not_cancel_clicked(GtkButton *button, GtkWidget *window); static void share_folder_construct (ShareFolder *sf); GType share_folder_get_type (void); @@ -453,18 +451,24 @@ share_folder (ShareFolder *sf) } else { if (new_list) { - if (e_gw_connection_share_folder (sf->cnc, sf->container_id, new_list, sf->sub, sf->mesg, 0) == E_GW_CONNECTION_STATUS_OK); + if (e_gw_connection_share_folder (sf->cnc, sf->container_id, new_list, sf->sub, sf->mesg, 0) == E_GW_CONNECTION_STATUS_OK) { + ; + } } if (update_list) { sf->sub = "Shared Folder rights updated"; - if (e_gw_connection_share_folder (sf->cnc, sf->container_id, update_list, sf->sub, sf->mesg, 2) == E_GW_CONNECTION_STATUS_OK); + if (e_gw_connection_share_folder (sf->cnc, sf->container_id, update_list, sf->sub, sf->mesg, 2) == E_GW_CONNECTION_STATUS_OK) { + ; + } } } if (remove_list) { sf->sub = "Shared Folder removed"; - if (e_gw_connection_share_folder (sf->cnc, sf->container_id, remove_list, sf->sub, sf->mesg, 1) == E_GW_CONNECTION_STATUS_OK); + if (e_gw_connection_share_folder (sf->cnc, sf->container_id, remove_list, sf->sub, sf->mesg, 1) == E_GW_CONNECTION_STATUS_OK) { + ; + } } } diff --git a/plugins/groupwise-features/share-folder.h b/plugins/groupwise-features/share-folder.h index 3acf595053..9801adce1b 100644 --- a/plugins/groupwise-features/share-folder.h +++ b/plugins/groupwise-features/share-folder.h @@ -93,7 +93,7 @@ struct _ShareFolder { gboolean is_shared; EGwConnection *cnc; gchar *container_id; - gchar *sub; + const gchar *sub; gchar *mesg; GList *container_list; GtkTreeIter iter; @@ -109,7 +109,7 @@ struct _ShareFolderClass { GType share_folderget_type (void); struct _ShareFolder * share_folder_new (EGwConnection *ccnc, gchar *id); void share_folder(struct _ShareFolder *sf); -gchar * get_container_id (EGwConnection *cnc, gchar *fname); +gchar * get_container_id (EGwConnection *cnc, const gchar *fname); EGwConnection * get_cnc (CamelStore *store); #ifdef __cplusplus diff --git a/plugins/groupwise-features/status-track.c b/plugins/groupwise-features/status-track.c index 65b66962c5..2b21b47616 100644 --- a/plugins/groupwise-features/status-track.c +++ b/plugins/groupwise-features/status-track.c @@ -238,7 +238,7 @@ track_status (EPopup *ep, EPopupItem *item, void *data) } static EPopupItem popup_items[] = { -{ E_POPUP_ITEM, "20.emfv.02", N_("Track Message Status..."), track_status, NULL, NULL, 0, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY} + { E_POPUP_ITEM, (gchar * ) "20.emfv.02", (gchar *) N_("Track Message Status..."), track_status, NULL, NULL, 0, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY} }; static void diff --git a/plugins/imap-features/Makefile.am b/plugins/imap-features/Makefile.am index 3b73e2741d..69b94ffbb1 100644 --- a/plugins/imap-features/Makefile.am +++ b/plugins/imap-features/Makefile.am @@ -5,7 +5,6 @@ endif INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/mail \ - -I$(top_srcdir)/libedataserver \ $(EVOLUTION_MAIL_CFLAGS) \ $(CAMEL_IMAP_CFLAGS) \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c index 04049ef6d5..25d02b4f5d 100644 --- a/plugins/itip-formatter/itip-formatter.c +++ b/plugins/itip-formatter/itip-formatter.c @@ -2585,8 +2585,9 @@ itip_formatter_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data) gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); gtk_box_pack_start (GTK_BOX (inner_vbox), label, FALSE, FALSE, 0); - if (!e_cal_get_sources (&source_list, E_CAL_SOURCE_TYPE_EVENT, NULL)) + if (!e_cal_get_sources (&source_list, E_CAL_SOURCE_TYPE_EVENT, NULL)) { /* FIXME Error handling */; + } scrolledwin = gtk_scrolled_window_new (NULL, NULL); diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c index 32fa3104cc..2d714b4a1e 100644 --- a/plugins/itip-formatter/itip-view.c +++ b/plugins/itip-formatter/itip-view.c @@ -780,7 +780,10 @@ button_clicked_cb (GtkWidget *widget, gpointer data) } static void -set_one_button (ItipView *view, char *label, char *stock_id, ItipViewResponse response) +set_one_button (ItipView *view, + const gchar *label, + const gchar *stock_id, + ItipViewResponse response) { ItipViewPrivate *priv; GtkWidget *button; diff --git a/plugins/mail-account-disable/mail-account-disable.c b/plugins/mail-account-disable/mail-account-disable.c index 886b66a66f..552bea5a6d 100644 --- a/plugins/mail-account-disable/mail-account-disable.c +++ b/plugins/mail-account-disable/mail-account-disable.c @@ -42,8 +42,8 @@ void mail_account_disable (EPopup *ep, EPopupItem *p, void *data); void org_gnome_create_mail_account_disable (EPlugin *ep, EMPopupTargetFolder *t); static EPopupItem popup_items[] = { - { E_POPUP_ITEM, "40.emc.04", N_("_Disable"), mail_account_disable, NULL, NULL, 0, EM_POPUP_FOLDER_STORE }, - { E_POPUP_ITEM, "40.emc.04", N_("Proxy _Logout"), mail_account_disable, NULL, NULL, 0, EM_POPUP_FOLDER_STORE } + { E_POPUP_ITEM, (gchar *) "40.emc.04", (gchar *) N_("_Disable"), mail_account_disable, NULL, NULL, 0, EM_POPUP_FOLDER_STORE }, + { E_POPUP_ITEM, (gchar *) "40.emc.04", (gchar *) N_("Proxy _Logout"), mail_account_disable, NULL, NULL, 0, EM_POPUP_FOLDER_STORE } }; static void diff --git a/plugins/mark-all-read/Makefile.am b/plugins/mark-all-read/Makefile.am index 352c2a0fab..724277826c 100644 --- a/plugins/mark-all-read/Makefile.am +++ b/plugins/mark-all-read/Makefile.am @@ -1,6 +1,5 @@ INCLUDES = \ -I$(top_srcdir)\ - -I$(top_srcdir)/camel \ $(EVOLUTION_MAIL_CFLAGS) @EVO_PLUGIN_RULE@ diff --git a/plugins/publish-calendar/url-editor-dialog.c b/plugins/publish-calendar/url-editor-dialog.c index ea03320ae8..de58a02b5e 100644 --- a/plugins/publish-calendar/url-editor-dialog.c +++ b/plugins/publish-calendar/url-editor-dialog.c @@ -42,7 +42,8 @@ create_uri (UrlEditorDialog *dialog) g_free (uri->location); uri->location = g_strdup (gtk_entry_get_text (GTK_ENTRY (dialog->server_entry))); } else { - char *method = "", *server, *file, *port, *username, *password; + const gchar *method; + char *server, *file, *port, *username, *password; server = g_strdup (gtk_entry_get_text (GTK_ENTRY (dialog->server_entry))); file = g_strdup (gtk_entry_get_text (GTK_ENTRY (dialog->file_entry))); diff --git a/plugins/sa-junk-plugin/em-junk-filter.c b/plugins/sa-junk-plugin/em-junk-filter.c index 39efa2f5ac..888ee40289 100644 --- a/plugins/sa-junk-plugin/em-junk-filter.c +++ b/plugins/sa-junk-plugin/em-junk-filter.c @@ -81,7 +81,7 @@ static gboolean em_junk_sa_checked_spamassassin_version = FALSE; static guint em_junk_sa_spamassassin_version = 0; static char *em_junk_sa_socket_path = NULL; static char *em_junk_sa_spamd_pidfile = NULL; -static char *em_junk_sa_spamc_binary = NULL; +static const gchar *em_junk_sa_spamc_binary = NULL; static GConfClient *em_junk_sa_gconf = NULL; /* volatile so not cached between threads */ @@ -89,8 +89,8 @@ static volatile gboolean em_junk_sa_local_only; static volatile gboolean em_junk_sa_use_daemon; static char * em_junk_sa_preferred_socket_path; -static char *em_junk_sa_spamc_binaries [4] = {"spamc", "/usr/bin/spamc", "/usr/sbin/spamc", NULL}; -static char *em_junk_sa_spamd_binaries [4] = {"spamd", "/usr/bin/spamd", "/usr/sbin/spamd", NULL}; +static const gchar *em_junk_sa_spamc_binaries [4] = {"spamc", "/usr/bin/spamc", "/usr/sbin/spamc", NULL}; +static const gchar *em_junk_sa_spamd_binaries [4] = {"spamd", "/usr/bin/spamd", "/usr/sbin/spamd", NULL}; #define SPAMD_RESTARTS_SIZE 8 static time_t em_junk_sa_spamd_restarts [SPAMD_RESTARTS_SIZE] = {0, 0, 0, 0, 0, 0, 0, 0}; @@ -104,7 +104,7 @@ char *em_junk_sa_spamc_gconf_binary = NULL; char *em_junk_sa_spamd_gconf_binary = NULL; static int -pipe_to_sa_full (CamelMimeMessage *msg, const char *in, char **argv, int rv_err, int wait_for_termination, GByteArray *output_buffer, GError **error) +pipe_to_sa_full (CamelMimeMessage *msg, const gchar *in, const gchar **argv, int rv_err, int wait_for_termination, GByteArray *output_buffer, GError **error) { int result, status, errnosav, fds[2], out_fds[2]; CamelStream *stream; @@ -169,7 +169,7 @@ pipe_to_sa_full (CamelMimeMessage *msg, const char *in, char **argv, int rv_err, for (fd = 3; fd < maxfd; fd++) fcntl (fd, F_SETFD, FD_CLOEXEC); - execvp (argv[0], argv); + execvp (argv[0], (gchar * const *) argv); _exit (rv_err & 0377); } else if (pid < 0) { errnosav = errno; @@ -254,7 +254,7 @@ pipe_to_sa_full (CamelMimeMessage *msg, const char *in, char **argv, int rv_err, } static int -pipe_to_sa (CamelMimeMessage *msg, const char *in, char **argv, GError **error) +pipe_to_sa (CamelMimeMessage *msg, const gchar *in, const gchar **argv, GError **error) { return pipe_to_sa_full (msg, in, argv, -1, 1, NULL, error); } @@ -269,9 +269,9 @@ em_junk_sa_get_socket_path () } static gboolean -em_junk_sa_test_spamd_running (char *binary, gboolean system) +em_junk_sa_test_spamd_running (const gchar *binary, gboolean system) { - char *argv[5]; + const gchar *argv[5]; int i = 0; gboolean rv; @@ -307,7 +307,7 @@ em_junk_sa_test_spamd_running (char *binary, gboolean system) static void em_junk_sa_test_allow_tell (void) { - char *argv [4] = { + const gchar *argv [4] = { "spamc", "-L", "forget", @@ -321,7 +321,7 @@ em_junk_sa_test_allow_tell (void) static void em_junk_sa_test_spamassassin (void) { - char *argv [3] = { + const gchar *argv [3] = { "spamassassin", "--version", NULL, @@ -338,9 +338,9 @@ em_junk_sa_test_spamassassin (void) #define MAX_SPAMD_PORTS 1 static gboolean -em_junk_sa_run_spamd (char *binary) +em_junk_sa_run_spamd (const gchar *binary) { - char *argv[8]; + const gchar *argv[8]; int i; gboolean rv = FALSE; @@ -431,7 +431,7 @@ em_junk_sa_find_spamc () static void em_junk_sa_test_spamd (void) { - char *argv[4]; + const gchar *argv[4]; int i, b; gboolean try_system_spamd = TRUE; @@ -577,7 +577,8 @@ gboolean em_junk_sa_check_junk(EPlugin *ep, EMJunkHookTarget *target) { GByteArray *out = NULL; - char *argv[7], *to_free = NULL; + const gchar *argv[7]; + char *to_free = NULL; int i = 0, socket_i; gboolean rv; CamelMimeMessage *msg = target->m; @@ -644,7 +645,7 @@ get_spamassassin_version () GByteArray *out = NULL; int i; - char * argv[3] = { + const gchar *argv[3] = { "sa-learn", "--version", NULL @@ -680,8 +681,10 @@ get_spamassassin_version () void em_junk_sa_report_junk (EPlugin *ep, EMJunkHookTarget *target) { - char *sync_op = ((get_spamassassin_version () >= 3) ? "--no-sync": "--no-rebuild"); - char *argv[6] = { + const gchar *sync_op = + (get_spamassassin_version () >= 3) + ? "--no-sync": "--no-rebuild"; + const gchar *argv[6] = { "sa-learn", sync_op, "--spam", @@ -690,7 +693,7 @@ em_junk_sa_report_junk (EPlugin *ep, EMJunkHookTarget *target) NULL }; /* Call setup for spamc */ - char *argv2[4] = { + const gchar *argv2[4] = { "spamc", "-L", "spam", @@ -718,8 +721,10 @@ em_junk_sa_report_junk (EPlugin *ep, EMJunkHookTarget *target) void em_junk_sa_report_non_junk (EPlugin *ep, EMJunkHookTarget *target) { - char *sync_op = ((get_spamassassin_version () >= 3) ? "--no-sync": "--no-rebuild"); - char *argv[6] = { + const char *sync_op = + (get_spamassassin_version () >= 3) + ? "--no-sync": "--no-rebuild"; + const gchar *argv[6] = { "sa-learn", sync_op, "--ham", @@ -728,7 +733,7 @@ em_junk_sa_report_non_junk (EPlugin *ep, EMJunkHookTarget *target) NULL }; /* Setup for spamc */ - char *argv2[4] = { + const gchar *argv2[4] = { "spamc", "-L", "ham", @@ -753,8 +758,9 @@ em_junk_sa_report_non_junk (EPlugin *ep, EMJunkHookTarget *target) void em_junk_sa_commit_reports (EPlugin *ep) { - char *sync_op = ((get_spamassassin_version () >= 3) ? "--sync": "--rebuild"); - char *argv[4] = { + const gchar *sync_op = + (get_spamassassin_version () >= 3) ? "--sync": "--rebuild"; + const gchar *argv[4] = { "sa-learn", sync_op, NULL, @@ -780,7 +786,7 @@ em_junk_sa_commit_reports (EPlugin *ep) void * em_junk_sa_validate_binary (EPlugin *ep) { - return em_junk_sa_is_available (NULL) ? "1" : NULL; + return em_junk_sa_is_available (NULL) ? (void *) "1" : NULL; } static void @@ -916,7 +922,7 @@ org_gnome_sa_use_remote_tests (struct _EPlugin *epl, struct _EConfigHookItemFact gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (label), FALSE, FALSE, 0); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), !em_junk_sa_local_only); - g_signal_connect (GTK_TOGGLE_BUTTON (check), "toggled", G_CALLBACK (use_remote_tests_cb), "/apps/evolution/mail/junk/sa/local_only"); + g_signal_connect (GTK_TOGGLE_BUTTON (check), "toggled", G_CALLBACK (use_remote_tests_cb), (gpointer) "/apps/evolution/mail/junk/sa/local_only"); gtk_table_attach((GtkTable *)data->parent, vbox, 0, 1, i, i+1, 0, 0, 0, 0); gtk_widget_show_all (vbox); return (GtkWidget *)vbox; diff --git a/plugins/save-calendar/csv-format.c b/plugins/save-calendar/csv-format.c index 2762dc5dfe..663ba12671 100644 --- a/plugins/save-calendar/csv-format.c +++ b/plugins/save-calendar/csv-format.c @@ -357,7 +357,7 @@ do_save_calendar_csv (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSource gint i=0; - static gchar *labels[] = { + static const gchar *labels[] = { N_("UID"), N_("Summary"), N_("Description List"), diff --git a/plugins/startup-wizard/startup-wizard.c b/plugins/startup-wizard/startup-wizard.c index 34d5961d4b..766f379c6c 100644 --- a/plugins/startup-wizard/startup-wizard.c +++ b/plugins/startup-wizard/startup-wizard.c @@ -38,7 +38,7 @@ void startup_wizard (EPlugin *ep, ESEventTargetUpgrade *target); GtkWidget *startup_wizard_importer_page (EPlugin *ep, EConfigHookItemFactoryData *hook_data); gboolean startup_wizard_check (EPlugin *ep, EConfigHookPageCheckData *check_data); void startup_wizard_commit (EPlugin *ep, EMConfigTargetAccount *target); -void startup_wizard_abort (EPlugin *ep, EMConfigTargetAccount *target); +void startup_wizard_abort (EPlugin *ep, EMConfigTargetAccount *target) G_GNUC_NORETURN; static EImport *import; static EImportTargetHome *import_target; diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c index 537b8822bc..02983f1f36 100644 --- a/plugins/templates/templates.c +++ b/plugins/templates/templates.c @@ -583,7 +583,7 @@ static GSList if (!g_str_has_suffix (folder->name, "Templates")) path = g_strdup_printf ("80.%s", folder->full_name); else - path = "80.Templates"; + path = g_strdup ("80.Templates"); /* If this uid is trashed, ignore it */ if (camel_folder_get_message_flags (folder, uid) & CAMEL_MESSAGE_DELETED) @@ -636,7 +636,7 @@ static GSList if (!g_str_has_suffix (folder->name, "Templates")) item->path = g_strdup_printf ("80.%s", folder->full_name); else - item->path = "80.Templates"; + item->path = g_strdup ("80.Templates"); list = g_slist_prepend (list, item); |