Merge lp:~cszikszoy/docky/service-consolidation into lp:docky

[Chris S.]

Completely remove the Docky.Windowing assembly. Separate DesktopItem related stuff from the WindowManager, and turn both into services. Move other items from Docky.Windowing into Docky.Services. Also clean up services in general by moving items into specialized namespaces / folders.

[lp:~cszikszoy/docky/service-consolidation]

1628. By Chris S. on 2010-08-06

add more feedback when adding / removing items

[Rico Tzschichholz (ricotz)]

Compiling Docky.Services.dll...
./Docky.Services/DesktopItemService.cs(224,33): error CS1579: foreach statement cannot operate on variables of type `int' because it does not contain a definition for `GetEnumerator' or is not accessible

and don't delete po/docky.pot ;-)

review: Needs Fixing

[Chris S. (cszikszoy)]

do a bzr pull. I fixed that but forgot to push. It's there now. As for
po/docky.pot... I have no idea why that keeps getting deleted. I think it
happens when I run 'make clean'.

[lp:~cszikszoy/docky/service-consolidation]

1629. By Chris S. on 2010-08-07

that won't work... don't care about feedback for removed apps

1630. By Chris S. on 2010-08-10

bring back docky.pot

[Rico Tzschichholz (ricotz)]

Didn't experienced problems, yet ;-)

review: Approve

[Robert Dyer (psybers)]

Let's switch to BAMF and then figure out how we want to refactor the windowing code.

review: Disapprove

[Rico Tzschichholz (ricotz)]

@Robert: I see no harm in merging this refactoring and consider a transition to BAMF afterwards. The new structure even seems to make it easier to distinguish the parts which BAMF would replace.

[lp:~cszikszoy/docky/service-consolidation]

1631. By Chris S. on 2010-08-14

merge el trunko

[Chris S. (cszikszoy)]

I think the switch to BAMF should come post 2.1. There are a lot of unknowns and unresolved issues when dealing with BAMF. I think it'd just be better to refactor the current code (as I've done), then investigate switching to BAMF.

=== modified file 'Docky-2.sln'
--- Docky-2.sln	2010-06-09 06:31:00 +0000
+++ Docky-2.sln	2010-08-14 22:27:42 +0000
@@ -9,8 +9,6 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Docky.CairoHelper", "Docky.CairoHelper\Docky.CairoHelper.csproj", "{B23E0EDD-6443-4F99-9EAC-B7CC906F080D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Docky.Windowing", "Docky.Windowing\Docky.Windowing.csproj", "{888FCD95-7C79-45C4-A744-9C840DF4B9B0}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "StandardPlugins", "StandardPlugins", "{8D4EE2FA-9CF2-4890-B14A-1BA8752404FE}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bookmarks", "StandardPlugins\Bookmarks\Bookmarks.csproj", "{4AC9784E-7AAA-467D-BF8F-D15B8FB88708}"
@@ -93,10 +91,6 @@
 		{74197632-9339-426E-B947-DE34766931E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{74197632-9339-426E-B947-DE34766931E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{74197632-9339-426E-B947-DE34766931E1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{888FCD95-7C79-45C4-A744-9C840DF4B9B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{888FCD95-7C79-45C4-A744-9C840DF4B9B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{888FCD95-7C79-45C4-A744-9C840DF4B9B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{888FCD95-7C79-45C4-A744-9C840DF4B9B0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8A6E0EDD-6443-4F99-9EAC-D9CC906F080D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8A6E0EDD-6443-4F99-9EAC-D9CC906F080D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8A6E0EDD-6443-4F99-9EAC-D9CC906F080D}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -160,12 +154,11 @@
 		{66939AAB-0832-4D2D-8282-3E29AA772B69} = {8D4EE2FA-9CF2-4890-B14A-1BA8752404FE}
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
-		version = 2.0
 		StartupItem = Docky\Docky.csproj
 		Policies = $0
 		$0.StandardHeader = $1
 		$1.Text = @ \n Copyright (C) ${Year} Jason Smith\n\n This program is free software: you can redistribute it and/or modify\n it under the terms of the GNU General Public License as published by\n the Free Software Foundation, either version 3 of the License, or\n (at your option) any later version.\n\n This program is distributed in the hope that it will be useful,\n but WITHOUT ANY WARRANTY; without even the implied warranty of\n MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n GNU General Public License for more details.\n\n You should have received a copy of the GNU General Public License\n along with this program.  If not, see <http://www.gnu.org/licenses/>.\n
-		$1.inheritsSet = MITX11License
+		$1.inheritsSet = Apache2License
 		$0.DotNetNamingPolicy = $2
 		$2.DirectoryNamespaceAssociation = Hierarchical
 		$2.ResourceNamePolicy = FileName
@@ -192,5 +185,6 @@
 		$7.inheritsSet = Mono
 		$7.inheritsScope = text/x-csharp
 		$7.scope = text/x-csharp
+		version = 2.0
 	EndGlobalSection
 EndGlobal

=== modified file 'Docky.DBus/Docky.DBus.csproj'
--- Docky.DBus/Docky.DBus.csproj	2010-06-01 12:53:24 +0000
+++ Docky.DBus/Docky.DBus.csproj	2010-08-14 22:27:42 +0000
@@ -80,10 +80,6 @@
       <Project>{AB6E0EDD-6443-4F99-9EAC-DABC906F080D}</Project>
       <Name>Docky.Items</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Docky.Windowing\Docky.Windowing.csproj">
-      <Project>{888FCD95-7C79-45C4-A744-9C840DF4B9B0}</Project>
-      <Name>Docky.Windowing</Name>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>

=== modified file 'Docky.DBus/Docky.DBus/DBusManager.cs'
--- Docky.DBus/Docky.DBus/DBusManager.cs	2010-08-06 22:37:42 +0000
+++ Docky.DBus/Docky.DBus/DBusManager.cs	2010-08-14 22:27:42 +0000
@@ -182,7 +182,7 @@
 			
 			InitializeSharedBus (bus);
 			
-			DockServices.Helpers.HelperStatusChanged += delegate(object sender, HelperStatusChangedEventArgs e) {
+			DockServices.Helpers.HelperStatusChanged += delegate(object sender, Docky.Services.Helpers.HelperStatusChangedEventArgs e) {
 				// if a script has stopped running, trigger a refresh
 				if (!e.IsRunning)
 					ForceRefresh ();

=== modified file 'Docky.DBus/Makefile.am'
--- Docky.DBus/Makefile.am	2010-05-25 06:04:27 +0000
+++ Docky.DBus/Makefile.am	2010-08-14 22:27:42 +0000
@@ -17,7 +17,6 @@
 
 PROJECT_REFERENCES = \
 	Docky.Items \
-	Docky.Windowing \
 	Docky.Services
 
 REFERENCES =  \

=== modified file 'Docky.Items/Docky.Items.csproj'
--- Docky.Items/Docky.Items.csproj	2010-08-01 11:25:54 +0000
+++ Docky.Items/Docky.Items.csproj	2010-08-14 22:27:42 +0000
@@ -106,10 +106,6 @@
       <Project>{B23E0EDD-6443-4F99-9EAC-B7CC906F080D}</Project>
       <Name>Docky.CairoHelper</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Docky.Windowing\Docky.Windowing.csproj">
-      <Project>{888FCD95-7C79-45C4-A744-9C840DF4B9B0}</Project>
-      <Name>Docky.Windowing</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Resources\apply.svg">

=== modified file 'Docky.Items/Docky.Items/ApplicationDockItem.cs'
--- Docky.Items/Docky.Items/ApplicationDockItem.cs	2010-07-28 06:24:54 +0000
+++ Docky.Items/Docky.Items/ApplicationDockItem.cs	2010-08-14 22:27:42 +0000
@@ -27,7 +27,8 @@
 
 using Docky.Menus;
 using Docky.Services;
-using Docky.Windowing;
+using Docky.Services.Applications;
+using Docky.Services.Windows;
 
 namespace Docky.Items
 {
@@ -40,7 +41,7 @@
 				if (!file.Exists)
 					return null;
 				
-				DesktopItem desktopItem = WindowMatcher.Default.DesktopItemForDesktopFile (file.Path);
+				DesktopItem desktopItem = DockServices.DesktopItems.DesktopItemFromDesktopFile (file.Path);
 				
 				if (desktopItem == null)
 					desktopItem = new DesktopItem (file.Path);
@@ -70,7 +71,7 @@
 		public ApplicationDockItem (DesktopItem item)
 		{
 			OwnedItem = item;
-			WindowMatcher.Default.RegisterDesktopItem (OwnedItem);
+			DockServices.DesktopItems.RegisterDesktopItem (OwnedItem);
 			can_manage_windows = true;
 			
 			UpdateInfo ();
@@ -153,7 +154,7 @@
 		void UpdateWindows ()
 		{
 			if (can_manage_windows)
-				Windows = WindowMatcher.Default.WindowsForDesktopItem (OwnedItem);
+				Windows = DockServices.WindowMatcher.WindowsForDesktopItem (OwnedItem);
 			else
 				Windows = Enumerable.Empty<Wnck.Window> ();
 		}

=== modified file 'Docky.Items/Docky.Items/ColoredIconDockItem.cs'
--- Docky.Items/Docky.Items/ColoredIconDockItem.cs	2010-07-23 06:50:19 +0000
+++ Docky.Items/Docky.Items/ColoredIconDockItem.cs	2010-08-14 22:27:42 +0000
@@ -28,6 +28,7 @@
 
 using Docky.Menus;
 using Docky.Services;
+using Docky.Services.Prefs;
 using Docky.CairoHelper;
 
 namespace Docky.Items

=== modified file 'Docky.Items/Docky.Items/FileApplicationProvider.cs'
--- Docky.Items/Docky.Items/FileApplicationProvider.cs	2010-06-25 13:06:51 +0000
+++ Docky.Items/Docky.Items/FileApplicationProvider.cs	2010-08-14 22:27:42 +0000
@@ -29,7 +29,9 @@
 
 using Docky.Menus;
 using Docky.Services;
-using Docky.Windowing;
+using Docky.Services.Prefs;
+using Docky.Services.Applications;
+using Docky.Services.Windows;
 
 namespace Docky.Items
 {
@@ -125,7 +127,7 @@
 			// update the transient items when something happens in a desktop file directory
 			// It is possible that a .desktop file was created for a window that didn't have one before,
 			// this would associate that desktop file with the existing window.
-			WindowMatcher.DesktopFileChanged += HandleWindowMatcherDesktopFileChanged;
+			DockServices.DesktopItems.DesktopFileChanged += HandleWindowMatcherDesktopFileChanged;
 			
 			Wnck.Screen.Default.WindowOpened += WnckScreenDefaultWindowOpened;
 			Wnck.Screen.Default.WindowClosed += WnckScreenDefaultWindowClosed;
@@ -177,11 +179,11 @@
 			if (args.Window.IsSkipTasklist)
 				return;
 			
-			longMatchInProgress = !WindowMatcher.Default.WindowIsReadyForMatch (args.Window);
+			longMatchInProgress = !DockServices.WindowMatcher.WindowIsReadyForMatch (args.Window);
 			
 			// ensure we run last (more or less) so that all icons can update first
 			GLib.Timeout.Add (150, delegate {
-				if (WindowMatcher.Default.WindowIsReadyForMatch (args.Window)) {
+				if (DockServices.WindowMatcher.WindowIsReadyForMatch (args.Window)) {
 					longMatchInProgress = false;
 					UpdateTransientItems ();
 				} else {
@@ -189,11 +191,11 @@
 					// their windows will be monitored for name changes (give up after 5 seconds)
 					uint matching_timeout = 5000;
 					// wait for OpenOffice up to 1min to startup before giving up
-					if (WindowMatcher.Default.WindowIsOpenOffice (args.Window))
+					if (DockServices.WindowMatcher.WindowIsOpenOffice (args.Window))
 						matching_timeout = 60000;
 					args.Window.NameChanged += HandleUnmatchedWindowNameChanged;
 					GLib.Timeout.Add (matching_timeout, delegate {
-						if (!WindowMatcher.Default.WindowIsReadyForMatch (args.Window)) {
+						if (!DockServices.WindowMatcher.WindowIsReadyForMatch (args.Window)) {
 							args.Window.NameChanged -= HandleUnmatchedWindowNameChanged;
 							longMatchInProgress = false;
 							UpdateTransientItems ();
@@ -208,7 +210,7 @@
 		void HandleUnmatchedWindowNameChanged (object sender, EventArgs e)
 		{
 			Wnck.Window window = (sender as Wnck.Window);
-			if (WindowMatcher.Default.WindowIsReadyForMatch (window)) {
+			if (DockServices.WindowMatcher.WindowIsReadyForMatch (window)) {
 				window.NameChanged -= HandleUnmatchedWindowNameChanged;
 				longMatchInProgress = false;
 				UpdateTransientItems ();
@@ -247,14 +249,14 @@
 					.Contains (window))
 					continue;
 				
-				DesktopItem desktop_item = WindowMatcher.Default.DesktopItemForWindow (window);
+				DesktopItem desktopItem = DockServices.WindowMatcher.DesktopItemForWindow (window);
 				WnckDockItem item;
 				
-				if (desktop_item != null) {
+				if (desktopItem != null) {
 					// This fixes WindowMatching for OpenOffice which is a bit slow setting up its window title
 					// Check if an existing ApplicationDockItem already uses this DesktopItem
 					ApplicationDockItem appdi = InternalItems
-						.Where (adi => (adi is ApplicationDockItem && (adi as ApplicationDockItem).OwnedItem == desktop_item))
+						.Where (adi => (adi is ApplicationDockItem && (adi as ApplicationDockItem).OwnedItem == desktopItem))
 						.Cast<ApplicationDockItem> ()
 						.FirstOrDefault ();
 					
@@ -264,7 +266,7 @@
 						continue;
 					}
 					
-					item = new ApplicationDockItem (desktop_item);
+					item = new ApplicationDockItem (desktopItem);
 				} else {
 					item = new WindowDockItem (window);
 				}
@@ -483,7 +485,7 @@
 		{
 			base.Dispose ();
 			
-			WindowMatcher.DesktopFileChanged -= HandleWindowMatcherDesktopFileChanged;
+			DockServices.DesktopItems.DesktopFileChanged -= HandleWindowMatcherDesktopFileChanged;
 			
 			Wnck.Screen.Default.WindowOpened -= WnckScreenDefaultWindowOpened;
 			Wnck.Screen.Default.WindowClosed -= WnckScreenDefaultWindowClosed;

=== modified file 'Docky.Items/Docky.Items/WindowDockItem.cs'
--- Docky.Items/Docky.Items/WindowDockItem.cs	2010-05-03 03:15:39 +0000
+++ Docky.Items/Docky.Items/WindowDockItem.cs	2010-08-14 22:27:42 +0000
@@ -26,7 +26,8 @@
 using Wnck;
 
 using Docky.Menus;
-using Docky.Windowing;
+using Docky.Services;
+using Docky.Services.Windows;
 
 namespace Docky.Items
 {
@@ -88,7 +89,7 @@
 		void UpdateWindows (Wnck.Window baseWindow)
 		{
 			if (baseWindow != null) {
-				Windows = WindowMatcher.Default.SimilarWindows (baseWindow)
+				Windows = DockServices.WindowMatcher.SimilarWindows (baseWindow)
 					.Where (w => !FileApplicationProvider.ManagedWindows.Contains (w));
 			} else {
 				Windows = Enumerable.Empty<Wnck.Window> ();

=== modified file 'Docky.Items/Docky.Items/WnckDockItem.cs'
--- Docky.Items/Docky.Items/WnckDockItem.cs	2010-07-26 03:16:20 +0000
+++ Docky.Items/Docky.Items/WnckDockItem.cs	2010-08-14 22:27:42 +0000
@@ -30,7 +30,8 @@
 using Docky.CairoHelper;
 using Docky.Menus;
 using Docky.Services;
-using Docky.Windowing;
+using Docky.Services.Prefs;
+using Docky.Services.Windows;
 
 namespace Docky.Items
 {

=== modified file 'Docky.Items/Docky.Menus/MenuItem.cs'
--- Docky.Items/Docky.Menus/MenuItem.cs	2010-08-01 11:25:54 +0000
+++ Docky.Items/Docky.Menus/MenuItem.cs	2010-08-14 22:27:42 +0000
@@ -25,6 +25,7 @@
 using Gdk;
 
 using Docky.Services;
+using Docky.Services.Prefs;
 
 namespace Docky.Menus
 {

=== modified file 'Docky.Items/Docky.Menus/WindowMenuItem.cs'
--- Docky.Items/Docky.Menus/WindowMenuItem.cs	2009-12-23 20:19:21 +0000
+++ Docky.Items/Docky.Menus/WindowMenuItem.cs	2010-08-14 22:27:42 +0000
@@ -19,7 +19,7 @@
 
 using Gdk;
 
-using Docky.Windowing;
+using Docky.Services.Windows;
 
 namespace Docky.Menus
 {

=== modified file 'Docky.Items/Makefile.am'
--- Docky.Items/Makefile.am	2010-08-01 11:25:54 +0000
+++ Docky.Items/Makefile.am	2010-08-14 22:27:42 +0000
@@ -47,8 +47,7 @@
 
 PROJECT_REFERENCES= \
 	Docky.CairoHelper \
-	Docky.Services \
-	Docky.Windowing
+	Docky.Services
 
 REFERENCES =  \
 	System \

=== modified file 'Docky.Services/Docky.Services.csproj'
--- Docky.Services/Docky.Services.csproj	2010-07-11 06:39:31 +0000
+++ Docky.Services/Docky.Services.csproj	2010-08-14 22:27:42 +0000
@@ -84,14 +84,15 @@
       <Package>gio-sharp-2.0</Package>
     </Reference>
     <Reference Include="ICSharpCode.SharpZipLib" />
+    <Reference Include="wnck-sharp, Version=2.20.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+      <Package>wnck-sharp-1.0</Package>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Docky.Services\IPreferences.cs" />
     <Compile Include="Docky.Services\PreferencesService.cs" />
     <Compile Include="Docky.Services\DockServices.cs" />
     <Compile Include="Docky.Services\SystemService.cs" />
     <Compile Include="Docky.Services\DrawingService.cs" />
-    <Compile Include="Docky.Services\Preferences.cs" />
     <Compile Include="Docky.Services\NotificationService.cs" />
     <Compile Include="Docky.Services\ConnectionStatusChangeEventArgs.cs" />
     <Compile Include="Docky.Services\Logging\LogBase.cs" />
@@ -108,13 +109,24 @@
     <Compile Include="Docky.Services\Extensions\GLibMountExtension.cs" />
     <Compile Include="Gtk\MountOperation.cs" />
     <Compile Include="Docky.Services\HelperService.cs" />
-    <Compile Include="Docky.Services\Helper.cs" />
-    <Compile Include="Docky.Services\HelperStatusChangedEventArgs.cs" />
-    <Compile Include="Docky.Services\HelperMetadata.cs" />
     <Compile Include="Docky.Services\Extensions\GtkIconThemeExtension.cs" />
     <Compile Include="Docky.Services\PathsService.cs" />
     <Compile Include="Docky.Services\ThemeService.cs" />
-    <Compile Include="Docky.Services\PreferencesChangedEventArgs.cs" />
+    <Compile Include="Docky.Services\DesktopItemService.cs" />
+    <Compile Include="Docky.Services\Helpers\Helper.cs" />
+    <Compile Include="Docky.Services\Helpers\HelperMetadata.cs" />
+    <Compile Include="Docky.Services\Helpers\HelperStatusChangedEventArgs.cs" />
+    <Compile Include="Docky.Services\Preferences\IPreferences.cs" />
+    <Compile Include="Docky.Services\Preferences\Preferences.cs" />
+    <Compile Include="Docky.Services\Preferences\PreferencesChangedEventArgs.cs" />
+    <Compile Include="Docky.Services\Applications\DesktopFileChangedEventArgs.cs" />
+    <Compile Include="Docky.Services\Applications\DesktopItem.cs" />
+    <Compile Include="Docky.Services\Windows\Position.cs" />
+    <Compile Include="Docky.Services\Windows\WindowControl.cs" />
+    <Compile Include="Docky.Services\WindowMatcherService.cs" />
+    <Compile Include="Docky.Services\Extensions\WnckWindowExtension.cs" />
+    <Compile Include="Docky.Services\Xlib\X11Atoms.cs" />
+    <Compile Include="Docky.Services\Xlib\Xlib.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
@@ -122,6 +134,14 @@
     <Folder Include="Docky.Services\Logging\" />
     <Folder Include="Docky.Services\Extensions\" />
     <Folder Include="GLibSharp\" />
+    <Folder Include="Docky.Services\Helpers\" />
+    <Folder Include="Docky.Services\Helpers\" />
+    <Folder Include="Docky.Services\Helpers\" />
+    <Folder Include="Docky.Services\Helpers\" />
+    <Folder Include="Docky.Services\Preferences\" />
+    <Folder Include="Docky.Services\Applications\" />
+    <Folder Include="Docky.Services\Windows\" />
+    <Folder Include="Docky.Services\Xlib\" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="gtk-gui\gui.stetic">

=== modified file 'Docky.Services/Docky.Services.dll.config'
--- Docky.Services/Docky.Services.dll.config	2009-11-14 04:04:00 +0000
+++ Docky.Services/Docky.Services.dll.config	2010-08-14 22:27:42 +0000
@@ -2,4 +2,5 @@
 	<dllmap dll="libgobject-2.0" target="libgobject-2.0.so.0"/>
 	<dllmap dll="libgtk-x11-2.0" target="libgtk-x11-2.0.so.0"/>
 	<dllmap dll="gio-2.0" target="libgio-2.0.so.0"/>
-</configuration>
\ No newline at end of file
+    <dllmap dll="X11" target="libX11.so.6"/>
+</configuration>

=== added directory 'Docky.Services/Docky.Services/Applications'
=== renamed file 'Docky.Windowing/Windowing/DesktopFileChangedEventArgs.cs' => 'Docky.Services/Docky.Services/Applications/DesktopFileChangedEventArgs.cs'
--- Docky.Windowing/Windowing/DesktopFileChangedEventArgs.cs	2010-06-22 18:58:21 +0000
+++ Docky.Services/Docky.Services/Applications/DesktopFileChangedEventArgs.cs	2010-08-14 22:27:42 +0000
@@ -18,7 +18,7 @@
 using System;
 using GLib;
 
-namespace Docky.Windowing
+namespace Docky.Services.Applications
 {
 	public class DesktopFileChangedEventArgs : EventArgs
 	{

=== renamed file 'Docky.Windowing/Windowing/DesktopItem.cs' => 'Docky.Services/Docky.Services/Applications/DesktopItem.cs'
--- Docky.Windowing/Windowing/DesktopItem.cs	2010-06-22 18:58:21 +0000
+++ Docky.Services/Docky.Services/Applications/DesktopItem.cs	2010-08-14 22:27:42 +0000
@@ -27,14 +27,13 @@
 
 using Docky.Services;
 
-namespace Docky.Windowing
+namespace Docky.Services.Applications
 {
 	public class DesktopItem : IDisposable
 	{
 		public static Regex keyValueRegex = new Regex (
 			@"(^(\s)*(?<Key>([^\=^\n]+))[\s^\n]*\=(\s)*(?<Value>([^\n]+(\n){0,1})))",
-			RegexOptions.IgnorePatternWhitespace | RegexOptions.Compiled | 
-			RegexOptions.CultureInvariant
+			RegexOptions.IgnorePatternWhitespace | RegexOptions.Compiled | RegexOptions.CultureInvariant
 		);
 		public static Regex sectionRegex = new Regex (
 			@"(^(\[)*(?<Section>([^\]^\n]+))\]$)" ,
@@ -45,15 +44,20 @@
 			RegexOptions.Compiled | RegexOptions.CultureInvariant
 		);
 
-		static IEnumerable<string> locales = PostfixStringsForLocale (WindowMatcher.Locale);
-		
-#region Delayed change propagation
+		IEnumerable<string> Locales {
+			get {
+				return PostfixStringsForLocale (DockServices.System.Locale);
+			}
+		}
+		
+		#region Delayed change propagation
+		
 		public event EventHandler HasChanged;
 		private uint trigger_changed_timer = 0;
 		private object onchanged_lock = new object ();
 		protected void OnChanged ()
 		{
-			if (HasChanged != null)
+			if (HasChanged != null) {
 				lock (onchanged_lock) {
 					// collect changes within 2500ms then trigger events
 					if (trigger_changed_timer == 0) {
@@ -65,16 +69,18 @@
 						});
 					}
 				}
+			}
 		}
-#endregion
+		
+		#endregion
 
 		public Dictionary<string, string> Values { get; set; }
 
-		private GLib.DesktopAppInfo appinfo;
+		GLib.DesktopAppInfo appinfo;
 		
-		private GLib.FileMonitor monitor;
-		private GLib.File file;
-		public GLib.File File { 
+		GLib.FileMonitor monitor;
+		GLib.File file;
+		public GLib.File File {
 			get {
 				return file;
 			}
@@ -90,28 +96,16 @@
 				monitor.Changed += HandleFileChanged;
 			}
 		}
-
-		void HandleFileChanged (object o, ChangedArgs args)
-		{
-			Log<DesktopItem>.Debug ("file {0} changed", File.Path);
-
-			Values = GetValuesFromFile ();
-			
-			OnChanged ();
-		}
 		
-		public string Path 
-		{ 
+		public string Path { 
 			get { return File.Path; }
 		}
 		
-		public Uri Uri 
-		{
+		public Uri Uri {
 			get { return File.Uri; }
 		}
 
-		public string DesktopID 
-		{
+		public string DesktopID {
 			get { return System.IO.Path.GetFileNameWithoutExtension (Path); }
 		}
 
@@ -196,6 +190,12 @@
 			
 			return Convert.ToDouble (result);
 		}
+		
+		public void Launch (IEnumerable<string> uris)
+		{
+			if (File.Exists)
+				DockServices.System.Open (appinfo, uris.Select (uri => GLib.FileFactory.NewForUri (uri)));
+		}
 
 		Dictionary<string, string> GetValuesFromFile ()
 		{
@@ -223,7 +223,7 @@
 								string section = match.Groups["Section"].Value;
 								desktop_entry_found = string.Equals (section, "Desktop Entry");
 							}
-							
+						
 						} else {
 							
 							//Only add unlocalized values and values matching the current locale
@@ -234,7 +234,7 @@
 								if (!string.IsNullOrEmpty (key) && !string.IsNullOrEmpty (val) && !result.ContainsKey (key)) {
 									match = localizedKeyRegex.Match (key);
 									if (match.Success) {
-										if (locales.Contains (match.Groups["Locale"].Value)) {
+										if (Locales.Contains (match.Groups["Locale"].Value)) {
 											//Remove existing value in favour of this localized one
 											result.Remove (match.Groups["PureKey"].Value);
 											result.Add (match.Groups["PureKey"].Value, val);
@@ -244,8 +244,8 @@
 											result.Add (key, val);
 									}
 								}
-								
-							} else if (sectionRegex.Match(line).Success)
+							
+							} else if (sectionRegex.Match (line).Success)
 								break;
 						}
 					}
@@ -253,14 +253,14 @@
 				}
 
 			} catch (Exception e) {
-				Log<DesktopItem>.Error (e.Message);
+				Log<DesktopItem>.Error ("Failed getting values from desktop file '{0}' : {1}", Path, e.Message);
 				Log<DesktopItem>.Error (e.StackTrace);
 			}
 
 			return result;
 		}
-
-		static IEnumerable<string> PostfixStringsForLocale (string locale)
+		
+		IEnumerable<string> PostfixStringsForLocale (string locale)
 		{
 			if (string.IsNullOrEmpty (locale) || locale.Length < 2)
 				yield break;
@@ -282,14 +282,18 @@
 			
 			yield return locale.Substring (0, 2);
 		}
-
-		public void Launch (IEnumerable<string> uris)
+		
+		void HandleFileChanged (object o, ChangedArgs args)
 		{
-			if (File.Exists)
-				DockServices.System.Open (appinfo, uris.Select (uri => GLib.FileFactory.NewForUri (uri)));
+			Log<DesktopItem>.Debug ("file {0} changed", File.Path);
+			
+			Values = GetValuesFromFile ();
+			
+			OnChanged ();
 		}
 
 		#region IDisposable implementation
+		
 		public void Dispose ()
 		{
 			Values.Clear ();
@@ -302,6 +306,7 @@
 				monitor.Dispose ();
 			}
 		}
+		
 		#endregion
 		
 	}

=== added file 'Docky.Services/Docky.Services/DesktopItemService.cs'
--- Docky.Services/Docky.Services/DesktopItemService.cs	1970-01-01 00:00:00 +0000
+++ Docky.Services/Docky.Services/DesktopItemService.cs	2010-08-14 22:27:42 +0000
@@ -0,0 +1,593 @@
+//  
+//  Copyright (C) 2010 Chris Szikszoy
+// 
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+// 
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+// 
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// 
+
+using System;
+using System.IO;
+using System.Linq;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Text.RegularExpressions;
+
+using GLib;
+
+using Docky.Services.Applications;
+
+namespace Docky.Services
+{
+	public class DesktopItemService
+	{
+		public event EventHandler<DesktopFileChangedEventArgs> DesktopFileChanged;
+		
+		object update_lock;
+		
+		// shorthand for all registered AND unregistered desktop items
+		public IEnumerable<DesktopItem> DesktopItems {
+			get { return RegisteredItems.Union (UnregisteredItems).AsEnumerable (); }
+		}
+		
+		public Dictionary<string, string> Remaps { get; private set; }
+		List<DesktopItem> RegisteredItems { get; set; }
+		List<DesktopItem> UnregisteredItems { get; set; }
+		Dictionary<string, List<DesktopItem>> ItemsByExec { get; set; }
+		Dictionary<string, DesktopItem> ItemByClass { get; set; }
+
+		internal DesktopItemService ()
+		{
+			update_lock = new object ();
+
+			Remaps = new Dictionary<string, string> ();
+			LoadRemaps (DockServices.Paths.SystemDataFolder.GetChild ("remaps.ini"));
+			LoadRemaps (DockServices.Paths.UserDataFolder.GetChild ("remaps.ini"));
+			
+			// Load DesktopFilesCache from docky.desktop.[LANG].cache
+			RegisteredItems = LoadDesktopItemsCache (DockyDesktopFileCacheFile);
+			UnregisteredItems = new List<DesktopItem> ();
+			
+			if (RegisteredItems == null || RegisteredItems.Count () == 0) {
+				Log<DesktopItemService>.Info ("Loading *.desktop files and regenerating cache. This may take a while...");
+				UpdateDesktopItemsList ();
+				ProcessAndMergeAllSystemCacheFiles ();
+				SaveDesktopItemsCache ();
+			}
+			DesktopItemsChanged ();
+			
+			// Update desktopItems and save cache after 2 minutes just to be sure we are up to date
+			GLib.Timeout.Add (2 * 60 * 1000, delegate {
+				lock (update_lock) {
+					UpdateDesktopItemsList ();
+					ProcessAndMergeAllSystemCacheFiles ();
+					DesktopItemsChanged ();
+					SaveDesktopItemsCache ();
+				}
+				return false;
+			});
+			
+			// Set up monitors for cache files and desktop directories
+			foreach (GLib.File dir in DesktopFileDirectories)
+				MonitorDesktopFileDirs (dir);
+			MonitorDesktopFileSystemCacheFiles ();
+		}
+		
+		#region public API
+		
+		/// <summary>
+		/// Find all DesktopItems by specifying the exec.
+		/// </summary>
+		/// <returns>
+		/// A List of DesktopItems that use the supplied exec string.
+		/// </returns>
+		/// <param name='exec'>
+		/// An exec string.
+		/// </param>
+		public IEnumerable<DesktopItem> DesktopItemsFromExec (string exec)
+		{
+			if (ItemsByExec.ContainsKey (exec))
+				return ItemsByExec [exec].AsEnumerable ();
+			return Enumerable.Empty<DesktopItem> ();
+		}
+		
+		/// <summary>
+		/// Find a DesktopItem by specifying the class.
+		/// </summary>
+		/// <returns>
+		/// The DesktopItem, if any exists.
+		/// </returns>
+		/// <param name='class'>
+		/// The Window class from the .desktop file.
+		/// </param>
+		public DesktopItem DesktopItemFromClass (string @class)
+		{
+			if (ItemByClass.ContainsKey (@class))
+				return ItemByClass [@class];
+			return null;
+		}
+		
+		public IEnumerable<DesktopItem> DesktopItemsFromID (string id)
+		{
+			if (DesktopItems.Any (item => item.DesktopID.Equals (id, StringComparison.InvariantCultureIgnoreCase)))
+				return DesktopItems.Where (item => item.DesktopID.Equals (id, StringComparison.CurrentCultureIgnoreCase));
+			return Enumerable.Empty<DesktopItem> ();
+		}
+		
+		/// <summary>
+		/// Find a DesktopItem by specifying a path to a .desktop file.
+		/// </summary>
+		/// <returns>
+		/// The DesktopItem, if any exists.
+		/// </returns>
+		/// <param name='file'>
+		/// A path to a .desktop file.
+		/// </param>
+		public DesktopItem DesktopItemFromDesktopFile (string file)
+		{
+			if (DesktopItems.Any (item => item.Path.Equals (file, StringComparison.InvariantCultureIgnoreCase)))
+				return DesktopItems.First (item => item.Path.Equals (file, StringComparison.CurrentCultureIgnoreCase));
+			return null;
+		}
+		
+		public void RegisterDesktopItem (DesktopItem item)
+		{
+			// check if this item is in either the registered or unregistered items
+			if (DesktopItems.Contains (item))
+				return;
+			
+			// if this item isn't in our desktop item list, we need to add it as an unregistered item
+			UnregisteredItems.Add (item);
+			
+			// and make sure we process it
+			// FIXME: do we really need to reload _every_ desktop file here? Probably only need to process the new one..
+			DesktopItemsChanged ();
+		}
+		
+		#endregion
+
+		void DesktopItemsChanged ()
+		{
+			BuildExecStrings ();
+			BuildClassStrings ();
+		}
+		
+		IEnumerable<GLib.File> DesktopFileSystemCacheFiles
+		{
+			get {
+				return DesktopFileDirectories
+					.Select (d => d.GetChild (string.Format ("desktop.{0}.cache", DockServices.System.Locale)))
+					.Where (f => f.Exists);
+			}
+		}
+		
+		string DockyDesktopFileCacheFile
+		{
+			get {
+				if (!string.IsNullOrEmpty (DockServices.System.Locale))
+					return DockServices.Paths.UserCacheFolder.GetChild (string.Format ("docky.desktop.{0}.cache", DockServices.System.Locale)).Path;
+				return DockServices.Paths.UserCacheFolder.GetChild ("docky.desktop.cache").Path;
+			}
+		}
+			
+		IEnumerable<GLib.File> DesktopFileDirectories
+		{
+			get {
+				return DockServices.Paths.XdgDataDirFolders.Select (d => d.GetChild ("applications"))
+					.Union (new [] {
+						DockServices.Paths.XdgDataHomeFolder.GetChild ("applications"),
+						DockServices.Paths.HomeFolder.GetChild (".cxoffice"),
+					})
+					.Where (d => d.Exists);
+			}
+		}
+		
+		void UpdateDesktopItemsList ()
+		{
+			if (RegisteredItems == null)
+				RegisteredItems = new List<DesktopItem> ();
+			
+			List<DesktopItem> newItems = new List<DesktopItem> ();
+
+			// Get desktop items for new "valid" desktop files
+			newItems = DesktopFileDirectories
+				.SelectMany (dir => dir.SubDirs ())
+				.Union (DesktopFileDirectories)
+				.SelectMany (file => file.GetFiles (".desktop"))
+				.Where (file => !DesktopItems.Any (existing => existing.File.Path == file.Path))
+				.Select (file => new DesktopItem (file))
+				.Where (item => item.Values.Any ())
+				.ToList ();
+			
+			RegisteredItems.AddRange (newItems);
+
+			if (newItems.Count () > 0) {
+				Log<DesktopItemService>.Debug ("{0} new application(s) found.", newItems.Count ());
+				foreach (DesktopItem item in newItems)
+					Log<DesktopItemService>.Debug ("Adding '{0}'.", item.Path);
+			}
+
+			// Check file existence and remove unlinked items
+			int removed = RegisteredItems.RemoveAll (item => !item.File.Exists);
+			if (removed > 0)
+				Log<DesktopItemService>.Debug ("{0} application(s) removed.", removed);
+		}
+		
+		void ProcessAndMergeAllSystemCacheFiles ()
+		{
+			foreach (GLib.File cache in DesktopFileSystemCacheFiles)
+				ProcessAndMergeSystemCacheFile (cache);
+		}
+
+		void ProcessAndMergeSystemCacheFile (GLib.File cache)
+		{
+			if (!cache.Exists)
+				return;
+			
+			Log<DesktopItemService>.Debug ("Processing {0}", cache.Path);
+			
+			try {
+				using (StreamReader reader = new StreamReader (cache.Path)) {
+					DesktopItem desktopItem = null;
+					string line;
+					
+					while ((line = reader.ReadLine ()) != null) {
+						if (line.Trim ().Length <= 0)
+							continue;
+						
+						if (line.ElementAt (0) == '[') {
+							Match match = DesktopItem.sectionRegex.Match (line);
+							if (match.Success) {
+								string section = match.Groups ["Section"].Value;
+								if (section != null) {
+									GLib.File file = cache.Parent.GetChild (string.Format ("{0}.desktop", section));
+									desktopItem = RegisteredItems.First (item => item.File.Path == file.Path);
+									if (desktopItem == null && file.Exists) {
+										desktopItem = new DesktopItem (file);
+										RegisteredItems.Add (desktopItem);
+										Log<DesktopItemService>.Debug ("New application found: {0}", desktopItem.Path);
+									}
+									continue;
+								}
+							}
+						} else if (desktopItem != null) {
+							Match match = DesktopItem.keyValueRegex.Match (line);
+							if (match.Success) {
+								string key = match.Groups ["Key"].Value;
+								string val = match.Groups ["Value"].Value;
+								if (!string.IsNullOrEmpty (key) && !string.IsNullOrEmpty (val))
+									desktopItem.SetString (key, val);
+								continue;
+							}
+						}
+					}
+					reader.Close ();
+				}
+			} catch (Exception e) {
+				Log<DesktopItemService>.Error ("Error processing desktop item cache: {0}", e.Message);
+				Log<DesktopItemService>.Error (e.StackTrace);
+			}
+		}
+
+		void LoadRemaps (GLib.File file)
+		{
+			if (file.Exists) {
+				Log<DesktopItemService>.Debug ("Loading remap file '{0}'.", file.Path);
+			} else {
+				Log<DesktopItemService>.Warn ("Could not find remap file '{0}'!", file.Path);
+				return;
+			}
+			
+			Regex keyValueRegex = new Regex (
+				@"(^(\s)*(?<Key>([^\=^\n]+))[\s^\n]*\=(\s)*(?<Value>([^\n]+(\n){0,1})))",
+				RegexOptions.IgnorePatternWhitespace | RegexOptions.Compiled | RegexOptions.CultureInvariant
+			);
+			
+			try {
+				using (StreamReader reader = new StreamReader (file.Path)) {
+					string line;
+					
+					while ((line = reader.ReadLine ()) != null) {
+						line = line.Trim ();
+						if (line.Length <= 0 || line.Substring (0, 1) == "#")
+							continue;
+						
+						Match match = keyValueRegex.Match (line);
+						if (match.Success) {
+							string key = match.Groups ["Key"].Value;
+							string val = match.Groups ["Value"].Value;
+							if (!string.IsNullOrEmpty (key)) {
+								Remaps [key] = val;
+								Log<DesktopItemService>.Debug ("Remapping '{0}' to '{1}'.", key, val);
+							}
+						}
+					}
+					reader.Close ();
+				}
+			} catch (Exception e) {
+				Log<DesktopItemService>.Error ("Error loading remap file: {0}", e.Message);
+				Log<DesktopItemService>.Error (e.StackTrace);
+			}
+		}
+		
+		List<DesktopItem> LoadDesktopItemsCache (string filename)
+		{
+			if (!GLib.FileFactory.NewForPath (filename).Exists)
+				return null;
+				
+			Log<DesktopItemService>.Debug ("Loading desktop item cache '{0}'.", DockyDesktopFileCacheFile);
+			
+			List<DesktopItem> items = new List<DesktopItem> ();
+			
+			try {
+				using (StreamReader reader = new StreamReader (filename)) {
+					DesktopItem desktopItem = null;
+					string line;
+					
+					while ((line = reader.ReadLine ()) != null) {
+						if (line.Trim ().Length <= 0)
+							continue;
+						
+						if (line.ElementAt (0) == '[') {
+							Match match = DesktopItem.sectionRegex.Match (line);
+							if (match.Success) {
+								string section = match.Groups ["Section"].Value;
+								if (section != null) {
+									GLib.File file = GLib.FileFactory.NewForPath (section);
+									desktopItem = new DesktopItem (file, false);
+									items.Add (desktopItem);
+								}
+								continue;
+							}
+						} else if (desktopItem != null) {
+							Match match = DesktopItem.keyValueRegex.Match (line);
+							if (match.Success) {
+								string key = match.Groups ["Key"].Value;
+								string val = match.Groups ["Value"].Value;
+								if (!string.IsNullOrEmpty (key) && !string.IsNullOrEmpty (val))
+									desktopItem.SetString (key, val);
+								continue;
+							}
+						}
+					}
+					reader.Close ();
+				}
+			} catch (Exception e) {
+				Log<DesktopItemService>.Error ("Error loading desktop item cache: {0}", e.Message);
+				Log<DesktopItemService>.Error (e.StackTrace);
+				return null;
+			}
+
+			return items;
+		}
+
+		void SaveDesktopItemsCache ()
+		{
+			Log<DesktopItemService>.Debug ("Saving desktop item cache '{0}'.", DockyDesktopFileCacheFile);
+
+			try {
+				using (StreamWriter writer = new StreamWriter (DockyDesktopFileCacheFile, false)) {
+					foreach (DesktopItem item in RegisteredItems) {
+						writer.WriteLine ("[{0}]", item.Path);
+						IDictionaryEnumerator enumerator = item.Values.GetEnumerator ();
+						enumerator.Reset ();
+						while (enumerator.MoveNext ())
+							writer.WriteLine ("{0}={1}", enumerator.Key, enumerator.Value);
+						writer.WriteLine ("");
+					}
+					writer.Close ();
+				}
+			} catch (Exception e) {
+				Log<DesktopItemService>.Error ("Error saving desktop item cache: {0}", e.Message);
+				Log<DesktopItemService>.Error (e.StackTrace);
+			}
+		}
+
+		void MonitorDesktopFileSystemCacheFiles ()
+		{
+			foreach (GLib.File file in DesktopFileSystemCacheFiles) {
+				GLib.FileMonitor mon = file.Monitor (GLib.FileMonitorFlags.None, null);
+				mon.RateLimit = 2500;
+				mon.Changed += delegate(object o, GLib.ChangedArgs args) {
+					if (args.EventType == GLib.FileMonitorEvent.ChangesDoneHint) {
+						DockServices.System.RunOnThread (() =>
+						{
+							lock (update_lock) {
+								ProcessAndMergeSystemCacheFile (file);
+								DesktopItemsChanged ();
+							}
+						});
+					}
+				};
+			}
+		}
+		
+		void MonitorDesktopFileDirs (GLib.File dir)
+		{
+			// build a list of all the subdirectories
+			List<GLib.File> dirs = new List<GLib.File> () {dir};
+			try {
+				dirs = dirs.Union (dir.SubDirs ()).ToList ();	
+			} catch {}
+			
+			foreach (GLib.File d in dirs) {
+				GLib.FileMonitor mon = d.Monitor (GLib.FileMonitorFlags.None, null);
+				mon.RateLimit = 2500;
+				mon.Changed += delegate(object o, GLib.ChangedArgs args) {
+					// bug in GIO#, calling args.File or args.OtherFile crashes hard
+					GLib.File file = GLib.FileAdapter.GetObject ((GLib.Object) args.Args [0]);
+					GLib.File otherFile = GLib.FileAdapter.GetObject ((GLib.Object) args.Args [1]);
+
+					// according to GLib documentation, the change signal runs on the same
+					// thread that the monitor was created on.  Without running this part on a thread
+					// docky freezes up for about 500-800 ms while the .desktop files are parsed.
+					DockServices.System.RunOnThread (() => {
+						// if a new directory was created, make sure we watch that dir as well
+						if (file.QueryFileType (GLib.FileQueryInfoFlags.NofollowSymlinks, null) == GLib.FileType.Directory)
+							MonitorDesktopFileDirs (file);
+						
+						// we only care about .desktop files
+						if (!file.Path.EndsWith (".desktop"))
+							return;
+
+						lock (update_lock) {
+							UpdateDesktopItemsList ();
+							DesktopItemsChanged ();
+							SaveDesktopItemsCache();
+						}
+						
+						// Make sure to trigger event on main thread
+						DockServices.System.RunOnMainThread (() => {
+							if (DesktopFileChanged != null)
+								DesktopFileChanged (this, new DesktopFileChangedEventArgs (args.EventType, file, otherFile));
+						});
+					});
+				};
+			}
+		}
+
+		void BuildClassStrings ()
+		{
+			ItemByClass = new Dictionary<string, DesktopItem> ();
+			
+			foreach (DesktopItem item in DesktopItems) {
+				if (item == null || !item.HasAttribute ("StartupWMClass"))
+					continue;
+				
+				if (item.HasAttribute ("NoDisplay") && item.GetBool ("NoDisplay"))
+					continue;
+				
+				if (item.HasAttribute ("X-Docky-NoMatch") && item.GetBool ("X-Docky-NoMatch"))
+					continue;
+				
+				string cls = item.GetString ("StartupWMClass").Trim ();
+				// we only want exactly 1 launcher, and so if we already have one we use that
+				// otherwise it will prefer global over local launchers
+				if (!ItemByClass.ContainsKey (cls))
+					ItemByClass [cls] = item;
+			}
+		}
+				
+		void BuildExecStrings ()
+		{
+			ItemsByExec = new Dictionary<string, List<DesktopItem>> ();
+			
+			foreach (DesktopItem item in DesktopItems) {
+				if (item == null || !item.HasAttribute ("Exec"))
+					continue;
+				
+				if (item.HasAttribute ("NoDisplay") && item.GetBool ("NoDisplay"))
+					continue;
+				
+				if (item.HasAttribute ("X-Docky-NoMatch") && item.GetBool ("X-Docky-NoMatch"))
+					continue;
+				
+				string exec = item.GetString ("Exec").Trim ();
+				string vexec = null;
+				
+				// for openoffice
+				if (exec.Contains (' ') &&
+					(exec.StartsWith ("ooffice") || exec.StartsWith ("openoffice") || exec.StartsWith ("soffice"))) {
+					vexec = "ooffice" + exec.Split (' ')[1];
+				
+				// for wine apps
+				} else if ((exec.Contains ("env WINEPREFIX=") && exec.Contains (" wine ")) ||
+						exec.Contains ("wine ")) {
+					int startIndex = exec.IndexOf ("wine ") + 5;
+					// length of 'wine '
+					// CommandLineForPid already splits based on \\ and takes the last entry, so do the same here
+					vexec = exec.Substring (startIndex).Split (new[] { @"\\" }, StringSplitOptions.RemoveEmptyEntries).Last ();
+					// remove the trailing " and anything after it
+					if (vexec.Contains ("\""))
+						vexec = vexec.Substring (0, vexec.IndexOf ("\""));
+
+				// for crossover apps
+				} else if (exec.Contains (".cxoffice") || (item.HasAttribute ("X-Created-By") && item.GetString ("X-Created-By").Contains ("cxoffice"))) {
+					// The exec is actually another file that uses exec to launch the actual app.
+					exec = exec.Replace ("\"", "");
+					
+					GLib.File launcher = GLib.FileFactory.NewForPath (exec);
+					if (!launcher.Exists) {
+						Log<DesktopItemService>.Warn ("Crossover launcher decoded as: {0}, but does not exist.", launcher.Path);
+						continue;
+					}
+					
+					string execLine = "";
+					using (GLib.DataInputStream stream = new GLib.DataInputStream (launcher.Read (null))) {
+						ulong len;
+						string line;
+						try {
+							while ((line = stream.ReadLine (out len, null)) != null) {
+								if (line.StartsWith ("exec")) {
+									execLine = line;
+									break;
+								}
+							}
+						} catch (Exception e) {
+							Log<DesktopItemService>.Error ("Error reading crossover launher: {0}", e.Message);
+							Log<DesktopItemService>.Error (e.StackTrace);
+							continue;
+						}
+					}
+	
+					// if no exec line was found, bail
+					if (string.IsNullOrEmpty (execLine))
+						continue;
+					
+					// get the relevant part from the execLine
+					string[] parts = execLine.Split (new[] { '\"' });
+					// find the part that contains C:/path/to/app.lnk
+					if (parts.Any (part => part.StartsWith ("C:"))) {
+						vexec = parts.First (part => part.StartsWith ("C:"));
+						// and take only app.lnk (this is what is exposed to ps -ef)
+						vexec = vexec.Split (new[] { '/' }).Last ();
+					} else {
+						continue;
+					}
+					
+				// other apps
+				} else {
+					string[] parts = exec.Split (' ');
+					
+					vexec = parts
+						.DefaultIfEmpty (null)
+						.Select (part => part.Split ( new[] { '/', '\\' }).Last ())
+						.Where (part => !DockServices.WindowMatcher.PrefixFilters.Any (f => f.IsMatch (part)))
+						.FirstOrDefault ();
+					
+					// for AIR apps
+					if (vexec != null && vexec.Contains ('\'')) {
+						vexec = vexec.Replace ("'", "");
+					}
+				}
+				
+				if (vexec == null)
+					continue;
+				
+				if (!ItemsByExec.ContainsKey (vexec))
+					ItemsByExec [vexec] = new List<DesktopItem> ();
+				
+				ItemsByExec [vexec].Add (item);
+				foreach (Regex f in DockServices.WindowMatcher.SuffixFilters) {
+					if (f.IsMatch (vexec)) {
+						string vexecStripped = f.Replace (vexec, "");
+						if (!ItemsByExec.ContainsKey (vexecStripped))
+							ItemsByExec [vexecStripped] = new List<DesktopItem> ();
+						ItemsByExec [vexecStripped].Add (item);
+					}
+				}
+			}
+		}
+	}
+}
+

=== modified file 'Docky.Services/Docky.Services/DockServices.cs'
--- Docky.Services/Docky.Services/DockServices.cs	2010-07-23 07:07:38 +0000
+++ Docky.Services/Docky.Services/DockServices.cs	2010-08-14 22:27:42 +0000
@@ -33,6 +33,10 @@
 		
 		public static ThemeService Theme { get; private set; }
 		
+		public static DesktopItemService DesktopItems { get; private set; }
+		
+		public static WindowMatcherService WindowMatcher { get; private set; }
+		
 		static DockServices ()
 		{
 			Paths = new PathsService ();
@@ -41,6 +45,9 @@
 			System = new SystemService ();
 			Helpers = new HelperService ();
 			Theme = new ThemeService ();
+			WindowMatcher = new WindowMatcherService ();
+			DesktopItems = new DesktopItemService ();
+			
 			NotificationService.Initialize ();
 			Theme.Initialize ();
 			

=== modified file 'Docky.Services/Docky.Services/DrawingService.cs'
--- Docky.Services/Docky.Services/DrawingService.cs	2010-07-30 08:40:47 +0000
+++ Docky.Services/Docky.Services/DrawingService.cs	2010-08-14 22:27:42 +0000
@@ -36,10 +36,6 @@
 	{
 		const string MissingIconIcon = "application-default-icon;;application-x-executable";
 		
-		internal DrawingService ()
-		{
-		}
-		
 		/// <summary>
 		/// An empty pixbuf
 		/// </summary>

=== renamed file 'Docky.Windowing/Wnck/Window_Extensions.cs' => 'Docky.Services/Docky.Services/Extensions/WnckWindowExtension.cs'
--- Docky.Windowing/Wnck/Window_Extensions.cs	2009-10-07 03:35:14 +0000
+++ Docky.Services/Docky.Services/Extensions/WnckWindowExtension.cs	2010-08-14 22:27:42 +0000
@@ -1,5 +1,5 @@
 //  
-//  Copyright (C) 2009 Jason Smith
+//  Copyright (C) 2009-2010 Jason Smith, Chris Szikszoy
 // 
 //  This program is free software: you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
@@ -16,22 +16,19 @@
 // 
 
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
 using System.Runtime.InteropServices;
-using System.Linq;
-using System.Text;
-
-using Docky.Windowing;
-using Docky.Xlib;
-
-namespace Wnck
+
+using Wnck;
+
+using Docky.Services.Windows;
+using Docky.Services.Xlib;
+
+namespace Docky.Services
 {
 
-
-	public static class Window_Extensions
+	public static class WnckWindowExtension
 	{
-		public static int Area (this Wnck.Window self)
+		public static int Area (this Window self)
 		{
 			Gdk.Rectangle geo = self.EasyGeometry ();
 			return geo.Width * geo.Height;
@@ -44,8 +41,8 @@
 			return geo;
 		}
 		
-		public static void SetWorkaroundGeometry (this Wnck.Window window, WindowGravity gravity, WindowMoveResizeMask mask, 
-		                                     int x, int y, int width, int height)
+		public static void SetWorkaroundGeometry (this Window window, WindowGravity gravity, WindowMoveResizeMask mask, 
+			int x, int y, int width, int height)
 		{
 			// This is very weird.  Don't know when they will fix it. You must subtract the top and left
 			// frame extents from a move operation to get the window to actually show in the right spot.
@@ -58,12 +55,12 @@
 			window.SetGeometry (gravity, mask, x, y, width, height);
 		}
 		
-		public static int [] FrameExtents (this Wnck.Window window)
+		public static int [] FrameExtents (this Window window)
 		{
 			return GetCardinalProperty (window, X11Atoms.Instance._NET_FRAME_EXTENTS);
 		}
 		
-		public static int [] GetCardinalProperty (this Wnck.Window window, IntPtr atom)
+		public static int [] GetCardinalProperty (this Window window, IntPtr atom)
 		{
 			X11Atoms atoms = X11Atoms.Instance;
 			IntPtr display;
@@ -75,12 +72,12 @@
 			
 			IntPtr window_handle = (IntPtr) window.Xid;
 			
-			display = Xlib.GdkDisplayXDisplay (Gdk.Screen.Default.Display);
+			display = X.GdkDisplayXDisplay (Gdk.Screen.Default.Display);
 			type = IntPtr.Zero;
 			
-			Xlib.XGetWindowProperty (display, window_handle, atom, (IntPtr) 0,
-			                                  (IntPtr) System.Int32.MaxValue, false, atoms.XA_CARDINAL, out type, out format,
-			                                  out nitems, out bytes_after, out prop_return);
+			X.XGetWindowProperty (display, window_handle, atom, (IntPtr) 0,
+				(IntPtr) System.Int32.MaxValue, false, atoms.XA_CARDINAL, out type, out format,
+				out nitems, out bytes_after, out prop_return);
 			
 			if (type == atoms.XA_CARDINAL && format == 32) {
 				extents = new int [(int) nitems];

=== modified file 'Docky.Services/Docky.Services/HelperService.cs'
--- Docky.Services/Docky.Services/HelperService.cs	2010-06-24 13:55:38 +0000
+++ Docky.Services/Docky.Services/HelperService.cs	2010-08-14 22:27:42 +0000
@@ -22,6 +22,9 @@
 
 using GLib;
 
+using Docky.Services.Helpers;
+using Docky.Services.Prefs;
+
 using ICSharpCode.SharpZipLib;
 using ICSharpCode.SharpZipLib.Tar;
 
@@ -93,7 +96,7 @@
 		
 		List<FileMonitor> monitors = new List<FileMonitor> ();
 		
-		public HelperService ()
+		internal HelperService ()
 		{
 			helpers = new List<Helper> ();
 			

=== added directory 'Docky.Services/Docky.Services/Helpers'
=== renamed file 'Docky.Services/Docky.Services/Helper.cs' => 'Docky.Services/Docky.Services/Helpers/Helper.cs'
--- Docky.Services/Docky.Services/Helper.cs	2010-06-23 01:34:47 +0000
+++ Docky.Services/Docky.Services/Helpers/Helper.cs	2010-08-14 22:27:42 +0000
@@ -19,9 +19,11 @@
 using System;
 using Diag = System.Diagnostics;
 
+using Docky.Services.Prefs;
+
 using GLib;
 
-namespace Docky.Services
+namespace Docky.Services.Helpers
 {
 	public class Helper
 	{

=== renamed file 'Docky.Services/Docky.Services/HelperMetadata.cs' => 'Docky.Services/Docky.Services/Helpers/HelperMetadata.cs'
--- Docky.Services/Docky.Services/HelperMetadata.cs	2010-06-12 12:15:35 +0000
+++ Docky.Services/Docky.Services/Helpers/HelperMetadata.cs	2010-08-14 22:27:42 +0000
@@ -22,7 +22,7 @@
 using GLib;
 using Gdk;
 
-namespace Docky.Services
+namespace Docky.Services.Helpers
 {
 	public class HelperMetadata
 	{

=== renamed file 'Docky.Services/Docky.Services/HelperStatusChangedEventArgs.cs' => 'Docky.Services/Docky.Services/Helpers/HelperStatusChangedEventArgs.cs'
--- Docky.Services/Docky.Services/HelperStatusChangedEventArgs.cs	2009-12-19 01:57:10 +0000
+++ Docky.Services/Docky.Services/Helpers/HelperStatusChangedEventArgs.cs	2010-08-14 22:27:42 +0000
@@ -19,7 +19,7 @@
 
 using GLib;
 
-namespace Docky.Services
+namespace Docky.Services.Helpers
 {
 
 	public class HelperStatusChangedEventArgs : EventArgs

=== modified file 'Docky.Services/Docky.Services/PathsService.cs'
--- Docky.Services/Docky.Services/PathsService.cs	2010-06-07 03:47:56 +0000
+++ Docky.Services/Docky.Services/PathsService.cs	2010-08-14 22:27:42 +0000
@@ -87,7 +87,7 @@
 		#endregion
 		
 		
-		public PathsService ()
+		internal PathsService ()
 		{
 			// get environment-based settings
 			File env_home         = FileFactory.NewForPath (Environment.GetFolderPath (Environment.SpecialFolder.Personal));
@@ -142,7 +142,7 @@
 				try {
 					dir.MakeDirectoryWithParents (null);
 				} catch {
-					Log<PathsService>.Fatal ("Could not access the directory '" + dir.Path + "' or create it.  Docky will not work properly unless this folder is writable.");
+					Log<PathsService>.Fatal ("Could not access the directory '{0}' or create it.  Docky will not work properly unless this folder is writable.", dir.Path);
 				}
 		}
 	}

=== added directory 'Docky.Services/Docky.Services/Preferences'
=== renamed file 'Docky.Services/Docky.Services/IPreferences.cs' => 'Docky.Services/Docky.Services/Preferences/IPreferences.cs'
--- Docky.Services/Docky.Services/IPreferences.cs	2010-07-23 07:25:33 +0000
+++ Docky.Services/Docky.Services/Preferences/IPreferences.cs	2010-08-14 22:27:42 +0000
@@ -17,7 +17,7 @@
 
 using System;
 
-namespace Docky.Services
+namespace Docky.Services.Prefs
 {
 	public interface IPreferences
 	{

=== renamed file 'Docky.Services/Docky.Services/Preferences.cs' => 'Docky.Services/Docky.Services/Preferences/Preferences.cs'
--- Docky.Services/Docky.Services/Preferences.cs	2010-08-01 20:02:27 +0000
+++ Docky.Services/Docky.Services/Preferences/Preferences.cs	2010-08-14 22:27:42 +0000
@@ -23,7 +23,7 @@
 using GConf;
 using Gnome.Keyring;
 
-namespace Docky.Services
+namespace Docky.Services.Prefs
 {
 	internal class Preferences : IPreferences
 	{

=== renamed file 'Docky.Services/Docky.Services/PreferencesChangedEventArgs.cs' => 'Docky.Services/Docky.Services/Preferences/PreferencesChangedEventArgs.cs'
--- Docky.Services/Docky.Services/PreferencesChangedEventArgs.cs	2010-07-11 06:39:31 +0000
+++ Docky.Services/Docky.Services/Preferences/PreferencesChangedEventArgs.cs	2010-08-14 22:27:42 +0000
@@ -17,7 +17,7 @@
 
 using System;
 
-namespace Docky.Services
+namespace Docky.Services.Prefs
 {
 	public class PreferencesChangedEventArgs : EventArgs
 	{

=== modified file 'Docky.Services/Docky.Services/PreferencesService.cs'
--- Docky.Services/Docky.Services/PreferencesService.cs	2010-08-01 19:44:36 +0000
+++ Docky.Services/Docky.Services/PreferencesService.cs	2010-08-14 22:27:42 +0000
@@ -17,6 +17,8 @@
 
 using System;
 
+using Docky.Services.Prefs;
+
 namespace Docky.Services
 {
 
@@ -30,7 +32,7 @@
 		public IPreferences Get<TOwner> ()
 			where TOwner : class
 		{
-			return new Preferences (typeof(TOwner).FullName.Replace (".", "/"));
+			return new Preferences (typeof (TOwner).FullName.Replace (".", "/"));
 		}
 		
 		public IPreferences Get (string basePath)

=== modified file 'Docky.Services/Docky.Services/SystemService.cs'
--- Docky.Services/Docky.Services/SystemService.cs	2010-07-23 07:22:42 +0000
+++ Docky.Services/Docky.Services/SystemService.cs	2010-08-14 22:27:42 +0000
@@ -20,13 +20,14 @@
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading;
 using System.Net;
 
 using GLib;
 
+using Docky.Services.Prefs;
+
 using NDesk.DBus;
 using org.freedesktop.DBus;
 
@@ -34,7 +35,7 @@
 {
 	public class SystemService
 	{
-		public static System.Threading.Thread MainThread { get; set; }
+		public System.Threading.Thread MainThread { get; set; }
 		
 		internal SystemService ()
 		{
@@ -42,10 +43,27 @@
 			InitializeNetwork ();
 		}
 		
-		IPreferences GConf = DockServices.Preferences.Get ("/system/http_proxy");
+		#region Locale
+
+		public string Locale {
+			get {
+				string loc;
+				foreach (string env in new[] { "LC_ALL", "LC_MESSAGES", "LANG", "LANGUAGE" }) {
+					loc = Environment.GetEnvironmentVariable (env);
+					if (!string.IsNullOrEmpty (loc) && loc.Length >= 2) {
+						return loc;
+					}
+				}
+				return "";
+			}
+		}
+		
+		#endregion
 		
 		#region Network
 		
+		IPreferences NetworkSettings = DockServices.Preferences.Get ("/system/http_proxy");
+		
 		const string PROXY_USE_PROXY = "use_http_proxy";
 		const string PROXY_USE_AUTH = "use_authentication";
 		const string PROXY_HOST = "host";
@@ -71,7 +89,7 @@
 			}
 			
 			// watch for changes on any of the proxy keys. If they change, reload the proxy
-			GConf.Changed += delegate(object sender, PreferencesChangedEventArgs e) {
+			NetworkSettings.Changed += delegate (object sender, PreferencesChangedEventArgs e) {
 				switch (e.Key) {
 				case PROXY_HOST:
 				case PROXY_USER:
@@ -140,7 +158,7 @@
 
 		public bool UseProxy {
 			get {
-				return GConf.Get<bool> (PROXY_USE_PROXY, false);
+				return NetworkSettings.Get<bool> (PROXY_USE_PROXY, false);
 			}
 		}
 
@@ -154,11 +172,11 @@
 				return null;
 			
 			try {
-				string proxyUri = string.Format ("http://{0}:{1}", GConf.Get<string> (PROXY_HOST, ""),
-					GConf.Get<int> (PROXY_PORT, 0).ToString ());
+				string proxyUri = string.Format ("http://{0}:{1}", NetworkSettings.Get<string> (PROXY_HOST, ""),
+					NetworkSettings.Get<int> (PROXY_PORT, 0).ToString ());
 				
 				proxy = new WebProxy (proxyUri);
-				string[] bypassList = GConf.Get<string[]> (PROXY_BYPASS_LIST, new[] { "" });
+				string[] bypassList = NetworkSettings.Get<string[]> (PROXY_BYPASS_LIST, new[] { "" });
 				if (bypassList != null) {
 					foreach (string host in bypassList) {
 						if (host.Contains ("*.local")) {
@@ -168,9 +186,9 @@
 						proxy.BypassArrayList.Add (string.Format ("http://{0}", host));
 					}
 				}
-				if (GConf.Get<bool> (PROXY_USE_AUTH, false))
-					proxy.Credentials = new NetworkCredential (GConf.Get<string> (PROXY_USER, ""),
-						GConf.Get<string> (PROXY_PASSWORD, ""));
+				if (NetworkSettings.Get<bool> (PROXY_USE_AUTH, false))
+					proxy.Credentials = new NetworkCredential (NetworkSettings.Get<string> (PROXY_USER, ""),
+						NetworkSettings.Get<string> (PROXY_PASSWORD, ""));
 			} catch (Exception e) {
 				Log.Error ("Error creating web proxy, {0}", e.Message);
 				Log.Debug (e.StackTrace);

=== modified file 'Docky.Services/Docky.Services/ThemeService.cs'
--- Docky.Services/Docky.Services/ThemeService.cs	2010-06-08 10:44:20 +0000
+++ Docky.Services/Docky.Services/ThemeService.cs	2010-08-14 22:27:42 +0000
@@ -27,6 +27,8 @@
 
 using Mono.Unix;
 
+using Docky.Services.Prefs;
+
 using ICSharpCode.SharpZipLib;
 using ICSharpCode.SharpZipLib.Tar;
 

=== renamed file 'Docky.Windowing/Windowing/WindowMatcher.cs' => 'Docky.Services/Docky.Services/WindowMatcherService.cs'
--- Docky.Windowing/Windowing/WindowMatcher.cs	2010-06-22 18:58:21 +0000
+++ Docky.Services/Docky.Services/WindowMatcherService.cs	2010-08-14 22:27:42 +0000
@@ -19,438 +19,119 @@
 using System;
 using System.IO;
 using System.Linq;
-using System.Text;
 using System.Collections.Generic;
-using System.Runtime.Serialization;
-using System.Collections;
-using System.Collections.ObjectModel;
 using System.Text.RegularExpressions;
 
 using Wnck;
 
 using Docky.Services;
+using Docky.Services.Applications;
 
-namespace Docky.Windowing
+namespace Docky.Services
 {
-	public class WindowMatcher
+	public class WindowMatcherService
 	{
-		public static event EventHandler<DesktopFileChangedEventArgs> DesktopFileChanged;
-		
-		static WindowMatcher ()
-		{
-			Default = new WindowMatcher ();
-		}
-		
-		public static WindowMatcher Default { get; protected set; }
-		
-		List<DesktopItem> custom_desktop_items;
-		List<DesktopItem> desktop_items;
-		IEnumerable<DesktopItem> DesktopItems { 
-			get {
-				return custom_desktop_items.Union (desktop_items).AsEnumerable ();
-			}
-		}
-		
-		static string[] LocaleEnvVariables = new[] { "LC_ALL", "LC_MESSAGES", "LANG", "LANGUAGE" };
-		static string locale;
-		public static string Locale 
-		{
-			get {
-				if (!string.IsNullOrEmpty (locale))
-					return locale;
-			
-				string loc;
-				foreach (string env in LocaleEnvVariables) {
-					loc = Environment.GetEnvironmentVariable (env);
-					if (!string.IsNullOrEmpty (loc) && loc.Length >= 2) {
-						locale = loc;
-						return locale;
-					}
-				}
-				
-				locale = "";
-				return locale;
-			}
-		}
-
-		IEnumerable<Wnck.Window> UnmatchedWindows {
-			get {
-				IEnumerable<Wnck.Window> matched = window_to_desktop_items.Keys.Cast<Wnck.Window> ();
-				return Wnck.Screen.Default.Windows
-					.Where (w => !w.IsSkipTasklist && !matched.Contains (w));
-			}
-		}
-		
-		object update_lock;
-		
-		Dictionary<Wnck.Window, List<DesktopItem>> window_to_desktop_items;
-		Dictionary<string, List<DesktopItem>> exec_to_desktop_items;
-		Dictionary<string, DesktopItem> class_to_desktop_items;
-		Dictionary<string, string> remap_items;
-		readonly List<Regex> prefix_filters;
-		readonly List<Regex> suffix_filters;
-		
-		void DesktopItemsChanged ()
-		{
-			exec_to_desktop_items = BuildExecStrings ();
-			class_to_desktop_items = BuildClassStrings ();
-		}
-		
-		private WindowMatcher ()
-		{
-			Log<WindowMatcher>.Debug ("Initialize WindowMatcher");
-
-			Wnck.Screen screen = Wnck.Screen.Default;
-
-			update_lock = new object ();
-			prefix_filters = BuildPrefixFilters ();
-			suffix_filters = BuildSuffixFilters ();
-			
-			Log<WindowMatcher>.Debug ("Loading Remaps..");
-			remap_items = new Dictionary<string, string> ();
-			LoadRemaps (DockServices.Paths.SystemDataFolder.GetChild ("remaps.ini"));
-			LoadRemaps (DockServices.Paths.UserDataFolder.GetChild ("remaps.ini"));
-			
-			// Load DesktopFilesCache from docky.desktop.[LANG].cache
-			desktop_items = LoadDesktopItemsCache (DockyDesktopFileCacheFile);
-			custom_desktop_items = new List<DesktopItem> ();
-			
-			if (desktop_items == null || desktop_items.Count () == 0) {
-				Log<WindowMatcher>.Info ("Loading *.desktop files and regenerating cache. This may take some while...");
-				UpdateDesktopItemsList ();
-				ProcessAndMergeAllSystemCacheFiles (desktop_items);
-				SaveDesktopItemsCache();
-			}
-			DesktopItemsChanged ();
-
-			// Update desktop_items and save cache after 2 minutes just to be sure we are up to date
-			GLib.Timeout.Add (2 * 60 * 1000, delegate {
-				lock (update_lock) {
-					UpdateDesktopItemsList ();
-					ProcessAndMergeAllSystemCacheFiles (desktop_items);
-					DesktopItemsChanged ();
-					SaveDesktopItemsCache();
-				}
-				return false;
-			});
-			
+		
+		internal WindowMatcherService ()
+		{
 			// Initialize window matching with currently available windows
-			window_to_desktop_items = new Dictionary<Wnck.Window, List<DesktopItem>> ();
-			foreach (Wnck.Window w in screen.Windows)
+			DesktopItemsByWindow = new Dictionary<Window, List<DesktopItem>> ();
+
+			foreach (Window w in Wnck.Screen.Default.Windows)
 				SetupWindow (w);
 
-			// Set up monitors for cache files and desktop directories
-			foreach (GLib.File dir in DesktopFileDirectories)
-				MonitorDesktopFileDirs (dir);
-			MonitorDesktopFileSystemCacheFiles ();
-			
-			screen.WindowOpened += WnckScreenDefaultWindowOpened;
-			screen.WindowClosed += WnckScreenDefaultWindowClosed;
-		}
-
-		#region Handle DesktopItems
-		static IEnumerable<GLib.File> DesktopFileSystemCacheFiles
-		{
-			get {
-				return DesktopFileDirectories
-					.Select (d => d.GetChild (string.Format ("desktop.{0}.cache", Locale)))
-					.Where (f => f.Exists);
-			}
-		}
-		
-		static string DockyDesktopFileCacheFile
-		{
-			get {
-				if (!string.IsNullOrEmpty (Locale))
-					return DockServices.Paths.UserCacheFolder.GetChild (string.Format ("docky.desktop.{0}.cache", Locale)).Path;
-				return DockServices.Paths.UserCacheFolder.GetChild ("docky.desktop.cache").Path;
-			}
-		}
-			
-		static IEnumerable<GLib.File> DesktopFileDirectories
-		{
-			get {
-				return DockServices.Paths.XdgDataDirFolders.Select (d => d.GetChild ("applications"))
-					.Union(new [] {
-						DockServices.Paths.XdgDataHomeFolder.GetChild ("applications"),
-						DockServices.Paths.HomeFolder.GetChild (".cxoffice"),
-					})
-					.Where (d => d.Exists);
-			}
-		}
-		
-		void UpdateDesktopItemsList ()
-		{
-			if (desktop_items == null)
-				desktop_items = new List<DesktopItem> ();
-			
-			List<GLib.File> known_desktop_files = desktop_items.Select (item => item.File).ToList ();
-			List<DesktopItem> new_items = new List<DesktopItem> ();
-
-			// Get desktop items for new "valid" desktop files
-			new_items = DesktopFileDirectories
-				.SelectMany (dir => dir.SubDirs ())
-				.Union (DesktopFileDirectories)
-				.SelectMany (file => file.GetFiles (".desktop"))
-				.Where (file => !known_desktop_files.Exists (known_file => (known_file.Path == file.Path)))
-				.Select (file => new DesktopItem (file))
-				.Where (item => item.Values.Any ())
-				.ToList ();
-			
-			desktop_items.AddRange (new_items);
-
-			if (new_items.Count () > 0)
-				Log<WindowMatcher>.Debug ("{0} new applications found", new_items.Count ());
-
-			// Check file existence and remove unlinked items
-			int removed = desktop_items.RemoveAll (item => !item.File.Exists);
-			if (removed > 0)
-				Log<WindowMatcher>.Debug ("{0} applications removed", removed);
-			
-			known_desktop_files.Clear ();
-			new_items.Clear ();
-		}		
-		
-		void ProcessAndMergeAllSystemCacheFiles (List<DesktopItem> items)
-		{
-			foreach (GLib.File cache_file in DesktopFileSystemCacheFiles)
-				ProcessAndMergeSystemCacheFile (cache_file, items);
-		}
-
-		void ProcessAndMergeSystemCacheFile (GLib.File cache_file, List<DesktopItem> items)
-		{
-			if (!cache_file.Exists)
-			    return;
-			
-			Log<WindowMatcher>.Debug ("Processing {0}", cache_file.Path);
-			
-			try {
-				using (StreamReader reader = new StreamReader (cache_file.Path)) {
-					DesktopItem desktop_item = null;
-					string line;
-					
-					while ((line = reader.ReadLine ()) != null) {
-						if (line.Trim ().Length <= 0)
-							continue;
-						
-						if (line.ElementAt (0) == '[') {
-							Match match = DesktopItem.sectionRegex.Match (line);
-							if (match.Success) {
-								string section = match.Groups["Section"].Value;
-								if (section != null) {
-									GLib.File file = cache_file.Parent.GetChild (string.Format ("{0}.desktop", section));
-									desktop_item = items.First (item => item.File.Path == file.Path);
-									if (desktop_item == null && file.Exists) {
-										desktop_item = new DesktopItem (file);
-										items.Add (desktop_item);
-										Log<WindowMatcher>.Debug ("New application found: {0}", desktop_item.Path);
-									}
-									continue;
-								}
-							}
-						} else if (desktop_item != null) {
-							Match match = DesktopItem.keyValueRegex.Match (line);
-							if (match.Success) {
-								string key = match.Groups["Key"].Value;
-								string val = match.Groups["Value"].Value;
-								if (!string.IsNullOrEmpty (key) && !string.IsNullOrEmpty (val))
-									desktop_item.SetString (key, val);
-								continue;
-							}
-						}
-					}
-					reader.Close ();
-				}
-			} catch (Exception e) {
-				Log<WindowMatcher>.Error (e.Message);
-				Log<WindowMatcher>.Error (e.StackTrace);
-			}
-		}
-
-		void LoadRemaps (GLib.File file)
-		{
-			if (!file.Exists)
-				return;
-			
-			Regex keyValueRegex = new Regex (
-				@"(^(\s)*(?<Key>([^\=^\n]+))[\s^\n]*\=(\s)*(?<Value>([^\n]+(\n){0,1})))",
-				RegexOptions.IgnorePatternWhitespace | RegexOptions.Compiled | 
-				RegexOptions.CultureInvariant
-			);
-			
-			try {
-				using (StreamReader reader = new StreamReader (file.Path)) {
-					string line;
-					
-					while ((line = reader.ReadLine ()) != null) {
-						line = line.Trim ();
-						if (line.Length <= 0 || line.Substring (0, 1) == "#")
-							continue;
-						
-						Match match = keyValueRegex.Match (line);
-						if (match.Success) {
-							string key = match.Groups["Key"].Value;
-							string val = match.Groups["Value"].Value;
-							if (!string.IsNullOrEmpty (key)) {
-								remap_items[key] = val;
-								Log<WindowMatcher>.Debug ("Remapping '" + key + "' to '" + val + "'");
-							}
-						}
-					}
-					reader.Close ();
-				}
-			} catch (Exception e) {
-				Log<WindowMatcher>.Error (e.Message);
-				Log<WindowMatcher>.Error (e.StackTrace);
-			}
-		}
-		
-		List<DesktopItem> LoadDesktopItemsCache (string filename)
-		{
-			if (!GLib.FileFactory.NewForPath (filename).Exists)
-				return new List<DesktopItem> ();
-				
-			Log<WindowMatcher>.Debug ("Loading {0}", DockyDesktopFileCacheFile);
-			
-			List<DesktopItem> items = new List<DesktopItem> ();
-			
-			try {
-				using (StreamReader reader = new StreamReader (filename)) {
-					DesktopItem desktop_item = null;
-					string line;
-					
-					while ((line = reader.ReadLine ()) != null) {
-						if (line.Trim ().Length <= 0)
-							continue;
-						
-						if (line.ElementAt (0) == '[') {
-							Match match = DesktopItem.sectionRegex.Match (line);
-							if (match.Success) {
-								string section = match.Groups["Section"].Value;
-								if (section != null) {
-									GLib.File file = GLib.FileFactory.NewForPath (section);
-									desktop_item = new DesktopItem (file, false);
-									items.Add (desktop_item);
-								}
-								continue;
-							}
-						} else if (desktop_item != null) {
-							Match match = DesktopItem.keyValueRegex.Match (line);
-							if (match.Success) {
-								string key = match.Groups["Key"].Value;
-								string val = match.Groups["Value"].Value;
-								if (!string.IsNullOrEmpty (key) && !string.IsNullOrEmpty (val))
-									desktop_item.SetString (key, val);
-								continue;
-							}
-						}
-					}
-					reader.Close ();
-				}
-			} catch (Exception e) {
-				Log<WindowMatcher>.Error (e.Message);
-				Log<WindowMatcher>.Error (e.StackTrace);
-				return null;
-			}
-
-			return items;
-		}
-
-		void SaveDesktopItemsCache ()
-		{
-			Log<WindowMatcher>.Debug ("Saving {0}", DockyDesktopFileCacheFile);
-
-			try {
-				using (StreamWriter writer = new StreamWriter (DockyDesktopFileCacheFile, false)) {
-					foreach (DesktopItem item in desktop_items) {
-						writer.WriteLine ("[{0}]", item.Path);
-						IDictionaryEnumerator enumerator = item.Values.GetEnumerator ();
-						enumerator.Reset();
-						while (enumerator.MoveNext())
-							writer.WriteLine ("{0}={1}", enumerator.Key, enumerator.Value);
-						writer.WriteLine ("");
-					}
-					writer.Close ();
-				}
-			} catch (Exception e) {
-				Log<WindowMatcher>.Error (e.Message);
-				Log<WindowMatcher>.Error (e.StackTrace);
-			}
-		}
-
-		void MonitorDesktopFileSystemCacheFiles ()
-		{
-			foreach (GLib.File file in DesktopFileSystemCacheFiles) {
-				GLib.FileMonitor mon = file.Monitor (GLib.FileMonitorFlags.None, null);
-				mon.RateLimit = 2500;
-				mon.Changed += delegate(object o, GLib.ChangedArgs args) {
-					if (args.EventType == GLib.FileMonitorEvent.ChangesDoneHint)
-						DockServices.System.RunOnThread (() => {
-							lock (update_lock) {
-								ProcessAndMergeSystemCacheFile (file, desktop_items);
-								DesktopItemsChanged ();
-							}   
-						});
-				};
-			}
-		}
-		
-		void MonitorDesktopFileDirs (GLib.File dir)
-		{
-			// build a list of all the subdirectories
-			List<GLib.File> dirs = new List<GLib.File> () {dir};
-			try {
-				dirs = dirs.Union (dir.SubDirs ()).ToList ();	
-			} catch {}
-			
-			foreach (GLib.File d in dirs) {
-				GLib.FileMonitor mon = d.Monitor (GLib.FileMonitorFlags.None, null);
-				mon.RateLimit = 2500;
-				mon.Changed += delegate(object o, GLib.ChangedArgs args) {
-					// bug in GIO#, calling args.File or args.OtherFile crashes hard
-					GLib.File file = GLib.FileAdapter.GetObject ((GLib.Object) args.Args[0]);
-					GLib.File otherFile = GLib.FileAdapter.GetObject ((GLib.Object) args.Args[1]);
-
-					// according to GLib documentation, the change signal runs on the same
-					// thread that the monitor was created on.  Without running this part on a thread
-					// docky freezes up for about 500-800 ms while the .desktop files are parsed.
-					DockServices.System.RunOnThread (() => {
-						// if a new directory was created, make sure we watch that dir as well
-						if (file.QueryFileType (GLib.FileQueryInfoFlags.NofollowSymlinks, null) == GLib.FileType.Directory)
-							MonitorDesktopFileDirs (file);
-						
-						// we only care about .desktop files
-						if (!file.Path.EndsWith (".desktop"))
-							return;
-
-						lock (update_lock) {
-							UpdateDesktopItemsList ();
-							DesktopItemsChanged ();
-							SaveDesktopItemsCache();
-						}
-						
-						// Make sure to trigger event on main thread
-						DockServices.System.RunOnMainThread (() => {
-							if (DesktopFileChanged != null)
-								DesktopFileChanged (this, new DesktopFileChangedEventArgs (args.EventType, file, otherFile));
-						});
-					});
-				};
-			}
-		}
-
-		public void RegisterDesktopItem (DesktopItem item)
-		{
-			if (DesktopItems.Contains (item))
-				return;
-			
-			custom_desktop_items.Add (item);
-			
-			DesktopItemsChanged ();
-		}
+			Wnck.Screen.Default.WindowOpened += WnckScreenDefaultWindowOpened;
+			Wnck.Screen.Default.WindowClosed += WnckScreenDefaultWindowClosed;
+		}
+		
+		IEnumerable<Window> UnmatchedWindows {
+			get {
+				IEnumerable<Window> matched = DesktopItemsByWindow.Keys.Cast<Window> ();
+				return Wnck.Screen.Default.Windows.Where (w => !w.IsSkipTasklist && !matched.Contains (w));
+			}
+		}
+		
+		Dictionary<Window, List<DesktopItem>> DesktopItemsByWindow;
+		
+		#region public API
+		
+		public IEnumerable<Window> WindowsForDesktopItem (DesktopItem item)
+		{
+			if (item == null)
+				throw new ArgumentNullException ("DesktopItem item cannot be null.");
+			
+
+			foreach (KeyValuePair<Window, List<DesktopItem>> kvp in DesktopItemsByWindow)
+				if (kvp.Value.Any (df => df == item))
+					yield return kvp.Key;
+		}
+		
+		public DesktopItem DesktopItemForWindow (Window window)
+		{
+			if (window == null)
+				throw new ArgumentNullException ("Window window cannot be null.");
+			
+			List<DesktopItem> matches;
+			if (DesktopItemsByWindow.TryGetValue (window, out matches)) {
+				DesktopItem useritem = matches.Find (item => item.File.Path.StartsWith (DockServices.Paths.HomeFolder.Path));
+				if (useritem != null)
+					return useritem;
+				return matches.FirstOrDefault ();
+			}
+			
+			return null;
+		}
+		
+		public List<Regex> PrefixFilters {
+			get {
+				return BuildPrefixFilters ();
+			}
+		}
+		public List<Regex> SuffixFilters {
+			get {
+				return BuildSuffixFilters ();
+			}
+		}
+		
+		public IEnumerable<Window> SimilarWindows (Window window)
+		{
+			if (window == null)
+				throw new ArgumentNullException ("Window cannot be null.");
+			
+			//TODO perhaps make it a bit smarter
+			if (!DesktopItemsByWindow.ContainsKey (window))
+				foreach (Window win in UnmatchedWindows) {
+					if (win == window)
+						continue;
+					
+					if (win.Pid == window.Pid)
+						yield return win; else if (window.Pid <= 1) {
+						if (window.ClassGroup != null && win.ClassGroup != null && !string.IsNullOrEmpty (window.ClassGroup.ResClass) && !string.IsNullOrEmpty (win.ClassGroup.ResClass) && win.ClassGroup.ResClass.Equals (window.ClassGroup.ResClass))
+							yield return win; else if (!string.IsNullOrEmpty (win.Name) && win.Name.Equals (window.Name))
+							yield return win;
+					}
+				}
+			
+			yield return window;
+		}
+		
+		public bool WindowIsReadyForMatch (Window window)
+		{
+			if (!WindowIsOpenOffice (window))
+				return true;
+			
+			return SetupWindow (window);
+		}
+		
+		public bool WindowIsOpenOffice (Window window)
+		{
+			return window.ClassGroup != null && window.ClassGroup.Name.ToLower ().StartsWith ("openoffice");
+		}
+
 		#endregion
-
+		
 		#region Window Setup
+		
 		void WnckScreenDefaultWindowOpened (object o, WindowOpenedArgs args)
 		{
 			SetupWindow (args.Window);
@@ -459,173 +140,39 @@
 		void WnckScreenDefaultWindowClosed (object o, WindowClosedArgs args)
 		{
 			if (args.Window != null)
-				window_to_desktop_items.Remove (args.Window);
+				DesktopItemsByWindow.Remove (args.Window);
 		}
 		
-		bool SetupWindow (Wnck.Window window)
+		bool SetupWindow (Window window)
 		{
 			IEnumerable<DesktopItem> items = DesktopItemsForWindow (window);
 			if (items.Any ()) {
-				window_to_desktop_items [window] = items.ToList ();
+				DesktopItemsByWindow [window] = items.ToList ();
 				return true;
-			} else
+			} else {
 				return false;
+			}
 		}
+		
 		#endregion
 
 		#region Window Matching
-		static IEnumerable<string> PrefixStrings {
-			get {
-				yield return "gksu(do)?";
-				yield return "sudo";
-				yield return "java";
-				yield return "mono";
-				yield return "ruby";
-				yield return "padsp";
-				yield return "perl";
-				yield return "aoss";
-				yield return "python(\\d+.\\d+)?";
-				yield return "wish(\\d+\\.\\d+)?";
-				yield return "(ba)?sh";
-				yield return "-.*";
-				yield return "*.\\.desktop";
-			}
-		}
-		
-		List<Regex> BuildPrefixFilters ()
-		{
-			return new List<Regex> (PrefixStrings.Select (s => new Regex ("^" + s + "$")));
-		}
-		
-		static IEnumerable<string> SuffixStrings {
-			get {
-				// some wine apps are launched via a shell script that sets the proc name to "app.exe"
-				yield return "\\.exe";
-				// some apps have a script 'foo' which does 'exec foo-bin' or 'exec foo.bin'
-				yield return "[.-]bin";
-				// some python apps have a script 'foo' for 'python foo.py'
-				yield return "\\.py";
-				// some apps append versions, such as '-1' or '-3.0'
-				yield return "(-)?\\d+(\\.\\d+)?";
-			}
-		}
-
-		List<Regex> BuildSuffixFilters ()
-		{
-			return new List<Regex> (SuffixStrings.Select (s => new Regex (s + "$")));
-		}
-
-		public bool WindowIsReadyForMatch (Wnck.Window window)
-		{
-			if (!WindowIsOpenOffice (window))
-				return true;
-
-			return SetupWindow (window);
-		}
-		
-		public bool WindowIsOpenOffice (Wnck.Window window)
-		{
-			return window.ClassGroup != null && window.ClassGroup.Name.ToLower ().StartsWith ("openoffice");
-		}
-		
-		public IEnumerable<Wnck.Window> WindowsForDesktopItem (DesktopItem item)
-		{
-			if (item == null)
-				throw new ArgumentNullException ("DesktopItem item");
-			
-			foreach (KeyValuePair<Wnck.Window, List<DesktopItem>> kvp in window_to_desktop_items)
-				if (kvp.Value.Any (df => df == item))
-					yield return kvp.Key;
-		}
-		
-		public IEnumerable<Wnck.Window> SimilarWindows (Wnck.Window window)
-		{
-			if (window == null)
-				throw new ArgumentNullException ("Wnck.Window window");
-			
-			//TODO perhaps make it a bit smarter
-			if (!window_to_desktop_items.ContainsKey (window))
-				foreach (Wnck.Window win in UnmatchedWindows) {
-					if (win == window)
-						continue;
-					
-					if (win.Pid == window.Pid)
-						yield return win;
-					else if (window.Pid <= 1) {
-						if (window.ClassGroup != null
-								&& win.ClassGroup != null
-								&& !string.IsNullOrEmpty (window.ClassGroup.ResClass)
-								&& !string.IsNullOrEmpty (win.ClassGroup.ResClass)
-								&& win.ClassGroup.ResClass.Equals (window.ClassGroup.ResClass))
-							yield return win;
-						else if (!string.IsNullOrEmpty (win.Name) && win.Name.Equals (window.Name)) 
-							yield return win;
-					}
-				}
-			
-			yield return window;
-		}
-
-		public DesktopItem DesktopItemForDesktopFile (string file)
-		{
-			try {
-				return DesktopItems
-					.Where (df => df.Path.Equals (file, StringComparison.CurrentCultureIgnoreCase))
-					.DefaultIfEmpty (null)
-					.FirstOrDefault ();
-			} catch (Exception e) {
-				Docky.Services.Log<WindowMatcher>.Error (e.Message);
-				Docky.Services.Log<WindowMatcher>.Debug (e.StackTrace);
-			}
-			
-			return null;
-		}
-		
-		public DesktopItem DesktopItemForWindow (Wnck.Window window)
-		{
-			if (window == null)
-				throw new ArgumentNullException ("window");
-			
-			List<DesktopItem> matches;
-			if (window_to_desktop_items.TryGetValue (window, out matches)) {
-				DesktopItem useritem = matches.Find (item => item.File.Path.StartsWith (DockServices.Paths.HomeFolder.Path));
-				if (useritem != null)
-					return useritem;
-				return matches.FirstOrDefault ();
-			}
-			
-			return null;
-		}
-		
-		IEnumerable<DesktopItem> DesktopItemsForDesktopID (string id)
-		{
-			IEnumerable<DesktopItem> matches = Enumerable.Empty<DesktopItem> ();
-			try {
-				matches = DesktopItems
-					.Where (df => df.DesktopID.Equals (id, StringComparison.CurrentCultureIgnoreCase));
-			} catch (Exception e) {
-				Docky.Services.Log<WindowMatcher>.Error (e.Message);
-				Docky.Services.Log<WindowMatcher>.Debug (e.StackTrace);
-			}
-			
-			return matches;
-		}
-		
-		IEnumerable<DesktopItem> DesktopItemsForWindow (Wnck.Window window)
+		
+		IEnumerable<DesktopItem> DesktopItemsForWindow (Window window)
 		{
 			// use the StartupWMClass as the definitive match
 			if (window.ClassGroup != null
 					&& !string.IsNullOrEmpty (window.ClassGroup.ResClass)
 					&& window.ClassGroup.ResClass != "Wine"
-					&& class_to_desktop_items.ContainsKey (window.ClassGroup.ResClass)) {
-				yield return class_to_desktop_items [window.ClassGroup.ResClass];
+					&& DockServices.DesktopItems.DesktopItemFromClass (window.ClassGroup.ResClass) != null) {
+				yield return DockServices.DesktopItems.DesktopItemFromClass (window.ClassGroup.ResClass);
 				yield break;
 			}
 			
 			int pid = window.Pid;
 			if (pid <= 1) {
 				if (window.ClassGroup != null && !string.IsNullOrEmpty (window.ClassGroup.ResClass)) {
-					IEnumerable<DesktopItem> matches = DesktopItemsForDesktopID (window.ClassGroup.ResClass);
+					IEnumerable<DesktopItem> matches = DockServices.DesktopItems.DesktopItemsFromID (window.ClassGroup.ResClass);
 					if (matches.Any ())
 						foreach (DesktopItem s in matches)
 							yield return s;
@@ -639,72 +186,109 @@
 			// get ppid and parents
 			IEnumerable<int> pids = PidAndParents (pid);
 			// this list holds a list of the command line parts from left (0) to right (n)
-			List<string> command_line = new List<string> ();
+			List<string> commandLine = new List<string> ();
 			
 			// if we have a classname that matches a desktopid we have a winner
 			if (window.ClassGroup != null) {
 				if (WindowIsOpenOffice (window)) {
 					string title = window.Name.Trim ();
 					if (title.EndsWith ("Writer"))
-						command_line.Add ("ooffice-writer");
+						commandLine.Add ("ooffice-writer");
 					else if (title.EndsWith ("Draw"))
-						command_line.Add ("ooffice-draw");
+						commandLine.Add ("ooffice-draw");
 					else if (title.EndsWith ("Impress"))
-						command_line.Add ("ooffice-impress");
+						commandLine.Add ("ooffice-impress");
 					else if (title.EndsWith ("Calc"))
-						command_line.Add ("ooffice-calc");
+						commandLine.Add ("ooffice-calc");
 					else if (title.EndsWith ("Math"))
-						command_line.Add ("ooffice-math");
+						commandLine.Add ("ooffice-math");
 				} else if (window.ClassGroup.ResClass == "Wine") {
 					// we can match Wine apps normally so don't do anything here
 				} else {
-					string class_name = window.ClassGroup.ResClass.Replace (".", "");
-					IEnumerable<DesktopItem> matches = DesktopItemsForDesktopID (class_name);
+					string className = window.ClassGroup.ResClass.Replace (".", "");
+					IEnumerable<DesktopItem> matches = DockServices.DesktopItems.DesktopItemsFromID (className);
 					
-					foreach (DesktopItem s in matches) {
+					if (matches.Any ()) {
+						foreach (DesktopItem s in matches) {
+							yield return s;
+							matched = true;
+						}
+					}
+				}
+			}
+			
+			do {
+				// do a match on the process name
+				string name = NameForPid (pids.ElementAt (currentPid));
+				foreach (DesktopItem s in DockServices.DesktopItems.DesktopItemsFromExec (name)) {
+					yield return s;
+					matched = true;
+				}
+				
+					// otherwise do a match on the commandline
+				commandLine.AddRange (CommandLineForPid (pids.ElementAt (currentPid++))
+				.Select (cmd => cmd.Replace (@"\", @"\\")));
+				
+				if (commandLine.Count () == 0)
+					continue;
+				
+				foreach (string cmd in commandLine) {
+					foreach (DesktopItem s in DockServices.DesktopItems.DesktopItemsFromExec (cmd)) {
 						yield return s;
 						matched = true;
 					}
-				}
-			}
-	
-			lock (update_lock) {
-				do {
-					// do a match on the process name
-					string name = NameForPid (pids.ElementAt (currentPid));
-					if (exec_to_desktop_items.ContainsKey (name)) {
-						foreach (DesktopItem s in exec_to_desktop_items[name]) {
-							yield return s;
-							matched = true;
-						}
-					}
-					
-					// otherwise do a match on the commandline
-					command_line.AddRange (CommandLineForPid (pids.ElementAt (currentPid++))
-						.Select (cmd => cmd.Replace (@"\", @"\\")));
-					
-					if (command_line.Count () == 0)
-						continue;
-					
-					foreach (string cmd in command_line) {
-						if (exec_to_desktop_items.ContainsKey (cmd)) {
-							foreach (DesktopItem s in exec_to_desktop_items[cmd]) {
-								yield return s;
-								matched = true;
-							}
-						}
-						if (matched)
-							break;
-					}
-					
-					// if we found a match, bail.
 					if (matched)
-						yield break;
-				} while (currentPid < pids.Count ());
-			}
-			command_line.Clear ();
+						break;
+				}
+				
+				// if we found a match, bail.
+				if (matched)
+					yield break;
+			} while (currentPid < pids.Count ());
+			
 			yield break;
 		}
+
+		IEnumerable<string> PrefixStrings {
+			get {
+				yield return "gksu(do)?";
+				yield return "sudo";
+				yield return "java";
+				yield return "mono";
+				yield return "ruby";
+				yield return "padsp";
+				yield return "perl";
+				yield return "aoss";
+				yield return "python(\\d+.\\d+)?";
+				yield return "wish(\\d+\\.\\d+)?";
+				yield return "(ba)?sh";
+				yield return "-.*";
+				yield return "*.\\.desktop";
+			}
+		}
+		
+		List<Regex> BuildPrefixFilters ()
+		{
+			return new List<Regex> (PrefixStrings.Select (s => new Regex ("^" + s + "$")));
+		}
+		
+		IEnumerable<string> SuffixStrings {
+			get {
+				// some wine apps are launched via a shell script that sets the proc name to "app.exe"
+				yield return "\\.exe";
+				// some apps have a script 'foo' which does 'exec foo-bin' or 'exec foo.bin'
+				yield return "[.-]bin";
+				// some python apps have a script 'foo' for 'python foo.py'
+				yield return "\\.py";
+				// some apps append versions, such as '-1' or '-3.0'
+				yield return "(-)?\\d+(\\.\\d+)?";
+			}
+		}
+
+		List<Regex> BuildSuffixFilters ()
+		{
+			return new List<Regex> (SuffixStrings.Select (s => new Regex (s + "$")));
+		}
 		
 		IEnumerable<int> PidAndParents (int pid)
 		{
@@ -760,15 +344,15 @@
 			foreach (string sanitizedCmd in result
 				.Select (s => s.Split (new []{'/', '\\'}).Last ())
 			    .Distinct ()
-				.Where (s => !string.IsNullOrEmpty (s) && !prefix_filters.Any (f => f.IsMatch (s)))) {
+				.Where (s => !string.IsNullOrEmpty (s) && !PrefixFilters.Any (f => f.IsMatch (s)))) {
 				
 				yield return sanitizedCmd;
 				
-				if (remap_items.ContainsKey (sanitizedCmd))
-					yield return remap_items [sanitizedCmd];
+				if (DockServices.DesktopItems.Remaps.ContainsKey (sanitizedCmd))
+					yield return DockServices.DesktopItems.Remaps [sanitizedCmd];
 				
 				// if it ends with a special suffix, strip the suffix and return an additional result
-				foreach (Regex f in suffix_filters)
+				foreach (Regex f in SuffixFilters)
 					if (f.IsMatch (sanitizedCmd))
 						yield return f.Replace (sanitizedCmd, "");
 			}
@@ -795,146 +379,6 @@
 			return name.Substring (6);
 		}
 		
-		Dictionary<string, DesktopItem> BuildClassStrings ()
-		{
-			Dictionary<string, DesktopItem> result = new Dictionary<string, DesktopItem> ();
-			
-			foreach (DesktopItem item in DesktopItems) {
-				if (item == null || !item.HasAttribute ("StartupWMClass"))
-					continue;
-				
-				if (item.HasAttribute ("NoDisplay") && item.GetBool ("NoDisplay"))
-					continue;
-				
-				if (item.HasAttribute ("X-Docky-NoMatch") && item.GetBool ("X-Docky-NoMatch"))
-					continue;
-				
-				string cls = item.GetString ("StartupWMClass").Trim ();
-				// we only want exactly 1 launcher, and so if we already have one we use that
-				// otherwise it will prefer global over local launchers
-				if (!result.ContainsKey (cls))
-					result [cls] = item;
-			}
-			
-			return result;
-		}
-				
-		Dictionary<string, List<DesktopItem>> BuildExecStrings ()
-		{
-			Dictionary<string, List<DesktopItem>> result = new Dictionary<string, List<DesktopItem>> ();
-			
-			foreach (DesktopItem item in DesktopItems) {
-				if (item == null || !item.HasAttribute ("Exec"))
-					continue;
-				
-				if (item.HasAttribute ("NoDisplay") && item.GetBool ("NoDisplay"))
-					continue;
-				
-				if (item.HasAttribute ("X-Docky-NoMatch") && item.GetBool ("X-Docky-NoMatch"))
-					continue;
-				
-				string exec = item.GetString ("Exec").Trim ();
-				string vexec = null;
-				
-				// for openoffice
-				if (exec.Contains (' ') &&
-					(exec.StartsWith ("ooffice") || exec.StartsWith ("openoffice") || exec.StartsWith ("soffice"))) {
-					vexec = "ooffice" + exec.Split (' ') [1];
-				
-				// for wine apps
-				} else if ((exec.Contains ("env WINEPREFIX=") && exec.Contains (" wine ")) ||
-						exec.Contains ("wine ")) {
-					int startIndex = exec.IndexOf ("wine ") + 5; // length of 'wine '
-					// CommandLineForPid already splits based on \\ and takes the last entry, so do the same here
-					vexec = exec.Substring (startIndex).Split (new [] {@"\\"}, StringSplitOptions.RemoveEmptyEntries).Last ();
-					// remove the trailing " and anything after it
-					if (vexec.Contains ("\""))
-						vexec = vexec.Substring (0, vexec.IndexOf ("\""));
-
-				// for crossover apps
-				} else if (exec.Contains (".cxoffice") || (item.HasAttribute ("X-Created-By") && item.GetString ("X-Created-By").Contains ("cxoffice"))) {
-					// The exec is actually another file that uses exec to launch the actual app.
-					exec = exec.Replace ("\"", "");
-					
-					GLib.File launcher = GLib.FileFactory.NewForPath (exec);
-					if (!launcher.Exists) {
-						Log<WindowMatcher>.Warn ("Crossover launcher decoded as: {0}, but does not exist.", launcher.Path);
-						continue;
-					}
-					
-					string execLine = "";
-					using (GLib.DataInputStream stream = new GLib.DataInputStream (launcher.Read (null))) {
-						ulong len;
-						string line;
-						try {
-							while ((line = stream.ReadLine (out len, null)) != null) {
-								if (line.StartsWith ("exec")) {
-									execLine = line;
-									break;
-								}
-							}
-						} catch (Exception e) {
-							Log<WindowMatcher>.Error (e.Message);
-							Log<WindowMatcher>.Error (e.StackTrace);
-							continue;					
-						}
-					}
-	
-					// if no exec line was found, bail
-					if (string.IsNullOrEmpty (execLine))
-						continue;
-					
-					// get the relevant part from the execLine
-					string [] parts = execLine.Split (new [] {'\"'});
-					// find the part that contains C:/path/to/app.lnk
-					if (parts.Any (part => part.StartsWith ("C:"))) {
-						vexec = parts.First (part => part.StartsWith ("C:"));
-						// and take only app.lnk (this is what is exposed to ps -ef)
-						vexec = vexec.Split (new [] {'/'}).Last ();
-					} else {
-						continue;
-					}
-					
-				// other apps
-				} else {
-					string [] parts = exec.Split (' ');
-					
-					vexec = parts
-						.DefaultIfEmpty (null)
-						.Select (part => part.Split (new [] {
-						'/',
-						'\\'
-					}).Last ())
-						.Where (part => !prefix_filters.Any (f => f.IsMatch (part)))
-						.FirstOrDefault ();
-					
-					// for AIR apps
-					if (vexec != null && vexec.Contains ('\'')) {
-						string strippedExec = vexec.Replace ("'", "");
-						if (!result.ContainsKey (strippedExec))
-							result [strippedExec] = new List<DesktopItem> ();
-						result [strippedExec].Add (item);
-					}
-				}
-				
-				if (vexec == null)
-					continue;
-				
-				if (!result.ContainsKey (vexec))
-					result [vexec] = new List<DesktopItem> ();
-				
-				result [vexec].Add (item);
-				foreach (Regex f in suffix_filters)
-					if (f.IsMatch (vexec)) {
-						string vexecStripped = f.Replace (vexec, "");
-						if (!result.ContainsKey (vexecStripped))
-							result [vexecStripped] = new List<DesktopItem> ();
-						result [vexecStripped].Add (item);
-					}
-			}
-			
-			return result;
-		}
 		#endregion
 	}
 }

=== added directory 'Docky.Services/Docky.Services/Windows'
=== renamed file 'Docky.Windowing/Windowing/Position.cs' => 'Docky.Services/Docky.Services/Windows/Position.cs'
--- Docky.Windowing/Windowing/Position.cs	2009-09-03 05:09:05 +0000
+++ Docky.Services/Docky.Services/Windows/Position.cs	2010-08-14 22:27:42 +0000
@@ -17,10 +17,9 @@
 
 using System;
 
-namespace Docky.Windowing
+namespace Docky.Services.Windows
 {
 	
-	
 	public enum Position {
 		Left = 0,
 		Right,

=== renamed file 'Docky.Windowing/Windowing/WindowControl.cs' => 'Docky.Services/Docky.Services/Windows/WindowControl.cs'
--- Docky.Windowing/Windowing/WindowControl.cs	2009-09-23 18:32:24 +0000
+++ Docky.Services/Docky.Services/Windows/WindowControl.cs	2010-08-14 22:27:42 +0000
@@ -22,10 +22,9 @@
 
 using Wnck;
 
-namespace Docky.Windowing
+namespace Docky.Services.Windows
 {
 	
-	
 	public static class WindowControl
 	{
 		

=== added directory 'Docky.Services/Docky.Services/Xlib'
=== renamed file 'Docky.Windowing/Xlib/X11Atoms.cs' => 'Docky.Services/Docky.Services/Xlib/X11Atoms.cs'
--- Docky.Windowing/Xlib/X11Atoms.cs	2009-09-03 05:09:05 +0000
+++ Docky.Services/Docky.Services/Xlib/X11Atoms.cs	2010-08-14 22:27:42 +0000
@@ -23,7 +23,7 @@
 
 using System;
 
-namespace Docky.Xlib {
+namespace Docky.Services.Xlib {
 
 	public class X11Atoms {
 		
@@ -179,7 +179,7 @@
 
 
 		X11Atoms (Gdk.Display dsp) {
-			IntPtr display = Xlib.GdkDisplayXDisplay (dsp);
+			IntPtr display = X.GdkDisplayXDisplay (dsp);
 			// make sure this array stays in sync with the statements below
 			string [] atom_names = new string[] {
 				"WM_PROTOCOLS",
@@ -255,7 +255,7 @@
 
 			IntPtr[] atoms = new IntPtr [atom_names.Length];;
 
-			Xlib.XInternAtoms (display, atom_names, atom_names.Length, false, atoms);
+			X.XInternAtoms (display, atom_names, atom_names.Length, false, atoms);
 
 			int off = 0;
 			WM_PROTOCOLS = atoms [off++];

=== renamed file 'Docky.Windowing/Xlib/Xlib.cs' => 'Docky.Services/Docky.Services/Xlib/Xlib.cs'
--- Docky.Windowing/Xlib/Xlib.cs	2009-09-03 05:09:05 +0000
+++ Docky.Services/Docky.Services/Xlib/Xlib.cs	2010-08-14 22:27:42 +0000
@@ -22,12 +22,9 @@
 //
 
 using System;
-using System.Text;
 using System.Runtime.InteropServices;
-using System.Collections.Generic;
-using System.Linq;
 
-namespace Docky.Xlib {
+namespace Docky.Services.Xlib {
 
 	public enum PropertyMode
 	{
@@ -67,9 +64,9 @@
 		StaticGravity = 10,
 	}
 	
-	public static class Xlib {
+	public static class X {
 		const string libX11 = "X11";
-		const string libGdkX11 = "libgdk-x11";
+		const string libGdkX11 = "libgdk-x11-2.0";
 		
 		[DllImport (libGdkX11)]
 		static extern IntPtr gdk_x11_drawable_get_xid (IntPtr handle);

=== modified file 'Docky.Services/Makefile.am'
--- Docky.Services/Makefile.am	2010-07-11 06:39:31 +0000
+++ Docky.Services/Makefile.am	2010-08-14 22:27:42 +0000
@@ -8,31 +8,40 @@
 
 FILES = \
 	AssemblyInfo.cs \
+	Docky.Services/Applications/DesktopFileChangedEventArgs.cs \
+	Docky.Services/Applications/DesktopItem.cs \
+	Docky.Services/Helpers/Helper.cs \
+	Docky.Services/Helpers/HelperStatusChangedEventArgs.cs \
+	Docky.Services/Helpers/HelperMetadata.cs \
+	Docky.Services/Extensions/GdkPixbufExtension.cs \
 	Docky.Services/Extensions/GLibFileExtension.cs \
 	Docky.Services/Extensions/GLibMountExtension.cs \
-	Docky.Services/Extensions/GdkPixbufExtension.cs \
 	Docky.Services/Extensions/GtkIconThemeExtension.cs \
+	Docky.Services/Extensions/WnckWindowExtension.cs \
 	Docky.Services/Logging/ConsoleCrayon.cs \
+	Docky.Services/Logging/ConsoleLog.cs \
 	Docky.Services/Logging/LogBase.cs \
-	Docky.Services/Logging/ConsoleLog.cs \
+	Docky.Services/Preferences/IPreferences.cs \
+	Docky.Services/Preferences/Preferences.cs \
+	Docky.Services/Preferences/PreferencesChangedEventArgs.cs \
+	Docky.Services/Windows/Position.cs \
+	Docky.Services/Windows/WindowControl.cs \
+	Docky.Services/Xlib/X11Atoms.cs \
+	Docky.Services/Xlib/Xlib.cs \
+	Docky.Services/ConnectionStatusChangeEventArgs.cs \
+	Docky.Services/DesktopItemService.cs \
+	Docky.Services/DockServices.cs \
+	Docky.Services/DrawingService.cs \
+	Docky.Services/HelperService.cs \
 	Docky.Services/Log.cs \
 	Docky.Services/LogTSender.cs \
-	Docky.Services/ConnectionStatusChangeEventArgs.cs \
-	Docky.Services/IPreferences.cs \
+	Docky.Services/NativeInterop.cs \
+	Docky.Services/NotificationService.cs \
+	Docky.Services/PathsService.cs \
  	Docky.Services/PreferencesService.cs \
-	Docky.Services/DockServices.cs \
 	Docky.Services/SystemService.cs \
 	Docky.Services/ThemeService.cs \
-	Docky.Services/HelperService.cs \
-	Docky.Services/Helper.cs \
-	Docky.Services/HelperStatusChangedEventArgs.cs \
-	Docky.Services/HelperMetadata.cs \
-	Docky.Services/DrawingService.cs \
-	Docky.Services/NotificationService.cs \
-	Docky.Services/Preferences.cs \
-	Docky.Services/NativeInterop.cs \
-	Docky.Services/PathsService.cs \
-	Docky.Services/PreferencesChangedEventArgs.cs \
+	Docky.Services/WindowMatcherService.cs \
 	Gtk/MountOperation.cs \
 	GLibSharp/AsyncReadyCallbackNative.cs
 
@@ -57,6 +66,7 @@
 	$(GTK_SHARP_20_LIBS) \
 	$(GNOME_KEYRING_SHARP_LIBS) \
 	$(NOTIFY_SHARP_LIBS) \
+	$(WNCK_SHARP_10_LIBS) \
 	$(LIBRSVG_SHARP_LIBS)
 
 EXTRA_DIST += Docky.Services.dll.config

=== removed directory 'Docky.Windowing'
=== removed file 'Docky.Windowing/AssemblyInfo.cs'
--- Docky.Windowing/AssemblyInfo.cs	2009-08-31 23:37:37 +0000
+++ Docky.Windowing/AssemblyInfo.cs	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-//  
-//  Copyright (C) 2009 Jason Smith
-// 
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-// 
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-// 
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-// 
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following attributes. 
-// Change them to the values specific to your project.
-
-[assembly: AssemblyTitle("Docky.Windowing")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
-// The form "{Major}.{Minor}.*" will automatically update the build and revision,
-// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-
-[assembly: AssemblyVersion("1.0.*")]
-
-// The following attributes are used to specify the signing key for the assembly, 
-// if desired. See the Mono documentation for more information about signing.
-
-//[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("")]

=== removed file 'Docky.Windowing/Docky.Windowing.csproj'
--- Docky.Windowing/Docky.Windowing.csproj	2010-06-01 12:53:24 +0000
+++ Docky.Windowing/Docky.Windowing.csproj	1970-01-01 00:00:00 +0000
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{888FCD95-7C79-45C4-A744-9C840DF4B9B0}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AssemblyName>Docky.Windowing</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <ReleaseVersion>2.0</ReleaseVersion>
-    <RootNamespace>Docky.Windowing</RootNamespace>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>none</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Package>gtk-sharp-2.0</Package>
-    </Reference>
-    <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Package>glib-sharp-2.0</Package>
-    </Reference>
-    <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Package>gtk-sharp-2.0</Package>
-    </Reference>
-    <Reference Include="Mono.Cairo, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="wnck-sharp, Version=2.20.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Package>wnck-sharp-1.0</Package>
-    </Reference>
-    <Reference Include="Mono.Posix" />
-    <Reference Include="gio-sharp, Version=2.14.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Package>gio-sharp-2.0</Package>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="Wnck\Window_Extensions.cs" />
-    <Compile Include="Windowing\ClickAction.cs" />
-    <Compile Include="Windowing\WindowControl.cs" />
-    <Compile Include="Xlib\X11Atoms.cs" />
-    <Compile Include="Xlib\Xlib.cs" />
-    <Compile Include="Windowing\Position.cs" />
-    <Compile Include="Windowing\WindowMatcher.cs" />
-    <Compile Include="Windowing\DesktopItem.cs" />
-    <Compile Include="Windowing\DesktopFileChangedEventArgs.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Wnck\" />
-    <Folder Include="Windowing\" />
-    <Folder Include="Xlib\" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <ItemGroup>
-    <None Include="Docky.Windowing.dll.config">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Docky.Services\Docky.Services.csproj">
-      <Project>{8A6E0EDD-6443-4F99-9EAC-D9CC906F080D}</Project>
-      <Name>Docky.Services</Name>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file

=== removed file 'Docky.Windowing/Docky.Windowing.dll.config'
--- Docky.Windowing/Docky.Windowing.dll.config	2009-11-14 04:04:00 +0000
+++ Docky.Windowing/Docky.Windowing.dll.config	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-<configuration>
-        <dllmap dll="X11" target="libX11.so.6"/>
-        <dllmap dll="libgdk-x11" target="libgdk-x11-2.0.so.0"/>
-</configuration>
\ No newline at end of file

=== removed file 'Docky.Windowing/Makefile.am'
--- Docky.Windowing/Makefile.am	2009-12-11 09:59:30 +0000
+++ Docky.Windowing/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-# Simple component buildsystem
-include $(top_srcdir)/build.rules.core.mk
-
-ASSEMBLY = Docky.Windowing
-TARGET = library
-
-PKG_CONFIG_FILES = docky.windowing.pc
-
-FILES = \
-    AssemblyInfo.cs \
-    Wnck/Window_Extensions.cs \
-    Windowing/ClickAction.cs \
-    Windowing/DesktopItem.cs \
-    Windowing/WindowControl.cs \
-    Xlib/X11Atoms.cs \
-    Xlib/Xlib.cs \
-    Windowing/Position.cs \
-    Windowing/DesktopFileChangedEventArgs.cs \
-    Windowing/WindowMatcher.cs
-
-PROJECT_REFERENCES= \
-	Docky.Services
-	
-REFERENCES =  \
-	System \
-	System.Core \
-	Mono.Posix \
-	$(GLIB_SHARP_20_LIBS) \
-	$(GIO_SHARP_LIBS) \
-	$(GTK_SHARP_20_LIBS) \
-	$(WNCK_SHARP_10_LIBS) \
-	$(MONO_CAIRO_LIBS)
-
-EXTRA_DIST += Docky.Windowing.dll.config
-
-module_DATA += Docky.Windowing.dll.config

=== removed directory 'Docky.Windowing/Windowing'
=== removed file 'Docky.Windowing/Windowing/ClickAction.cs'
--- Docky.Windowing/Windowing/ClickAction.cs	2009-09-03 05:09:05 +0000
+++ Docky.Windowing/Windowing/ClickAction.cs	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-//  
-//  Copyright (C) 2009 GNOME Do
-// 
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-// 
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-// 
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-// 
-
-using System;
-
-namespace Docky.Windowing
-{
-	
-	
-	public enum ClickAction
-	{
-		Focus,
-		Minimize,
-		Restore,
-		None,
-	}
-}

=== removed directory 'Docky.Windowing/Wnck'
=== removed directory 'Docky.Windowing/Xlib'
=== removed file 'Docky.Windowing/docky.windowing.pc.in'
--- Docky.Windowing/docky.windowing.pc.in	2009-09-16 09:36:05 +0000
+++ Docky.Windowing/docky.windowing.pc.in	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-Name: Docky.Windowing
-Description: Docky Windowing.
-Version: @ABI_VERSION@
-
-Libs: -r:@expanded_libdir@/@PACKAGE@/Docky.Windowing.dll

=== modified file 'Docky/Docky.csproj'
--- Docky/Docky.csproj	2010-07-28 06:24:54 +0000
+++ Docky/Docky.csproj	2010-08-14 22:27:42 +0000
@@ -144,10 +144,6 @@
       <Project>{AB6E0EDD-6443-4F99-9EAC-DABC906F080D}</Project>
       <Name>Docky.Items</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Docky.Windowing\Docky.Windowing.csproj">
-      <Project>{888FCD95-7C79-45C4-A744-9C840DF4B9B0}</Project>
-      <Name>Docky.Windowing</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Docky.DBus\Docky.DBus.csproj">
       <Project>{487D3B93-FAAF-4734-B337-85810A60ACCF}</Project>
       <Name>Docky.DBus</Name>

=== modified file 'Docky/Docky/ConfigurationWindow.cs'
--- Docky/Docky/ConfigurationWindow.cs	2010-06-29 13:09:06 +0000
+++ Docky/Docky/ConfigurationWindow.cs	2010-08-14 22:27:42 +0000
@@ -32,6 +32,7 @@
 
 using Docky.Interface;
 using Docky.Services;
+using Docky.Services.Helpers;
 using Docky.Widgets;
 using Docky.Items;
 

=== modified file 'Docky/Docky/DockController.cs'
--- Docky/Docky/DockController.cs	2010-08-01 11:16:08 +0000
+++ Docky/Docky/DockController.cs	2010-08-14 22:27:42 +0000
@@ -33,6 +33,7 @@
 using Docky.Items;
 using Docky.Interface;
 using Docky.Services;
+using Docky.Services.Prefs;
 
 namespace Docky
 {

=== modified file 'Docky/Docky/Docky.cs'
--- Docky/Docky/Docky.cs	2010-07-28 06:24:54 +0000
+++ Docky/Docky/Docky.cs	2010-08-14 22:27:42 +0000
@@ -65,7 +65,7 @@
 			DockServices.System.SetProcessName ("docky");
 			
 			// cache main thread
-			SystemService.MainThread = Thread.CurrentThread;
+			DockServices.System.MainThread = Thread.CurrentThread;
 			
 			// check compositing
 			CheckComposite ();

=== modified file 'Docky/Docky/HelperTile.cs'
--- Docky/Docky/HelperTile.cs	2010-06-29 13:09:06 +0000
+++ Docky/Docky/HelperTile.cs	2010-08-14 22:27:42 +0000
@@ -22,11 +22,11 @@
 
 using Docky.Widgets;
 using Docky.Services;
+using Docky.Services.Helpers;
 
 namespace Docky
 {
 
-
 	public class HelperTile : AbstractTileObject
 	{
 		public Helper Helper { get; private set; }

=== modified file 'Docky/Docky/Interface/AutohideManager.cs'
--- Docky/Docky/Interface/AutohideManager.cs	2010-06-27 02:02:26 +0000
+++ Docky/Docky/Interface/AutohideManager.cs	2010-08-14 22:27:42 +0000
@@ -28,6 +28,7 @@
 using Wnck;
 
 using Docky.Services;
+using Docky.Services.Prefs;
 
 namespace Docky.Interface
 {

=== modified file 'Docky/Docky/Interface/DockDragTracker.cs'
--- Docky/Docky/Interface/DockDragTracker.cs	2010-06-29 16:27:45 +0000
+++ Docky/Docky/Interface/DockDragTracker.cs	2010-08-14 22:27:42 +0000
@@ -17,23 +17,17 @@
 
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.Linq;
-using System.Reflection;
 using System.Text;
 using System.Text.RegularExpressions;
 
-using Cairo;
 using Gdk;
 using Gtk;
-using Wnck;
 
 using Docky.Items;
 using Docky.CairoHelper;
-using Docky.Menus;
-using Docky.Painters;
 using Docky.Services;
-using Docky.Xlib;
+using Docky.Services.Prefs;
 
 namespace Docky.Interface
 {

=== modified file 'Docky/Docky/Interface/DockPreferences.cs'
--- Docky/Docky/Interface/DockPreferences.cs	2010-08-01 19:56:58 +0000
+++ Docky/Docky/Interface/DockPreferences.cs	2010-08-14 22:27:42 +0000
@@ -23,6 +23,7 @@
 using System.Linq;
 using System.IO;
 using System.Text;
+using System.Text.RegularExpressions;
 
 using Cairo;
 using Gdk;
@@ -30,7 +31,7 @@
 
 using Docky.Items;
 using Docky.Services;
-using System.Text.RegularExpressions;
+using Docky.Services.Prefs;
 
 namespace Docky.Interface
 {

=== modified file 'Docky/Docky/Interface/DockWindow.cs'
--- Docky/Docky/Interface/DockWindow.cs	2010-07-31 16:32:24 +0000
+++ Docky/Docky/Interface/DockWindow.cs	2010-08-14 22:27:42 +0000
@@ -18,11 +18,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Diagnostics;
 using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Text.RegularExpressions;
 
 using Cairo;
 using Gdk;
@@ -36,7 +32,7 @@
 using Docky.Menus;
 using Docky.Painters;
 using Docky.Services;
-using Docky.Xlib;
+using Docky.Services.Xlib;
 
 namespace Docky.Interface
 {
@@ -2787,10 +2783,10 @@
 			
 			IntPtr [] first_struts = new [] { struts [0], struts [1], struts [2], struts [3] };
 
-			Xlib.Xlib.XChangeProperty (GdkWindow, atoms._NET_WM_STRUT_PARTIAL, atoms.XA_CARDINAL,
+			X.XChangeProperty (GdkWindow, atoms._NET_WM_STRUT_PARTIAL, atoms.XA_CARDINAL,
 			                      (int) PropertyMode.PropModeReplace, struts);
 			
-			Xlib.Xlib.XChangeProperty (GdkWindow, atoms._NET_WM_STRUT, atoms.XA_CARDINAL, 
+			X.XChangeProperty (GdkWindow, atoms._NET_WM_STRUT, atoms.XA_CARDINAL, 
 			                      (int) PropertyMode.PropModeReplace, first_struts);
 		}
 		#endregion

=== modified file 'Docky/Docky/Items/DockyItem.cs'
--- Docky/Docky/Items/DockyItem.cs	2010-08-07 21:02:45 +0000
+++ Docky/Docky/Items/DockyItem.cs	2010-08-14 22:27:42 +0000
@@ -27,6 +27,7 @@
 
 using Docky.Menus;
 using Docky.Services;
+using Docky.Services.Prefs;
 
 namespace Docky.Items
 {

=== modified file 'Docky/Makefile.am'
--- Docky/Makefile.am	2010-07-28 06:24:54 +0000
+++ Docky/Makefile.am	2010-08-14 22:27:42 +0000
@@ -58,7 +58,6 @@
 	Docky.DBus \
 	Docky.Items \
 	Docky.Services \
-	Docky.Windowing \
 	Docky.Widgets
 
 REFERENCES =  \

=== modified file 'Docky/gtk-gui/gui.stetic'
--- Docky/gtk-gui/gui.stetic	2010-07-18 10:49:09 +0000
+++ Docky/gtk-gui/gui.stetic	2010-08-14 22:27:42 +0000
@@ -9,7 +9,6 @@
     <widget-library name="gnomedesktop-sharp, Version=2.20.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <widget-library name="../../Docky.Services/bin/Debug/Docky.Services.dll" />
     <widget-library name="../../Docky.Items/bin/Debug/Docky.Items.dll" />
-    <widget-library name="../../Docky.Windowing/bin/Debug/Docky.Windowing.dll" />
     <widget-library name="../../Docky.DBus/bin/Debug/Docky.DBus.dll" />
     <widget-library name="../../Docky.Widgets/bin/Debug/Docky.Widgets.dll" />
     <widget-library name="../bin/Debug/Docky.exe" internal="true" />

=== modified file 'Makefile.am'
--- Makefile.am	2010-06-01 10:30:05 +0000
+++ Makefile.am	2010-08-14 22:27:42 +0000
@@ -9,7 +9,6 @@
 	Docky.CairoHelper \
 	Docky.Services \
 	Docky.Widgets \
-	Docky.Windowing \
 	Docky.Items \
 	Docky.DBus \
 	StandardPlugins \

=== modified file 'StandardPlugins/Clock/src/ClockDockItem.cs'
--- StandardPlugins/Clock/src/ClockDockItem.cs	2010-06-16 08:40:55 +0000
+++ StandardPlugins/Clock/src/ClockDockItem.cs	2010-08-14 22:27:42 +0000
@@ -31,6 +31,7 @@
 using Docky.Items;
 using Docky.Menus;
 using Docky.Services;
+using Docky.Services.Prefs;
 using Docky.Widgets;
 
 namespace Clock

=== modified file 'StandardPlugins/Desktop/Desktop.csproj'
--- StandardPlugins/Desktop/Desktop.csproj	2010-08-01 19:51:00 +0000
+++ StandardPlugins/Desktop/Desktop.csproj	2010-08-14 22:27:42 +0000
@@ -60,10 +60,6 @@
       <Project>{B23E0EDD-6443-4F99-9EAC-B7CC906F080D}</Project>
       <Name>Docky.CairoHelper</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Docky.Windowing\Docky.Windowing.csproj">
-      <Project>{888FCD95-7C79-45C4-A744-9C840DF4B9B0}</Project>
-      <Name>Docky.Windowing</Name>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>

=== modified file 'StandardPlugins/Desktop/Makefile.am'
--- StandardPlugins/Desktop/Makefile.am	2010-03-07 15:08:38 +0000
+++ StandardPlugins/Desktop/Makefile.am	2010-08-14 22:27:42 +0000
@@ -13,7 +13,6 @@
 PROJECT_REFERENCES= \
 	Docky.CairoHelper \
 	Docky.Items \
-	Docky.Windowing \
 	Docky.Services
 
 REFERENCES =  \

=== modified file 'StandardPlugins/GMail/src/GMailPreferences.cs'
--- StandardPlugins/GMail/src/GMailPreferences.cs	2010-04-04 06:28:19 +0000
+++ StandardPlugins/GMail/src/GMailPreferences.cs	2010-08-14 22:27:42 +0000
@@ -18,6 +18,7 @@
 using System;
 
 using Docky.Services;
+using Docky.Services.Prefs;
 
 namespace GMail
 {

=== modified file 'StandardPlugins/NPR/src/NPR.cs'
--- StandardPlugins/NPR/src/NPR.cs	2010-04-12 12:44:59 +0000
+++ StandardPlugins/NPR/src/NPR.cs	2010-08-14 22:27:42 +0000
@@ -19,7 +19,6 @@
 using System.Web;
 using System.Linq;
 using System.Net;
-using System.Xml;
 using System.Xml.Linq;
 using System.Text;
 using System.IO;
@@ -27,6 +26,7 @@
 using System.Collections.Generic;
 
 using Docky.Services;
+using Docky.Services.Prefs;
 
 namespace NPR
 {

=== modified file 'StandardPlugins/RecentDocuments/src/RecentDocumentsItem.cs'
--- StandardPlugins/RecentDocuments/src/RecentDocumentsItem.cs	2010-07-28 23:10:53 +0000
+++ StandardPlugins/RecentDocuments/src/RecentDocumentsItem.cs	2010-08-14 22:27:42 +0000
@@ -26,6 +26,7 @@
 using Docky.Items;
 using Docky.Menus;
 using Docky.Services;
+using Docky.Services.Prefs;
 
 namespace RecentDocuments
 {

=== modified file 'StandardPlugins/SessionManager/src/SessionManagerItem.cs'
--- StandardPlugins/SessionManager/src/SessionManagerItem.cs	2010-06-23 01:34:47 +0000
+++ StandardPlugins/SessionManager/src/SessionManagerItem.cs	2010-08-14 22:27:42 +0000
@@ -30,6 +30,7 @@
 using Docky.Items;
 using Docky.Menus;
 using Docky.Services;
+using Docky.Services.Prefs;
 
 namespace SessionManager
 {

=== modified file 'StandardPlugins/Timer/src/TimerMainDockItem.cs'
--- StandardPlugins/Timer/src/TimerMainDockItem.cs	2010-07-23 07:29:35 +0000
+++ StandardPlugins/Timer/src/TimerMainDockItem.cs	2010-08-14 22:27:42 +0000
@@ -22,6 +22,7 @@
 using Docky.Items;
 using Docky.Menus;
 using Docky.Services;
+using Docky.Services.Prefs;
 
 namespace Timer
 {

=== modified file 'StandardPlugins/Trash/src/TrashDockItem.cs'
--- StandardPlugins/Trash/src/TrashDockItem.cs	2010-08-01 19:56:58 +0000
+++ StandardPlugins/Trash/src/TrashDockItem.cs	2010-08-14 22:27:42 +0000
@@ -25,6 +25,7 @@
 using Docky.Items;
 using Docky.Menus;
 using Docky.Services;
+using Docky.Services.Prefs;
 
 namespace Trash
 {

=== modified file 'StandardPlugins/Weather/src/WeatherPreferences.cs'
--- StandardPlugins/Weather/src/WeatherPreferences.cs	2010-05-14 10:20:07 +0000
+++ StandardPlugins/Weather/src/WeatherPreferences.cs	2010-08-14 22:27:42 +0000
@@ -19,6 +19,7 @@
 using System.Globalization;
 
 using Docky.Services;
+using Docky.Services.Prefs;
 
 namespace WeatherDocklet
 {

=== modified file 'StandardPlugins/WorkspaceSwitcher/Makefile.am'
--- StandardPlugins/WorkspaceSwitcher/Makefile.am	2010-06-13 05:09:24 +0000
+++ StandardPlugins/WorkspaceSwitcher/Makefile.am	2010-08-14 22:27:42 +0000
@@ -14,7 +14,6 @@
 PROJECT_REFERENCES= \
 	Docky.CairoHelper \
 	Docky.Items \
-	Docky.Windowing \
 	Docky.Services
 
 REFERENCES =  \

=== modified file 'StandardPlugins/WorkspaceSwitcher/WorkspaceSwitcher.csproj'
--- StandardPlugins/WorkspaceSwitcher/WorkspaceSwitcher.csproj	2010-06-13 05:09:24 +0000
+++ StandardPlugins/WorkspaceSwitcher/WorkspaceSwitcher.csproj	2010-08-14 22:27:42 +0000
@@ -6,7 +6,7 @@
     <ProductVersion>9.0.21022</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{66939AAB-0832-4D2D-8282-3E29AA772B69}</ProjectGuid>
-    <OutputType>Exe</OutputType>
+    <OutputType>Library</OutputType>
     <RootNamespace>WorkspaceSwitcher</RootNamespace>
     <AssemblyName>WorkspaceSwitcher</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
@@ -45,10 +45,6 @@
       <Project>{AB6E0EDD-6443-4F99-9EAC-DABC906F080D}</Project>
       <Name>Docky.Items</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Docky.Windowing\Docky.Windowing.csproj">
-      <Project>{888FCD95-7C79-45C4-A744-9C840DF4B9B0}</Project>
-      <Name>Docky.Windowing</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\Docky.Services\Docky.Services.csproj">
       <Project>{8A6E0EDD-6443-4F99-9EAC-D9CC906F080D}</Project>
       <Name>Docky.Services</Name>
@@ -70,6 +66,7 @@
     <Reference Include="wnck-sharp, Version=2.20.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <Package>wnck-sharp-1.0</Package>
     </Reference>
+    <Reference Include="Mono.Posix" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file

=== modified file 'StandardPlugins/WorkspaceSwitcher/src/WorkspaceSwitcherDockItem.cs'
--- StandardPlugins/WorkspaceSwitcher/src/WorkspaceSwitcherDockItem.cs	2010-08-07 12:11:12 +0000
+++ StandardPlugins/WorkspaceSwitcher/src/WorkspaceSwitcherDockItem.cs	2010-08-14 22:27:42 +0000
@@ -33,6 +33,7 @@
 using Docky.Items;
 using Docky.Menus;
 using Docky.Services;
+using Docky.Services.Prefs;
 
 namespace WorkspaceSwitcher
 {

=== modified file 'configure.ac'
--- configure.ac	2010-07-29 05:57:36 +0000
+++ configure.ac	2010-08-14 22:27:42 +0000
@@ -99,18 +99,6 @@
 AC_SUBST([NOTIFY_SHARP_LIBS])
 AC_SUBST([WNCK_SHARP_10_LIBS])
 
-dnl Docky references
-DOCKY_CAIRO_LIBS="-r:$(pwd)/build/Docky.CairoHelper.dll"
-AC_SUBST([DOCKY_CAIRO_LIBS])
-DOCKY_ITEMS_LIBS="-r:$(pwd)/build/Docky.Items.dll"
-AC_SUBST([DOCKY_ITEMS_LIBS])
-DOCKY_SERVICES_LIBS="-r:$(pwd)/build/Docky.Services.dll"
-AC_SUBST([DOCKY_SERVICES_LIBS])
-DOCKY_WIDGETS_LIBS="-r:$(pwd)/build/Docky.Widgets.dll"
-AC_SUBST([DOCKY_WIDGETS_LIBS])
-DOCKY_WINDOWING_LIBS="-r:$(pwd)/build/Docky.Windowing.dll"
-AC_SUBST([DOCKY_WINDOWING_LIBS])
-
 AM_CONDITIONAL(CONFIG_REQUESTED, test -z "")
 
 dnl {{{ run with heapshot
@@ -164,7 +152,6 @@
 Docky.Widgets/Makefile
 Docky.Services/Makefile
 Docky.Services/AssemblyInfo.cs
-Docky.Windowing/Makefile
 Docky/docky
 Docky/AssemblyInfo.cs
 StandardPlugins/Makefile