[Galago-commits] r2459 - in trunk/notification-daemon: . src

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2006-01-22 13:24:04 -0800 (Sun, 22 Jan 2006)
New Revision: 2459

Modified:
   trunk/notification-daemon/ChangeLog
   trunk/notification-daemon/src/daemon.c
   trunk/notification-daemon/src/daemon.h
   trunk/notification-daemon/src/notificationdaemon.xml
Log:
Rearrange some parameters to match the spec.


Modified: trunk/notification-daemon/ChangeLog
===================================================================
--- trunk/notification-daemon/ChangeLog	2006-01-22 21:22:27 UTC (rev 2458)
+++ trunk/notification-daemon/ChangeLog	2006-01-22 21:24:04 UTC (rev 2459)
@@ -1,3 +1,10 @@
+Sun Jan 22 13:23:51 PST 2006  Christian Hammond <chipx86 at chipx86.com>
+
+	* src/daemon.c:
+	* src/daemon.h:
+	* src/notificationdaemon.xml:
+	  - Rearrange some parameters to match the spec.
+
 Fri Jan 20 00:22:38 PST 2006  Christian Hammond <chipx86 at chipx86.com>
 
 	* src/daemon.c:

Modified: trunk/notification-daemon/src/daemon.c
===================================================================
--- trunk/notification-daemon/src/daemon.c	2006-01-22 21:22:27 UTC (rev 2458)
+++ trunk/notification-daemon/src/daemon.c	2006-01-22 21:24:04 UTC (rev 2459)
@@ -693,8 +693,8 @@
 gboolean
 notify_daemon_notify_handler(NotifyDaemon *daemon,
 							 const gchar *app_name,
+							 guint id,
 							 const gchar *icon,
-							 guint id,
 							 const gchar *summary,
 							 const gchar *body,
 							 gchar **actions,

Modified: trunk/notification-daemon/src/daemon.h
===================================================================
--- trunk/notification-daemon/src/daemon.h	2006-01-22 21:22:27 UTC (rev 2458)
+++ trunk/notification-daemon/src/daemon.h	2006-01-22 21:24:04 UTC (rev 2459)
@@ -74,8 +74,8 @@
 
 gboolean notify_daemon_notify_handler(NotifyDaemon *daemon,
 									  const gchar *app_name,
+									  guint id,
 									  const gchar *icon,
-									  guint id,
 									  const gchar *summary,
 									  const gchar *body,
 									  gchar **actions,

Modified: trunk/notification-daemon/src/notificationdaemon.xml
===================================================================
--- trunk/notification-daemon/src/notificationdaemon.xml	2006-01-22 21:22:27 UTC (rev 2458)
+++ trunk/notification-daemon/src/notificationdaemon.xml	2006-01-22 21:24:04 UTC (rev 2459)
@@ -8,11 +8,11 @@
       <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="notify_daemon_notify_handler"/>
       <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
       <arg type="s" name="app_name" direction="in" />
+      <arg type="u" name="id" direction="in" />
       <arg type="s" name="icon" direction="in" />
-      <arg type="u" name="id" direction="in" />
-      <arg type="s" name="trouble" direction="in" />
-      <arg type="s" name="d_ret" direction="in" />
-      <arg type="as" name="str_ret" direction="in" />
+      <arg type="s" name="summary" direction="in" />
+      <arg type="s" name="body" direction="in" />
+      <arg type="as" name="actions" direction="in" />
       <arg type="a{sv}" name="hints" direction="in" />
       <arg type="i" name="timeout" direction="in" />
       <arg type="u" name="return_id" direction="out" />