Enlightenment CVS committal
Author : lok
Project : e17
Module : libs/e_dbus
Dir : e17/libs/e_dbus/src/lib/notification
Modified Files:
marshal.c
Log Message:
Added some check against dbus errors.
===================================================================
RCS file: /cvs/e/e17/libs/e_dbus/src/lib/notification/marshal.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- marshal.c 29 Oct 2007 02:20:48 -0000 1.1
+++ marshal.c 12 Jan 2008 14:07:05 -0000 1.2
@@ -229,7 +229,7 @@
dbus_uint32_t id;
if (!dbus_message_has_signature(msg, "u")) return 0;
dbus_message_get_args(msg, err, DBUS_TYPE_UINT32, &id, DBUS_TYPE_INVALID);
- if (dbus_error_is_set(err))
+ if (err && dbus_error_is_set(err))
return 0;
return id;
@@ -465,6 +465,8 @@
dbus_message_iter_get_basic(&dict, &key);
dbus_message_iter_next(&dict);
dbus_message_iter_recurse(&dict, &variant);
+ if (dbus_message_iter_get_arg_type(&variant) != DBUS_TYPE_INVALID)
+ continue;
switch(dbus_message_iter_get_element_type(&variant))
{
case DBUS_TYPE_STRING:
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
