diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/em-composer-utils.c | 1 | ||||
| -rw-r--r-- | mail/em-event.h | 2 | ||||
| -rw-r--r-- | mail/em-folder-browser.c | 2 | ||||
| -rw-r--r-- | mail/em-sync-stream.c | 2 | ||||
| -rw-r--r-- | mail/mail-mt.c | 4 | ||||
| -rw-r--r-- | mail/mail-send-recv.h | 10 |
6 files changed, 10 insertions, 11 deletions
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c index 8b77c716a5..e76159a0dc 100644 --- a/mail/em-composer-utils.c +++ b/mail/em-composer-utils.c @@ -2336,7 +2336,6 @@ em_utils_reply_to_message(CamelFolder *folder, const gchar *uid, CamelMimeMessag g_return_val_if_fail(message != NULL, NULL); - to = camel_internet_address_new(); cc = camel_internet_address_new(); diff --git a/mail/em-event.h b/mail/em-event.h index 6b6a5cf675..6b3618405f 100644 --- a/mail/em-event.h +++ b/mail/em-event.h @@ -152,7 +152,7 @@ EMEvent *em_event_peek(void); EMEventTargetFolder *em_event_target_new_folder(EMEvent *emp, const gchar *uri, guint32 flags); EMEventTargetFolderBrowser *em_event_target_new_folder_browser (EMEvent *eme, EMFolderBrowser *emfb); EMEventTargetComposer *em_event_target_new_composer(EMEvent *emp, const EMsgComposer *composer, guint32 flags); -EMEventTargetMessage *em_event_target_new_message(EMEvent *emp, CamelFolder *folder, CamelMimeMessage *message, const gchar *uid, guint32 flags, +EMEventTargetMessage *em_event_target_new_message(EMEvent *emp, CamelFolder *folder, CamelMimeMessage *message, const gchar *uid, guint32 flags, EMsgComposer *composer); EMEventTargetSendReceive * em_event_target_new_send_receive(EMEvent *eme, GtkWidget *table, gpointer data, gint row, guint32 flags); EMEventTargetCustomIcon * em_event_target_new_custom_icon(EMEvent *eme, GtkTreeStore *store, GtkTreeIter *iter, const gchar *uri, guint32 flags); diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c index 66f76c6548..5c939992ac 100644 --- a/mail/em-folder-browser.c +++ b/mail/em-folder-browser.c @@ -1285,7 +1285,7 @@ emfb_search_search_activated(ESearchBar *esb, EMFolderBrowser *emfb) l = l->next; } - camel_vee_folder_set_expression (efb->all_account_search_vf, search_word); + camel_vee_folder_set_expression (efb->all_account_search_vf, search_word); efb->account_search_cancel = camel_operation_new (NULL, NULL); vfolder_setup ((CamelFolder *)efb->all_account_search_vf, NULL, folder_list, efb->account_search_cancel); diff --git a/mail/em-sync-stream.c b/mail/em-sync-stream.c index 8c7d266855..982a56c90a 100644 --- a/mail/em-sync-stream.c +++ b/mail/em-sync-stream.c @@ -108,7 +108,7 @@ emss_sync_op (EMSyncStream *emss, enum _write_msg_t op, msg.len = len; camel_object_ref (emss); - + if (emss->idle_id) g_source_remove (emss->idle_id); emss->idle_id = g_idle_add ((GSourceFunc) emss_process_message, &msg); diff --git a/mail/mail-mt.c b/mail/mail-mt.c index 729a4228cc..0032a21432 100644 --- a/mail/mail-mt.c +++ b/mail/mail-mt.c @@ -486,7 +486,7 @@ mail_msg_idle_cb (void) G_LOCK (idle_source_id); idle_source_id = 0; G_UNLOCK (idle_source_id); - mail_component_show_status_bar (TRUE); + mail_component_show_status_bar (TRUE); /* check the main loop queue */ while ((msg = g_async_queue_try_pop (main_loop_queue)) != NULL) { if (msg->info->exec != NULL) @@ -503,7 +503,7 @@ mail_msg_idle_cb (void) mail_msg_check_error (msg); mail_msg_unref (msg); } - mail_component_show_status_bar (FALSE); + mail_component_show_status_bar (FALSE); return FALSE; } diff --git a/mail/mail-send-recv.h b/mail/mail-send-recv.h index d00e461b4f..08ab233d13 100644 --- a/mail/mail-send-recv.h +++ b/mail/mail-send-recv.h @@ -29,17 +29,17 @@ G_BEGIN_DECLS /* send/receive all uri's */ -GtkWidget * mail_send_receive (void); -GtkWidget * mail_send_receive_dialog (gboolean show_dialog); +GtkWidget * mail_send_receive (void); +GtkWidget * mail_send_receive_dialog (gboolean show_dialog); /* receive a single uri */ -void mail_receive_uri (const gchar *uri, +void mail_receive_uri (const gchar *uri, gboolean keep_on_server); -void mail_send (void); +void mail_send (void); /* setup auto receive stuff */ -void mail_autoreceive_init (CamelSession *session); +void mail_autoreceive_init (CamelSession *session); G_END_DECLS |