Fix some harmless compiler warnings.

Some variables in notification_popup.c were peeking
out of their ifdefs, and I forgot to remove an
unused variable in vcal_meeting_gtk.c in my commit
8d93e8c.

diff --git a/src/plugins/notification/notification_popup.c b/src/plugins/notification/notification_popup.c
index 56717e52ee91f6bb22ae9e0c2d827b4497ed6f4a..9a7dde883233c2a88423ca38ac73207fc7ab3a0d 100644 (file)
--- a/src/plugins/notification/notification_popup.c
+++ b/src/plugins/notification/notification_popup.c
@@ -92,8 +92,8 @@ static gboolean notification_popup_button(GtkWidget*, GdkEventButton*, gpointer)
 
 void notification_popup_msg(MsgInfo *msginfo)
 {
 
 void notification_popup_msg(MsgInfo *msginfo)
 {

-  FolderType ftype;

 #if HAVE_LIBNOTIFY
 #if HAVE_LIBNOTIFY

+  FolderType ftype;

   gchar *uistr;
 #else
   NotificationPopup *ppopup;
   gchar *uistr;
 #else
   NotificationPopup *ppopup;


@@ -136,11 +136,11 @@ void notification_popup_msg(MsgInfo *msginfo)
       return;
   }
 
       return;
   }
 

-  ftype = msginfo->folder->folder->klass->type;

 
   G_LOCK(popup);
 #ifdef HAVE_LIBNOTIFY
   /* Check out which type to notify about */
 
   G_LOCK(popup);
 #ifdef HAVE_LIBNOTIFY
   /* Check out which type to notify about */

+  ftype = msginfo->folder->folder->klass->type;

   switch(ftype) {
   case F_MH:
   case F_MBOX:
   switch(ftype) {
   case F_MH:
   case F_MBOX:


@@ -227,9 +227,6 @@ static void popup_timeout_fun(NotifyNotification *nn, gpointer data)
 static gboolean popup_timeout_fun(gpointer data)
 {
   NotificationPopup *ppopup;
 static gboolean popup_timeout_fun(gpointer data)
 {
   NotificationPopup *ppopup;

-  NotificationFolderType nftype;
-
-  nftype = GPOINTER_TO_INT(data);

 
   G_LOCK(popup);
 
 
   G_LOCK(popup);
 

diff --git a/src/plugins/vcalendar/vcal_meeting_gtk.c b/src/plugins/vcalendar/vcal_meeting_gtk.c
index 941482ba3ec8b708ce3f261aea3f4ecf343b4567..99e43fd4055d19253655007e5df7732406a5bff2 100644 (file)
--- a/src/plugins/vcalendar/vcal_meeting_gtk.c
+++ b/src/plugins/vcalendar/vcal_meeting_gtk.c
@@ -1221,7 +1221,6 @@ static gboolean send_meeting_cb(GtkButton *widget, gpointer data)
        gchar *summary = NULL;
        gchar *description = NULL;
        VCalEvent *event = NULL;
        gchar *summary = NULL;
        gchar *description = NULL;
        VCalEvent *event = NULL;

-       gchar buf[256];

        GSList *cur;
        PrefsAccount *account = NULL;
        gboolean res = FALSE;
        GSList *cur;
        PrefsAccount *account = NULL;
        gboolean res = FALSE;