The first patch adds support for the artdir variable to the pkgconfig file in case handlers want to provide their own art. The second uses a slightly more sophisticated method to determine if Beagle is installed in case a distro installs the .desktop files with a vendor prefix. -- Ignacio Vazquez-Abrams <ivazquez ivazquez net> http://fedora.ivazquez.net/ gpg --keyserver hkp://subkeys.pgp.net --recv-key 38028b72
--- deskbar-applet-2.14.1/data/deskbar-applet.pc.in.artdir 2006-04-13 07:25:47.000000000 -0400 +++ deskbar-applet-2.14.1/data/deskbar-applet.pc.in 2006-04-13 07:26:48.000000000 -0400 @@ -2,6 +2,7 @@ exec_prefix= exec_prefix@ libdir= libdir@ handlersdir= libdir@/deskbar-applet/handlers +artdir= datadir@/deskbar-applet/art Name: Deskbar Applet Handlers Location Description: Providing the location of deskbar-applet system-wide handlers.
--- deskbar-applet-2.14.0/deskbar/handlers/beagle-static.py.fedora 2006-03-12 21:24:16.000000000 -0500 +++ deskbar-applet-2.14.0/deskbar/handlers/beagle-static.py 2006-03-12 21:24:56.000000000 -0500 @@ -1,5 +1,6 @@ import os from os.path import exists, join +from glob import glob from gettext import gettext as _ import gobject @@ -9,7 +10,7 @@ #FIXME: better way to detect beagle ? def _check_requirements(): for dir in get_xdg_data_dirs(): - if exists(join(dir, "applications", "best.desktop")) or exists(join(dir, "applications", "beagle-search.desktop")): + if glob(join(dir, "applications", "*best.desktop")) or glob(join(dir, "applications", "*beagle-search.desktop")): return (deskbar.Handler.HANDLER_IS_HAPPY, None, None) return (deskbar.Handler.HANDLER_IS_NOT_APPLICABLE, "Beagle does not seem to be installed, skipping", None)
Attachment:
signature.asc
Description: This is a digitally signed message part