Seif Lotfy has proposed merging lp:~seif/zeitgeist/fix-787691 into lp:zeitgeist.
Requested reviews:
Zeitgeist Framework Team (zeitgeist)
For more details, see:
https://code.launchpad.net/~seif/zeitgeist/fix-787691/+merge/63295
Fixes the signature issue in case of no extensions being available
--
https://code.launchpad.net/~seif/zeitgeist/fix-787691/+merge/63295
Your team Zeitgeist Framework Team is requested to review the proposed merge of
lp:~seif/zeitgeist/fix-787691 into lp:zeitgeist.
=== modified file '_zeitgeist/engine/remote.py'
--- _zeitgeist/engine/remote.py 2011-06-02 20:15:11 +0000
+++ _zeitgeist/engine/remote.py 2011-06-02 20:18:35 +0000
@@ -59,8 +59,13 @@
_dbus_properties = {
"version": DBUSProperty(lambda self: (0, 8, 0), out_signature="iii"),
"extensions": DBUSProperty(
+<<<<<<< TREE
lambda self: dbus.Array(self._engine.extensions.iter_names(), 's'),
out_signature="as"),
+=======
+ lambda self: dbus.Array(self._engine.extensions.iter_names(), signature="as"), out_signature="as"
+ )
+>>>>>>> MERGE-SOURCE
}
# Initialization
_______________________________________________
Mailing list: https://launchpad.net/~zeitgeist
Post to : zeitgeist@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zeitgeist
More help : https://help.launchpad.net/ListHelp
