8 files changed, 311 insertions, 265 deletions

diff --git a/deskutils/deskbar-applet/Makefile b/deskutils/deskbar-applet/Makefile
index 1073f5aac0f4..f0ad50de167a 100644
--- a/deskutils/deskbar-applet/Makefile
+++ b/deskutils/deskbar-applet/Makefile
@@ -3,12 +3,11 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/deskutils/deskbar-applet/Makefile,v 1.54 2007/03/14 11:58:47 ahze Exp $
+#   $MCom: ports/deskutils/deskbar-applet/Makefile,v 1.69 2007/10/15 17:32:49 mezz Exp $
 #
 
 PORTNAME=	deskbar-applet
-PORTVERSION=	2.18.1
-PORTREVISION=	2
+PORTVERSION=	2.20.1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -49,19 +48,17 @@ PLIST_SUB+=	EVO="@comment "
 
 .if !defined(DISPLAY)
 BUILD_DEPENDS+=	Xvfb:${X_VFBSERVER_PORT} \
-		${X11BASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT}
+		${LOCALBASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT}
 .if !defined(PACKAGE_BUILDING)
 CONFIGURE_ENV+=	DISPLAY="localhost:1001"
 .endif
 .endif
 
 post-patch:
-	@${FIND} ${WRKSRC}/deskbar -name "*.py" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|/usr/share/applications|${LOCALBASE}/share/gnome/applications|g'
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
 		s|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/deskbar/handlers/mozilla.py \
-		${WRKSRC}/deskbar/Utils.py
+		${WRKSRC}/deskbar/core/Utils.py
 
 .if !defined(DISPLAY)
 pre-configure:
@@ -69,7 +66,7 @@ pre-configure:
 		${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill || ${TRUE} ; \
 		${RM} -f ${WRKDIR}/.Xvfb.pid ; \
 	fi
-	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
+	@${LOCALBASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
 	@sleep 5
 
 post-configure:
diff --git a/deskutils/deskbar-applet/distinfo b/deskutils/deskbar-applet/distinfo
index 829c3e5f9d93..e17a676e4227 100644
--- a/deskutils/deskbar-applet/distinfo
+++ b/deskutils/deskbar-applet/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/deskbar-applet-2.18.1.tar.bz2) = 6e0ea0d4140f9e7b0ee75d819a74172f
-SHA256 (gnome2/deskbar-applet-2.18.1.tar.bz2) = 1f1b4ed0d7cd2948aeca7cae33600397218be0b072f105ca0fb05c52e2f1e278
-SIZE (gnome2/deskbar-applet-2.18.1.tar.bz2) = 646387
+MD5 (gnome2/deskbar-applet-2.20.1.tar.bz2) = ba23f3a629b6f7287ff905e76e395466
+SHA256 (gnome2/deskbar-applet-2.20.1.tar.bz2) = 3ff6c1e6f15e79ac6ddcc61a73f94c985a8cc33e536b55fbe7db76660aa13310
+SIZE (gnome2/deskbar-applet-2.20.1.tar.bz2) = 747044
diff --git a/deskutils/deskbar-applet/files/patch-deskbar_Utils.py b/deskutils/deskbar-applet/files/patch-deskbar_Utils.py
deleted file mode 100644
index 4c68b77664cc..000000000000
--- a/deskutils/deskbar-applet/files/patch-deskbar_Utils.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- deskbar/Utils.py.orig	Tue Nov  1 20:32:51 2005
-+++ deskbar/Utils.py	Tue Nov  1 20:33:08 2005
-@@ -10,7 +10,7 @@
- 	
- 	sysdirs = os.getenv("XDG_DATA_DIRS")
- 	if sysdirs == None:
--		sysdirs = "/usr/local/share:/usr/share"
-+	    sysdirs = "/usr/local/share/gnome:/usr/local/share:/usr/share"
- 	
- 	dirs = "%s:%s" % (dirs, sysdirs)
- 	return [dir for dir in dirs.split(":") if dir.strip() != "" and exists(dir)]
diff --git a/deskutils/deskbar-applet/files/patch-deskbar___init__.py b/deskutils/deskbar-applet/files/patch-deskbar___init__.py
deleted file mode 100644
index dbe19007d25a..000000000000
--- a/deskutils/deskbar-applet/files/patch-deskbar___init__.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- deskbar/__init__.py.orig	Thu Sep  7 15:04:34 2006
-+++ deskbar/__init__.py	Thu Sep  7 15:04:50 2006
-@@ -26,7 +26,7 @@ if _check(name):
- if UNINSTALLED_DESKBAR:
- 	SHARED_DATA_DIR = abspath(join(dirname(__file__), '..', 'data'))
- else:
--	SHARED_DATA_DIR = join(DATA_DIR, "deskbar-applet")
-+	SHARED_DATA_DIR = join(DATA_DIR, "gnome", "deskbar-applet")
- print "Data Dir: %s" % SHARED_DATA_DIR
- 
- HANDLERS_DIR = []
diff --git a/deskutils/deskbar-applet/files/patch-deskbar_core_Utils.py b/deskutils/deskbar-applet/files/patch-deskbar_core_Utils.py
new file mode 100644
index 000000000000..1a41213c334d
--- /dev/null
+++ b/deskutils/deskbar-applet/files/patch-deskbar_core_Utils.py
@@ -0,0 +1,11 @@
+--- deskbar/core/Utils.py.orig	2007-08-13 13:07:20.000000000 -0400
++++ deskbar/core/Utils.py	2007-08-14 14:35:19.000000000 -0400
+@@ -51,7 +51,7 @@ def get_xdg_data_dirs():
+     
+     sysdirs = os.getenv("XDG_DATA_DIRS")
+     if sysdirs == None:
+-        sysdirs = "/usr/local/share:/usr/share"
++        sysdirs = "/usr/local/share"
+     
+     dirs = "%s:%s" % (dirs, sysdirs)
+     return [dir for dir in dirs.split(":") if dir.strip() != "" and exists(dir)]
diff --git a/deskutils/deskbar-applet/files/patch-deskbar_deskbar-applet.py b/deskutils/deskbar-applet/files/patch-deskbar_deskbar-applet.py
index 4b01cdd9be6f..aeb9dadaaadf 100644
--- a/deskutils/deskbar-applet/files/patch-deskbar_deskbar-applet.py
+++ b/deskutils/deskbar-applet/files/patch-deskbar_deskbar-applet.py
@@ -1,17 +1,17 @@
---- deskbar/deskbar-applet.py.orig	Mon May 29 19:20:47 2006
-+++ deskbar/deskbar-applet.py	Mon May 29 19:20:54 2006
-@@ -42,10 +42,10 @@ if hasattr(gettext, 'bind_textdomain_cod
- 	gettext.bind_textdomain_codeset('deskbar-applet','UTF-8')
+--- deskbar/deskbar-applet.py.orig	Tue Jul 10 15:28:29 2007
++++ deskbar/deskbar-applet.py	Tue Jul 10 15:29:43 2007
+@@ -43,10 +43,10 @@
+     gettext.bind_textdomain_codeset('deskbar-applet','UTF-8')
  gettext.textdomain('deskbar-applet')
  
 -locale.bindtextdomain('deskbar-applet', abspath(join(deskbar.defs.DATA_DIR, "locale")))
 -if hasattr(locale, 'bind_textdomain_codeset'):
--	locale.bind_textdomain_codeset('deskbar-applet','UTF-8')
+-    locale.bind_textdomain_codeset('deskbar-applet','UTF-8')
 -locale.textdomain('deskbar-applet')
 +#locale.bindtextdomain('deskbar-applet', abspath(join(deskbar.defs.DATA_DIR, "locale")))
 +#if hasattr(locale, 'bind_textdomain_codeset'):
-+#	locale.bind_textdomain_codeset('deskbar-applet','UTF-8')
++#    locale.bind_textdomain_codeset('deskbar-applet','UTF-8')
 +#locale.textdomain('deskbar-applet')
  
- import gtkexcepthook
- 
+ # Enable threads
+ gtk.gdk.threads_init()
diff --git a/deskutils/deskbar-applet/files/patch-deskbar_handlers_mozilla.py b/deskutils/deskbar-applet/files/patch-deskbar_handlers_mozilla.py
deleted file mode 100644
index ffad36e44f87..000000000000
--- a/deskutils/deskbar-applet/files/patch-deskbar_handlers_mozilla.py
+++ /dev/null
@@ -1,18 +0,0 @@
---- deskbar/handlers/mozilla.py.orig	Wed Mar  1 13:32:12 2006
-+++ deskbar/handlers/mozilla.py	Wed Mar  1 13:33:19 2006
-@@ -189,6 +189,7 @@ class MozillaSearchHandler(deskbar.Handl
- 				get_firefox_home_file("searchplugins"),
- 				get_firefox_home_file("search"),
- 				expanduser("~/.mozilla/searchplugins"),
-+				"%%LOCALBASE%%/lib/firefox/searchplugins",
- 				"/usr/lib/firefox/searchplugins",
- 				"/usr/local/lib/firefox/searchplugins",
- 				"/usr/lib/mozilla-firefox/searchplugins",
-@@ -197,6 +198,7 @@ class MozillaSearchHandler(deskbar.Handl
- 			smart_dirs = [
- 				get_mozilla_home_file("search"),
- 				expanduser("~/.mozilla/searchplugins"),
-+				"%%LOCALBASE%%/lib/mozilla/searchplugins",
- 				"/usr/lib/mozilla/searchplugins",
- 				"/usr/local/lib/mozilla/searchplugins"]
- 		
diff --git a/deskutils/deskbar-applet/pkg-plist b/deskutils/deskbar-applet/pkg-plist
index f4f75074f823..3771bdc9096f 100644
--- a/deskutils/deskbar-applet/pkg-plist
+++ b/deskutils/deskbar-applet/pkg-plist
@@ -1,128 +1,180 @@
 lib/deskbar-applet/deskbar-applet
-lib/deskbar-applet/handlers/beagle-live.py
-lib/deskbar-applet/handlers/beagle-live.pyc
-lib/deskbar-applet/handlers/beagle-live.pyo
-lib/deskbar-applet/handlers/beagle-static.py
-lib/deskbar-applet/handlers/beagle-static.pyc
-lib/deskbar-applet/handlers/beagle-static.pyo
-lib/deskbar-applet/handlers/desklicious.py
-lib/deskbar-applet/handlers/desklicious.pyc
-lib/deskbar-applet/handlers/desklicious.pyo
-lib/deskbar-applet/handlers/epiphany.py
-lib/deskbar-applet/handlers/epiphany.pyc
-lib/deskbar-applet/handlers/epiphany.pyo
-%%EVO%%lib/deskbar-applet/handlers/evolution.py
-%%EVO%%lib/deskbar-applet/handlers/evolution.pyc
-%%EVO%%lib/deskbar-applet/handlers/evolution.pyo
-lib/deskbar-applet/handlers/files.py
-lib/deskbar-applet/handlers/files.pyc
-lib/deskbar-applet/handlers/files.pyo
-lib/deskbar-applet/handlers/galeon.py
-lib/deskbar-applet/handlers/galeon.pyc
-lib/deskbar-applet/handlers/galeon.pyo
-lib/deskbar-applet/handlers/gdmactions.py
-lib/deskbar-applet/handlers/gdmactions.pyc
-lib/deskbar-applet/handlers/gdmactions.pyo
-lib/deskbar-applet/handlers/history.py
-lib/deskbar-applet/handlers/history.pyc
-lib/deskbar-applet/handlers/history.pyo
-lib/deskbar-applet/handlers/iswitch-window.py
-lib/deskbar-applet/handlers/iswitch-window.pyc
-lib/deskbar-applet/handlers/iswitch-window.pyo
-lib/deskbar-applet/handlers/mozilla.py
-lib/deskbar-applet/handlers/mozilla.pyc
-lib/deskbar-applet/handlers/mozilla.pyo
-lib/deskbar-applet/handlers/programs.py
-lib/deskbar-applet/handlers/programs.pyc
-lib/deskbar-applet/handlers/programs.pyo
-lib/deskbar-applet/handlers/recent.py
-lib/deskbar-applet/handlers/recent.pyc
-lib/deskbar-applet/handlers/recent.pyo
-lib/deskbar-applet/handlers/web_address.py
-lib/deskbar-applet/handlers/web_address.pyc
-lib/deskbar-applet/handlers/web_address.pyo
-lib/deskbar-applet/handlers/yahoo.py
-lib/deskbar-applet/handlers/yahoo.pyc
-lib/deskbar-applet/handlers/yahoo.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/BrowserMatch.py
-%%PYTHON_SITELIBDIR%%/deskbar/BrowserMatch.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/BrowserMatch.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/Categories.py
-%%PYTHON_SITELIBDIR%%/deskbar/Categories.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/Categories.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/DeskbarApplet.py
-%%PYTHON_SITELIBDIR%%/deskbar/DeskbarApplet.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/DeskbarApplet.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/DeskbarAppletPreferences.py
-%%PYTHON_SITELIBDIR%%/deskbar/DeskbarAppletPreferences.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/DeskbarAppletPreferences.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/DeskbarHistory.py
-%%PYTHON_SITELIBDIR%%/deskbar/DeskbarHistory.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/DeskbarHistory.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/Handler.py
-%%PYTHON_SITELIBDIR%%/deskbar/Handler.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/Handler.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/Indexer.py
-%%PYTHON_SITELIBDIR%%/deskbar/Indexer.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/Indexer.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/Keybinder.py
-%%PYTHON_SITELIBDIR%%/deskbar/Keybinder.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/Keybinder.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/Match.py
-%%PYTHON_SITELIBDIR%%/deskbar/Match.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/Match.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/ModuleContext.py
-%%PYTHON_SITELIBDIR%%/deskbar/ModuleContext.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/ModuleContext.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/ModuleInstaller.py
-%%PYTHON_SITELIBDIR%%/deskbar/ModuleInstaller.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/ModuleInstaller.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/ModuleList.py
-%%PYTHON_SITELIBDIR%%/deskbar/ModuleList.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/ModuleList.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/ModuleLoader.py
-%%PYTHON_SITELIBDIR%%/deskbar/ModuleLoader.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/ModuleLoader.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/Utils.py
-%%PYTHON_SITELIBDIR%%/deskbar/Utils.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/Utils.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/Watcher.py
-%%PYTHON_SITELIBDIR%%/deskbar/Watcher.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/Watcher.pyo
+lib/deskbar-applet/modules-2.20-compatible/beagle-live.py
+lib/deskbar-applet/modules-2.20-compatible/beagle-live.pyc
+lib/deskbar-applet/modules-2.20-compatible/beagle-live.pyo
+lib/deskbar-applet/modules-2.20-compatible/beagle-static.py
+lib/deskbar-applet/modules-2.20-compatible/beagle-static.pyc
+lib/deskbar-applet/modules-2.20-compatible/beagle-static.pyo
+lib/deskbar-applet/modules-2.20-compatible/desklicious.py
+lib/deskbar-applet/modules-2.20-compatible/desklicious.pyc
+lib/deskbar-applet/modules-2.20-compatible/desklicious.pyo
+lib/deskbar-applet/modules-2.20-compatible/epiphany.py
+lib/deskbar-applet/modules-2.20-compatible/epiphany.pyc
+lib/deskbar-applet/modules-2.20-compatible/epiphany.pyo
+%%EVO%%lib/deskbar-applet/modules-2.20-compatible/evolution.py
+%%EVO%%lib/deskbar-applet/modules-2.20-compatible/evolution.pyc
+%%EVO%%lib/deskbar-applet/modules-2.20-compatible/evolution.pyo
+lib/deskbar-applet/modules-2.20-compatible/files.py
+lib/deskbar-applet/modules-2.20-compatible/files.pyc
+lib/deskbar-applet/modules-2.20-compatible/files.pyo
+lib/deskbar-applet/modules-2.20-compatible/gdmactions.py
+lib/deskbar-applet/modules-2.20-compatible/gdmactions.pyc
+lib/deskbar-applet/modules-2.20-compatible/gdmactions.pyo
+lib/deskbar-applet/modules-2.20-compatible/history.py
+lib/deskbar-applet/modules-2.20-compatible/history.pyc
+lib/deskbar-applet/modules-2.20-compatible/history.pyo
+lib/deskbar-applet/modules-2.20-compatible/iswitch-window.py
+lib/deskbar-applet/modules-2.20-compatible/iswitch-window.pyc
+lib/deskbar-applet/modules-2.20-compatible/iswitch-window.pyo
+lib/deskbar-applet/modules-2.20-compatible/mozilla.py
+lib/deskbar-applet/modules-2.20-compatible/mozilla.pyc
+lib/deskbar-applet/modules-2.20-compatible/mozilla.pyo
+lib/deskbar-applet/modules-2.20-compatible/programs.py
+lib/deskbar-applet/modules-2.20-compatible/programs.pyc
+lib/deskbar-applet/modules-2.20-compatible/programs.pyo
+lib/deskbar-applet/modules-2.20-compatible/recent.py
+lib/deskbar-applet/modules-2.20-compatible/recent.pyc
+lib/deskbar-applet/modules-2.20-compatible/recent.pyo
+lib/deskbar-applet/modules-2.20-compatible/web_address.py
+lib/deskbar-applet/modules-2.20-compatible/web_address.pyc
+lib/deskbar-applet/modules-2.20-compatible/web_address.pyo
+lib/deskbar-applet/modules-2.20-compatible/yahoo.py
+lib/deskbar-applet/modules-2.20-compatible/yahoo.pyc
+lib/deskbar-applet/modules-2.20-compatible/yahoo.pyo
 %%PYTHON_SITELIBDIR%%/deskbar/__init__.py
 %%PYTHON_SITELIBDIR%%/deskbar/__init__.pyc
 %%PYTHON_SITELIBDIR%%/deskbar/__init__.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/core/BrowserMatch.py
+%%PYTHON_SITELIBDIR%%/deskbar/core/BrowserMatch.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/core/BrowserMatch.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/core/Categories.py
+%%PYTHON_SITELIBDIR%%/deskbar/core/Categories.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/core/Categories.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/core/CoreImpl.py
+%%PYTHON_SITELIBDIR%%/deskbar/core/CoreImpl.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/core/CoreImpl.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/core/DeskbarHistory.py
+%%PYTHON_SITELIBDIR%%/deskbar/core/DeskbarHistory.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/core/DeskbarHistory.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/core/GconfStore.py
+%%PYTHON_SITELIBDIR%%/deskbar/core/GconfStore.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/core/GconfStore.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/core/Indexer.py
+%%PYTHON_SITELIBDIR%%/deskbar/core/Indexer.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/core/Indexer.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/core/Keybinder.py
+%%PYTHON_SITELIBDIR%%/deskbar/core/Keybinder.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/core/Keybinder.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/core/ModuleInstaller.py
+%%PYTHON_SITELIBDIR%%/deskbar/core/ModuleInstaller.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/core/ModuleInstaller.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/core/ModuleList.py
+%%PYTHON_SITELIBDIR%%/deskbar/core/ModuleList.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/core/ModuleList.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/core/ModuleLoader.py
+%%PYTHON_SITELIBDIR%%/deskbar/core/ModuleLoader.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/core/ModuleLoader.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/core/ThreadPool.py
+%%PYTHON_SITELIBDIR%%/deskbar/core/ThreadPool.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/core/ThreadPool.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/core/Utils.py
+%%PYTHON_SITELIBDIR%%/deskbar/core/Utils.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/core/Utils.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/core/Watcher.py
+%%PYTHON_SITELIBDIR%%/deskbar/core/Watcher.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/core/Watcher.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/core/__init__.py
+%%PYTHON_SITELIBDIR%%/deskbar/core/__init__.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/core/__init__.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/core/gnomedesktop/__init__.py
+%%PYTHON_SITELIBDIR%%/deskbar/core/gnomedesktop/__init__.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/core/gnomedesktop/__init__.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/core/gnomedesktop/_gnomedesktop.la
+%%PYTHON_SITELIBDIR%%/deskbar/core/gnomedesktop/_gnomedesktop.so
+%%PYTHON_SITELIBDIR%%/deskbar/core/keybinder/__init__.py
+%%PYTHON_SITELIBDIR%%/deskbar/core/keybinder/__init__.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/core/keybinder/__init__.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/core/keybinder/_keybinder.la
+%%PYTHON_SITELIBDIR%%/deskbar/core/keybinder/_keybinder.so
+%%PYTHON_SITELIBDIR%%/deskbar/core/updater/NewStuffUpdater.py
+%%PYTHON_SITELIBDIR%%/deskbar/core/updater/NewStuffUpdater.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/core/updater/NewStuffUpdater.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/core/updater/__init__.py
+%%PYTHON_SITELIBDIR%%/deskbar/core/updater/__init__.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/core/updater/__init__.pyo
 %%PYTHON_SITELIBDIR%%/deskbar/defs.py
 %%PYTHON_SITELIBDIR%%/deskbar/defs.pyc
 %%PYTHON_SITELIBDIR%%/deskbar/defs.pyo
-%%EVO%%%%PYTHON_SITELIBDIR%%/deskbar/evolution/__init__.py
-%%EVO%%%%PYTHON_SITELIBDIR%%/deskbar/evolution/__init__.pyc
-%%EVO%%%%PYTHON_SITELIBDIR%%/deskbar/evolution/__init__.pyo
-%%EVO%%%%PYTHON_SITELIBDIR%%/deskbar/evolution/_evolution.la
-%%EVO%%%%PYTHON_SITELIBDIR%%/deskbar/evolution/_evolution.so
-%%PYTHON_SITELIBDIR%%/deskbar/gdmclient/__init__.py
-%%PYTHON_SITELIBDIR%%/deskbar/gdmclient/__init__.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/gdmclient/__init__.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/gdmclient/_gdmclient.la
-%%PYTHON_SITELIBDIR%%/deskbar/gdmclient/_gdmclient.so
-%%PYTHON_SITELIBDIR%%/deskbar/gnomedesktop/__init__.py
-%%PYTHON_SITELIBDIR%%/deskbar/gnomedesktop/__init__.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/gnomedesktop/__init__.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/gnomedesktop/_gnomedesktop.la
-%%PYTHON_SITELIBDIR%%/deskbar/gnomedesktop/_gnomedesktop.so
 %%PYTHON_SITELIBDIR%%/deskbar/gtkexcepthook.py
 %%PYTHON_SITELIBDIR%%/deskbar/gtkexcepthook.pyc
 %%PYTHON_SITELIBDIR%%/deskbar/gtkexcepthook.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/iconentry/__init__.py
-%%PYTHON_SITELIBDIR%%/deskbar/iconentry/__init__.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/iconentry/__init__.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/iconentry/_iconentry.la
-%%PYTHON_SITELIBDIR%%/deskbar/iconentry/_iconentry.so
-%%PYTHON_SITELIBDIR%%/deskbar/keybinder/__init__.py
-%%PYTHON_SITELIBDIR%%/deskbar/keybinder/__init__.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/keybinder/__init__.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/keybinder/_keybinder.la
-%%PYTHON_SITELIBDIR%%/deskbar/keybinder/_keybinder.so
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/__init__.py
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/__init__.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/__init__.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/ActionsFactory.py
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/ActionsFactory.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/ActionsFactory.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/CopyToClipboardAction.py
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/CopyToClipboardAction.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/CopyToClipboardAction.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/GoToLocationAction.py
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/GoToLocationAction.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/GoToLocationAction.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/OpenDesktopFileAction.py
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/OpenDesktopFileAction.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/OpenDesktopFileAction.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/OpenFileAction.py
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/OpenFileAction.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/OpenFileAction.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/OpenWithApplicationAction.py
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/OpenWithApplicationAction.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/OpenWithApplicationAction.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/OpenWithNautilusAction.py
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/OpenWithNautilusAction.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/OpenWithNautilusAction.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/SendEmailToAction.py
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/SendEmailToAction.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/SendEmailToAction.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/SendFileViaEmailAction.py
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/SendFileViaEmailAction.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/SendFileViaEmailAction.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/ShowUrlAction.py
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/ShowUrlAction.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/ShowUrlAction.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/__init__.py
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/__init__.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/actions/__init__.pyo
+%%EVO%%%%PYTHON_SITELIBDIR%%/deskbar/handlers/evolution/__init__.py
+%%EVO%%%%PYTHON_SITELIBDIR%%/deskbar/handlers/evolution/__init__.pyc
+%%EVO%%%%PYTHON_SITELIBDIR%%/deskbar/handlers/evolution/__init__.pyo
+%%EVO%%%%PYTHON_SITELIBDIR%%/deskbar/handlers/evolution/_evolution.la
+%%EVO%%%%PYTHON_SITELIBDIR%%/deskbar/handlers/evolution/_evolution.so
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/gdmclient/__init__.py
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/gdmclient/__init__.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/gdmclient/__init__.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/gdmclient/_gdmclient.la
+%%PYTHON_SITELIBDIR%%/deskbar/handlers/gdmclient/_gdmclient.so
+%%PYTHON_SITELIBDIR%%/deskbar/interfaces/Action.py
+%%PYTHON_SITELIBDIR%%/deskbar/interfaces/Action.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/interfaces/Action.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/interfaces/Controller.py
+%%PYTHON_SITELIBDIR%%/deskbar/interfaces/Controller.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/interfaces/Controller.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/interfaces/Core.py
+%%PYTHON_SITELIBDIR%%/deskbar/interfaces/Core.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/interfaces/Core.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/interfaces/Match.py
+%%PYTHON_SITELIBDIR%%/deskbar/interfaces/Match.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/interfaces/Match.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/interfaces/Module.py
+%%PYTHON_SITELIBDIR%%/deskbar/interfaces/Module.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/interfaces/Module.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/interfaces/View.py
+%%PYTHON_SITELIBDIR%%/deskbar/interfaces/View.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/interfaces/View.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/interfaces/__init__.py
+%%PYTHON_SITELIBDIR%%/deskbar/interfaces/__init__.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/interfaces/__init__.pyo
 %%PYTHON_SITELIBDIR%%/deskbar/osutils/__init__.py
 %%PYTHON_SITELIBDIR%%/deskbar/osutils/__init__.pyc
 %%PYTHON_SITELIBDIR%%/deskbar/osutils/__init__.pyo
@@ -131,30 +183,21 @@ lib/deskbar-applet/handlers/yahoo.pyo
 %%PYTHON_SITELIBDIR%%/deskbar/ui/About.py
 %%PYTHON_SITELIBDIR%%/deskbar/ui/About.pyc
 %%PYTHON_SITELIBDIR%%/deskbar/ui/About.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/ui/DeskbarPreferencesUI.py
-%%PYTHON_SITELIBDIR%%/deskbar/ui/DeskbarPreferencesUI.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/ui/DeskbarPreferencesUI.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/ui/DeskbarUI.py
-%%PYTHON_SITELIBDIR%%/deskbar/ui/DeskbarUI.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/ui/DeskbarUI.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/ui/EntryHistoryManager.py
-%%PYTHON_SITELIBDIR%%/deskbar/ui/EntryHistoryManager.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/ui/EntryHistoryManager.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/ui/ModuleListView.py
-%%PYTHON_SITELIBDIR%%/deskbar/ui/ModuleListView.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/ui/ModuleListView.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/CuemiacWindowController.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/CuemiacWindowController.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/CuemiacWindowController.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/CuemiacWindowView.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/CuemiacWindowView.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/CuemiacWindowView.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/DeskbarApplet.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/DeskbarApplet.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/DeskbarApplet.pyo
 %%PYTHON_SITELIBDIR%%/deskbar/ui/__init__.py
 %%PYTHON_SITELIBDIR%%/deskbar/ui/__init__.pyc
 %%PYTHON_SITELIBDIR%%/deskbar/ui/__init__.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacAlignedWindow.py
-%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacAlignedWindow.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacAlignedWindow.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacAppletButton.py
-%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacAppletButton.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacAppletButton.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacButtonUI.py
-%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacButtonUI.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacButtonUI.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacActionsTreeView.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacActionsTreeView.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacActionsTreeView.pyo
 %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacEntry.py
 %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacEntry.pyc
 %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacEntry.pyo
@@ -167,76 +210,79 @@ lib/deskbar-applet/handlers/yahoo.pyo
 %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacItems.py
 %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacItems.pyc
 %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacItems.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacLayoutProvider.py
-%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacLayoutProvider.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacLayoutProvider.pyo
 %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacModel.py
 %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacModel.pyc
 %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacModel.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacPopupEntry.py
-%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacPopupEntry.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacPopupEntry.pyo
 %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacTreeView.py
 %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacTreeView.pyc
 %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacTreeView.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacUIManager.py
-%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacUIManager.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacUIManager.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/DeskbarAppletButton.py
-%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/DeskbarAppletButton.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/DeskbarAppletButton.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/LingeringSelectionWindow.py
-%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/LingeringSelectionWindow.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/LingeringSelectionWindow.pyo
 %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/__init__.py
 %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/__init__.pyc
 %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/__init__.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/ui/entriac/CuemiacEntryUI.py
-%%PYTHON_SITELIBDIR%%/deskbar/ui/entriac/CuemiacEntryUI.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/ui/entriac/CuemiacEntryUI.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/ui/entriac/__init__.py
-%%PYTHON_SITELIBDIR%%/deskbar/ui/entriac/__init__.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/ui/entriac/__init__.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/ui/window/CuemiacWindowUI.py
-%%PYTHON_SITELIBDIR%%/deskbar/ui/window/CuemiacWindowUI.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/ui/window/CuemiacWindowUI.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/ui/window/__init__.py
-%%PYTHON_SITELIBDIR%%/deskbar/ui/window/__init__.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/ui/window/__init__.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/updater/ErrorDialog.py
-%%PYTHON_SITELIBDIR%%/deskbar/updater/ErrorDialog.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/updater/ErrorDialog.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/updater/NewStuffUpdater.py
-%%PYTHON_SITELIBDIR%%/deskbar/updater/NewStuffUpdater.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/updater/NewStuffUpdater.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/updater/ProgressbarDialog.py
-%%PYTHON_SITELIBDIR%%/deskbar/updater/ProgressbarDialog.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/updater/ProgressbarDialog.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/updater/__init__.py
-%%PYTHON_SITELIBDIR%%/deskbar/updater/__init__.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/updater/__init__.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/iconentry/__init__.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/iconentry/__init__.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/iconentry/__init__.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/iconentry/_iconentry.la
+%%PYTHON_SITELIBDIR%%/deskbar/ui/iconentry/_iconentry.so
+%%PYTHON_SITELIBDIR%%/deskbar/ui/preferences/AccelEntry.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/preferences/AccelEntry.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/preferences/AccelEntry.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/preferences/DeskbarPreferences.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/preferences/DeskbarPreferences.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/preferences/DeskbarPreferences.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/preferences/ErrorDialog.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/preferences/ErrorDialog.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/preferences/ErrorDialog.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/preferences/ModuleListView.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/preferences/ModuleListView.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/preferences/ModuleListView.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/preferences/ProgressbarDialog.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/preferences/ProgressbarDialog.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/preferences/ProgressbarDialog.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/preferences/__init__.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/preferences/__init__.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/preferences/__init__.pyo
 libdata/bonobo/servers/Deskbar_Applet.server
 libdata/pkgconfig/deskbar-applet.pc
-share/gnome/deskbar-applet/Deskbar_Applet.xml
-share/gnome/deskbar-applet/art/delicious.png
-share/gnome/deskbar-applet/art/deskbar-applet-panel-h.png
-share/gnome/deskbar-applet/art/deskbar-applet-panel-h.svg
-share/gnome/deskbar-applet/art/deskbar-applet-panel-v.png
-share/gnome/deskbar-applet/art/deskbar-applet-panel-v.svg
-share/gnome/deskbar-applet/art/epiphany-history.png
-share/gnome/deskbar-applet/art/folder-bookmark.png
-share/gnome/deskbar-applet/art/generic.png
-share/gnome/deskbar-applet/art/google.png
-share/gnome/deskbar-applet/art/gpm-suspend-to-disk.png
-share/gnome/deskbar-applet/art/gpm-suspend-to-ram.png
-share/gnome/deskbar-applet/art/yahoo.png
-share/gnome/deskbar-applet/mozilla-search.glade
-share/gnome/deskbar-applet/prefs-dialog.glade
-share/gnome/deskbar-applet/smart-bookmarks.glade
+%%DATADIR%%/Deskbar_Applet.xml
+%%DATADIR%%/art/delicious.png
+%%DATADIR%%/art/deskbar-applet-panel-h.png
+%%DATADIR%%/art/deskbar-applet-panel-h.svg
+%%DATADIR%%/art/deskbar-applet-panel-v.png
+%%DATADIR%%/art/deskbar-applet-panel-v.svg
+%%DATADIR%%/art/epiphany-history.png
+%%DATADIR%%/art/generic.png
+%%DATADIR%%/art/gpm-suspend-to-disk.png
+%%DATADIR%%/art/gpm-suspend-to-ram.png
+%%DATADIR%%/art/web-search.png
+%%DATADIR%%/art/yahoo.png
+%%DATADIR%%/mozilla-search.glade
+%%DATADIR%%/prefs-dialog.glade
+%%DATADIR%%/smart-bookmarks.glade
 share/gnome/help/deskbar/C/deskbar.xml
 share/gnome/help/deskbar/C/figures/deskbar-applet.png
 share/gnome/help/deskbar/C/legal.xml
-share/gnome/omf/deskbar/deskbar-C.omf
+share/gnome/help/deskbar/ca/deskbar.xml
+share/gnome/help/deskbar/ca/figures/deskbar-applet.png
+share/gnome/help/deskbar/ca/legal.xml
+share/gnome/help/deskbar/en_GB/deskbar.xml
+share/gnome/help/deskbar/en_GB/figures/deskbar-applet.png
+share/gnome/help/deskbar/en_GB/legal.xml
+share/gnome/help/deskbar/es/deskbar.xml
+share/gnome/help/deskbar/es/figures/deskbar-applet.png
+share/gnome/help/deskbar/es/legal.xml
+share/gnome/help/deskbar/fr/deskbar.xml
+share/gnome/help/deskbar/fr/figures/deskbar-applet.png
+share/gnome/help/deskbar/fr/legal.xml
+share/gnome/help/deskbar/oc/deskbar.xml
+share/gnome/help/deskbar/oc/figures/deskbar-applet.png
+share/gnome/help/deskbar/oc/legal.xml
+share/gnome/help/deskbar/sv/deskbar.xml
+share/gnome/help/deskbar/sv/figures/deskbar-applet.png
+share/gnome/help/deskbar/sv/legal.xml
+share/gnome/help/deskbar/uk/deskbar.xml
+share/gnome/help/deskbar/uk/figures/deskbar-applet.png
+share/gnome/help/deskbar/uk/legal.xml
 share/icons/hicolor/16x16/apps/deskbar-applet.png
 share/icons/hicolor/22x22/apps/deskbar-applet.png
 share/icons/hicolor/32x32/apps/deskbar-applet.png
@@ -244,6 +290,7 @@ share/icons/hicolor/48x48/apps/deskbar-applet.png
 share/icons/hicolor/scalable/apps/deskbar-applet.svg
 share/locale/ar/LC_MESSAGES/deskbar-applet.mo
 share/locale/be/LC_MESSAGES/deskbar-applet.mo
+share/locale/be@latin/LC_MESSAGES/deskbar-applet.mo
 share/locale/bg/LC_MESSAGES/deskbar-applet.mo
 share/locale/bn/LC_MESSAGES/deskbar-applet.mo
 share/locale/bn_IN/LC_MESSAGES/deskbar-applet.mo
@@ -283,6 +330,7 @@ share/locale/mr/LC_MESSAGES/deskbar-applet.mo
 share/locale/nb/LC_MESSAGES/deskbar-applet.mo
 share/locale/ne/LC_MESSAGES/deskbar-applet.mo
 share/locale/nl/LC_MESSAGES/deskbar-applet.mo
+share/locale/oc/LC_MESSAGES/deskbar-applet.mo
 share/locale/or/LC_MESSAGES/deskbar-applet.mo
 share/locale/pa/LC_MESSAGES/deskbar-applet.mo
 share/locale/pl/LC_MESSAGES/deskbar-applet.mo
@@ -290,6 +338,7 @@ share/locale/pt/LC_MESSAGES/deskbar-applet.mo
 share/locale/pt_BR/LC_MESSAGES/deskbar-applet.mo
 share/locale/ro/LC_MESSAGES/deskbar-applet.mo
 share/locale/ru/LC_MESSAGES/deskbar-applet.mo
+share/locale/si/LC_MESSAGES/deskbar-applet.mo
 share/locale/sk/LC_MESSAGES/deskbar-applet.mo
 share/locale/sl/LC_MESSAGES/deskbar-applet.mo
 share/locale/sq/LC_MESSAGES/deskbar-applet.mo
@@ -304,30 +353,57 @@ share/locale/vi/LC_MESSAGES/deskbar-applet.mo
 share/locale/zh_CN/LC_MESSAGES/deskbar-applet.mo
 share/locale/zh_HK/LC_MESSAGES/deskbar-applet.mo
 share/locale/zh_TW/LC_MESSAGES/deskbar-applet.mo
-@dirrm share/gnome/omf/deskbar
+share/omf/deskbar/deskbar-C.omf
+share/omf/deskbar/deskbar-ca.omf
+share/omf/deskbar/deskbar-en_GB.omf
+share/omf/deskbar/deskbar-es.omf
+share/omf/deskbar/deskbar-fr.omf
+share/omf/deskbar/deskbar-oc.omf
+share/omf/deskbar/deskbar-sv.omf
+share/omf/deskbar/deskbar-uk.omf
+@dirrm share/omf/deskbar
+@dirrm share/gnome/help/deskbar/uk/figures
+@dirrm share/gnome/help/deskbar/uk
+@dirrm share/gnome/help/deskbar/sv/figures
+@dirrm share/gnome/help/deskbar/sv
+@dirrm share/gnome/help/deskbar/oc/figures
+@dirrm share/gnome/help/deskbar/oc
+@dirrm share/gnome/help/deskbar/fr/figures
+@dirrm share/gnome/help/deskbar/fr
+@dirrm share/gnome/help/deskbar/es/figures
+@dirrm share/gnome/help/deskbar/es
+@dirrm share/gnome/help/deskbar/en_GB/figures
+@dirrm share/gnome/help/deskbar/en_GB
+@dirrm share/gnome/help/deskbar/ca/figures
+@dirrm share/gnome/help/deskbar/ca
 @dirrm share/gnome/help/deskbar/C/figures
 @dirrm share/gnome/help/deskbar/C
 @dirrm share/gnome/help/deskbar
-@dirrm share/gnome/deskbar-applet/art
-@dirrm share/gnome/deskbar-applet
-@dirrm %%PYTHON_SITELIBDIR%%/deskbar/updater
-@dirrm %%PYTHON_SITELIBDIR%%/deskbar/ui/window
-@dirrm %%PYTHON_SITELIBDIR%%/deskbar/ui/entriac
+@dirrm %%DATADIR%%/art
+@dirrm %%DATADIR%%
+@dirrm %%PYTHON_SITELIBDIR%%/deskbar/ui/preferences
+@dirrm %%PYTHON_SITELIBDIR%%/deskbar/ui/iconentry
 @dirrm %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac
 @dirrm %%PYTHON_SITELIBDIR%%/deskbar/ui
 @dirrm %%PYTHON_SITELIBDIR%%/deskbar/osutils
-@dirrm %%PYTHON_SITELIBDIR%%/deskbar/keybinder
-@dirrm %%PYTHON_SITELIBDIR%%/deskbar/iconentry
-@dirrm %%PYTHON_SITELIBDIR%%/deskbar/gnomedesktop
-@dirrm %%PYTHON_SITELIBDIR%%/deskbar/gdmclient
-%%EVO%%@dirrm %%PYTHON_SITELIBDIR%%/deskbar/evolution
+@dirrm %%PYTHON_SITELIBDIR%%/deskbar/interfaces
+@dirrm %%PYTHON_SITELIBDIR%%/deskbar/handlers/gdmclient
+%%EVO%%@dirrm %%PYTHON_SITELIBDIR%%/deskbar/handlers/evolution
+@dirrm %%PYTHON_SITELIBDIR%%/deskbar/handlers/actions
+@dirrm %%PYTHON_SITELIBDIR%%/deskbar/handlers
+@dirrm %%PYTHON_SITELIBDIR%%/deskbar/core/updater
+@dirrm %%PYTHON_SITELIBDIR%%/deskbar/core/keybinder
+@dirrm %%PYTHON_SITELIBDIR%%/deskbar/core/gnomedesktop
+@dirrm %%PYTHON_SITELIBDIR%%/deskbar/core
 @dirrm %%PYTHON_SITELIBDIR%%/deskbar
-@dirrmtry %%PYTHON_SITELIBDIR%%
-@dirrmtry %%PYTHON_LIBDIR%%
-@dirrm lib/deskbar-applet/handlers
+@dirrm lib/deskbar-applet/modules-2.20-compatible
 @dirrm lib/deskbar-applet
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mg/LC_MESSAGES
@@ -338,3 +414,5 @@ share/locale/zh_TW/LC_MESSAGES/deskbar-applet.mo
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin