gnome-panel r11160 - trunk/applets/notification_area

[vuntz svn gnome org]

Author: vuntz
Date: Mon Jun 30 16:45:55 2008
New Revision: 11160
URL: http://svn.gnome.org/viewvc/gnome-panel?rev=11160&view=rev

Log:
2008-06-30  Vincent Untz  <vuntz gnome org>

	Fix compiler warnings. Patch by Kjartan Maraas <kmaraas gnome org>.
	Part of bug #521409.

	* main.c:
	* na-tray-manager.c: (na_tray_manager_handle_begin_message):
	* na-tray.c:


Modified:
   trunk/applets/notification_area/ChangeLog
   trunk/applets/notification_area/main.c
   trunk/applets/notification_area/na-tray-manager.c
   trunk/applets/notification_area/na-tray.c

Modified: trunk/applets/notification_area/main.c
==============================================================================
--- trunk/applets/notification_area/main.c	(original)
+++ trunk/applets/notification_area/main.c	Mon Jun 30 16:45:55 2008
@@ -252,12 +252,12 @@
   return TRUE;
 }
 
-#if NOTIFICATION_AREA_INPROCESS
+#ifdef NOTIFICATION_AREA_INPROCESS
 PANEL_APPLET_BONOBO_SHLIB_FACTORY ("OAFIID:GNOME_NotificationAreaApplet_Factory",
 				   PANEL_TYPE_APPLET,
 				   "NotificationArea",
 				   applet_factory,
-				   NULL);
+				   NULL)
 #else
 PANEL_APPLET_BONOBO_FACTORY ("OAFIID:GNOME_NotificationAreaApplet_Factory",
 			     PANEL_TYPE_APPLET,

Modified: trunk/applets/notification_area/na-tray-manager.c
==============================================================================
--- trunk/applets/notification_area/na-tray-manager.c	(original)
+++ trunk/applets/notification_area/na-tray-manager.c	Mon Jun 30 16:45:55 2008
@@ -447,13 +447,13 @@
   /* Check if the same message is already in the queue and remove it if so */
   for (p = manager->messages; p; p = p->next)
     {
-      PendingMessage *msg = p->data;
+      PendingMessage *pmsg = p->data;
 
-      if (xevent->window == msg->window &&
-	  xevent->data.l[4] == msg->id)
+      if (xevent->window == pmsg->window &&
+	  xevent->data.l[4] == pmsg->id)
 	{
 	  /* Hmm, we found it, now remove it */
-	  pending_message_free (msg);
+	  pending_message_free (pmsg);
 	  manager->messages = g_list_remove_link (manager->messages, p);
           g_list_free_1 (p);
 	  break;

Modified: trunk/applets/notification_area/na-tray.c
==============================================================================
--- trunk/applets/notification_area/na-tray.c	(original)
+++ trunk/applets/notification_area/na-tray.c	Mon Jun 30 16:45:55 2008
@@ -88,7 +88,7 @@
 
 static void icon_tip_show_next (IconTip *icontip);
 
-G_DEFINE_TYPE (NaTray, na_tray, GTK_TYPE_BIN);
+G_DEFINE_TYPE (NaTray, na_tray, GTK_TYPE_BIN)
 
 static NaTray *
 get_tray (TraysScreen *trays_screen)