Enlightenment CVS committal
Author : rephorm
Project : e17
Module : proto
Dir : e17/proto/e_dbus/src/lib/dbus
Modified Files:
e_dbus.c e_dbus_object.c
Log Message:
init/shutdown the object subsystem
fix introspection
===================================================================
RCS file: /cvs/e/e17/proto/e_dbus/src/lib/dbus/e_dbus.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_dbus.c 22 Mar 2007 01:44:12 -0000 1.3
+++ e_dbus.c 22 Mar 2007 04:54:23 -0000 1.4
@@ -549,6 +549,7 @@
E_DBUS_EVENT_SIGNAL = ecore_event_type_new();
e_dbus_signal_init();
+ e_dbus_object_init();
return init;
}
@@ -559,5 +560,6 @@
e_dbus_shutdown(void)
{
if (--init) return;
+ e_dbus_object_shutdown();
e_dbus_signal_shutdown();
}
===================================================================
RCS file: /cvs/e/e17/proto/e_dbus/src/lib/dbus/e_dbus_object.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_dbus_object.c 22 Mar 2007 04:07:29 -0000 1.4
+++ e_dbus_object.c 22 Mar 2007 04:54:23 -0000 1.5
@@ -85,7 +85,7 @@
}
printf("XML: \n\n%s\n\n", obj->introspection_data);
ret = dbus_message_new_method_return(msg);
- dbus_message_append_args(msg, DBUS_TYPE_STRING, &(obj->introspection_data),
DBUS_TYPE_INVALID);
+ dbus_message_append_args(ret, DBUS_TYPE_STRING, &(obj->introspection_data),
DBUS_TYPE_INVALID);
return ret;
}
@@ -389,7 +389,9 @@
level++;
/* append args */
- if (method->signature && dbus_signature_validate(method->signature, NULL))
+ if (method->signature &&
+ method->signature[0] &&
+ dbus_signature_validate(method->signature, NULL))
{
dbus_signature_iter_init(&iter, method->signature);
while ((type = dbus_signature_iter_get_signature(&iter)))
@@ -402,7 +404,9 @@
}
/* append reply args */
- if (method->reply_signature &&
dbus_signature_validate(method->reply_signature, NULL))
+ if (method->reply_signature &&
+ method->reply_signature[0] &&
+ dbus_signature_validate(method->reply_signature, NULL))
{
printf("valid reply sig: '%s'\n", method->reply_signature);
dbus_signature_iter_init(&iter, method->reply_signature);
@@ -429,6 +433,6 @@
ecore_strbuf_append(buf, type);
ecore_strbuf_append(buf, "\" direction=\"");
ecore_strbuf_append(buf, direction);
- ecore_strbuf_append(buf, "\">\n");
+ ecore_strbuf_append(buf, "\"/>\n");
}
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
