diff options
| author | Matthew Barnes <mbarnes@src.gnome.org> | 2009-02-02 11:39:24 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2009-02-02 11:39:24 +0800 |
| commit | 38c8ce1aac739a3e74448ff5ed7fa2e003a9cc28 (patch) | |
| tree | 8cbc3bcc756380e222510848ca94f34d087357d6 /mail | |
| parent | 533cd49bc6475ef48ad5eb6a93d0f58450b3c9e8 (diff) | |
| download | gsoc2013-evolution-38c8ce1aac739a3e74448ff5ed7fa2e003a9cc28.tar.gz gsoc2013-evolution-38c8ce1aac739a3e74448ff5ed7fa2e003a9cc28.tar.zst gsoc2013-evolution-38c8ce1aac739a3e74448ff5ed7fa2e003a9cc28.zip | |
Fix compiler warnings.
svn path=/trunk/; revision=37206
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 7 | ||||
| -rw-r--r-- | mail/em-event.c | 1 | ||||
| -rw-r--r-- | mail/em-event.h | 2 | ||||
| -rw-r--r-- | mail/em-migrate.c | 7 |
4 files changed, 13 insertions, 4 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index c2f0e4689f..969d4a4550 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,10 @@ +2009-02-01 Matthew Barnes <mbarnes@redhat.com> + + * em-event.c: + * em-event.h: + * em-migrate.c: + Fix compiler warnings. + 2009-02-01 Johnny Jacob <jjohnny@novell.com> * em-event.h (struct _EMEventTargetFolderBrowser): Added. diff --git a/mail/em-event.c b/mail/em-event.c index fe7f5bd1fd..8a027cce98 100644 --- a/mail/em-event.c +++ b/mail/em-event.c @@ -32,7 +32,6 @@ #include "em-event.h" #include "composer/e-msg-composer.h" #include "libedataserver/e-msgport.h" -#include "em-folder-browser.h" #include <camel/camel-store.h> #include <camel/camel-folder.h> diff --git a/mail/em-event.h b/mail/em-event.h index 10da5a669d..eb45050a27 100644 --- a/mail/em-event.h +++ b/mail/em-event.h @@ -27,6 +27,7 @@ #include <glib-object.h> #include "e-util/e-event.h" +#include "mail/em-folder-browser.h" #ifdef __cplusplus extern "C" { @@ -154,6 +155,7 @@ GType em_event_get_type(void); EMEvent *em_event_peek(void); EMEventTargetFolder *em_event_target_new_folder(EMEvent *emp, const char *uri, guint32 flags); +EMEventTargetFolderBrowser *em_event_target_new_folder_browser (EMEvent *eme, EMFolderBrowser *emfb); EMEventTargetComposer *em_event_target_new_composer(EMEvent *emp, const struct _EMsgComposer *composer, guint32 flags); EMEventTargetMessage *em_event_target_new_message(EMEvent *emp, struct _CamelFolder *folder, struct _CamelMimeMessage *message, const char *uid, guint32 flags); EMEventTargetSendReceive * em_event_target_new_send_receive(EMEvent *eme, struct _GtkWidget *table, gpointer data, int row, guint32 flags); diff --git a/mail/em-migrate.c b/mail/em-migrate.c index c2c63582ea..7f7e6a1c44 100644 --- a/mail/em-migrate.c +++ b/mail/em-migrate.c @@ -2856,10 +2856,11 @@ migrate_folders(CamelStore *store, gboolean is_local, CamelFolderInfo *fi, const while (fi) { double progress; + char *tmp; *nth_folder = *nth_folder + 1; - char *tmp = g_strdup_printf ("%s/%s", acc, fi->full_name); + tmp = g_strdup_printf ("%s/%s", acc, fi->full_name); em_migrate_set_folder_name (tmp); g_free (tmp); @@ -2957,6 +2958,7 @@ migrate_to_db() info = camel_store_get_folder_info (store, NULL, CAMEL_STORE_FOLDER_INFO_RECURSIVE|CAMEL_STORE_FOLDER_INFO_FAST|CAMEL_STORE_FOLDER_INFO_SUBSCRIBED, NULL); if (info) { + GThread *thread; struct migrate_folders_to_db_structure migrate_dbs; if (g_str_has_suffix (((CamelService *)store)->url->path, ".evolution/mail/local")) @@ -2969,7 +2971,6 @@ migrate_to_db() migrate_dbs.store = store; migrate_dbs.done = FALSE; - GThread *thread; thread = g_thread_create ((GThreadFunc) migrate_folders_to_db_thread, &migrate_dbs, TRUE, NULL); while (!migrate_dbs.done) g_main_context_iteration (NULL, TRUE); @@ -2995,6 +2996,7 @@ migrate_to_db() store = (CamelStore *) camel_session_get_service (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) { + GThread *thread; struct migrate_folders_to_db_structure migrate_dbs; migrate_dbs.ex = ex; @@ -3003,7 +3005,6 @@ migrate_to_db() migrate_dbs.store = store; migrate_dbs.done = FALSE; - GThread *thread; thread = g_thread_create ((GThreadFunc) migrate_folders_to_db_thread, &migrate_dbs, TRUE, NULL); while (!migrate_dbs.done) g_main_context_iteration (NULL, TRUE); |