From: Enlightenment C. <no...@cv...> - 2007-03-22 07:15:26
|
Enlightenment CVS committal Author : englebass Project : e17 Module : proto Dir : e17/proto/e_dbus/src/lib/dbus Modified Files: Makefile.am e_dbus.c e_dbus_object.c e_dbus_private.h Log Message: Fix compiler error =================================================================== RCS file: /cvs/e/e17/proto/e_dbus/src/lib/dbus/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- Makefile.am 22 Mar 2007 04:07:29 -0000 1.4 +++ Makefile.am 22 Mar 2007 07:15:23 -0000 1.5 @@ -1,6 +1,5 @@ INCLUDES = \ -@ECORE_CFLAGS@ \ -@DBUS_CFLAGS@ +@EDBUS_CFLAGS@ lib_LTLIBRARIES = libedbus.la include_HEADERS = E_DBus.h @@ -16,5 +15,4 @@ libedbus_la_LIBADD = \ -@ECORE_LIBS@ \ -@DBUS_LIBS@ +@EDBUS_LIBS@ =================================================================== RCS file: /cvs/e/e17/proto/e_dbus/src/lib/dbus/e_dbus.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- e_dbus.c 22 Mar 2007 04:54:23 -0000 1.4 +++ e_dbus.c 22 Mar 2007 07:15:23 -0000 1.5 @@ -544,7 +544,6 @@ int e_dbus_init(void) { - int i; if (++init != 1) return init; E_DBUS_EVENT_SIGNAL = ecore_event_type_new(); =================================================================== RCS file: /cvs/e/e17/proto/e_dbus/src/lib/dbus/e_dbus_object.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- e_dbus_object.c 22 Mar 2007 04:54:23 -0000 1.5 +++ e_dbus_object.c 22 Mar 2007 07:15:23 -0000 1.6 @@ -30,7 +30,7 @@ //static Ecore_List *standard_methods = NULL; -static DBusObjectPathVTable vtable = (DBusObjectPathVTable){ +static DBusObjectPathVTable vtable = { e_dbus_object_unregister, e_dbus_object_handler, NULL, @@ -93,8 +93,6 @@ int e_dbus_object_init(void) { - E_DBus_Method *m; - introspectable_interface = e_dbus_interface_new("org.freedesktop.DBus.Introspectable"); if (!introspectable_interface) return 0; e_dbus_interface_method_add(introspectable_interface, "Introspect", "", "s", cb_introspect); @@ -328,7 +326,6 @@ e_dbus_object_introspect(E_DBus_Object *obj) { Ecore_Strbuf *buf; - char *current_interface = NULL; int level = 0; E_DBus_Interface *iface; =================================================================== RCS file: /cvs/e/e17/proto/e_dbus/src/lib/dbus/e_dbus_private.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_dbus_private.h 22 Mar 2007 01:44:12 -0000 1.1 +++ e_dbus_private.h 22 Mar 2007 07:15:23 -0000 1.2 @@ -18,4 +18,7 @@ int refcount; }; +int e_dbus_object_init(void); +void e_dbus_object_shutdown(void); + #endif |