[E-devel] [patch] e_dbus notification

[Libor Zoubek]

Hi, devs

I've reported a bug http://trac.enlightenment.org/e/ticket/775
Please review/apply attached patch that fixes above bug.

Thanks

cheers,

Libor Zoubek

P.S. I am a happy e-user and this is my 1st attempt to contribute
Index: src/lib/notification/E_Notify.h
===================================================================
--- src/lib/notification/E_Notify.h	(revision 60687)
+++ src/lib/notification/E_Notify.h	(working copy)
@@ -76,6 +76,7 @@
   const char *name;
   const char *vendor;
   const char *version;
+  const char *spec_version;
 };
 
 /* signals */
Index: src/lib/notification/E_Notification_Daemon.h
===================================================================
--- src/lib/notification/E_Notification_Daemon.h	(revision 60687)
+++ src/lib/notification/E_Notification_Daemon.h	(working copy)
@@ -2,7 +2,7 @@
 #define E_NOTIFICATION_DAEMON_H
 
 #define E_NOTIFICATION_DAEMON_VERSION "0.9"
-
+#define E_NOTIFICATION_DAEMON_SUPPORTS_SPEC_VERSION "0.9"
 #include <E_Notify.h>
 
 #ifdef EAPI
Index: src/lib/notification/daemon.c
===================================================================
--- src/lib/notification/daemon.c	(revision 60687)
+++ src/lib/notification/daemon.c	(working copy)
@@ -68,7 +68,7 @@
 
   daemon = e_dbus_object_data_get(obj);
 
-  return e_notify_marshal_get_server_information_return(message, daemon->name, daemon->vendor, E_NOTIFICATION_DAEMON_VERSION);
+  return e_notify_marshal_get_server_information_return(message, daemon->name, daemon->vendor, E_NOTIFICATION_DAEMON_VERSION, E_NOTIFICATION_DAEMON_SUPPORTS_SPEC_VERSION);
 }
 
 
@@ -126,7 +126,7 @@
   e_dbus_interface_method_add(daemon->iface, "GetCapabilities", "", "as", method_get_capabilities);
   e_dbus_interface_method_add(daemon->iface, "Notify", "susssasa{sv}i", "u", method_notify);
   e_dbus_interface_method_add(daemon->iface, "CloseNotification", "u", "u", method_close_notification);
-  e_dbus_interface_method_add(daemon->iface, "GetServerInformation", "", "sss", method_get_server_information);
+  e_dbus_interface_method_add(daemon->iface, "GetServerInformation", "", "ssss", method_get_server_information);
 
   return daemon;
 }
Index: src/lib/notification/marshal.c
===================================================================
--- src/lib/notification/marshal.c	(revision 60687)
+++ src/lib/notification/marshal.c	(working copy)
@@ -178,11 +178,11 @@
 }
 
 DBusMessage *
-e_notify_marshal_get_server_information_return(DBusMessage *method_call, const char *name, const char *vendor, const char *version)
+e_notify_marshal_get_server_information_return(DBusMessage *method_call, const char *name, const char *vendor, const char *version, const char *spec_version)
 {
   DBusMessage *msg;
   msg = dbus_message_new_method_return(method_call);
-  dbus_message_append_args(msg, DBUS_TYPE_STRING, &name, DBUS_TYPE_STRING, &vendor, DBUS_TYPE_STRING, &version, DBUS_TYPE_INVALID);
+  dbus_message_append_args(msg, DBUS_TYPE_STRING, &name, DBUS_TYPE_STRING, &vendor, DBUS_TYPE_STRING, &version, DBUS_TYPE_STRING, &spec_version, DBUS_TYPE_INVALID);
   return msg;
 }
 
@@ -190,13 +190,14 @@
 e_notify_unmarshal_get_server_information_return(DBusMessage *msg, DBusError *err)
 {
   E_Notification_Return_Get_Server_Information *info;
-  if (!dbus_message_has_signature(msg, "sss")) return NULL;
+  if (!dbus_message_has_signature(msg, "ssss")) return NULL;
 
   info = calloc(1, sizeof(E_Notification_Return_Get_Server_Information));
   dbus_message_get_args(msg, err,
     DBUS_TYPE_STRING, &(info->name),
     DBUS_TYPE_STRING, &(info->vendor),
     DBUS_TYPE_STRING, &(info->version),
+    DBUS_TYPE_STRING, &(info->spec_version),
     DBUS_TYPE_INVALID
   );
   if (dbus_error_is_set(err))
Index: src/lib/notification/e_notify_private.h
===================================================================
--- src/lib/notification/e_notify_private.h	(revision 60687)
+++ src/lib/notification/e_notify_private.h	(working copy)
@@ -23,7 +23,7 @@
 void * e_notify_unmarshal_get_capabilities_return(DBusMessage *msg, DBusError *err);
 void   e_notify_free_get_capabilities_return(void *data);
 DBusMessage * e_notify_marshal_get_server_information();
-DBusMessage * e_notify_marshal_get_server_information_return(DBusMessage *method_call, const char *name, const char *vendor, const char *version);
+DBusMessage * e_notify_marshal_get_server_information_return(DBusMessage *method_call, const char *name, const char *vendor, const char *version, const char *spec_version);
 void * e_notify_unmarshal_get_server_information_return(DBusMessage *msg, DBusError *err);
 void   e_notify_free_get_server_information_return(void *data);
 DBusMessage * e_notify_marshal_close_notification(dbus_uint32_t id);

------------------------------------------------------------------------------
All of the data generated in your IT infrastructure is seriously valuable.
Why? It contains a definitive record of application performance, security 
threats, fraudulent activity, and more. Splunk takes this data and makes 
sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-d2d-c2
_______________________________________________
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel