emacs data-provider should handle dbus errors

[MartinDengler]

My screen-based emacs's DBUS_SESSION_BUS_ADDRESS environment variable got superceded, and though emacs was fine and could open frames in the new session, it was very naughty about opening, saving, and closing files/buffers because the dbus-call-method in zeitgeist.el was failing.

This patch reduces the annoyance a bit:

--- emacs/zeitgeist.el 2011-05-04 18:57:00 +0000
+++ emacs/zeitgeist.el 2011-05-09 09:59:08 +0000
@@ -26,12 +26,14 @@

 (defun zeitgeist-call (method &rest args)
   "Call the zeitgeist method METHOD with ARGS over dbus"
- (apply 'dbus-call-method
- :session ; use the session (not system) bus
- "org.gnome.zeitgeist.Engine" ; service name
- "/org/gnome/zeitgeist/log/activity" ; path name
- "org.gnome.zeitgeist.Log" ; interface name
- method args))
+ (condition-case err
+ (apply 'dbus-call-method
+ :session ; use the session (not system) bus
+ "org.gnome.zeitgeist.Engine" ; service name
+ "/org/gnome/zeitgeist/log/activity" ; path name
+ "org.gnome.zeitgeist.Log" ; interface name
+ method args))
+ (dbus-error (message (format "zeitgeist-call %s failed due to D-Bus error %s" method err))))

 (defun zeitgeist-event-timestamp ()
   "Get the timestamp in zeitgeist format."

[MartinDengler (mtd)]

Sorry, flubbed one set of parens in condition-case when rebasing to latest zeitgeist.el; Here's the right diff:

=== modified file 'emacs/zeitgeist.el'
--- emacs/zeitgeist.el 2011-05-04 18:57:00 +0000
+++ emacs/zeitgeist.el 2011-05-09 14:36:21 +0000
@@ -26,12 +26,14 @@

 (defun zeitgeist-call (method &rest args)
   "Call the zeitgeist method METHOD with ARGS over dbus"
- (apply 'dbus-call-method
- :session ; use the session (not system) bus
- "org.gnome.zeitgeist.Engine" ; service name
- "/org/gnome/zeitgeist/log/activity" ; path name
- "org.gnome.zeitgeist.Log" ; interface name
- method args))
+ (condition-case err
+ (apply 'dbus-call-method
+ :session ; use the session (not system) bus
+ "org.gnome.zeitgeist.Engine" ; service name
+ "/org/gnome/zeitgeist/log/activity" ; path name
+ "org.gnome.zeitgeist.Log" ; interface name
+ method args)
+ (dbus-error (message (format "zeitgeist-call %s failed due to D-Bus error %s" method err)))))

 (defun zeitgeist-event-timestamp ()
   "Get the timestamp in zeitgeist format."

[Siegfried Gevatter (rainct)]

Thanks, I've committed your fix.

Can you please check if it's working right (since I applied the chnges by hand):
http://bazaar.launchpad.net/~zeitgeist-dataproviders/zeitgeist-dataproviders/trunk/view/head:/emacs/zeitgeist.el

[MartinDengler (mtd)]

On Wed, May 11, 2011 at 04:04:01PM -0000, Siegfried Gevatter wrote:
> Thanks, I've committed your fix.
>
> Can you please check if it's working right (since I applied the chnges by hand):
> http://bazaar.launchpad.net/~zeitgeist-dataproviders/zeitgeist-dataproviders/trunk/view/head:/emacs/zeitgeist.el

Thanks - looks good to me.

Martin