Enlightenment CVS committal
Author : englebass
Project : e17
Module : proto
Dir : e17/proto/e_dbus/src/lib/notification
Modified Files:
daemon.c e_notify_private.h marshal.c notification.c
Log Message:
Cleanup warnings.
===================================================================
RCS file: /cvs/e/e17/proto/e_dbus/src/lib/notification/daemon.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- daemon.c 11 Jul 2007 00:48:49 -0000 1.2
+++ daemon.c 24 Jul 2007 17:17:04 -0000 1.3
@@ -3,7 +3,8 @@
#include "e_notify_private.h"
#include <string.h>
-static int next_id = 0;
+static int e_notification_daemon_bus_init(E_Notification_Daemon *daemon);
+static int e_notification_daemon_object_init(E_Notification_Daemon *daemon);
DBusMessage *
method_get_capabilities(E_DBus_Object *obj, DBusMessage *message)
@@ -166,7 +167,7 @@
}
}
-int
+static int
e_notification_daemon_bus_init(E_Notification_Daemon *daemon)
{
daemon->conn = e_dbus_bus_get(DBUS_BUS_SESSION);
@@ -174,14 +175,13 @@
// this blocks... make it async, and handle failure, etc
e_dbus_request_name(daemon->conn, E_NOTIFICATION_BUS_NAME,
DBUS_NAME_FLAG_REPLACE_EXISTING, cb_request_name, daemon);
+
+ return 1;
}
-int
+static int
e_notification_daemon_object_init(E_Notification_Daemon *daemon)
{
- E_DBus_Object *obj = NULL;
- E_DBus_Interface *iface = NULL;
-
if (!daemon || !daemon->conn) return 0;
daemon->obj = e_dbus_object_add(daemon->conn, E_NOTIFICATION_PATH, daemon);
if (!daemon->obj) return 0;
===================================================================
RCS file: /cvs/e/e17/proto/e_dbus/src/lib/notification/e_notify_private.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_notify_private.h 11 Jul 2007 00:48:33 -0000 1.5
+++ e_notify_private.h 24 Jul 2007 17:17:04 -0000 1.6
@@ -20,10 +20,10 @@
Ecore_List * e_notify_unmarshal_string_array_as_list(DBusMessageIter *iter,
DBusError *err);
DBusMessage * e_notify_marshal_get_capabilities();
DBusMessage * e_notify_marshal_get_capabilities_return(DBusMessage
*method_call, const char **capabilities);
-E_Notification_Return_Get_Capabilities *
e_notify_unmarshal_get_capabilities_return(DBusMessage *msg, DBusError *err);
+void * e_notify_unmarshal_get_capabilities_return(DBusMessage *msg, DBusError
*err);
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);
-E_Notification_Return_Get_Server_Information *
e_notify_unmarshal_get_server_information_return(DBusMessage *msg, DBusError
*err);
+void * e_notify_unmarshal_get_server_information_return(DBusMessage *msg,
DBusError *err);
DBusMessage * e_notify_marshal_close_notification(dbus_uint32_t id);
dbus_uint32_t e_notify_unmarshal_close_notification(DBusMessage *msg,
DBusError *err);
DBusMessage * e_notify_marshal_notification_closed_signal(dbus_uint32_t id,
dbus_uint32_t reason);
@@ -33,9 +33,9 @@
DBusMessage * e_notify_marshal_notify(E_Notification *n);
E_Notification * e_notify_unmarshal_notify(DBusMessage *msg, DBusError *err);
DBusMessage * e_notify_marshal_notify_return(DBusMessage *method_call,
dbus_uint32_t notification_id);
-E_Notification_Return_Notify * e_notify_unmarshal_notify_return(DBusMessage
*msg, DBusError *err);
-Ecore_List * e_notify_unmarshal_notify_actions(E_Notification *n,
DBusMessageIter *iter);
-Ecore_List * e_notify_unmarshal_notify_hints(E_Notification *n,
DBusMessageIter *iter);
+void * e_notify_unmarshal_notify_return(DBusMessage *msg, DBusError *err);
+void e_notify_unmarshal_notify_actions(E_Notification *n, DBusMessageIter
*iter);
+void e_notify_unmarshal_notify_hints(E_Notification *n, DBusMessageIter *iter);
void e_notify_marshal_hint_image(DBusMessageIter *iter, E_Notification_Image
*img);
E_Notification_Image * e_notify_unmarshal_hint_image(DBusMessageIter *iter);
===================================================================
RCS file: /cvs/e/e17/proto/e_dbus/src/lib/notification/marshal.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- marshal.c 11 Jul 2007 00:48:33 -0000 1.6
+++ marshal.c 24 Jul 2007 17:17:04 -0000 1.7
@@ -139,12 +139,11 @@
return msg;
}
-E_Notification_Return_Get_Capabilities *
+void *
e_notify_unmarshal_get_capabilities_return(DBusMessage *msg, DBusError *err)
{
- DBusMessageIter iter, arr;
+ DBusMessageIter iter;
E_Notification_Return_Get_Capabilities *ret;
- Ecore_List *capabilities;
if (!dbus_message_has_signature(msg, "as")) return NULL;
@@ -173,7 +172,7 @@
return msg;
}
-E_Notification_Return_Get_Server_Information *
+void *
e_notify_unmarshal_get_server_information_return(DBusMessage *msg, DBusError
*err)
{
E_Notification_Return_Get_Server_Information *info;
@@ -338,7 +337,7 @@
const char *s_val;
dbus_uint32_t u_val;
dbus_int32_t i_val;
- DBusMessageIter iter, arr;
+ DBusMessageIter iter;
if (!dbus_message_has_signature(msg, "susssasa{sv}i")) return NULL;
n = e_notification_new();
@@ -386,7 +385,7 @@
return msg;
}
-E_Notification_Return_Notify *
+void *
e_notify_unmarshal_notify_return(DBusMessage *msg, DBusError *err)
{
E_Notification_Return_Notify *ret;
@@ -400,7 +399,7 @@
return ret;
}
-Ecore_List *
+void
e_notify_unmarshal_notify_actions(E_Notification *n, DBusMessageIter *iter)
{
DBusMessageIter arr;
@@ -416,7 +415,7 @@
}
}
-Ecore_List *
+void
e_notify_unmarshal_notify_hints(E_Notification *n, DBusMessageIter *iter)
{
DBusMessageIter arr;
@@ -509,8 +508,6 @@
e_notify_unmarshal_hint_image(DBusMessageIter *iter)
{
DBusMessageIter sub, arr;
- dbus_int32_t i_val;
- char b_val;
char *byte_array;
int array_len;
E_Notification_Image *img;
@@ -521,7 +518,6 @@
sig_matches = strcmp(sig, "(iiibiiay)");
dbus_free(sig);
if (!sig_matches) return NULL;
-
img = e_notification_image_new();
if (!img) return NULL;
===================================================================
RCS file: /cvs/e/e17/proto/e_dbus/src/lib/notification/notification.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- notification.c 11 Jul 2007 00:48:25 -0000 1.5
+++ notification.c 24 Jul 2007 17:17:04 -0000 1.6
@@ -388,4 +388,5 @@
{
}
#endif
+ return NULL;
}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
