From 8bd9a3dfa2b20ef6f07f9022bb7bdf1da42bfb67 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 11 Oct 2007 20:44:33 +0000 Subject: Miscellaneous changes related to bug #437579. 2007-10-11 Matthew Barnes Miscellaneous changes related to bug #437579. * configure.in: Put a blank line between the configuration summary and the final "now type make" message. * mail/em-format.c (em_format_add_puri): Use G_GSIZE_FORMAT when printing a gsize/size_t to make compilers on all arches happy. * plugins/mail-notification/mail-notification.c: Put the notification_callback() declaration inside a #ifdef HAVE_LIBNOTIFY block to avoid a potential compiler warning. * calendar/gui/alarm-notify/alarm-queue.c: Fix an implicit GTK+ function declaration on x86_64. svn path=/trunk/; revision=34378 --- ChangeLog | 6 ++++++ calendar/ChangeLog | 5 +++++ calendar/gui/alarm-notify/alarm-queue.c | 13 +++++++------ configure.in | 3 ++- mail/ChangeLog | 6 ++++++ mail/em-format.c | 4 +++- plugins/mail-notification/ChangeLog | 6 ++++++ plugins/mail-notification/mail-notification.c | 2 +- 8 files changed, 36 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 14d168c63d..c912ac97ed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-10-11 Matthew Barnes + + * configure.in: + Put a blank line between the configuration summary and the + final "now type make" message. + 2007-10-11 Tobias Mueller ** Fixes bug 360134 diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 00861a8ead..a4107f05b5 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,8 @@ +2007-10-11 Matthew Barnes + + * gui/alarm-notify/alarm-queue.c: + Fix an implicit GTK+ function declaration on x86_64. + 2007-10-09 Matthew Barnes ** Fixes part of bug #437579 diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c index b650f2e36b..5c74332d42 100644 --- a/calendar/gui/alarm-notify/alarm-queue.c +++ b/calendar/gui/alarm-notify/alarm-queue.c @@ -28,21 +28,22 @@ #include #include #include -#include #include -#include -#include +#include +#include #include #include -#include #include +#include +#include #include #include -#include -#include +#include +#include #include #include #include +#include #include #include #include diff --git a/configure.in b/configure.in index 1e2ffa95c8..2112760f58 100644 --- a/configure.in +++ b/configure.in @@ -2016,4 +2016,5 @@ echo "\ SSL support: $msg_ssl SMIME support: $msg_smime Plugins: $msg_plugins - DBus API version $DBUS_VERSION" + DBus API version $DBUS_VERSION +" diff --git a/mail/ChangeLog b/mail/ChangeLog index 1ab7d36198..af72a912f1 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,9 @@ +2007-10-11 Matthew Barnes + + * em-format.c (em_format_add_puri): + Use G_GSIZE_FORMAT when printing a gsize/size_t to make compilers + on all arches happy. + 2007-10-11 Milan Crha ** Fix for bug #323977 diff --git a/mail/em-format.c b/mail/em-format.c index 94cba750bf..5bedde4007 100644 --- a/mail/em-format.c +++ b/mail/em-format.c @@ -366,7 +366,9 @@ em_format_add_puri(EMFormat *emf, size_t size, const char *cid, CamelMimePart *p d(printf("adding puri for part: %s\n", emf->part_id->str)); if (size < sizeof(*puri)) { - g_warning ("size (%d) less than size of puri\n", size); + g_warning ( + "size (%" G_GSIZE_FORMAT + ") less than size of puri\n", size); size = sizeof (*puri); } diff --git a/plugins/mail-notification/ChangeLog b/plugins/mail-notification/ChangeLog index 1ea7e377c1..a3f7fed466 100644 --- a/plugins/mail-notification/ChangeLog +++ b/plugins/mail-notification/ChangeLog @@ -1,3 +1,9 @@ +2007-10-11 Matthew Barnes + + * mail-notification.c: + Put the notification_callback() declaration inside a + #ifdef HAVE_LIBNOTIFY block to avoid a potential compiler warning. + 2007-08-03 Johnny Jacob ** Fix for bug #458822 from Anand V M diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c index 55cd705372..bcdac7263e 100644 --- a/plugins/mail-notification/mail-notification.c +++ b/plugins/mail-notification/mail-notification.c @@ -46,12 +46,12 @@ int e_plugin_lib_enable (EPluginLib *ep, int enable); void org_gnome_mail_new_notify (EPlugin *ep, EMEventTargetFolder *t); void org_gnome_mail_read_notify (EPlugin *ep, EMEventTargetMessage *t); -static gboolean notification_callback (gpointer notify); static gboolean enabled = FALSE; static GtkStatusIcon *status_icon = NULL; #ifdef HAVE_LIBNOTIFY +static gboolean notification_callback (gpointer notify); static NotifyNotification *notify = NULL; #endif -- cgit