update to 2.20.1

This switches to the new gnome-2.20 branch.

3 files changed, 264 insertions, 190 deletions

diff --git a/misc/deskbar-applet/Makefile b/misc/deskbar-applet/Makefile
index 41525e17201..64a849774cd 100644
--- a/misc/deskbar-applet/Makefile
+++ b/misc/deskbar-applet/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2007/09/21 13:04:00 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2007/11/05 19:52:28 drochner Exp $
 #
 
-DISTNAME=	deskbar-applet-2.18.1
-PKGREVISION=	3
+DISTNAME=	deskbar-applet-2.20.1
 CATEGORIES=	misc gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/deskbar-applet/2.18/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/deskbar-applet/2.20/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	drochner@NetBSD.org
@@ -42,4 +41,5 @@ BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.6.0
 .include "../../x11/py-gnome2/buildlink3.mk"
 .include "../../x11/py-gnome2-desktop/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.include "../../sysutils/py-dbus/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/deskbar-applet/PLIST b/misc/deskbar-applet/PLIST
index e6447de57de..51fecb25b84 100644
--- a/misc/deskbar-applet/PLIST
+++ b/misc/deskbar-applet/PLIST
@@ -1,126 +1,179 @@
-@comment $NetBSD: PLIST,v 1.8 2007/09/25 10:54:15 hira Exp $
+@comment $NetBSD: PLIST,v 1.9 2007/11/05 19:52:28 drochner Exp $
 lib/bonobo/servers/Deskbar_Applet.server
 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
-lib/deskbar-applet/handlers/evolution.py
-lib/deskbar-applet/handlers/evolution.pyc
-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
+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
+lib/deskbar-applet/modules-2.20-compatible/evolution.py
+lib/deskbar-applet/modules-2.20-compatible/evolution.pyc
+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
 lib/pkgconfig/deskbar-applet.pc
-${PYSITELIB}/deskbar/BrowserMatch.py
-${PYSITELIB}/deskbar/BrowserMatch.pyc
-${PYSITELIB}/deskbar/BrowserMatch.pyo
-${PYSITELIB}/deskbar/Categories.py
-${PYSITELIB}/deskbar/Categories.pyc
-${PYSITELIB}/deskbar/Categories.pyo
-${PYSITELIB}/deskbar/DeskbarApplet.py
-${PYSITELIB}/deskbar/DeskbarApplet.pyc
-${PYSITELIB}/deskbar/DeskbarApplet.pyo
-${PYSITELIB}/deskbar/DeskbarAppletPreferences.py
-${PYSITELIB}/deskbar/DeskbarAppletPreferences.pyc
-${PYSITELIB}/deskbar/DeskbarAppletPreferences.pyo
-${PYSITELIB}/deskbar/DeskbarHistory.py
-${PYSITELIB}/deskbar/DeskbarHistory.pyc
-${PYSITELIB}/deskbar/DeskbarHistory.pyo
-${PYSITELIB}/deskbar/Handler.py
-${PYSITELIB}/deskbar/Handler.pyc
-${PYSITELIB}/deskbar/Handler.pyo
-${PYSITELIB}/deskbar/Indexer.py
-${PYSITELIB}/deskbar/Indexer.pyc
-${PYSITELIB}/deskbar/Indexer.pyo
-${PYSITELIB}/deskbar/Keybinder.py
-${PYSITELIB}/deskbar/Keybinder.pyc
-${PYSITELIB}/deskbar/Keybinder.pyo
-${PYSITELIB}/deskbar/Match.py
-${PYSITELIB}/deskbar/Match.pyc
-${PYSITELIB}/deskbar/Match.pyo
-${PYSITELIB}/deskbar/ModuleContext.py
-${PYSITELIB}/deskbar/ModuleContext.pyc
-${PYSITELIB}/deskbar/ModuleContext.pyo
-${PYSITELIB}/deskbar/ModuleInstaller.py
-${PYSITELIB}/deskbar/ModuleInstaller.pyc
-${PYSITELIB}/deskbar/ModuleInstaller.pyo
-${PYSITELIB}/deskbar/ModuleList.py
-${PYSITELIB}/deskbar/ModuleList.pyc
-${PYSITELIB}/deskbar/ModuleList.pyo
-${PYSITELIB}/deskbar/ModuleLoader.py
-${PYSITELIB}/deskbar/ModuleLoader.pyc
-${PYSITELIB}/deskbar/ModuleLoader.pyo
-${PYSITELIB}/deskbar/Utils.py
-${PYSITELIB}/deskbar/Utils.pyc
-${PYSITELIB}/deskbar/Utils.pyo
-${PYSITELIB}/deskbar/Watcher.py
-${PYSITELIB}/deskbar/Watcher.pyc
-${PYSITELIB}/deskbar/Watcher.pyo
 ${PYSITELIB}/deskbar/__init__.py
 ${PYSITELIB}/deskbar/__init__.pyc
 ${PYSITELIB}/deskbar/__init__.pyo
+${PYSITELIB}/deskbar/core/BrowserMatch.py
+${PYSITELIB}/deskbar/core/BrowserMatch.pyc
+${PYSITELIB}/deskbar/core/BrowserMatch.pyo
+${PYSITELIB}/deskbar/core/Categories.py
+${PYSITELIB}/deskbar/core/Categories.pyc
+${PYSITELIB}/deskbar/core/Categories.pyo
+${PYSITELIB}/deskbar/core/CoreImpl.py
+${PYSITELIB}/deskbar/core/CoreImpl.pyc
+${PYSITELIB}/deskbar/core/CoreImpl.pyo
+${PYSITELIB}/deskbar/core/DeskbarHistory.py
+${PYSITELIB}/deskbar/core/DeskbarHistory.pyc
+${PYSITELIB}/deskbar/core/DeskbarHistory.pyo
+${PYSITELIB}/deskbar/core/GconfStore.py
+${PYSITELIB}/deskbar/core/GconfStore.pyc
+${PYSITELIB}/deskbar/core/GconfStore.pyo
+${PYSITELIB}/deskbar/core/Indexer.py
+${PYSITELIB}/deskbar/core/Indexer.pyc
+${PYSITELIB}/deskbar/core/Indexer.pyo
+${PYSITELIB}/deskbar/core/Keybinder.py
+${PYSITELIB}/deskbar/core/Keybinder.pyc
+${PYSITELIB}/deskbar/core/Keybinder.pyo
+${PYSITELIB}/deskbar/core/ModuleInstaller.py
+${PYSITELIB}/deskbar/core/ModuleInstaller.pyc
+${PYSITELIB}/deskbar/core/ModuleInstaller.pyo
+${PYSITELIB}/deskbar/core/ModuleList.py
+${PYSITELIB}/deskbar/core/ModuleList.pyc
+${PYSITELIB}/deskbar/core/ModuleList.pyo
+${PYSITELIB}/deskbar/core/ModuleLoader.py
+${PYSITELIB}/deskbar/core/ModuleLoader.pyc
+${PYSITELIB}/deskbar/core/ModuleLoader.pyo
+${PYSITELIB}/deskbar/core/ThreadPool.py
+${PYSITELIB}/deskbar/core/ThreadPool.pyc
+${PYSITELIB}/deskbar/core/ThreadPool.pyo
+${PYSITELIB}/deskbar/core/Utils.py
+${PYSITELIB}/deskbar/core/Utils.pyc
+${PYSITELIB}/deskbar/core/Utils.pyo
+${PYSITELIB}/deskbar/core/Watcher.py
+${PYSITELIB}/deskbar/core/Watcher.pyc
+${PYSITELIB}/deskbar/core/Watcher.pyo
+${PYSITELIB}/deskbar/core/__init__.py
+${PYSITELIB}/deskbar/core/__init__.pyc
+${PYSITELIB}/deskbar/core/__init__.pyo
+${PYSITELIB}/deskbar/core/gnomedesktop/__init__.py
+${PYSITELIB}/deskbar/core/gnomedesktop/__init__.pyc
+${PYSITELIB}/deskbar/core/gnomedesktop/__init__.pyo
+${PYSITELIB}/deskbar/core/gnomedesktop/_gnomedesktop.la
+${PYSITELIB}/deskbar/core/keybinder/__init__.py
+${PYSITELIB}/deskbar/core/keybinder/__init__.pyc
+${PYSITELIB}/deskbar/core/keybinder/__init__.pyo
+${PYSITELIB}/deskbar/core/keybinder/_keybinder.la
+${PYSITELIB}/deskbar/core/updater/NewStuffUpdater.py
+${PYSITELIB}/deskbar/core/updater/NewStuffUpdater.pyc
+${PYSITELIB}/deskbar/core/updater/NewStuffUpdater.pyo
+${PYSITELIB}/deskbar/core/updater/__init__.py
+${PYSITELIB}/deskbar/core/updater/__init__.pyc
+${PYSITELIB}/deskbar/core/updater/__init__.pyo
 ${PYSITELIB}/deskbar/defs.py
 ${PYSITELIB}/deskbar/defs.pyc
 ${PYSITELIB}/deskbar/defs.pyo
-${PYSITELIB}/deskbar/evolution/__init__.py
-${PYSITELIB}/deskbar/evolution/__init__.pyc
-${PYSITELIB}/deskbar/evolution/__init__.pyo
-${PYSITELIB}/deskbar/evolution/_evolution.la
-${PYSITELIB}/deskbar/gdmclient/__init__.py
-${PYSITELIB}/deskbar/gdmclient/__init__.pyc
-${PYSITELIB}/deskbar/gdmclient/__init__.pyo
-${PYSITELIB}/deskbar/gdmclient/_gdmclient.la
-${PYSITELIB}/deskbar/gnomedesktop/__init__.py
-${PYSITELIB}/deskbar/gnomedesktop/__init__.pyc
-${PYSITELIB}/deskbar/gnomedesktop/__init__.pyo
-${PYSITELIB}/deskbar/gnomedesktop/_gnomedesktop.la
 ${PYSITELIB}/deskbar/gtkexcepthook.py
 ${PYSITELIB}/deskbar/gtkexcepthook.pyc
 ${PYSITELIB}/deskbar/gtkexcepthook.pyo
-${PYSITELIB}/deskbar/iconentry/__init__.py
-${PYSITELIB}/deskbar/iconentry/__init__.pyc
-${PYSITELIB}/deskbar/iconentry/__init__.pyo
-${PYSITELIB}/deskbar/iconentry/_iconentry.la
-${PYSITELIB}/deskbar/keybinder/__init__.py
-${PYSITELIB}/deskbar/keybinder/__init__.pyc
-${PYSITELIB}/deskbar/keybinder/__init__.pyo
-${PYSITELIB}/deskbar/keybinder/_keybinder.la
+${PYSITELIB}/deskbar/handlers/__init__.py
+${PYSITELIB}/deskbar/handlers/__init__.pyc
+${PYSITELIB}/deskbar/handlers/__init__.pyo
+${PYSITELIB}/deskbar/handlers/actions/ActionsFactory.py
+${PYSITELIB}/deskbar/handlers/actions/ActionsFactory.pyc
+${PYSITELIB}/deskbar/handlers/actions/ActionsFactory.pyo
+${PYSITELIB}/deskbar/handlers/actions/CopyToClipboardAction.py
+${PYSITELIB}/deskbar/handlers/actions/CopyToClipboardAction.pyc
+${PYSITELIB}/deskbar/handlers/actions/CopyToClipboardAction.pyo
+${PYSITELIB}/deskbar/handlers/actions/GoToLocationAction.py
+${PYSITELIB}/deskbar/handlers/actions/GoToLocationAction.pyc
+${PYSITELIB}/deskbar/handlers/actions/GoToLocationAction.pyo
+${PYSITELIB}/deskbar/handlers/actions/OpenDesktopFileAction.py
+${PYSITELIB}/deskbar/handlers/actions/OpenDesktopFileAction.pyc
+${PYSITELIB}/deskbar/handlers/actions/OpenDesktopFileAction.pyo
+${PYSITELIB}/deskbar/handlers/actions/OpenFileAction.py
+${PYSITELIB}/deskbar/handlers/actions/OpenFileAction.pyc
+${PYSITELIB}/deskbar/handlers/actions/OpenFileAction.pyo
+${PYSITELIB}/deskbar/handlers/actions/OpenWithApplicationAction.py
+${PYSITELIB}/deskbar/handlers/actions/OpenWithApplicationAction.pyc
+${PYSITELIB}/deskbar/handlers/actions/OpenWithApplicationAction.pyo
+${PYSITELIB}/deskbar/handlers/actions/OpenWithNautilusAction.py
+${PYSITELIB}/deskbar/handlers/actions/OpenWithNautilusAction.pyc
+${PYSITELIB}/deskbar/handlers/actions/OpenWithNautilusAction.pyo
+${PYSITELIB}/deskbar/handlers/actions/SendEmailToAction.py
+${PYSITELIB}/deskbar/handlers/actions/SendEmailToAction.pyc
+${PYSITELIB}/deskbar/handlers/actions/SendEmailToAction.pyo
+${PYSITELIB}/deskbar/handlers/actions/SendFileViaEmailAction.py
+${PYSITELIB}/deskbar/handlers/actions/SendFileViaEmailAction.pyc
+${PYSITELIB}/deskbar/handlers/actions/SendFileViaEmailAction.pyo
+${PYSITELIB}/deskbar/handlers/actions/ShowUrlAction.py
+${PYSITELIB}/deskbar/handlers/actions/ShowUrlAction.pyc
+${PYSITELIB}/deskbar/handlers/actions/ShowUrlAction.pyo
+${PYSITELIB}/deskbar/handlers/actions/__init__.py
+${PYSITELIB}/deskbar/handlers/actions/__init__.pyc
+${PYSITELIB}/deskbar/handlers/actions/__init__.pyo
+${PYSITELIB}/deskbar/handlers/evolution/__init__.py
+${PYSITELIB}/deskbar/handlers/evolution/__init__.pyc
+${PYSITELIB}/deskbar/handlers/evolution/__init__.pyo
+${PYSITELIB}/deskbar/handlers/evolution/_evolution.la
+${PYSITELIB}/deskbar/handlers/gdmclient/__init__.py
+${PYSITELIB}/deskbar/handlers/gdmclient/__init__.pyc
+${PYSITELIB}/deskbar/handlers/gdmclient/__init__.pyo
+${PYSITELIB}/deskbar/handlers/gdmclient/_gdmclient.la
+${PYSITELIB}/deskbar/interfaces/Action.py
+${PYSITELIB}/deskbar/interfaces/Action.pyc
+${PYSITELIB}/deskbar/interfaces/Action.pyo
+${PYSITELIB}/deskbar/interfaces/Controller.py
+${PYSITELIB}/deskbar/interfaces/Controller.pyc
+${PYSITELIB}/deskbar/interfaces/Controller.pyo
+${PYSITELIB}/deskbar/interfaces/Core.py
+${PYSITELIB}/deskbar/interfaces/Core.pyc
+${PYSITELIB}/deskbar/interfaces/Core.pyo
+${PYSITELIB}/deskbar/interfaces/Match.py
+${PYSITELIB}/deskbar/interfaces/Match.pyc
+${PYSITELIB}/deskbar/interfaces/Match.pyo
+${PYSITELIB}/deskbar/interfaces/Module.py
+${PYSITELIB}/deskbar/interfaces/Module.pyc
+${PYSITELIB}/deskbar/interfaces/Module.pyo
+${PYSITELIB}/deskbar/interfaces/View.py
+${PYSITELIB}/deskbar/interfaces/View.pyc
+${PYSITELIB}/deskbar/interfaces/View.pyo
+${PYSITELIB}/deskbar/interfaces/__init__.py
+${PYSITELIB}/deskbar/interfaces/__init__.pyc
+${PYSITELIB}/deskbar/interfaces/__init__.pyo
 ${PYSITELIB}/deskbar/osutils/__init__.py
 ${PYSITELIB}/deskbar/osutils/__init__.pyc
 ${PYSITELIB}/deskbar/osutils/__init__.pyo
@@ -128,30 +181,21 @@ ${PYSITELIB}/deskbar/osutils/_osutils.la
 ${PYSITELIB}/deskbar/ui/About.py
 ${PYSITELIB}/deskbar/ui/About.pyc
 ${PYSITELIB}/deskbar/ui/About.pyo
-${PYSITELIB}/deskbar/ui/DeskbarPreferencesUI.py
-${PYSITELIB}/deskbar/ui/DeskbarPreferencesUI.pyc
-${PYSITELIB}/deskbar/ui/DeskbarPreferencesUI.pyo
-${PYSITELIB}/deskbar/ui/DeskbarUI.py
-${PYSITELIB}/deskbar/ui/DeskbarUI.pyc
-${PYSITELIB}/deskbar/ui/DeskbarUI.pyo
-${PYSITELIB}/deskbar/ui/EntryHistoryManager.py
-${PYSITELIB}/deskbar/ui/EntryHistoryManager.pyc
-${PYSITELIB}/deskbar/ui/EntryHistoryManager.pyo
-${PYSITELIB}/deskbar/ui/ModuleListView.py
-${PYSITELIB}/deskbar/ui/ModuleListView.pyc
-${PYSITELIB}/deskbar/ui/ModuleListView.pyo
+${PYSITELIB}/deskbar/ui/CuemiacWindowController.py
+${PYSITELIB}/deskbar/ui/CuemiacWindowController.pyc
+${PYSITELIB}/deskbar/ui/CuemiacWindowController.pyo
+${PYSITELIB}/deskbar/ui/CuemiacWindowView.py
+${PYSITELIB}/deskbar/ui/CuemiacWindowView.pyc
+${PYSITELIB}/deskbar/ui/CuemiacWindowView.pyo
+${PYSITELIB}/deskbar/ui/DeskbarApplet.py
+${PYSITELIB}/deskbar/ui/DeskbarApplet.pyc
+${PYSITELIB}/deskbar/ui/DeskbarApplet.pyo
 ${PYSITELIB}/deskbar/ui/__init__.py
 ${PYSITELIB}/deskbar/ui/__init__.pyc
 ${PYSITELIB}/deskbar/ui/__init__.pyo
-${PYSITELIB}/deskbar/ui/cuemiac/CuemiacAlignedWindow.py
-${PYSITELIB}/deskbar/ui/cuemiac/CuemiacAlignedWindow.pyc
-${PYSITELIB}/deskbar/ui/cuemiac/CuemiacAlignedWindow.pyo
-${PYSITELIB}/deskbar/ui/cuemiac/CuemiacAppletButton.py
-${PYSITELIB}/deskbar/ui/cuemiac/CuemiacAppletButton.pyc
-${PYSITELIB}/deskbar/ui/cuemiac/CuemiacAppletButton.pyo
-${PYSITELIB}/deskbar/ui/cuemiac/CuemiacButtonUI.py
-${PYSITELIB}/deskbar/ui/cuemiac/CuemiacButtonUI.pyc
-${PYSITELIB}/deskbar/ui/cuemiac/CuemiacButtonUI.pyo
+${PYSITELIB}/deskbar/ui/cuemiac/CuemiacActionsTreeView.py
+${PYSITELIB}/deskbar/ui/cuemiac/CuemiacActionsTreeView.pyc
+${PYSITELIB}/deskbar/ui/cuemiac/CuemiacActionsTreeView.pyo
 ${PYSITELIB}/deskbar/ui/cuemiac/CuemiacEntry.py
 ${PYSITELIB}/deskbar/ui/cuemiac/CuemiacEntry.pyc
 ${PYSITELIB}/deskbar/ui/cuemiac/CuemiacEntry.pyo
@@ -164,54 +208,37 @@ ${PYSITELIB}/deskbar/ui/cuemiac/CuemiacHistory.pyo
 ${PYSITELIB}/deskbar/ui/cuemiac/CuemiacItems.py
 ${PYSITELIB}/deskbar/ui/cuemiac/CuemiacItems.pyc
 ${PYSITELIB}/deskbar/ui/cuemiac/CuemiacItems.pyo
-${PYSITELIB}/deskbar/ui/cuemiac/CuemiacLayoutProvider.py
-${PYSITELIB}/deskbar/ui/cuemiac/CuemiacLayoutProvider.pyc
-${PYSITELIB}/deskbar/ui/cuemiac/CuemiacLayoutProvider.pyo
 ${PYSITELIB}/deskbar/ui/cuemiac/CuemiacModel.py
 ${PYSITELIB}/deskbar/ui/cuemiac/CuemiacModel.pyc
 ${PYSITELIB}/deskbar/ui/cuemiac/CuemiacModel.pyo
-${PYSITELIB}/deskbar/ui/cuemiac/CuemiacPopupEntry.py
-${PYSITELIB}/deskbar/ui/cuemiac/CuemiacPopupEntry.pyc
-${PYSITELIB}/deskbar/ui/cuemiac/CuemiacPopupEntry.pyo
 ${PYSITELIB}/deskbar/ui/cuemiac/CuemiacTreeView.py
 ${PYSITELIB}/deskbar/ui/cuemiac/CuemiacTreeView.pyc
 ${PYSITELIB}/deskbar/ui/cuemiac/CuemiacTreeView.pyo
-${PYSITELIB}/deskbar/ui/cuemiac/CuemiacUIManager.py
-${PYSITELIB}/deskbar/ui/cuemiac/CuemiacUIManager.pyc
-${PYSITELIB}/deskbar/ui/cuemiac/CuemiacUIManager.pyo
-${PYSITELIB}/deskbar/ui/cuemiac/DeskbarAppletButton.py
-${PYSITELIB}/deskbar/ui/cuemiac/DeskbarAppletButton.pyc
-${PYSITELIB}/deskbar/ui/cuemiac/DeskbarAppletButton.pyo
-${PYSITELIB}/deskbar/ui/cuemiac/LingeringSelectionWindow.py
-${PYSITELIB}/deskbar/ui/cuemiac/LingeringSelectionWindow.pyc
-${PYSITELIB}/deskbar/ui/cuemiac/LingeringSelectionWindow.pyo
 ${PYSITELIB}/deskbar/ui/cuemiac/__init__.py
 ${PYSITELIB}/deskbar/ui/cuemiac/__init__.pyc
 ${PYSITELIB}/deskbar/ui/cuemiac/__init__.pyo
-${PYSITELIB}/deskbar/ui/entriac/CuemiacEntryUI.py
-${PYSITELIB}/deskbar/ui/entriac/CuemiacEntryUI.pyc
-${PYSITELIB}/deskbar/ui/entriac/CuemiacEntryUI.pyo
-${PYSITELIB}/deskbar/ui/entriac/__init__.py
-${PYSITELIB}/deskbar/ui/entriac/__init__.pyc
-${PYSITELIB}/deskbar/ui/entriac/__init__.pyo
-${PYSITELIB}/deskbar/ui/window/CuemiacWindowUI.py
-${PYSITELIB}/deskbar/ui/window/CuemiacWindowUI.pyc
-${PYSITELIB}/deskbar/ui/window/CuemiacWindowUI.pyo
-${PYSITELIB}/deskbar/ui/window/__init__.py
-${PYSITELIB}/deskbar/ui/window/__init__.pyc
-${PYSITELIB}/deskbar/ui/window/__init__.pyo
-${PYSITELIB}/deskbar/updater/ErrorDialog.py
-${PYSITELIB}/deskbar/updater/ErrorDialog.pyc
-${PYSITELIB}/deskbar/updater/ErrorDialog.pyo
-${PYSITELIB}/deskbar/updater/NewStuffUpdater.py
-${PYSITELIB}/deskbar/updater/NewStuffUpdater.pyc
-${PYSITELIB}/deskbar/updater/NewStuffUpdater.pyo
-${PYSITELIB}/deskbar/updater/ProgressbarDialog.py
-${PYSITELIB}/deskbar/updater/ProgressbarDialog.pyc
-${PYSITELIB}/deskbar/updater/ProgressbarDialog.pyo
-${PYSITELIB}/deskbar/updater/__init__.py
-${PYSITELIB}/deskbar/updater/__init__.pyc
-${PYSITELIB}/deskbar/updater/__init__.pyo
+${PYSITELIB}/deskbar/ui/iconentry/__init__.py
+${PYSITELIB}/deskbar/ui/iconentry/__init__.pyc
+${PYSITELIB}/deskbar/ui/iconentry/__init__.pyo
+${PYSITELIB}/deskbar/ui/iconentry/_iconentry.la
+${PYSITELIB}/deskbar/ui/preferences/AccelEntry.py
+${PYSITELIB}/deskbar/ui/preferences/AccelEntry.pyc
+${PYSITELIB}/deskbar/ui/preferences/AccelEntry.pyo
+${PYSITELIB}/deskbar/ui/preferences/DeskbarPreferences.py
+${PYSITELIB}/deskbar/ui/preferences/DeskbarPreferences.pyc
+${PYSITELIB}/deskbar/ui/preferences/DeskbarPreferences.pyo
+${PYSITELIB}/deskbar/ui/preferences/ErrorDialog.py
+${PYSITELIB}/deskbar/ui/preferences/ErrorDialog.pyc
+${PYSITELIB}/deskbar/ui/preferences/ErrorDialog.pyo
+${PYSITELIB}/deskbar/ui/preferences/ModuleListView.py
+${PYSITELIB}/deskbar/ui/preferences/ModuleListView.pyc
+${PYSITELIB}/deskbar/ui/preferences/ModuleListView.pyo
+${PYSITELIB}/deskbar/ui/preferences/ProgressbarDialog.py
+${PYSITELIB}/deskbar/ui/preferences/ProgressbarDialog.pyc
+${PYSITELIB}/deskbar/ui/preferences/ProgressbarDialog.pyo
+${PYSITELIB}/deskbar/ui/preferences/__init__.py
+${PYSITELIB}/deskbar/ui/preferences/__init__.pyc
+${PYSITELIB}/deskbar/ui/preferences/__init__.pyo
 share/deskbar-applet/Deskbar_Applet.xml
 share/deskbar-applet/art/delicious.png
 share/deskbar-applet/art/deskbar-applet-panel-h.png
@@ -219,11 +246,10 @@ share/deskbar-applet/art/deskbar-applet-panel-h.svg
 share/deskbar-applet/art/deskbar-applet-panel-v.png
 share/deskbar-applet/art/deskbar-applet-panel-v.svg
 share/deskbar-applet/art/epiphany-history.png
-share/deskbar-applet/art/folder-bookmark.png
 share/deskbar-applet/art/generic.png
-share/deskbar-applet/art/google.png
 share/deskbar-applet/art/gpm-suspend-to-disk.png
 share/deskbar-applet/art/gpm-suspend-to-ram.png
+share/deskbar-applet/art/web-search.png
 share/deskbar-applet/art/yahoo.png
 share/deskbar-applet/mozilla-search.glade
 share/deskbar-applet/prefs-dialog.glade
@@ -232,6 +258,27 @@ share/gconf/schemas/deskbar-applet.schemas
 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/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
@@ -239,6 +286,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
@@ -278,6 +326,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
@@ -285,6 +334,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
@@ -300,6 +350,13 @@ 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
 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
 @comment in scrollkeeper: @dirrm share/omf
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps
@@ -308,6 +365,20 @@ share/omf/deskbar/deskbar-C.omf
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor
+@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
@@ -315,18 +386,21 @@ share/omf/deskbar/deskbar-C.omf
 @comment in GConf: @dirrm share/gconf/schemas
 @dirrm share/deskbar-applet/art
 @dirrm share/deskbar-applet
-@dirrm ${PYSITELIB}/deskbar/updater
-@dirrm ${PYSITELIB}/deskbar/ui/window
-@dirrm ${PYSITELIB}/deskbar/ui/entriac
+@dirrm ${PYSITELIB}/deskbar/ui/preferences
+@dirrm ${PYSITELIB}/deskbar/ui/iconentry
 @dirrm ${PYSITELIB}/deskbar/ui/cuemiac
 @dirrm ${PYSITELIB}/deskbar/ui
 @dirrm ${PYSITELIB}/deskbar/osutils
-@dirrm ${PYSITELIB}/deskbar/keybinder
-@dirrm ${PYSITELIB}/deskbar/iconentry
-@dirrm ${PYSITELIB}/deskbar/gnomedesktop
-@dirrm ${PYSITELIB}/deskbar/gdmclient
-@dirrm ${PYSITELIB}/deskbar/evolution
+@dirrm ${PYSITELIB}/deskbar/interfaces
+@dirrm ${PYSITELIB}/deskbar/handlers/gdmclient
+@dirrm ${PYSITELIB}/deskbar/handlers/evolution
+@dirrm ${PYSITELIB}/deskbar/handlers/actions
+@dirrm ${PYSITELIB}/deskbar/handlers
+@dirrm ${PYSITELIB}/deskbar/core/updater
+@dirrm ${PYSITELIB}/deskbar/core/keybinder
+@dirrm ${PYSITELIB}/deskbar/core/gnomedesktop
+@dirrm ${PYSITELIB}/deskbar/core
 @dirrm ${PYSITELIB}/deskbar
-@dirrm lib/deskbar-applet/handlers
+@dirrm lib/deskbar-applet/modules-2.20-compatible
 @dirrm lib/deskbar-applet
 @comment in libbonobo: @dirrm lib/bonobo/servers
diff --git a/misc/deskbar-applet/distinfo b/misc/deskbar-applet/distinfo
index 144a1d4a524..b83345b9f4e 100644
--- a/misc/deskbar-applet/distinfo
+++ b/misc/deskbar-applet/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2007/04/15 08:53:40 wiz Exp $
+$NetBSD: distinfo,v 1.5 2007/11/05 19:52:28 drochner Exp $
 
-SHA1 (deskbar-applet-2.18.1.tar.bz2) = 37c3955e1aecf95b56bd727a1cee4222970e37da
-RMD160 (deskbar-applet-2.18.1.tar.bz2) = c7c0015fd0cfcff0d893313e1b0fc658160646ad
-Size (deskbar-applet-2.18.1.tar.bz2) = 646387 bytes
+SHA1 (deskbar-applet-2.20.1.tar.bz2) = 831d01365f0fa473744b64e5959e51512658c168
+RMD160 (deskbar-applet-2.20.1.tar.bz2) = f7a3aebcf634d71e0a04425e6b188859844a9df1
+Size (deskbar-applet-2.20.1.tar.bz2) = 747044 bytes