aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorMilan Crha <mcrha@src.gnome.org>2007-10-03 16:40:20 +0800
committerMilan Crha <mcrha@src.gnome.org>2007-10-03 16:40:20 +0800
commit10f140bfc24187f5c8d49a3a522e45cfc3b92453 (patch)
tree3506a9d7c683ca8d415d0fe872f018dec2a4a62d /mail
parent6885f966fa5581eda3feeca2b8e0fe001e88410d (diff)
downloadgsoc2013-evolution-10f140bfc24187f5c8d49a3a522e45cfc3b92453.tar
gsoc2013-evolution-10f140bfc24187f5c8d49a3a522e45cfc3b92453.tar.gz
gsoc2013-evolution-10f140bfc24187f5c8d49a3a522e45cfc3b92453.tar.bz2
gsoc2013-evolution-10f140bfc24187f5c8d49a3a522e45cfc3b92453.tar.lz
gsoc2013-evolution-10f140bfc24187f5c8d49a3a522e45cfc3b92453.tar.xz
gsoc2013-evolution-10f140bfc24187f5c8d49a3a522e45cfc3b92453.tar.zst
gsoc2013-evolution-10f140bfc24187f5c8d49a3a522e45cfc3b92453.zip
2007-10-03 mcrha Fix for bug #473903
svn path=/trunk/; revision=34346
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog11
-rw-r--r--mail/em-event.c2
-rw-r--r--mail/em-event.h4
-rw-r--r--mail/mail-send-recv.c7
4 files changed, 18 insertions, 6 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index b27e61c57f..380c3749ff 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,14 @@
+2007-10-03 Milan Crha <mcrha@redhat.com>
+
+ ** Fix for bug #473903
+
+ * mail-send-recv.c: (build_dialog), (receive_get_folder):
+ Fixes serious warnings, rest is because of this fix.
+ * em-event.c: (em_event_target_new_send_receive):
+ * em-event.h: (struct _EMEventTargetSendReceive),
+ (em_event_target_new_send_receive):
+ Changed structure member and function prototype to reflect fixes.
+
2007-10-02 Matthew Barnes <mbarnes@redhat.com>
** Fixes part of bug #469657
diff --git a/mail/em-event.c b/mail/em-event.c
index a2c79e1b94..148db1cf9b 100644
--- a/mail/em-event.c
+++ b/mail/em-event.c
@@ -177,7 +177,7 @@ em_event_target_new_message(EMEvent *eme, CamelFolder *folder, CamelMimeMessage
}
EMEventTargetSendReceive *
-em_event_target_new_send_receive(EMEvent *eme, GtkWidget *table, gpointer *data, int row, guint32 flags)
+em_event_target_new_send_receive(EMEvent *eme, GtkWidget *table, gpointer data, int row, guint32 flags)
{
EMEventTargetSendReceive *t = e_event_target_new(&eme->popup, EM_EVENT_TARGET_SEND_RECEIVE, sizeof(*t));
diff --git a/mail/em-event.h b/mail/em-event.h
index 8ff48813df..4279565c19 100644
--- a/mail/em-event.h
+++ b/mail/em-event.h
@@ -100,7 +100,7 @@ struct _EMEventTargetSendReceive {
EEventTarget target;
struct _GtkWidget *table;
- gpointer *data;
+ gpointer data;
int row;
};
@@ -125,7 +125,7 @@ EMEvent *em_event_peek(void);
EMEventTargetFolder *em_event_target_new_folder(EMEvent *emp, const char *uri, guint32 flags);
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);
+EMEventTargetSendReceive * em_event_target_new_send_receive(EMEvent *eme, struct _GtkWidget *table, gpointer data, int row, guint32 flags);
/* ********************************************************************** */
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index ff6d3d6403..83f146d5ff 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -543,7 +543,7 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destinati
/* Hook: If some one wants to hook on to the sendreceive dialog, this is the way to go. */
target = em_event_target_new_send_receive (em_event_peek(), table, data, row, EM_EVENT_SEND_RECEIVE);
- e_event_emit (em_event_peek(), "mail.sendreceive", target);
+ e_event_emit ((EEvent *)em_event_peek (), "mail.sendreceive", (EEventTarget *) target);
if (outbox && destination) {
info = g_hash_table_lookup (data->active, SEND_URI_KEY);
@@ -736,7 +736,7 @@ receive_get_folder(CamelFilterDriver *d, const char *uri, void *data, CamelExcep
struct _send_info *info = data;
CamelFolder *folder;
struct _folder_info *oldinfo;
- gpointer oldkey;
+ gpointer oldkey, oldinfoptr;
g_mutex_lock(info->data->lock);
oldinfo = g_hash_table_lookup(info->data->folders, uri);
@@ -753,7 +753,8 @@ receive_get_folder(CamelFilterDriver *d, const char *uri, void *data, CamelExcep
/* and we assume the newer one is the same, but unref the old one anyway */
g_mutex_lock(info->data->lock);
- if (g_hash_table_lookup_extended(info->data->folders, uri, &oldkey, (void **)&oldinfo)) {
+ if (g_hash_table_lookup_extended (info->data->folders, uri, &oldkey, &oldinfoptr)) {
+ oldinfo = (struct _folder_info *) oldinfoptr;
camel_object_unref(oldinfo->folder);
oldinfo->folder = folder;
} else {