diff options
Diffstat (limited to 'mail')
150 files changed, 715 insertions, 605 deletions
diff --git a/mail/Makefile.am b/mail/Makefile.am index 3df61647f1..25441641dc 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)/em-format \ diff --git a/mail/e-attachment-handler-mail.c b/mail/e-attachment-handler-mail.c index df4c0a9e3e..c17c97d8ca 100644 --- a/mail/e-attachment-handler-mail.c +++ b/mail/e-attachment-handler-mail.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) @@ -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-attachment-handler-mail.h b/mail/e-attachment-handler-mail.h index da4ff23d89..c62ea99cab 100644 --- a/mail/e-attachment-handler-mail.h +++ b/mail/e-attachment-handler-mail.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/e-mail-attachment-bar.c b/mail/e-mail-attachment-bar.c index 731b52164a..fd53292610 100644 --- a/mail/e-mail-attachment-bar.c +++ b/mail/e-mail-attachment-bar.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/e-mail-attachment-bar.h b/mail/e-mail-attachment-bar.h index e32f6e2ede..38a4a86fae 100644 --- a/mail/e-mail-attachment-bar.h +++ b/mail/e-mail-attachment-bar.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/e-mail-browser.c b/mail/e-mail-browser.c index 152821b32a..e4013c5004 100644 --- a/mail/e-mail-browser.c +++ b/mail/e-mail-browser.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/e-mail-browser.h b/mail/e-mail-browser.h index b67ea9a797..2605b2e04c 100644 --- a/mail/e-mail-browser.h +++ b/mail/e-mail-browser.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/e-mail-display.c b/mail/e-mail-display.c index f649393f40..95073305af 100644 --- a/mail/e-mail-display.c +++ b/mail/e-mail-display.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/e-mail-display.h b/mail/e-mail-display.h index f1d5fc583f..815fd45f3e 100644 --- a/mail/e-mail-display.h +++ b/mail/e-mail-display.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/e-mail-label-dialog.c b/mail/e-mail-label-dialog.c index 23b5068737..bebe0e69fb 100644 --- a/mail/e-mail-label-dialog.c +++ b/mail/e-mail-label-dialog.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/e-mail-label-dialog.h b/mail/e-mail-label-dialog.h index 3a259f6f50..17430c3607 100644 --- a/mail/e-mail-label-dialog.h +++ b/mail/e-mail-label-dialog.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/e-mail-label-list-store.c b/mail/e-mail-label-list-store.c index 3892838aaf..1cbe927cb6 100644 --- a/mail/e-mail-label-list-store.c +++ b/mail/e-mail-label-list-store.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/e-mail-label-list-store.h b/mail/e-mail-label-list-store.h index 2469d210c0..a9093eaa08 100644 --- a/mail/e-mail-label-list-store.h +++ b/mail/e-mail-label-list-store.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/e-mail-label-manager.c b/mail/e-mail-label-manager.c index fc18da3e95..212a0507ad 100644 --- a/mail/e-mail-label-manager.c +++ b/mail/e-mail-label-manager.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/e-mail-label-manager.h b/mail/e-mail-label-manager.h index 0a36ee27c8..20d375efc0 100644 --- a/mail/e-mail-label-manager.h +++ b/mail/e-mail-label-manager.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/e-mail-label-tree-view.c b/mail/e-mail-label-tree-view.c index 5675329139..808d8d060a 100644 --- a/mail/e-mail-label-tree-view.c +++ b/mail/e-mail-label-tree-view.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/e-mail-label-tree-view.h b/mail/e-mail-label-tree-view.h index d29ad628a5..0dd58f2152 100644 --- a/mail/e-mail-label-tree-view.h +++ b/mail/e-mail-label-tree-view.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/e-mail-reader-utils.c b/mail/e-mail-reader-utils.c index 96fe1baad8..79144211c4 100644 --- a/mail/e-mail-reader-utils.c +++ b/mail/e-mail-reader-utils.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/e-mail-reader-utils.h b/mail/e-mail-reader-utils.h index 8ec2235629..46c3ea7345 100644 --- a/mail/e-mail-reader-utils.h +++ b/mail/e-mail-reader-utils.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c index 3969f4babd..1cf9ff983e 100644 --- a/mail/e-mail-reader.c +++ b/mail/e-mail-reader.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) @@ -1746,7 +1746,7 @@ mail_reader_message_loaded_cb (CamelFolder *folder, EM_FORMAT (html_display), folder, message_uid, message); /* Reset the shell view icon. */ - e_shell_event (shell, "mail-icon", "evolution-mail"); + e_shell_event (shell, "mail-icon", (gpointer) "evolution-mail"); /* Determine whether to mark the message as read. */ mark_read = e_shell_settings_get_boolean ( diff --git a/mail/e-mail-reader.h b/mail/e-mail-reader.h index 13a9ba8080..c55ba92abd 100644 --- a/mail/e-mail-reader.h +++ b/mail/e-mail-reader.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/e-mail-search-bar.c b/mail/e-mail-search-bar.c index 4d555857ca..6dcddaf83b 100644 --- a/mail/e-mail-search-bar.c +++ b/mail/e-mail-search-bar.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/e-mail-search-bar.h b/mail/e-mail-search-bar.h index 7f19e176b7..f4748c77ad 100644 --- a/mail/e-mail-search-bar.h +++ b/mail/e-mail-search-bar.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/e-mail-shell-backend.c b/mail/e-mail-shell-backend.c index 3fa066a3e8..10a99e744b 100644 --- a/mail/e-mail-shell-backend.c +++ b/mail/e-mail-shell-backend.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) @@ -113,7 +113,7 @@ static GType mail_shell_backend_type; /* The array elements correspond to EMailFolderType. */ static struct { - gchar *name; + const gchar *name; gchar *uri; CamelFolder *folder; } default_local_folders[] = { diff --git a/mail/e-mail-shell-backend.h b/mail/e-mail-shell-backend.h index 7521559b23..248768062f 100644 --- a/mail/e-mail-shell-backend.h +++ b/mail/e-mail-shell-backend.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/e-mail-shell-content.c b/mail/e-mail-shell-content.c index de07873dc2..203876fcc3 100644 --- a/mail/e-mail-shell-content.c +++ b/mail/e-mail-shell-content.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/e-mail-shell-content.h b/mail/e-mail-shell-content.h index 2c5da1b27f..57d2438705 100644 --- a/mail/e-mail-shell-content.h +++ b/mail/e-mail-shell-content.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/e-mail-shell-migrate.c b/mail/e-mail-shell-migrate.c index 9a31f67820..6202224b0c 100644 --- a/mail/e-mail-shell-migrate.c +++ b/mail/e-mail-shell-migrate.c @@ -52,6 +52,7 @@ #include <libxml/xmlmemory.h> #include <e-util/e-util.h> +#include <libedataserver/e-xml-utils.h> #include <libedataserver/e-data-server-util.h> #include <e-util/e-xml-utils.h> @@ -354,7 +355,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) { @@ -947,8 +948,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 */ @@ -1095,9 +1096,10 @@ static GtkLabel *label; static GtkProgressBar *progress; static void -em_migrate_setup_progress_dialog (const char *desc) +em_migrate_setup_progress_dialog (const char *title, const char *desc) { GtkWidget *vbox, *hbox, *w; + gchar *markup; window = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_title ((GtkWindow *) window, _("Migrating...")); @@ -1126,6 +1128,39 @@ em_migrate_setup_progress_dialog (const char *desc) gtk_widget_show ((GtkWidget *) progress); gtk_box_pack_start_defaults ((GtkBox *) hbox, (GtkWidget *) progress); + /* Prepare the message */ + vbox = gtk_vbox_new (FALSE, 12); + gtk_widget_show (vbox); + gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0); + + w = gtk_label_new (NULL); + gtk_misc_set_alignment (GTK_MISC (w), 0.0, 0.0); + markup = g_strconcat ("<big><b>", title ? title : _("Migration"), "</b></big>", NULL); + gtk_label_set_markup (GTK_LABEL (w), markup); + gtk_box_pack_start (GTK_BOX (vbox), w, TRUE, TRUE, 0); + g_free (markup); + + w = gtk_label_new (desc); + gtk_misc_set_alignment (GTK_MISC (w), 0.0, 0.0); + gtk_label_set_line_wrap (GTK_LABEL (w), TRUE); + gtk_box_pack_start (GTK_BOX (vbox), w, TRUE, TRUE, 0); + + /* Progress bar */ + w = gtk_vbox_new (FALSE, 6); + gtk_box_pack_start (GTK_BOX (vbox), w, TRUE, TRUE, 0); + + label = GTK_LABEL (gtk_label_new ("")); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0); + gtk_label_set_line_wrap (label, TRUE); + gtk_widget_show (GTK_WIDGET (label)); + gtk_box_pack_start (GTK_BOX (w), GTK_WIDGET (label), TRUE, TRUE, 0); + + progress = GTK_PROGRESS_BAR (gtk_progress_bar_new ()); + gtk_widget_show (GTK_WIDGET (progress)); + gtk_box_pack_start (GTK_BOX (w), GTK_WIDGET (progress), TRUE, TRUE, 0); + + gtk_container_add (GTK_CONTAINER (window), hbox); + gtk_widget_show_all (hbox); gtk_widget_show (window); } @@ -1259,7 +1294,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; @@ -1270,8 +1305,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)) @@ -1532,7 +1567,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; @@ -1778,9 +1813,11 @@ em_migrate_local_folders_1_4 (EMMigrateSession *session, GError **error) return FALSE; } - em_migrate_setup_progress_dialog (_("The location and hierarchy of the Evolution mailbox " - "folders has changed since Evolution 1.x.\n\nPlease be " - "patient while Evolution migrates your folders...")); + em_migrate_setup_progress_dialog ( + _("Migrating Folders"), + _("The location and hierarchy of the Evolution mailbox " + "folders has changed since Evolution 1.x.\n\nPlease be " + "patient while Evolution migrates your folders...")); while (success && (dent = readdir (dir))) { char *full_path; @@ -2762,20 +2799,53 @@ em_update_sa_junk_setting_2_23 (void) g_object_unref (client); } +static gboolean +update_progress_in_main_thread (double *progress) +{ + em_migrate_set_progress (*progress); + return FALSE; +} static void -migrate_folders(CamelStore *store, CamelFolderInfo *fi, const char *acc, CamelException *ex) +migrate_folders(CamelStore *store, gboolean is_local, CamelFolderInfo *fi, const char *acc, CamelException *ex, gboolean *done, int *nth_folder, int total_folders) { CamelFolder *folder; while (fi) { - char *tmp = g_strdup_printf ("%s/%s", acc, fi->full_name); + double progress; + char *tmp; + + *nth_folder = *nth_folder + 1; + + tmp = g_strdup_printf ("%s/%s", acc, fi->full_name); em_migrate_set_folder_name (tmp); g_free (tmp); - folder = camel_store_get_folder (store, fi->full_name, 0, ex); + + progress = (double) (*nth_folder) / total_folders; + g_idle_add ((GSourceFunc) update_progress_in_main_thread, &progress); + + if (is_local) + folder = camel_store_get_folder (store, fi->full_name, CAMEL_STORE_IS_MIGRATING, ex); + else + folder = camel_store_get_folder (store, fi->full_name, 0, ex); + if (folder != NULL) camel_folder_summary_migrate_infos (folder->summary); - migrate_folders(store, fi->child, acc, ex); + migrate_folders(store, is_local, fi->child, acc, ex, done, nth_folder, total_folders); + fi = fi->next; + } + + if ((*nth_folder) == (total_folders - 1)) + *done = TRUE; +} + +/* This could be in CamelStore.ch */ +static void +count_folders (CamelFolderInfo *fi, int *count) +{ + while (fi) { + *count = *count + 1; + count_folders (fi->child, count); fi = fi->next; } } @@ -2799,8 +2869,27 @@ setup_local_store (EShellBackend *shell_backend, g_free(tmp); return store; +} + +struct migrate_folders_to_db_structure { + char *account_name; + CamelException ex; + CamelStore *store; + CamelFolderInfo *info; + gboolean done; + gboolean is_local_store; +}; +static void +migrate_folders_to_db_thread (struct migrate_folders_to_db_structure *migrate_dbs) +{ + int num_of_folders = 0, nth_folder = 0; + count_folders (migrate_dbs->info, &num_of_folders); + migrate_folders (migrate_dbs->store, migrate_dbs->is_local_store, migrate_dbs->info, + migrate_dbs->account_name, &(migrate_dbs->ex), &(migrate_dbs->done), + &nth_folder, num_of_folders); } + static void migrate_to_db (EShellBackend *shell_backend) { @@ -2821,15 +2910,32 @@ migrate_to_db (EShellBackend *shell_backend) data_dir = e_shell_backend_get_data_dir (shell_backend); session = (EMMigrateSession *) em_migrate_session_new (data_dir); camel_session_set_online ((CamelSession *) session, FALSE); - em_migrate_setup_progress_dialog (_("The summary format of the Evolution mailbox " - "folders has been moved to SQLite since Evolution 2.24.\n\nPlease be " - "patient while Evolution migrates your folders...")); + em_migrate_setup_progress_dialog ( + _("Migrating Folders"), + _("The summary format of the Evolution mailbox " + "folders has been moved to SQLite since Evolution 2.24.\n\nPlease be " + "patient while Evolution migrates your folders...")); em_migrate_set_progress ( (double)i/(len+1)); store = setup_local_store (shell_backend, session); info = camel_store_get_folder_info (store, NULL, CAMEL_STORE_FOLDER_INFO_RECURSIVE|CAMEL_STORE_FOLDER_INFO_FAST|CAMEL_STORE_FOLDER_INFO_SUBSCRIBED, NULL); if (info) { - migrate_folders(store, info, _("On This Computer"), NULL); + GThread *thread; + struct migrate_folders_to_db_structure migrate_dbs; + + if (g_str_has_suffix (((CamelService *)store)->url->path, ".evolution/mail/local")) + migrate_dbs.is_local_store = TRUE; + else + migrate_dbs.is_local_store = FALSE; + camel_exception_init (&migrate_dbs.ex); + migrate_dbs.account_name = _("On This Computer"); + migrate_dbs.info = info; + migrate_dbs.store = store; + migrate_dbs.done = FALSE; + + thread = g_thread_create ((GThreadFunc) migrate_folders_to_db_thread, &migrate_dbs, TRUE, NULL); + while (!migrate_dbs.done) + g_main_context_iteration (NULL, TRUE); } i++; em_migrate_set_progress ( (double)i/(len+1)); @@ -2859,8 +2965,18 @@ migrate_to_db (EShellBackend *shell_backend) store = (CamelStore *) camel_session_get_service (CAMEL_SESSION (session), service->url, CAMEL_PROVIDER_STORE, &ex); info = camel_store_get_folder_info (store, NULL, CAMEL_STORE_FOLDER_INFO_RECURSIVE|CAMEL_STORE_FOLDER_INFO_FAST|CAMEL_STORE_FOLDER_INFO_SUBSCRIBED, &ex); if (info) { - migrate_folders(store, info, account->name, &ex); - + GThread *thread; + struct migrate_folders_to_db_structure migrate_dbs; + + migrate_dbs.ex = ex; + migrate_dbs.account_name = account->name; + migrate_dbs.info = info; + migrate_dbs.store = store; + migrate_dbs.done = FALSE; + + thread = g_thread_create ((GThreadFunc) migrate_folders_to_db_thread, &migrate_dbs, TRUE, NULL); + while (!migrate_dbs.done) + g_main_context_iteration (NULL, TRUE); } else printf("%s:%s: failed to get folder infos \n", G_STRLOC, G_STRFUNC); camel_exception_clear(&ex); diff --git a/mail/e-mail-shell-migrate.h b/mail/e-mail-shell-migrate.h index c5fb08f53b..8f3057ec0d 100644 --- a/mail/e-mail-shell-migrate.h +++ b/mail/e-mail-shell-migrate.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/e-mail-shell-sidebar.c b/mail/e-mail-shell-sidebar.c index 6f6bdf7bf8..1b090fa703 100644 --- a/mail/e-mail-shell-sidebar.c +++ b/mail/e-mail-shell-sidebar.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/e-mail-shell-sidebar.h b/mail/e-mail-shell-sidebar.h index 5075225fc4..10a2ff6a2a 100644 --- a/mail/e-mail-shell-sidebar.h +++ b/mail/e-mail-shell-sidebar.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/e-mail-shell-view-actions.c b/mail/e-mail-shell-view-actions.c index 33d497c9ae..3d0b76d176 100644 --- a/mail/e-mail-shell-view-actions.c +++ b/mail/e-mail-shell-view-actions.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/e-mail-shell-view-actions.h b/mail/e-mail-shell-view-actions.h index bf7410db5f..2a05582df8 100644 --- a/mail/e-mail-shell-view-actions.h +++ b/mail/e-mail-shell-view-actions.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/e-mail-shell-view-private.c b/mail/e-mail-shell-view-private.c index 552ff1aff7..9026c8ed60 100644 --- a/mail/e-mail-shell-view-private.c +++ b/mail/e-mail-shell-view-private.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/e-mail-shell-view-private.h b/mail/e-mail-shell-view-private.h index 1d61f8d68d..4b27c4c541 100644 --- a/mail/e-mail-shell-view-private.h +++ b/mail/e-mail-shell-view-private.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/e-mail-shell-view.c b/mail/e-mail-shell-view.c index f58d1f6288..8d8b4aa2b3 100644 --- a/mail/e-mail-shell-view.c +++ b/mail/e-mail-shell-view.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/e-mail-shell-view.h b/mail/e-mail-shell-view.h index 2bc769557c..d20bde74a6 100644 --- a/mail/e-mail-shell-view.h +++ b/mail/e-mail-shell-view.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/e-searching-tokenizer.c b/mail/e-searching-tokenizer.c index 129aa0539b..726ae41ed4 100644 --- a/mail/e-searching-tokenizer.c +++ b/mail/e-searching-tokenizer.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -94,7 +94,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) @@ -877,7 +878,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/e-searching-tokenizer.h b/mail/e-searching-tokenizer.h index 7bab007a9f..7eb603a25d 100644 --- a/mail/e-searching-tokenizer.h +++ b/mail/e-searching-tokenizer.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c index a9ba161122..e5f0f98001 100644 --- a/mail/em-account-editor.c +++ b/mail/em-account-editor.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -189,7 +189,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; @@ -269,7 +269,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); @@ -301,8 +301,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. */ @@ -790,7 +790,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") }, @@ -1092,34 +1092,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] = { @@ -1422,7 +1422,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; + char *current = NULL; + const gchar *tmp; CamelURL *url; dropdown = service->providers; @@ -1441,7 +1442,7 @@ emae_refresh_providers(EMAccountEditor *emae, EMAccountEditorService *service) } else { current = g_strdup("imap"); } - + store = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_POINTER); i = 0; @@ -1467,7 +1468,7 @@ emae_refresh_providers(EMAccountEditor *emae, EMAccountEditorService *service) gtk_list_store_append(store, &iter); gtk_list_store_set(store, &iter, 0, provider->name, 1, provider, -1); - + /* find the displayed and set default */ if (i == 0 || (current && strcmp(provider->protocol, current) == 0)) { service->provider = provider; @@ -1499,10 +1500,10 @@ emae_refresh_providers(EMAccountEditor *emae, EMAccountEditorService *service) if (!uri || (url = camel_url_new(uri, NULL)) == NULL) { return; } - - tmp = (char *)camel_url_get_param(url, "use_ssl"); + + tmp = camel_url_get_param(url, "use_ssl"); if (tmp == NULL) - tmp = "never"; + tmp = "never"; for (i=0;i<num_ssl_options;i++) { if (!strcmp(ssl_options[i].value, tmp)) { gtk_combo_box_set_active(service->use_ssl, i); @@ -1776,8 +1777,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 }, @@ -2389,7 +2390,7 @@ emae_send_page(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct gtk_box_pack_start((GtkBox*)((GnomeDruidPageStandard *)page)->vbox, w, TRUE, TRUE, 0); w = page; g_object_unref(druidxml); - gnome_druid_append_page((GnomeDruid *)parent, (GnomeDruidPage *)page); + gnome_druid_append_page((GnomeDruid *)parent, (GnomeDruidPage *)page); } else { gtk_notebook_append_page((GtkNotebook *)parent, w, gtk_label_new(_("Sending Email"))); } @@ -2540,34 +2541,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 }, @@ -2633,34 +2634,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; @@ -2706,7 +2707,7 @@ emae_service_complete(EMAccountEditor *emae, EMAccountEditorService *service) if (CAMEL_PROVIDER_NEEDS(service->provider, CAMEL_URL_PART_HOST)) { if (url->host == NULL || url->host[0] == 0) ok = FALSE; - else + else gtk_entry_set_text(service->hostname, url->host); } /* We only need the user if the service needs auth as well, i think */ @@ -2734,11 +2735,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"}, @@ -2821,14 +2822,14 @@ emae_check_complete(EConfig *ec, const char *pageid, void *data) } else { g_warning("buz1\n"); } - + } } else if (!strcmp(pageid, "30.send")) { CamelURL *url; char *at, *user; int index; char *uri = (char *)e_account_get_string(emae->account, E_ACCOUNT_TRANSPORT_URL); - + tmp = e_account_get_string(emae->account, E_ACCOUNT_ID_ADDRESS); at = strchr(tmp, '@'); user = g_alloca(at-tmp+1); @@ -2850,8 +2851,7 @@ emae_check_complete(EConfig *ec, const char *pageid, void *data) } else { g_warning("buz2\n"); } - - + } else if (!strcmp(pageid, "20.receive_options")) { if (emae->priv->source.provider && emae->priv->extra_provider != emae->priv->source.provider) { @@ -2893,8 +2893,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"))) { @@ -2902,8 +2903,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"))) { @@ -2911,8 +2913,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"))) { @@ -2920,8 +2923,9 @@ emae_check_complete(EConfig *ec, const char *pageid, void *data) && tmp[0] && ((ea = e_get_account_by_name (tmp)) == NULL || ea == emae->original); - if (!ok) + if (!ok) { d(printf("management page incomplete\n")); + } } return ok; @@ -2995,7 +2999,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; @@ -3120,5 +3124,5 @@ em_account_editor_construct(EMAccountEditor *emae, EAccount *account, em_account g_signal_connect(emae->editor, "destroy", G_CALLBACK(emae_editor_destroyed), emae); } else { e_config_create_widget((EConfig *)ec); - } + } } diff --git a/mail/em-account-editor.h b/mail/em-account-editor.h index 41da661089..e17236e865 100644 --- a/mail/em-account-editor.h +++ b/mail/em-account-editor.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -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-account-prefs.c b/mail/em-account-prefs.c index 75ff66db9c..82342de3c9 100644 --- a/mail/em-account-prefs.c +++ b/mail/em-account-prefs.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/em-account-prefs.h b/mail/em-account-prefs.h index 4c02d716b8..82df8fa941 100644 --- a/mail/em-account-prefs.h +++ b/mail/em-account-prefs.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/em-composer-prefs.c b/mail/em-composer-prefs.c index fde3297321..68c1392410 100644 --- a/mail/em-composer-prefs.c +++ b/mail/em-composer-prefs.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -382,16 +382,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 diff --git a/mail/em-composer-prefs.h b/mail/em-composer-prefs.h index 19d753e121..83560b13d9 100644 --- a/mail/em-composer-prefs.h +++ b/mail/em-composer-prefs.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c index f6ea663a40..fdff69861b 100644 --- a/mail/em-composer-utils.c +++ b/mail/em-composer-utils.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -502,7 +502,7 @@ static void composer_set_no_change (EMsgComposer *composer, gboolean drop_undo, gboolean editor_changed) { GtkhtmlEditor *editor; - + g_return_if_fail (composer != NULL); editor = GTKHTML_EDITOR (composer); @@ -674,7 +674,7 @@ create_new_composer (const char *subject, const char *fromuri, gboolean lite) if (lite) composer = e_msg_composer_lite_new (); else - composer = e_msg_composer_new (); + composer = e_msg_composer_new (); table = e_msg_composer_get_header_table (composer); if (fromuri != NULL) { @@ -781,7 +781,7 @@ edit_message (CamelMimeMessage *message, CamelFolder *drafts, const char *uid) CamelMimePart *mime_part = CAMEL_MIME_PART (message); CamelDataWrapper *mail_text; CamelMultipart *body = camel_multipart_new (); - CamelStream *stream; + CamelStream *stream; CamelMimePart *part; int count1 = 0, string_changed = 0; const char *cur; @@ -871,8 +871,8 @@ edit_message (CamelMimeMessage *message, CamelFolder *drafts, const char *uid) } g_strfreev(temp_str); - } - else + } + else cur++; } @@ -887,7 +887,7 @@ edit_message (CamelMimeMessage *message, CamelFolder *drafts, const char *uid) mail_text = camel_data_wrapper_new (); camel_data_wrapper_set_mime_type_field (mail_text, type); - + camel_stream_printf (stream, "%s", g_strdup(str)); camel_data_wrapper_construct_from_stream (mail_text, stream); @@ -904,9 +904,9 @@ edit_message (CamelMimeMessage *message, CamelFolder *drafts, const char *uid) camel_object_unref (body); } } - + composer = e_msg_composer_new_with_message (message); - + if (em_utils_folder_is_drafts (drafts, NULL)) { struct emcs_t *emcs; @@ -935,7 +935,7 @@ em_utils_edit_message (CamelMimeMessage *message, CamelFolder *folder) if (folder) edit_message (message, folder, NULL); else - edit_message (message, NULL, NULL); + edit_message (message, NULL, NULL); } static void @@ -1057,7 +1057,7 @@ forward_attached_cb (CamelFolder *folder, GPtrArray *messages, CamelMimePart *pa if (part) forward_attached (folder, fad->uids, messages, part, subject, fad->fromuri); - + g_free (fad->fromuri); g_free (fad); } @@ -1816,7 +1816,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 @@ -2272,7 +2275,7 @@ em_utils_construct_composer_text (CamelMimeMessage *message, EMFormat *source) char *text, *credits; ssize_t len = 0; gboolean start_bottom = 0; - + credits = attribution_format (ATTRIBUTION, message); text = em_utils_message_to_html (message, credits, EM_FORMAT_QUOTE_CITE, &len, source, start_bottom ? "<BR>" : NULL); diff --git a/mail/em-composer-utils.h b/mail/em-composer-utils.h index 37fd185eaa..8ee05a50b5 100644 --- a/mail/em-composer-utils.h +++ b/mail/em-composer-utils.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -42,7 +42,7 @@ struct _EAccount; struct _EDestination; void em_utils_compose_new_message (const char *fromuri); -struct _EMsgComposer * em_utils_compose_lite_new_message (const char *fromuri); +struct _EMsgComposer * em_utils_compose_lite_new_message (const char *fromuri); /* FIXME: mailto? url? should make up its mind what its called. imho use 'uri' */ void em_utils_compose_new_message_with_mailto (const char *url, const char *fromuri); diff --git a/mail/em-config.c b/mail/em-config.c index 94df437519..160cec851e 100644 --- a/mail/em-config.c +++ b/mail/em-config.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-config.h b/mail/em-config.h index ba19bb1c37..5f895305b0 100644 --- a/mail/em-config.h +++ b/mail/em-config.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-event.c b/mail/em-event.c index 8a027cce98..b415d5f8a0 100644 --- a/mail/em-event.c +++ b/mail/em-event.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-event.h b/mail/em-event.h index 21df1df42d..7c2c4c639d 100644 --- a/mail/em-event.h +++ b/mail/em-event.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-filter-context.c b/mail/em-filter-context.c index b0f82a7dad..a2a699a36f 100644 --- a/mail/em-filter-context.c +++ b/mail/em-filter-context.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-filter-context.h b/mail/em-filter-context.h index 6b2e4f18fd..56f11a3d81 100644 --- a/mail/em-filter-context.h +++ b/mail/em-filter-context.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-filter-editor.c b/mail/em-filter-editor.c index 4a92a65c58..4f68cf47df 100644 --- a/mail/em-filter-editor.c +++ b/mail/em-filter-editor.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -141,7 +141,7 @@ select_source (GtkComboBox *combobox, EMFilterEditor *fe) idx = gtk_combo_box_get_active (combobox); sources = g_object_get_data (G_OBJECT (combobox), "sources"); - + g_return_if_fail (idx >= 0 && idx < g_slist_length (sources)); source = (char *)g_slist_nth (sources, idx); diff --git a/mail/em-filter-editor.h b/mail/em-filter-editor.h index b0ee632779..8d9926b873 100644 --- a/mail/em-filter-editor.h +++ b/mail/em-filter-editor.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -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-filter-folder-element.c b/mail/em-filter-folder-element.c index 61051106d1..7b49df8a15 100644 --- a/mail/em-filter-folder-element.c +++ b/mail/em-filter-folder-element.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-filter-folder-element.h b/mail/em-filter-folder-element.h index 8f9a2d8b4e..0d7d3b50b2 100644 --- a/mail/em-filter-folder-element.h +++ b/mail/em-filter-folder-element.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-filter-rule.c b/mail/em-filter-rule.c index 45dd78c708..583f82977c 100644 --- a/mail/em-filter-rule.c +++ b/mail/em-filter-rule.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -496,7 +496,7 @@ more_parts(GtkWidget *button, struct _rule_data *data) adjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (w)); if (adjustment) gtk_adjustment_set_value (adjustment, adjustment->upper); - + } } } diff --git a/mail/em-filter-rule.h b/mail/em-filter-rule.h index 49e71850d6..6ddaddc8d2 100644 --- a/mail/em-filter-rule.h +++ b/mail/em-filter-rule.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-filter-source-element.c b/mail/em-filter-source-element.c index e35871638f..23a1b762cd 100644 --- a/mail/em-filter-source-element.c +++ b/mail/em-filter-source-element.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-filter-source-element.h b/mail/em-filter-source-element.h index 3204b636a0..ac9a1ff911 100644 --- a/mail/em-filter-source-element.h +++ b/mail/em-filter-source-element.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c index 989206ae36..6a8a67b454 100644 --- a/mail/em-folder-browser.c +++ b/mail/em-folder-browser.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -129,7 +129,7 @@ struct _EMFolderBrowserPrivate { typedef struct EMFBSearchBarItem { ESearchBarItem search; - char *image; + const gchar *image; } EMFBSearchBarItem; static void emfb_activate(EMFolderView *emfv, BonoboUIComponent *uic, int state); @@ -183,7 +183,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 } }; @@ -603,7 +603,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; @@ -792,7 +793,6 @@ emfb_search_search_activated(ESearchBar *esb, EMFolderBrowser *emfb) g_free (word); g_free (search_word); - g_free (view_sexp); camel_exception_free (ex); } diff --git a/mail/em-folder-browser.h b/mail/em-folder-browser.h index 75dbe975b5..e2c74ecf17 100644 --- a/mail/em-folder-browser.h +++ b/mail/em-folder-browser.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-folder-properties.c b/mail/em-folder-properties.c index c8b56b2c3c..c22987b37c 100644 --- a/mail/em-folder-properties.c +++ b/mail/em-folder-properties.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -241,7 +241,7 @@ emfp_get_folder_item(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, gtk_misc_set_alignment ((GtkMisc *) label, 0.0, 0.5); gtk_widget_show (label); gtk_table_attach ((GtkTable *) table, label, 0, 1, row, row + 1, GTK_FILL, 0, 0, 0); - + w = gtk_spin_button_new_with_range (G_MININT, G_MAXINT, 1.0); gtk_spin_button_set_value ((GtkSpinButton *) w, (double) prop_data->argv->argv[i].ca_int); gtk_spin_button_set_numeric ((GtkSpinButton *) w, TRUE); @@ -255,7 +255,7 @@ emfp_get_folder_item(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, gtk_misc_set_alignment ((GtkMisc *) label, 0.0, 0.5); gtk_widget_show (label); gtk_table_attach ((GtkTable *) table, label, 0, 1, row, row + 1, GTK_FILL, 0, 0, 0); - + w = gtk_spin_button_new_with_range (G_MININT, G_MAXINT, 1.0); gtk_spin_button_set_value ((GtkSpinButton *) w, prop_data->argv->argv[i].ca_double); gtk_spin_button_set_numeric ((GtkSpinButton *) w, TRUE); @@ -280,10 +280,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-properties.h b/mail/em-folder-properties.h index 35d80c293b..330be151a3 100644 --- a/mail/em-folder-properties.h +++ b/mail/em-folder-properties.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-folder-selection-button.c b/mail/em-folder-selection-button.c index e078f44f16..27b1f1b08b 100644 --- a/mail/em-folder-selection-button.c +++ b/mail/em-folder-selection-button.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-folder-selection-button.h b/mail/em-folder-selection-button.h index a8b009b1c0..391b6b1dbd 100644 --- a/mail/em-folder-selection-button.h +++ b/mail/em-folder-selection-button.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-folder-selection.c b/mail/em-folder-selection.c index ba63d19082..07c0bfdcff 100644 --- a/mail/em-folder-selection.c +++ b/mail/em-folder-selection.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-folder-selection.h b/mail/em-folder-selection.h index 78cd300410..25c35d254b 100644 --- a/mail/em-folder-selection.h +++ b/mail/em-folder-selection.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-folder-selector.c b/mail/em-folder-selector.c index 1f5140701a..e04460b7ac 100644 --- a/mail/em-folder-selector.c +++ b/mail/em-folder-selector.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-folder-selector.h b/mail/em-folder-selector.h index ee8fc2856f..5d13f10cb9 100644 --- a/mail/em-folder-selector.h +++ b/mail/em-folder-selector.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c index abdd3c8b6f..c0e3f2bb68 100644 --- a/mail/em-folder-tree-model.c +++ b/mail/em-folder-tree-model.c @@ -98,6 +98,8 @@ enum { LAST_SIGNAL }; +extern CamelStore *vfolder_store; + static gpointer parent_class; static guint signals[LAST_SIGNAL]; @@ -155,7 +157,6 @@ folder_tree_model_sort (GtkTreeModel *model, GtkTreeIter *b, gpointer user_data) { - extern CamelStore *vfolder_store; char *aname, *bname; CamelStore *store; gboolean is_store; diff --git a/mail/em-folder-tree-model.h b/mail/em-folder-tree-model.h index 733c940951..8758b8dc9e 100644 --- a/mail/em-folder-tree-model.h +++ b/mail/em-folder-tree-model.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c index 07aedc2c8c..f4980dc8e7 100644 --- a/mail/em-folder-tree.c +++ b/mail/em-folder-tree.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -140,15 +140,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]; @@ -157,6 +157,7 @@ static GdkAtom drop_atoms[NUM_DROP_TYPES]; static guint signals[LAST_SIGNAL] = { 0 }; extern CamelSession *session; +extern CamelStore *vfolder_store; static gboolean emft_save_state (EMFolderTree *emft); static void emft_queue_save_state (EMFolderTree *emft); @@ -544,7 +545,6 @@ emft_expand_node (EMFolderTreeModel *model, const char *key, EMFolderTree *emft) { struct _EMFolderTreePrivate *priv = emft->priv; struct _EMFolderTreeModelStoreInfo *si; - extern CamelStore *vfolder_store; EMailShellBackend *mail_shell_backend; GtkTreeRowReference *row; GtkTreeView *tree_view; @@ -946,12 +946,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 @@ -1756,7 +1756,7 @@ emft_get_folder_info__done (struct _EMFolderTreeGetFolderInfo *m) /* Traverse to the last valid iter */ titer = iter; - while (gtk_tree_model_iter_next((GtkTreeModel *) model, &iter)) + while (gtk_tree_model_iter_next((GtkTreeModel *) model, &iter)) titer = iter; /* Preserve the last valid iter */ iter = titer; diff --git a/mail/em-folder-tree.h b/mail/em-folder-tree.h index 232a15e59a..7b148d424b 100644 --- a/mail/em-folder-tree.h +++ b/mail/em-folder-tree.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c index 510bcf782e..2b319ff360 100644 --- a/mail/em-folder-utils.c +++ b/mail/em-folder-utils.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -270,7 +270,7 @@ emfu_copy_folder_selected (const char *uri, void *data) struct _copy_folder_data *cfd = data; CamelStore *fromstore = NULL, *tostore = NULL; CamelStore *local_store; - char *tobase = NULL; + const gchar *tobase = NULL; CamelException ex; CamelURL *url; @@ -412,8 +412,8 @@ em_folder_utils_delete_folder (CamelFolder *folder) em_utils_show_error_silent (dialog); return; } - - if (mail_folder_cache_get_folder_info_flags (folder, &flags) && (flags & CAMEL_FOLDER_SYSTEM)) + + if (mail_folder_cache_get_folder_info_flags (folder, &flags) && (flags & CAMEL_FOLDER_SYSTEM)) { e_error_run(NULL,"mail:no-delete-special-folder", folder->name, NULL); return; diff --git a/mail/em-folder-utils.h b/mail/em-folder-utils.h index deed1407e9..f78dbbcd66 100644 --- a/mail/em-folder-utils.h +++ b/mail/em-folder-utils.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c index 8da3b5dc98..b72e187365 100644 --- a/mail/em-folder-view.c +++ b/mail/em-folder-view.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -127,7 +127,7 @@ static const EMFolderViewEnable emfv_enable_map[] = { // { "MessageFilterJunk", EM_POPUP_SELECT_MANY }, // { "MessageCopy", EM_POPUP_SELECT_MANY }, // { "MessageDelete", EM_POPUP_SELECT_MANY|EM_POPUP_SELECT_DELETE }, -// { "MessageDeleteKey", EM_POPUP_SELECT_MANY}, +// { "MessageDeleteKey", EM_POPUP_SELECT_MANY}, // { "MessageForward", EM_POPUP_SELECT_MANY }, // { "MessageForwardAttached", EM_POPUP_SELECT_MANY }, // { "MessageForwardInline", EM_POPUP_SELECT_ONE }, @@ -197,6 +197,8 @@ enum { LAST_SIGNAL }; +extern CamelSession *session; + static guint signals[LAST_SIGNAL]; static void @@ -204,7 +206,6 @@ emfv_init(GObject *o) { EMFolderView *emfv = (EMFolderView *)o; struct _EMFolderViewPrivate *p; - extern CamelSession *session; // gtk_box_set_homogeneous (GTK_BOX (emfv), FALSE); // @@ -757,11 +758,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 @@ -957,7 +958,7 @@ emfv_format_popup_event(EMFormatHTMLDisplay *efhd, GdkEventButton *event, const if (!main_emp) main_emp = emp; } - + if (event == NULL) gtk_menu_popup (menu, NULL, NULL, NULL, NULL, 0, gtk_get_current_event_time()); else diff --git a/mail/em-folder-view.h b/mail/em-folder-view.h index 70c6c4335e..f55fda2c81 100644 --- a/mail/em-folder-view.h +++ b/mail/em-folder-view.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-format-hook.c b/mail/em-format-hook.c index 60881396c2..9fec654ae5 100644 --- a/mail/em-format-hook.c +++ b/mail/em-format-hook.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-format-hook.h b/mail/em-format-hook.h index 4c7dc16517..6fed1b1088 100644 --- a/mail/em-format-hook.h +++ b/mail/em-format-hook.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c index 1cc7d43175..1cfe836e76 100644 --- a/mail/em-format-html-display.c +++ b/mail/em-format-html-display.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -718,31 +718,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 @@ -884,11 +884,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 @@ -1148,7 +1148,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-display.h b/mail/em-format-html-display.h index 7554053e37..4626598cb5 100644 --- a/mail/em-format-html-display.h +++ b/mail/em-format-html-display.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/em-format-html-print.c b/mail/em-format-html-print.c index 137711dbb7..88bcb10dac 100644 --- a/mail/em-format-html-print.c +++ b/mail/em-format-html-print.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-format-html-print.h b/mail/em-format-html-print.h index ef25b63033..2abdc82178 100644 --- a/mail/em-format-html-print.h +++ b/mail/em-format-html-print.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) */ diff --git a/mail/em-format-html.c b/mail/em-format-html.c index cbf90a9214..6bc4a79794 100644 --- a/mail/em-format-html.c +++ b/mail/em-format-html.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -978,7 +978,6 @@ em_format_html_get_color (EMFormatHTML *efh, GdkColor *format_color; g_return_if_fail (EM_IS_FORMAT_HTML (efh)); - g_return_if_fail (type >= 0); g_return_if_fail (type < EM_FORMAT_HTML_NUM_COLOR_TYPES); g_return_if_fail (color != NULL); @@ -998,7 +997,6 @@ em_format_html_set_color (EMFormatHTML *efh, const gchar *property_name; g_return_if_fail (EM_IS_FORMAT_HTML (efh)); - g_return_if_fail (type >= 0); g_return_if_fail (type < EM_FORMAT_HTML_NUM_COLOR_TYPES); g_return_if_fail (color != NULL); @@ -2014,40 +2012,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 @@ -2071,18 +2069,18 @@ efh_format_text_header (EMFormatHTML *emfh, CamelStream *stream, const char *lab const char *fmt, *html; char *mhtml = NULL; gboolean is_rtl; - + if (value == NULL) return; while (*value == ' ') value++; - + if (!(flags & EM_FORMAT_HTML_HEADER_HTML)) html = mhtml = camel_text_to_html (value, emfh->text_html_flags, 0); - else + else html = value; - + is_rtl = gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL; if (emfh->simple_headers) { fmt = "<b>%s</b>: %s<br>"; @@ -2099,7 +2097,7 @@ efh_format_text_header (EMFormatHTML *emfh, CamelStream *stream, const char *lab else fmt = "<tr><th align=\"right\" valign=\"top\" nowrap>%s<b> </b></th><td valign=top>%s</td></tr>"; } else { - + if (flags & EM_FORMAT_HEADER_BOLD) { if (is_rtl) fmt = "<tr><td align=\"right\" valign=\"top\" width=\"100%%\">%2$s</td><th align=\"left\" nowrap>%1$s:<b> </b></th></tr>"; @@ -2118,7 +2116,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 @@ -2238,22 +2236,22 @@ static void canon_header_name (char *name) { char *inptr = name; - + /* canonicalise the header name... first letter is * capitalised and any letter following a '-' also gets * capitalised */ - + if (*inptr >= 'a' && *inptr <= 'z') *inptr -= 0x20; - + inptr++; - + while (*inptr) { if (inptr[-1] == '-' && *inptr >= 'a' && *inptr <= 'z') *inptr -= 0x20; else if (*inptr >= 'A' && *inptr <= 'Z') *inptr += 0x20; - + inptr++; } } @@ -2278,22 +2276,22 @@ efh_format_header(EMFormat *emf, CamelStream *stream, CamelMedium *part, struct break; } } - + label = _(name); - + if (addrspec) { struct _camel_header_address *addrs; GString *html; char *img; - + buf = camel_header_unfold (header->value); if (!(addrs = camel_header_address_decode (buf, emf->charset ? emf->charset : emf->default_charset))) { g_free (buf); return; } - + g_free (buf); - + html = g_string_new(""); img = efh_format_address(efh, html, addrs, (char *)label); @@ -2303,7 +2301,7 @@ efh_format_header(EMFormat *emf, CamelStream *stream, CamelMedium *part, struct flags |= EM_FORMAT_HTML_HEADER_NODEC; g_free (img); } - + camel_header_address_unref(addrs); txt = value = html->str; g_string_free(html, FALSE); @@ -2313,7 +2311,7 @@ efh_format_header(EMFormat *emf, CamelStream *stream, CamelMedium *part, struct buf = camel_header_unfold (header->value); txt = value = camel_header_decode_string (buf, charset); g_free (buf); - + flags |= EM_FORMAT_HEADER_BOLD; } else if (!strcmp(name, "X-evolution-mailer")) { /* pseudo-header */ @@ -2340,7 +2338,7 @@ efh_format_header(EMFormat *emf, CamelStream *stream, CamelMedium *part, struct if (msg_offset) { char buf[256], *html; - + msg_offset += (local.tm_hour * 60) + local.tm_min; if (msg_offset >= (24 * 60) || msg_offset < 0) { /* translators: strftime format for local time equivalent in Date header display, with day */ @@ -2353,27 +2351,27 @@ efh_format_header(EMFormat *emf, CamelStream *stream, CamelMedium *part, struct e_utf8_strftime(buf, sizeof(buf), msg, &local); g_free(msg); } - + html = camel_text_to_html(txt, efh->text_html_flags, 0); txt = value = g_strdup_printf("%s %s", html, buf); g_free(html); flags |= EM_FORMAT_HTML_HEADER_HTML; } - + flags |= EM_FORMAT_HEADER_BOLD; } else if (!strcmp(name, "Newsgroups")) { struct _camel_header_newsgroup *ng, *scan; GString *html; - + buf = camel_header_unfold (header->value); - + if (!(ng = camel_header_newsgroups_decode (buf))) { g_free (buf); return; } - + g_free (buf); - + html = g_string_new(""); scan = ng; while (scan) { @@ -2382,9 +2380,9 @@ efh_format_header(EMFormat *emf, CamelStream *stream, CamelMedium *part, struct if (scan) g_string_append_printf(html, ", "); } - + camel_header_newsgroups_free(ng); - + txt = html->str; g_string_free(html, FALSE); flags |= EM_FORMAT_HEADER_BOLD|EM_FORMAT_HTML_HEADER_HTML; @@ -2397,9 +2395,9 @@ efh_format_header(EMFormat *emf, CamelStream *stream, CamelMedium *part, struct txt = value = camel_header_decode_string (buf, charset); g_free (buf); } - + efh_format_text_header(efh, stream, label, txt, flags); - + g_free (value); g_free (str_field); } @@ -2421,7 +2419,7 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part) char *header_sender = NULL, *header_from = NULL, *name; gboolean mail_from_delegate = FALSE; const char *hdr_charset; - + if (!part) return; @@ -2436,9 +2434,9 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part) e_color_to_value ( &efh->priv->colors[ EM_FORMAT_HTML_COLOR_HEADER])); - + hdr_charset = emf->charset ? emf->charset : emf->default_charset; - + header = ((CamelMimePart *)part)->headers; while (header) { if (!g_ascii_strcasecmp (header->name, "Sender")) { @@ -2477,7 +2475,7 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part) header = header->next; } - + if (header_sender && header_from && mail_from_delegate) { camel_stream_printf(stream, "<tr><td><table border=1 width=\"100%%\" cellspacing=2 cellpadding=2><tr>"); if(gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL) @@ -2541,7 +2539,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; @@ -2550,11 +2548,11 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part) have_icon = TRUE; } else if (!face_decoded && face && !g_ascii_strcasecmp (header->name, "Face")) { char *cp = header->value; - + /* Skip over spaces */ while (*cp == ' ') cp++; - + face_header_value = g_base64_decode (cp, &face_header_len); face_header_value = g_realloc (face_header_value, face_header_len + 1); face_header_value[face_header_len] = 0; diff --git a/mail/em-format-html.h b/mail/em-format-html.h index e20daaf5ab..3293318104 100644 --- a/mail/em-format-html.h +++ b/mail/em-format-html.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-html-stream.c b/mail/em-html-stream.c index 096e1c9aa5..c39e705b91 100644 --- a/mail/em-html-stream.c +++ b/mail/em-html-stream.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-html-stream.h b/mail/em-html-stream.h index 674cc590af..7bf79470dd 100644 --- a/mail/em-html-stream.h +++ b/mail/em-html-stream.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-icon-stream.c b/mail/em-icon-stream.c index 2e1a7ae2f6..b06145acc0 100644 --- a/mail/em-icon-stream.c +++ b/mail/em-icon-stream.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-icon-stream.h b/mail/em-icon-stream.h index f92bfefb54..321e0cacae 100644 --- a/mail/em-icon-stream.h +++ b/mail/em-icon-stream.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-inline-filter.c b/mail/em-inline-filter.c index 07dd55fa3a..26ae580dc8 100644 --- a/mail/em-inline-filter.c +++ b/mail/em-inline-filter.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-inline-filter.h b/mail/em-inline-filter.h index 062a590445..b6bc38502f 100644 --- a/mail/em-inline-filter.h +++ b/mail/em-inline-filter.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-junk-hook.c b/mail/em-junk-hook.c index c4ea8b16f3..f95685e351 100644 --- a/mail/em-junk-hook.c +++ b/mail/em-junk-hook.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-junk-hook.h b/mail/em-junk-hook.h index 70926b2f11..0e467a20bd 100644 --- a/mail/em-junk-hook.h +++ b/mail/em-junk-hook.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-mailer-prefs.c b/mail/em-mailer-prefs.c index 589576ab27..5123d3d49a 100644 --- a/mail/em-mailer-prefs.c +++ b/mail/em-mailer-prefs.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -233,7 +233,7 @@ jh_add_cb (GtkWidget *widget, gpointer user_data) gtk_box_pack_start ((GtkBox *)hbox, l2, FALSE, FALSE, 6); gtk_box_pack_start ((GtkBox *)hbox, entry2, FALSE, FALSE, 6); gtk_box_pack_start ((GtkBox *)vbox, hbox, FALSE, FALSE, 6); - + gtk_widget_show_all (vbox); gtk_container_add ((GtkContainer *)((GtkDialog *)dialog)->vbox, vbox); response = gtk_dialog_run ((GtkDialog *)dialog); @@ -242,9 +242,9 @@ jh_add_cb (GtkWidget *widget, gpointer user_data) const char *value = gtk_entry_get_text ((GtkEntry *)entry2); char *tok; GSList *list = gconf_client_get_list (prefs->gconf, "/apps/evolution/mail/junk/custom_header", GCONF_VALUE_STRING, NULL); - + /* FIXME: Validate the values */ - + tok = g_strdup_printf ("%s=%s", name, value); list = g_slist_append (list, tok); gconf_client_set_list (prefs->gconf, "/apps/evolution/mail/junk/custom_header", GCONF_VALUE_STRING, list, NULL); @@ -275,14 +275,14 @@ 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++; if (strcmp (test, value) == 0) break; } - + prev = node; node = node->next; } @@ -705,22 +705,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 diff --git a/mail/em-mailer-prefs.h b/mail/em-mailer-prefs.h index c7dc6ac80a..fddc7cd4e1 100644 --- a/mail/em-mailer-prefs.h +++ b/mail/em-mailer-prefs.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -106,7 +106,7 @@ struct _EMMailerPrefs { /* Junk prefs */ GtkToggleButton *empty_junk; GtkComboBox *empty_junk_days; - + GtkToggleButton *sa_local_tests_only; GtkToggleButton *sa_use_daemon; GtkComboBox *default_junk_plugin; @@ -115,7 +115,7 @@ struct _EMMailerPrefs { GtkToggleButton *junk_header_check; GtkTreeView *junk_header_tree; - GtkListStore *junk_header_list_store; + GtkListStore *junk_header_list_store; GtkButton *junk_header_add; GtkButton *junk_header_remove; GtkToggleButton *junk_book_lookup; diff --git a/mail/em-menu.c b/mail/em-menu.c index fc2e43d455..b504bd3304 100644 --- a/mail/em-menu.c +++ b/mail/em-menu.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-menu.h b/mail/em-menu.h index 08467fefd8..cdcc12bcae 100644 --- a/mail/em-menu.h +++ b/mail/em-menu.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-network-prefs.c b/mail/em-network-prefs.c index 13f71b966e..f892849fae 100644 --- a/mail/em-network-prefs.c +++ b/mail/em-network-prefs.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -74,7 +74,7 @@ GType em_network_prefs_get_type (void) { static GType type = 0; - + if (!type) { static const GTypeInfo info = { sizeof (EMNetworkPrefsClass), @@ -85,10 +85,10 @@ em_network_prefs_get_type (void) 0, (GInstanceInitFunc) em_network_prefs_init, }; - + type = g_type_register_static (gtk_vbox_get_type (), "EMNetworkPrefs", &info, 0); } - + return type; } @@ -97,9 +97,9 @@ em_network_prefs_class_init (EMNetworkPrefsClass *klass) { GObjectClass *gobject_class = G_OBJECT_CLASS (klass); GtkObjectClass *object_class = GTK_OBJECT_CLASS (klass); - + parent_class = g_type_class_ref (gtk_vbox_get_type ()); - + object_class->destroy = em_network_prefs_destroy; gobject_class->finalize = em_network_prefs_finalise; } @@ -114,7 +114,7 @@ static void em_network_prefs_finalise (GObject *obj) { d(g_print ("Network preferences finalize is called\n")); - + /* do something here */ G_OBJECT_CLASS (parent_class)->finalize (obj); } @@ -131,7 +131,7 @@ static void toggle_button_toggled (GtkToggleButton *toggle, EMNetworkPrefs *prefs) { const char *key; - + key = g_object_get_data ((GObject *) toggle, "key"); gconf_client_set_bool (prefs->gconf, key, gtk_toggle_button_get_active (toggle), NULL); if (toggle == prefs->use_auth) { @@ -147,13 +147,13 @@ static void toggle_button_init (EMNetworkPrefs *prefs, GtkToggleButton *toggle, const char *key) { gboolean bool; - + bool = gconf_client_get_bool (prefs->gconf, key, NULL); gtk_toggle_button_set_active (toggle, bool); - + g_object_set_data ((GObject *) toggle, "key", (void *) key); g_signal_connect (toggle, "toggled", G_CALLBACK (toggle_button_toggled), prefs); - + if (!gconf_client_key_is_writable (prefs->gconf, key, NULL)) gtk_widget_set_sensitive ((GtkWidget *) toggle, FALSE); } @@ -174,9 +174,9 @@ emnp_set_sensitiveness (EMNetworkPrefs *prefs, NetworkConfigProxyType type, gboo gtk_widget_set_sensitive ((GtkWidget *) prefs->auto_proxy_url, sensitivity); d(g_print ("Setting sensitivity of autoconfig to: %d\n", sensitivity)); } else -#endif +#endif if (type == NETWORK_PROXY_MANUAL) { - gboolean state; + gboolean state; gtk_widget_set_sensitive ((GtkWidget *) prefs->http_host, sensitivity); gtk_widget_set_sensitive ((GtkWidget *) prefs->https_host, sensitivity); @@ -237,11 +237,11 @@ notify_proxy_type_changed (GtkWidget *widget, EMNetworkPrefs *prefs) emnp_set_sensitiveness (prefs, NETWORK_PROXY_MANUAL, TRUE); } - if (type != NETWORK_PROXY_DIRECT_CONNECTION) + if (type != NETWORK_PROXY_DIRECT_CONNECTION) gconf_client_set_bool (prefs->gconf, GCONF_E_USE_PROXY_KEY, TRUE, NULL); else if (type != NETWORK_PROXY_SYS_SETTINGS) gconf_client_set_bool (prefs->gconf, GCONF_E_USE_PROXY_KEY, FALSE, NULL); - + } static void @@ -251,8 +251,8 @@ widget_entry_changed_cb (GtkWidget *widget, gpointer data) int port = -1; GConfClient *gconf = mail_config_get_gconf_client (); - /* - Do not change the order of comparison - + /* + Do not change the order of comparison - GtkSpinButton is an extended form of GtkEntry */ if (GTK_IS_SPIN_BUTTON (widget)) { @@ -269,9 +269,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 @@ -305,9 +305,9 @@ em_network_prefs_construct (EMNetworkPrefs *prefs) gboolean locked; int i, val, port; char *gladefile; - + prefs->gconf = mail_config_get_gconf_client (); - + gladefile = g_build_filename (EVOLUTION_GLADEDIR, "mail-config.glade", NULL); @@ -391,27 +391,34 @@ em_network_prefs_construct (EMNetworkPrefs *prefs) prefs->socks_port = GTK_SPIN_BUTTON (glade_xml_get_widget (gui, "spnSocksPort")); prefs->lbl_socks_host = GTK_LABEL (glade_xml_get_widget (gui, "lblSocksHost")); prefs->lbl_socks_port = GTK_LABEL (glade_xml_get_widget (gui, "lblSocksPort")); - g_signal_connect (prefs->socks_host, "changed", + g_signal_connect (prefs->socks_host, "changed", G_CALLBACK(widget_entry_changed_cb), GCONF_E_SOCKS_HOST_KEY); - g_signal_connect (prefs->socks_port, "value_changed", + g_signal_connect (prefs->socks_port, "value_changed", G_CALLBACK(widget_entry_changed_cb), GCONF_E_SOCKS_PORT_KEY); #endif - + /* Manual proxy options */ - g_signal_connect (prefs->http_host, "changed", - G_CALLBACK(widget_entry_changed_cb), GCONF_E_HTTP_HOST_KEY); - g_signal_connect (prefs->https_host, "changed", - G_CALLBACK(widget_entry_changed_cb), GCONF_E_HTTPS_HOST_KEY); - g_signal_connect (prefs->ignore_hosts, "changed", - G_CALLBACK(widget_entry_changed_cb), 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_signal_connect (prefs->https_port, "value_changed", - G_CALLBACK(widget_entry_changed_cb), GCONF_E_HTTPS_PORT_KEY); - g_signal_connect (prefs->auth_user, "changed", - G_CALLBACK(widget_entry_changed_cb), GCONF_E_AUTH_USER_KEY); - g_signal_connect (prefs->auth_pwd, "changed", - G_CALLBACK(widget_entry_changed_cb), GCONF_E_AUTH_PWD_KEY); + g_signal_connect (prefs->http_host, "changed", + G_CALLBACK(widget_entry_changed_cb), + (gpointer) GCONF_E_HTTP_HOST_KEY); + g_signal_connect (prefs->https_host, "changed", + G_CALLBACK(widget_entry_changed_cb), + (gpointer) GCONF_E_HTTPS_HOST_KEY); + g_signal_connect (prefs->ignore_hosts, "changed", + G_CALLBACK(widget_entry_changed_cb), + (gpointer) GCONF_E_IGNORE_HOSTS_KEY); + g_signal_connect (prefs->http_port, "value_changed", + G_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), + (gpointer) GCONF_E_HTTPS_PORT_KEY); + g_signal_connect (prefs->auth_user, "changed", + G_CALLBACK(widget_entry_changed_cb), + (gpointer) GCONF_E_AUTH_USER_KEY); + g_signal_connect (prefs->auth_pwd, "changed", + G_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); @@ -484,9 +491,9 @@ GtkWidget * em_network_prefs_new (void) { EMNetworkPrefs *new; - + new = (EMNetworkPrefs *) g_object_new (em_network_prefs_get_type (), NULL); em_network_prefs_construct (new); - + return (GtkWidget *) new; } diff --git a/mail/em-network-prefs.h b/mail/em-network-prefs.h index 50d986c5d1..bd4e9e7c8e 100644 --- a/mail/em-network-prefs.h +++ b/mail/em-network-prefs.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -60,11 +60,11 @@ typedef enum { struct _EMNetworkPrefs { GtkVBox parent_object; - + GConfClient *gconf; - + GladeXML *gui; - + /* Default Behavior */ GtkToggleButton *sys_proxy; GtkToggleButton *no_proxy; diff --git a/mail/em-popup.c b/mail/em-popup.c index 4e15a2552d..38c0f7e40b 100644 --- a/mail/em-popup.c +++ b/mail/em-popup.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-popup.h b/mail/em-popup.h index 870055140b..cde903a4ec 100644 --- a/mail/em-popup.h +++ b/mail/em-popup.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-search-context.c b/mail/em-search-context.c index a8a63ebe2d..7bc43a18be 100644 --- a/mail/em-search-context.c +++ b/mail/em-search-context.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-search-context.h b/mail/em-search-context.h index ad18570901..d8b890270c 100644 --- a/mail/em-search-context.h +++ b/mail/em-search-context.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-subscribe-editor.c b/mail/em-subscribe-editor.c index c17872f351..338ec4ccfd 100644 --- a/mail/em-subscribe-editor.c +++ b/mail/em-subscribe-editor.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -113,7 +113,7 @@ struct _EMSubscribeNode { typedef struct _MailMsgListNode MailMsgListNode; struct _MailMsgListNode { - EDListNode node; + EDListNode node; MailMsg *msg; }; @@ -211,8 +211,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 */ @@ -265,7 +266,7 @@ sub_subscribe_folder (EMSubscribe *sub, EMSubscribeNode *node, int state, const d(printf("running subscribe folder '%s'\n", spath)); mail_msg_unordered_push (m); } else { - msgListNode = g_malloc0(sizeof(MailMsgListNode)); + msgListNode = g_malloc0(sizeof(MailMsgListNode)); msgListNode->msg = (MailMsg *) m; d(printf("queueing subscribe folder '%s'\n", spath)); e_dlist_addtail(&sub->subscribe, (EDListNode *)msgListNode); @@ -357,7 +358,7 @@ sub_folderinfo_exec (struct _emse_folderinfo_msg *m) if (m->seq == m->sub->seq) { camel_operation_register(m->base.cancel); - m->info = camel_store_get_folder_info(m->sub->store, m->node?m->node->info->full_name:pub_full_name, + m->info = camel_store_get_folder_info(m->sub->store, m->node?m->node->info->full_name:pub_full_name, CAMEL_STORE_FOLDER_INFO_NO_VIRTUAL | CAMEL_STORE_FOLDER_INFO_SUBSCRIPTION_LIST, &m->base.ex); camel_operation_unregister(m->base.cancel); } @@ -560,7 +561,7 @@ static void sub_destroy(GtkWidget *w, EMSubscribe *sub) { struct _zsubscribe_msg *m; - MailMsgListNode *msgListNode; + MailMsgListNode *msgListNode; d(printf("subscribe closed\n")); sub->cancel = TRUE; diff --git a/mail/em-subscribe-editor.h b/mail/em-subscribe-editor.h index 5e6f4f5e4a..d10d68bbb8 100644 --- a/mail/em-subscribe-editor.h +++ b/mail/em-subscribe-editor.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/em-sync-stream.c b/mail/em-sync-stream.c index 311c2e1b7a..138932cfc7 100644 --- a/mail/em-sync-stream.c +++ b/mail/em-sync-stream.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-sync-stream.h b/mail/em-sync-stream.h index af513e9594..fc687fa462 100644 --- a/mail/em-sync-stream.h +++ b/mail/em-sync-stream.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-utils.c b/mail/em-utils.c index 2a7ce74c70..9b2786904a 100644 --- a/mail/em-utils.c +++ b/mail/em-utils.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -666,12 +666,12 @@ em_utils_save_messages (GtkWindow *parent, CamelFolder *folder, GPtrArray *uids) info = camel_folder_get_message_info (folder, uids->pdata[0]); if (info) { filename = g_strdup (camel_message_info_subject (info)); - e_filename_make_safe (filename); + e_filename_make_safe (filename); camel_message_info_free (info); } filesel = e_file_get_save_filesel (parent, _("Save Message..."), filename, GTK_FILE_CHOOSER_ACTION_SAVE); - if (filename) + if (filename) g_free (filename); camel_object_ref(folder); @@ -1406,15 +1406,15 @@ em_utils_folder_is_templates (CamelFolder *folder, const char *uri) if (folder == local_templates_folder) return TRUE; - + if (folder == NULL || uri == NULL) return FALSE; - + accounts = e_get_account_list (); iter = e_list_get_iterator ((EList *)accounts); while (e_iterator_is_valid (iter)) { account = (EAccount *)e_iterator_get (iter); - + if (account->templates_folder_uri) { templates_uri = em_uri_to_camel (account->templates_folder_uri); if (camel_store_folder_uri_equal (folder->parent_store, templates_uri, uri)) { @@ -1424,15 +1424,15 @@ em_utils_folder_is_templates (CamelFolder *folder, const char *uri) } g_free (templates_uri); } - + e_iterator_next (iter); } - + g_object_unref (iter); - + return is; } - + /** * em_utils_folder_is_drafts: * @folder: folder diff --git a/mail/em-utils.h b/mail/em-utils.h index 3167dba8fb..dd04f40ec3 100644 --- a/mail/em-utils.h +++ b/mail/em-utils.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-vfolder-context.c b/mail/em-vfolder-context.c index 88c97b0a0f..e317b5cabf 100644 --- a/mail/em-vfolder-context.c +++ b/mail/em-vfolder-context.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-vfolder-context.h b/mail/em-vfolder-context.h index 50ce239fb6..7f17f4e2b4 100644 --- a/mail/em-vfolder-context.h +++ b/mail/em-vfolder-context.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-vfolder-editor.c b/mail/em-vfolder-editor.c index 9c43b211ed..9a18c69a3a 100644 --- a/mail/em-vfolder-editor.c +++ b/mail/em-vfolder-editor.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-vfolder-editor.h b/mail/em-vfolder-editor.h index d46c35fa3d..550f7cd2d3 100644 --- a/mail/em-vfolder-editor.h +++ b/mail/em-vfolder-editor.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/em-vfolder-rule.c b/mail/em-vfolder-rule.c index fa27e22f9c..b8ef41fda8 100644 --- a/mail/em-vfolder-rule.c +++ b/mail/em-vfolder-rule.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -261,7 +261,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); @@ -384,7 +384,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) }, @@ -431,7 +431,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/em-vfolder-rule.h b/mail/em-vfolder-rule.h index bc6a330c4b..9274c94b5c 100644 --- a/mail/em-vfolder-rule.h +++ b/mail/em-vfolder-rule.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/evolution-module-mail.c b/mail/evolution-module-mail.c index a629681b4c..97bc953c41 100644 --- a/mail/evolution-module-mail.c +++ b/mail/evolution-module-mail.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/importers/elm-importer.c b/mail/importers/elm-importer.c index 156c8d08cb..39bfd7bc3f 100644 --- a/mail/importers/elm-importer.c +++ b/mail/importers/elm-importer.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/importers/evolution-mbox-importer.c b/mail/importers/evolution-mbox-importer.c index 964741f28a..ff6c7dd13b 100644 --- a/mail/importers/evolution-mbox-importer.c +++ b/mail/importers/evolution-mbox-importer.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/importers/mail-importer.c b/mail/importers/mail-importer.c index ebf79e88b8..e56ca01dcd 100644 --- a/mail/importers/mail-importer.c +++ b/mail/importers/mail-importer.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/importers/mail-importer.h b/mail/importers/mail-importer.h index 4144deba98..f108967ebc 100644 --- a/mail/importers/mail-importer.h +++ b/mail/importers/mail-importer.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -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/importers/pine-importer.c b/mail/importers/pine-importer.c index e040a4060e..3a4e6d9cc1 100644 --- a/mail/importers/pine-importer.c +++ b/mail/importers/pine-importer.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/mail-autofilter.c b/mail/mail-autofilter.c index b437fda1c6..f195ebf5d1 100644 --- a/mail/mail-autofilter.c +++ b/mail/mail-autofilter.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * Authors: * Michael Zucchi <notzed@ximian.com> diff --git a/mail/mail-autofilter.h b/mail/mail-autofilter.h index bae8bd8313..c12539a9d2 100644 --- a/mail/mail-autofilter.h +++ b/mail/mail-autofilter.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/mail-component.c b/mail/mail-component.c index 6167cc58f6..7cf42f63a6 100644 --- a/mail/mail-component.c +++ b/mail/mail-component.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -387,7 +387,6 @@ impl_quit(PortableServer_Servant servant, CORBA_Environment *ev) 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; @@ -520,7 +519,7 @@ mail_component_init (MailComponent *component) // priv->mail_sync_in_progress = 0; // if (g_getenv("CAMEL_FLUSH_CHANGES")) // priv->mail_sync_id = g_timeout_add_seconds (mail_config_get_sync_timeout (), call_mail_sync, component); -// else +// else // priv->mail_sync_id = 0; } diff --git a/mail/mail-component.h b/mail/mail-component.h index 7ab8d64cf0..09b19f4c4f 100644 --- a/mail/mail-component.h +++ b/mail/mail-component.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/mail-config.c b/mail/mail-config.c index 45fc8f9b40..59bab65785 100644 --- a/mail/mail-config.c +++ b/mail/mail-config.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -90,10 +90,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; - static void config_clear_mime_types (void) { @@ -197,8 +198,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 */ @@ -367,7 +366,7 @@ mail_config_init (void) config->gconf, key, func, &config->error_time, NULL, NULL); config->error_time = - gconf_client_get_int (config->gconf, key, NULL); + gconf_client_get_int (config->gconf, key, NULL); key = "/apps/evolution/mail/display/error_level"; func = (GConfClientNotifyFunc) gconf_int_value_changed; @@ -375,7 +374,7 @@ mail_config_init (void) config->gconf, key, func, &config->error_level, NULL, NULL); config->error_level = - gconf_client_get_int (config->gconf, key, NULL); + gconf_client_get_int (config->gconf, key, NULL); key = "/apps/evolution/mail/display/force_message_limit"; func = (GConfClientNotifyFunc) gconf_bool_value_changed; @@ -595,7 +594,7 @@ mail_config_get_address_count (void) guint mail_config_get_error_timeout (void) -{ +{ if (!config) mail_config_init (); @@ -604,7 +603,7 @@ mail_config_get_error_timeout (void) guint mail_config_get_error_level (void) -{ +{ if (!config) mail_config_init (); @@ -800,12 +799,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 }; account_list = e_get_account_list (); iter = e_list_get_iterator ((EList *) account_list); @@ -929,7 +929,7 @@ mail_config_reload_junk_headers (void) /* It automatically sets in the session */ if (config == NULL) mail_config_init (); - else + else gconf_jh_check_changed (config->gconf, 0, NULL, config); } diff --git a/mail/mail-config.h b/mail/mail-config.h index 9a3386dd1d..87628dcfcb 100644 --- a/mail/mail-config.h +++ b/mail/mail-config.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/mail-dialogs.glade b/mail/mail-dialogs.glade index 19a20fe629..67feb18be0 100644 --- a/mail/mail-dialogs.glade +++ b/mail/mail-dialogs.glade @@ -197,7 +197,6 @@ <property name="visible">True</property> <property name="label" translatable="yes">S_erver:</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">store_menu</property> </widget> <packing> <property name="expand">False</property> @@ -206,10 +205,8 @@ </packing> </child> <child> - <widget class="GtkOptionMenu" id="store_menu"> + <widget class="GtkComboBox" id="store_combobox"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> </widget> <packing> <property name="expand">False</property> @@ -455,10 +452,10 @@ <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="Custom" id="pixmap"> + <widget class="GtkImage" id="pixmap"> <property name="visible">True</property> - <property name="creation_function">e_create_image_widget</property> - <property name="string1">stock_mail-flag-for-followup</property> + <property name="icon_name">stock_mail-flag-for-followup</property> + <property name="icon-size">6</property> </widget> <packing> <property name="expand">False</property> @@ -517,7 +514,6 @@ Please select a follow up action from the "Flag" menu.</property> <property name="label" translatable="yes">_Flag:</property> <property name="use_underline">True</property> <property name="justify">center</property> - <property name="mnemonic_widget">combo-entry</property> </widget> <packing> <property name="x_options">GTK_FILL</property> @@ -555,37 +551,6 @@ Please select a follow up action from the "Flag" menu.</property> </packing> </child> <child> - <widget class="GtkCombo" id="combo"> - <property name="visible">True</property> - <property name="enable_arrows_always">False</property> - <child internal-child="entry"> - <widget class="GtkEntry" id="combo-entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </widget> - <packing> - <property name="position">0</property> - </packing> - </child> - <child internal-child="list"> - <widget class="GtkList" id="convertwidget3"> - <property name="visible">True</property> - <property name="selection_mode">browse</property> - <child> - <widget class="GtkListItem" id="convertwidget4"> - <property name="visible">True</property> - </widget> - </child> - </widget> - </child> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="y_options"></property> - </packing> - </child> - <child> <widget class="Custom" id="target_date"> <property name="visible">True</property> <property name="creation_function">target_date_new</property> @@ -617,6 +582,19 @@ Please select a follow up action from the "Flag" menu.</property> </packing> </child> <child> + <widget class="GtkComboBoxEntry" id="combo"> + <property name="visible">True</property> + <property name="items" translatable="yes">a +b</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> <placeholder/> </child> </widget> diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c index b6a92bc8be..23b85acc7f 100644 --- a/mail/mail-folder-cache.c +++ b/mail/mail-folder-cache.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -198,7 +198,8 @@ real_flush_updates (EMailShellBackend *mail_shell_backend) if (t->new > 0) e_shell_event ( - shell, "mail-icon", "mail-unread"); + shell, "mail-icon", + (gpointer) "mail-unread"); /** @Event: folder.changed * @Title: Folder changed diff --git a/mail/mail-folder-cache.h b/mail/mail-folder-cache.h index fe893af84f..d7bd82dbaf 100644 --- a/mail/mail-folder-cache.h +++ b/mail/mail-folder-cache.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/mail-mt.c b/mail/mail-mt.c index 716b36a03c..90119cc55a 100644 --- a/mail/mail-mt.c +++ b/mail/mail-mt.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) */ diff --git a/mail/mail-mt.h b/mail/mail-mt.h index b95620a000..ed23c3beeb 100644 --- a/mail/mail-mt.h +++ b/mail/mail-mt.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/mail-ops.c b/mail/mail-ops.c index a762e75676..d1116395b6 100644 --- a/mail/mail-ops.c +++ b/mail/mail-ops.c @@ -1,5 +1,5 @@ /* - * mail-ops.c: callbacks for the mail toolbar/menus + * mail-ops.c: callbacks for the mail toolbar/menus * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -99,7 +99,7 @@ struct _fetch_mail_msg { char *source_uri; - void (*done)(char *source, void *data); + void (*done)(const char *source, void *data); void *data; }; @@ -407,7 +407,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; @@ -436,13 +436,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 @@ -674,7 +674,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; }; @@ -733,7 +733,7 @@ send_queue_exec (struct _send_queue_msg *m) camel_operation_register (m->cancel); else camel_operation_register (m->base.cancel); - + if (!m->cancel) camel_operation_start (NULL, _("Sending message")); @@ -795,7 +795,7 @@ send_queue_exec (struct _send_queue_msg *m) camel_folder_sync (sent_folder, FALSE, &ex); camel_exception_clear (&ex); } - + if (!m->cancel) camel_operation_end (NULL); @@ -803,7 +803,7 @@ send_queue_exec (struct _send_queue_msg *m) camel_operation_unregister (m->cancel); else camel_operation_unregister (m->base.cancel); - + } static void @@ -844,7 +844,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; @@ -2482,7 +2482,7 @@ prepare_offline_exec (struct _set_offline_msg *m) } else if (CAMEL_IS_OFFLINE_STORE (m->store)) { camel_offline_store_prepare_for_offline (CAMEL_OFFLINE_STORE (m->store), &m->base.ex); - } + } } static void diff --git a/mail/mail-ops.h b/mail/mail-ops.h index 327a35174b..55816ca24b 100644 --- a/mail/mail-ops.h +++ b/mail/mail-ops.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -136,14 +136,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 7b6326338e..a463bb835b 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -427,7 +427,7 @@ build_dialog (GtkWindow *parent, g_object_unref (iter); /* Check to see if we have to send any mails --- if we don't, don't display the SMTP row in the table */ - if (outbox && destination + if (outbox && destination && (camel_folder_get_message_count(outbox) - camel_folder_get_deleted_message_count(outbox)) == 0) num_sources--; @@ -556,7 +556,7 @@ build_dialog (GtkWindow *parent, e_event_emit ((EEvent *)em_event_peek (), "mail.sendreceive", (EEventTarget *) target); /* Skip displaying the SMTP row if we've got no outbox, destination or unsent mails */ - if (outbox && destination + if (outbox && destination && (camel_folder_get_message_count(outbox) - camel_folder_get_deleted_message_count(outbox)) != 0) { info = g_hash_table_lookup (data->active, SEND_URI_KEY); if (info == NULL) { @@ -570,7 +570,7 @@ build_dialog (GtkWindow *parent, 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); @@ -684,7 +684,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; @@ -1226,7 +1226,7 @@ mail_send (void) info->status_label = NULL; info->uri = g_strdup (transport->url); info->keep_on_server = FALSE; - info->cancel = NULL; + info->cancel = NULL; info->cancel_button = NULL; info->data = data; info->state = SEND_ACTIVE; @@ -1234,7 +1234,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 = e_mail_shell_backend_get_folder ( diff --git a/mail/mail-send-recv.h b/mail/mail-send-recv.h index a9f18f6a0b..02be2ce2e0 100644 --- a/mail/mail-send-recv.h +++ b/mail/mail-send-recv.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/mail-session.c b/mail/mail-session.c index c236a144d1..bab6a67729 100644 --- a/mail/mail-session.c +++ b/mail/mail-session.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/mail-session.h b/mail/mail-session.h index 135898e8b2..764ee0f710 100644 --- a/mail/mail-session.h +++ b/mail/mail-session.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/mail-tools.c b/mail/mail-tools.c index d5f90b0d35..1dc96f702e 100644 --- a/mail/mail-tools.c +++ b/mail/mail-tools.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/mail-tools.h b/mail/mail-tools.h index 794c1d4735..1590636e5c 100644 --- a/mail/mail-tools.h +++ b/mail/mail-tools.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c index dc0f64e6fd..6be803b70b 100644 --- a/mail/mail-vfolder.c +++ b/mail/mail-vfolder.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -996,8 +996,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/mail-vfolder.h b/mail/mail-vfolder.h index 2db87654b1..1c7ad0d150 100644 --- a/mail/mail-vfolder.h +++ b/mail/mail-vfolder.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/message-list.c b/mail/message-list.c index e970a09a7d..8d84e4ae8c 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -128,7 +128,7 @@ enum { }; static struct { - char *target; + const gchar *target; GdkAtom atom; guint32 actions; } ml_drag_info[] = { @@ -145,15 +145,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 }, }; /* @@ -228,8 +228,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 }, @@ -1203,7 +1203,7 @@ sanitize_recipients (const gchar *string) char **name; if (!string || !*string) - return ""; + return (gchar *) ""; gstring = g_string_new (""); @@ -2186,10 +2186,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 @@ -2785,7 +2785,7 @@ clear_tree (MessageList *ml, gboolean tfree) ml->tree_root = e_tree_memory_node_insert (E_TREE_MEMORY(etm), NULL, 0, NULL); if (tfree) - e_tree_model_rebuilt (E_TREE_MODEL(etm)); + e_tree_model_rebuilt (E_TREE_MODEL(etm)); #ifdef TIMEIT gettimeofday(&end, NULL); diff = end.tv_sec * 1000 + end.tv_usec/1000; @@ -3749,7 +3749,7 @@ message_list_get_uids(MessageList *ml) ml, g_ptr_array_new() }; - + e_tree_path_foreach(ml->tree, ml_getselected_cb, &data); if (ml->folder && data.uids->len) @@ -3765,11 +3765,11 @@ message_list_get_selected(MessageList *ml) ml, g_ptr_array_new() }; - + e_tree_selected_path_foreach(ml->tree, ml_getselected_cb, &data); if (ml->folder && data.uids->len) - camel_folder_sort_uids (ml->folder, data.uids); + camel_folder_sort_uids (ml->folder, data.uids); return data.uids; } @@ -4169,7 +4169,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; @@ -4190,13 +4190,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) { @@ -4204,7 +4204,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; } @@ -4457,7 +4457,7 @@ regen_list_done (struct _regen_list_msg *m) if (m->last_row >= e_table_model_row_count (E_TABLE_MODEL (etta))) m->last_row = e_table_model_row_count (E_TABLE_MODEL (etta)) - 1; - + if (m->last_row >= 0) { ETreePath path; diff --git a/mail/message-list.h b/mail/message-list.h index c388f89f96..4288568d4f 100644 --- a/mail/message-list.h +++ b/mail/message-list.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/message-tag-editor.c b/mail/message-tag-editor.c index 71d2ae41c8..d3a1d15bfe 100644 --- a/mail/message-tag-editor.c +++ b/mail/message-tag-editor.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/message-tag-editor.h b/mail/message-tag-editor.h index 019c7e2e63..30d3ec1e9b 100644 --- a/mail/message-tag-editor.h +++ b/mail/message-tag-editor.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/mail/message-tag-followup.c b/mail/message-tag-followup.c index f2a7437a6f..ddbb6492f9 100644 --- a/mail/message-tag-followup.c +++ b/mail/message-tag-followup.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -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/mail/message-tag-followup.h b/mail/message-tag-followup.h index 4b18865d89..5c229fe36e 100644 --- a/mail/message-tag-followup.h +++ b/mail/message-tag-followup.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: |