aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog23
-rw-r--r--mail/mail-callbacks.c1
-rw-r--r--mail/mail-config.c2
-rw-r--r--mail/mail-identify.c1
-rw-r--r--mail/mail-mt.c18
-rw-r--r--mail/mail-offline-handler.c1
-rw-r--r--mail/mail-session.c8
-rw-r--r--mail/message-list.c6
8 files changed, 43 insertions, 17 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 522af8d4df..d6264ff5af 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,26 @@
+2003-05-17 Jeremy Katz <katzj@redhat.com>
+
+ * mail-offline-handler.c: Add #include to fix warning.
+
+ * mail-mt.c (mail_msg_new): Use glib macros for pointer/int
+ conversions.
+ (mail_msg_free): Likewise.
+ (mail_msg_cancel): Likewise.
+ (mail_msg_wait): Likewise.
+ (mail_msg_active): Likewise.
+ * mail-session.c (main_register_timeout): Likewise.
+ (register_timeout): Likewise.
+ (main_remove_timeout): Likewise.
+ (remove_timeout): Likewise.
+ * message-list.c (ml_value_to_string): Likewise.
+
+ * mail-identify.c: Add #include to fix warning.
+
+ * mail-config.c (config_write_fonts): Don't pass extra arguments
+ to g_warning.
+
+ * mail-callbacks.c: Add #include to fix warning.
+
2003-05-15 Not Zed <NotZed@Ximian.com>
** See bug #42838.
diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c
index ff77fcd453..0ae5467011 100644
--- a/mail/mail-callbacks.c
+++ b/mail/mail-callbacks.c
@@ -41,6 +41,7 @@
#include <libgnomeprint/gnome-print-job.h>
#include <libgnomeprintui/gnome-print-dialog.h>
+#include <libgnomeprintui/gnome-print-job-preview.h>
#include <bonobo/bonobo-widget.h>
#include <bonobo/bonobo-socket.h>
diff --git a/mail/mail-config.c b/mail/mail-config.c
index ed789204ef..48ca76ccfc 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -438,7 +438,7 @@ config_write_fonts (void)
char *var_font;
if (!evolution_dir) {
- g_warning ("evolution_dir empty", filename);
+ g_warning ("evolution_dir empty");
return;
}
diff --git a/mail/mail-identify.c b/mail/mail-identify.c
index 483725c78f..2e3f517145 100644
--- a/mail/mail-identify.c
+++ b/mail/mail-identify.c
@@ -31,6 +31,7 @@
#include <glib.h>
#include <libgnomevfs/gnome-vfs-utils.h>
+#include <libgnomevfs/gnome-vfs-mime.h>
#include <libgnomevfs/gnome-vfs-mime-utils.h>
#include "mail.h"
diff --git a/mail/mail-mt.c b/mail/mail-mt.c
index ac67fc4485..0cef1f2b30 100644
--- a/mail/mail-mt.c
+++ b/mail/mail-mt.c
@@ -114,11 +114,11 @@ void *mail_msg_new(mail_msg_op_t *ops, EMsgPort *reply_port, size_t size)
msg->ops = ops;
msg->seq = mail_msg_seq++;
msg->msg.reply_port = reply_port;
- msg->cancel = camel_operation_new(mail_operation_status, (void *)msg->seq);
+ msg->cancel = camel_operation_new(mail_operation_status, GINT_TO_POINTER(msg->seq));
camel_exception_init(&msg->ex);
msg->priv = g_malloc0(sizeof(*msg->priv));
- g_hash_table_insert(mail_msg_active_table, (void *)msg->seq, msg);
+ g_hash_table_insert(mail_msg_active_table, GINT_TO_POINTER(msg->seq), msg);
d(printf("New message %p\n", msg));
@@ -184,7 +184,7 @@ void mail_msg_free(void *msg)
fprintf(log, "%p: Free (exception `%s')\n", msg,
camel_exception_get_description(&m->ex)?camel_exception_get_description(&m->ex):"None");
#endif
- g_hash_table_remove(mail_msg_active_table, (void *)m->seq);
+ g_hash_table_remove(mail_msg_active_table, GINT_TO_POINTER(m->seq));
pthread_cond_broadcast(&mail_msg_cond);
/* We need to make sure we dont lose a reference here YUCK YUCK */
@@ -281,7 +281,7 @@ void mail_msg_cancel(unsigned int msgid)
struct _mail_msg *m;
MAIL_MT_LOCK(mail_msg_lock);
- m = g_hash_table_lookup(mail_msg_active_table, (void *)msgid);
+ m = g_hash_table_lookup(mail_msg_active_table, GINT_TO_POINTER(msgid));
if (m && m->cancel)
camel_operation_cancel(m->cancel);
@@ -299,20 +299,20 @@ void mail_msg_wait(unsigned int msgid)
if (ismain) {
MAIL_MT_LOCK(mail_msg_lock);
- m = g_hash_table_lookup(mail_msg_active_table, (void *)msgid);
+ m = g_hash_table_lookup(mail_msg_active_table, GINT_TO_POINTER(msgid));
while (m) {
MAIL_MT_UNLOCK(mail_msg_lock);
gtk_main_iteration();
MAIL_MT_LOCK(mail_msg_lock);
- m = g_hash_table_lookup(mail_msg_active_table, (void *)msgid);
+ m = g_hash_table_lookup(mail_msg_active_table, GINT_TO_POINTER(msgid));
}
MAIL_MT_UNLOCK(mail_msg_lock);
} else {
MAIL_MT_LOCK(mail_msg_lock);
- m = g_hash_table_lookup(mail_msg_active_table, (void *)msgid);
+ m = g_hash_table_lookup(mail_msg_active_table, GINT_TO_POINTER(msgid));
while (m) {
pthread_cond_wait(&mail_msg_cond, &mail_msg_lock);
- m = g_hash_table_lookup(mail_msg_active_table, (void *)msgid);
+ m = g_hash_table_lookup(mail_msg_active_table, GINT_TO_POINTER(msgid));
}
MAIL_MT_UNLOCK(mail_msg_lock);
}
@@ -326,7 +326,7 @@ int mail_msg_active(unsigned int msgid)
if (msgid == (unsigned int)-1)
active = g_hash_table_size(mail_msg_active_table) > 0;
else
- active = g_hash_table_lookup(mail_msg_active_table, (void *)msgid) != NULL;
+ active = g_hash_table_lookup(mail_msg_active_table, GINT_TO_POINTER(msgid)) != NULL;
MAIL_MT_UNLOCK(mail_msg_lock);
return active;
diff --git a/mail/mail-offline-handler.c b/mail/mail-offline-handler.c
index 8249d66a48..37a2a6eaae 100644
--- a/mail/mail-offline-handler.c
+++ b/mail/mail-offline-handler.c
@@ -29,6 +29,7 @@
#include "mail-offline-handler.h"
#include "mail.h"
#include "mail-ops.h"
+#include "mail-folder-cache.h"
#include <gtk/gtkmain.h>
diff --git a/mail/mail-session.c b/mail/mail-session.c
index db5695c095..52bfba7497 100644
--- a/mail/mail-session.c
+++ b/mail/mail-session.c
@@ -657,7 +657,7 @@ static void
main_register_timeout (CamelSession *session, void *event_data, void *data)
{
MailSession *ms = (MailSession *)session;
- unsigned int handle = (unsigned int)event_data;
+ unsigned int handle = GPOINTER_TO_UINT(event_data);
struct _timeout_data *td;
MAIL_SESSION_LOCK(session, lock);
@@ -707,7 +707,7 @@ register_timeout (CamelSession *session, guint32 interval, CamelTimeoutCallback
camel_object_ref (ms);
mail_async_event_emit (ms->async, MAIL_ASYNC_GUI, (MailAsyncFunc) main_register_timeout,
- (CamelObject *) session, (void *) ret, NULL);
+ (CamelObject *) session, GUINT_TO_POINTER(ret), NULL);
return ret;
}
@@ -716,7 +716,7 @@ static void
main_remove_timeout (CamelSession *session, void *event_data, void *data)
{
MailSession *ms = (MailSession *) session;
- unsigned int handle = (unsigned int) event_data;
+ unsigned int handle = GPOINTER_TO_UINT(event_data);
struct _timeout_data *td;
MAIL_SESSION_LOCK(session, lock);
@@ -750,7 +750,7 @@ remove_timeout (CamelSession *session, guint handle)
if (remove) {
camel_object_ref (ms);
mail_async_event_emit (ms->async, MAIL_ASYNC_GUI, (MailAsyncFunc) main_remove_timeout,
- (CamelObject *) session, (void *) handle, NULL);
+ (CamelObject *) session, GUINT_TO_POINTER(handle), NULL);
} else
g_warning ("Removing a timeout i dont know about (or twice): %d", handle);
diff --git a/mail/message-list.c b/mail/message-list.c
index a33f0d0342..3f3da9f8d2 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -762,13 +762,13 @@ ml_value_to_string (ETreeModel *etm, int col, const void *value, void *data)
switch (col){
case COL_MESSAGE_STATUS:
- i = (unsigned int)value;
+ i = GPOINTER_TO_UINT(value);
if (i > 4)
return g_strdup ("");
return g_strdup (_(status_map[i]));
case COL_SCORE:
- i = (unsigned int) value + 3;
+ i = GPOINTER_TO_UINT(value) + 3;
if (i > 6)
i = 3;
return g_strdup (_(score_map[i]));
@@ -778,7 +778,7 @@ ml_value_to_string (ETreeModel *etm, int col, const void *value, void *data)
case COL_DELETED:
case COL_UNREAD:
case COL_FOLLOWUP_FLAG_STATUS:
- return g_strdup_printf ("%d", (int) value);
+ return g_strdup_printf ("%d", GPOINTER_TO_UINT(value));
case COL_SENT:
case COL_RECEIVED: