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

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2006-01-15 17:52:00 -0800 (Sun, 15 Jan 2006)
New Revision: 2431

Modified:
   trunk/notification-daemon/ChangeLog
   trunk/notification-daemon/src/daemon.c
   trunk/notification-daemon/src/daemon.h
   trunk/notification-daemon/src/notificationdaemon.xml
Log:
Add back GetCapabilities and GetServerInformation.


Modified: trunk/notification-daemon/ChangeLog
===================================================================
--- trunk/notification-daemon/ChangeLog	2006-01-16 00:09:06 UTC (rev 2430)
+++ trunk/notification-daemon/ChangeLog	2006-01-16 01:52:00 UTC (rev 2431)
@@ -1,3 +1,10 @@
+Sun Jan 15 17:51:27 PST 2006  Christian Hammond <chipx86 at chipx86.com>
+
+	* src/daemon.c:
+	* src/daemon.h:
+	* src/notificationdaemon.xml:
+	  - Add back GetCapabilities and GetServerInformation.
+
 Sun Jan 15 16:07:00 PST 2006  Christian Hammond <chipx86 at chipx86.com>
 
 	A data/Makefile.am:

Modified: trunk/notification-daemon/src/daemon.c
===================================================================
--- trunk/notification-daemon/src/daemon.c	2006-01-16 00:09:06 UTC (rev 2430)
+++ trunk/notification-daemon/src/daemon.c	2006-01-16 01:52:00 UTC (rev 2431)
@@ -811,6 +811,36 @@
   return TRUE;
 }
 
+gboolean
+notify_daemon_get_capabilities(NotifyDaemon *daemon,
+							   char ***caps)
+{
+	*caps = g_new0(char *, 6);
+	(*caps)[0] = g_strdup("actions");
+	(*caps)[1] = g_strdup("body");
+	(*caps)[2] = g_strdup("body-hyperlinks");
+	(*caps)[3] = g_strdup("body-markup");
+	(*caps)[4] = g_strdup("icon-static");
+	(*caps)[5] = NULL;
+
+	return TRUE;
+}
+
+gboolean
+notify_daemon_get_server_information(NotifyDaemon *daemon,
+									 char **out_name,
+									 char **out_vendor,
+									 char **out_version,
+									 char **out_spec_ver)
+{
+	*out_name     = g_strdup("Notification Daemon");
+	*out_vendor   = g_strdup("Galago Project");
+	*out_version  = g_strdup(VERSION);
+	*out_spec_ver = g_strdup("0.8");
+
+	return TRUE;
+}
+
 GConfClient *
 get_gconf_client(void)
 {

Modified: trunk/notification-daemon/src/daemon.h
===================================================================
--- trunk/notification-daemon/src/daemon.h	2006-01-16 00:09:06 UTC (rev 2430)
+++ trunk/notification-daemon/src/daemon.h	2006-01-16 01:52:00 UTC (rev 2431)
@@ -61,26 +61,33 @@
   NOTIFY_DAEMON_ERROR_GENERIC = 0,
 };
 
-GType notify_daemon_get_type (void);
+GType notify_daemon_get_type(void);
 
-NotifyDaemon *notify_daemon_new (void)
-  G_GNUC_MALLOC;
+NotifyDaemon *notify_daemon_new(void) G_GNUC_MALLOC;
 
-gboolean notify_daemon_notify_handler (NotifyDaemon *daemon,
-                                       const gchar *app_name,
-                                       const gchar *icon,
-                                       guint id,
-                                       const gchar *summary,
-                                       const gchar *body,
-                                       gchar **actions,
-                                       GHashTable *hints,
-                                       int timeout,
-                                       DBusGMethodInvocation *context);
+gboolean notify_daemon_notify_handler(NotifyDaemon *daemon,
+									  const gchar *app_name,
+                                      const gchar *icon,
+                                      guint id,
+                                      const gchar *summary,
+                                      const gchar *body,
+                                      gchar **actions,
+                                      GHashTable *hints,
+                                      int timeout,
+                                      DBusGMethodInvocation *context);
 
-gboolean notify_daemon_close_notification_handler (NotifyDaemon *daemon,
-                                                   guint id,
-                                                   GError **error);
+gboolean notify_daemon_close_notification_handler(NotifyDaemon *daemon,
+												  guint id,
+												  GError **error);
 
+gboolean notify_daemon_get_capabilities(NotifyDaemon *daemon,
+										char ***out_caps);
+gboolean notify_daemon_get_server_information(NotifyDaemon *daemon,
+											  char **out_name,
+											  char **out_vendor,
+											  char **out_version,
+											  char **out_spec_ver);
+
 GConfClient *get_gconf_client(void);
 
 G_END_DECLS

Modified: trunk/notification-daemon/src/notificationdaemon.xml
===================================================================
--- trunk/notification-daemon/src/notificationdaemon.xml	2006-01-16 00:09:06 UTC (rev 2430)
+++ trunk/notification-daemon/src/notificationdaemon.xml	2006-01-16 01:52:00 UTC (rev 2431)
@@ -17,9 +17,33 @@
       <arg type="i" name="timeout" direction="in" />
       <arg type="u" name="return_id" direction="out" />
     </method>
+
     <method name="CloseNotification">
       <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="notify_daemon_close_notification_handler"/>
       <arg type="u" name="id" direction="in" />
     </method>
+
+    <method name="GetCapabilities">
+      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="notify_daemon_get_capabilities"/>
+      <arg type="as" name="return_caps" direction="out"/>
+    </method>
+
+    <method name="GetServerInformation">
+      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="notify_daemon_get_server_information"/>
+      <arg type="s" name="return_name" direction="out"/>
+      <arg type="s" name="return_vendor" direction="out"/>
+      <arg type="s" name="return_version" direction="out"/>
+      <arg type="s" name="return_spec_version" direction="out"/>
+    </method>
+
+    <!-- DEPRECATED -->
+    <method name="GetServerInfo">
+      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="notify_daemon_get_server_information"/>
+      <arg type="s" name="return_name" direction="out"/>
+      <arg type="s" name="return_vendor" direction="out"/>
+      <arg type="s" name="return_version" direction="out"/>
+      <arg type="s" name="return_spec_version" direction="out"/>
+    </method>
+
   </interface>
 </node>