Merge lp:~psybers/docky/dockmanager-dbus into lp:docky

[Robert Dyer]

[lp:~psybers/docky/dockmanager-dbus]

1382. By Robert Dyer on 2010-05-27

remove overlay images

1383. By Robert Dyer on 2010-05-27

update MD build

[Rico Tzschichholz (ricotz)]

It doesnt compile, because po/POTFILES.in needs to be fixed.

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in 2010-05-27 09:01:27 +0000
+++ po/POTFILES.in 2010-05-27 12:29:00 +0000
@@ -7,6 +7,7 @@
 Docky/Docky/Items/DockyItem.cs
 Docky/gtk-gui/Docky.ConfigurationWindow.cs
 Docky/gtk-gui/Docky.Interface.DockPreferences.cs
+Docky.DBus/Docky.DBus/DockManagerDBus.cs
 Docky.Items/Docky.Items/AbstractDockItem.cs
 Docky.Items/Docky.Items/ApplicationDockItem.cs
 Docky.Items/Docky.Items/ColoredIconDockItem.cs
@@ -46,4 +47,3 @@
 StandardPlugins/Weather/src/WeatherDocklet.cs
 StandardPlugins/Weather/src/WeatherForecast.cs
 StandardPlugins/Weather/src/WeatherPainter.cs
-scripts/zeitgeist_menus.py

review: Needs Fixing

[lp:~psybers/docky/dockmanager-dbus]

1384. By Robert Dyer on 2010-05-27

fix build

[Robert Dyer (psybers)]

@Rico: fixed.

[Rico Tzschichholz (ricotz)]

review: Approve

=== modified file 'Docky.DBus/Docky.DBus.csproj'
--- Docky.DBus/Docky.DBus.csproj	2010-05-27 12:14:04 +0000
+++ Docky.DBus/Docky.DBus.csproj	2010-05-27 18:20:46 +0000
@@ -64,8 +64,10 @@
   <ItemGroup>
     <Compile Include="Docky.DBus\DBusManager.cs" />
     <Compile Include="Docky.DBus\IDockyDBus.cs" />
-    <Compile Include="Docky.DBus\IDockyDBusItem.cs" />
-    <Compile Include="Docky.DBus\DockyDBusItem.cs" />
+    <Compile Include="Docky.DBus\IDockManagerDBus.cs" />
+    <Compile Include="Docky.DBus\IDockManagerDBusItem.cs" />
+    <Compile Include="Docky.DBus\DockManagerDBus.cs" />
+    <Compile Include="Docky.DBus\DockManagerDBusItem.cs" />
     <Compile Include="Docky.DBus\DockyDBus.cs" />
     <Compile Include="Docky.DBus\RemoteMenuEntry.cs" />
     <Compile Include="Docky.DBus\RemoteFileMenuEntry.cs" />
@@ -85,4 +87,4 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
\ No newline at end of file
+</Project>

=== modified file 'Docky.DBus/Docky.DBus/DBusManager.cs'
--- Docky.DBus/Docky.DBus/DBusManager.cs	2010-05-22 09:31:09 +0000
+++ Docky.DBus/Docky.DBus/DBusManager.cs	2010-05-27 18:20:46 +0000
@@ -32,74 +32,90 @@
 {
 	public class DBusManager
 	{
+		#region The Private/non-standard Bus
+		
 		const string BusName        = "org.gnome.Docky";
 		const string DockyPath      = "/org/gnome/Docky";
 		const string ItemsPath      = "/org/gnome/Docky/Items";
-		
-		public event Action QuitCalled;
-		public event Action SettingsCalled;
-		public event Action AboutCalled;
-		
-		static DBusManager manager;
-		public static DBusManager Default {
-			get {
-				return manager;
-			}
-		}
-		
-		static DBusManager ()
-		{
-			manager = new DBusManager ();
-		}
 
 		DockyDBus docky;
-		Dictionary<AbstractDockItem, DockyDBusItem> item_dict;
-		
-		internal IEnumerable<AbstractDockItem> Items {
-			get {
-				return item_dict.Keys;
-			}
-		}
-		
-		private DBusManager ()
-		{
-		}
-		
-		public void Initialize ()
-		{
-			Bus bus = Bus.Session;
-			
+		
+		bool InitializePrivateBus (Bus bus)
+		{
 			if (bus.RequestName (BusName) != RequestNameReply.PrimaryOwner) {
-				Log<DBusManager>.Error ("Bus Name is already owned");
-				return;
+				Log<DBusManager>.Error ("Bus Name '" + BusName + "' is already owned");
+				return false;
 			}
 			
-			item_dict = new Dictionary<AbstractDockItem, DockyDBusItem> ();
-			
-			ObjectPath dockyPath = new ObjectPath (DockyPath);
 			docky = new DockyDBus ();
 			docky.QuitCalled += HandleQuitCalled;
 			docky.SettingsCalled += HandleSettingsCalled;
 			docky.AboutCalled += HandleAboutCalled;
 			
+			ObjectPath dockyPath = new ObjectPath (DockyPath);
 			bus.Register (dockyPath, docky);
-			
-			DockServices.Helpers.HelperStatusChanged += delegate(object sender, HelperStatusChangedEventArgs e) {
-				// if a script has stopped running, trigger a refresh
-				if (!e.IsRunning)
-					ForceRefresh ();
-			};
-		}
-		
-		public void ForceRefresh ()
-		{
-			foreach (DockyDBusItem item in item_dict.Values)
-				item.TriggerConfirmation ();
-		}
-		
-		public void Shutdown ()
-		{
-			docky.Shutdown ();
+			Log<DBusManager>.Debug ("DBus Registered: " + BusName);
+			
+			return true;
+		}
+		
+		public void HandleAboutCalled ()
+		{
+			if (AboutCalled != null)
+				AboutCalled ();
+		}
+		
+		public void HandleSettingsCalled ()
+		{
+			if (SettingsCalled != null)
+				SettingsCalled ();
+		}
+		
+		public void HandleQuitCalled ()
+		{
+			if (QuitCalled != null)
+				QuitCalled ();
+		}
+		
+		#endregion
+		
+		#region The Shared/standard Bus
+		
+		const string DockManagerBusName   = "org.freedesktop.DockManager";
+		const string DockManagerPath      = "/org/freedesktop/DockManager";
+		const string DockManagerItemsPath = "/org/freedesktop/DockManager/Item";
+
+		internal IEnumerable<AbstractDockItem> Items {
+			get {
+				return item_dict.Keys;
+			}
+		}
+		
+		Dictionary<AbstractDockItem, DockManagerDBusItem> item_dict;
+		
+		DockManagerDBus dock_manager;
+		
+		bool InitializeSharedBus (Bus bus)
+		{
+			if (bus.RequestName (DockManagerBusName) != RequestNameReply.PrimaryOwner) {
+				Log<DBusManager>.Error ("Bus Name '" + DockManagerBusName + "' is already owned");
+				return false;
+			}
+			
+			item_dict = new Dictionary<AbstractDockItem, DockManagerDBusItem> ();
+			
+			dock_manager = new DockManagerDBus ();
+			
+			ObjectPath dockPath = new ObjectPath (DockManagerPath);
+			bus.Register (dockPath, dock_manager);
+			Log<DBusManager>.Debug ("DBus Registered: " + DockManagerBusName);
+			
+			return true;
+		}
+		
+		internal string PathForItem (AbstractDockItem item)
+		{
+			return DockManagerItemsPath + Math.Abs (item.UniqueID ().GetHashCode ());
 		}
 		
 		public void RegisterItem (AbstractDockItem item)
@@ -107,13 +123,13 @@
 			if (item_dict.ContainsKey (item))
 				return;
 			
+			DockManagerDBusItem dbusitem = new DockManagerDBusItem (item);
+			item_dict[item] = dbusitem;
+			
 			string path = PathForItem (item);
-			DockyDBusItem dbusitem = new DockyDBusItem (item);
-			
-			item_dict[item] = dbusitem;
 			Bus.Session.Register (new ObjectPath (path), dbusitem);
 			
-			docky.OnItemAdded (path);
+			dock_manager.OnItemAdded (path);
 		}
 		
 		public void UnregisterItem (AbstractDockItem item)
@@ -134,31 +150,53 @@
 				return;
 			}
 			
-			docky.OnItemRemoved (PathForItem (item));
-		}
-		
-		internal string PathForItem (AbstractDockItem item)
-		{
-			
-			return ItemsPath + "/" + Math.Abs (item.UniqueID ().GetHashCode ());
-		}
-		
-		public void HandleAboutCalled ()
-		{
-			if (AboutCalled != null)
-				AboutCalled ();
-		}
-		
-		public void HandleSettingsCalled ()
-		{
-			if (SettingsCalled != null)
-				SettingsCalled ();
-		}
-		
-		public void HandleQuitCalled ()
-		{
-			if (QuitCalled != null)
-				QuitCalled ();
+			dock_manager.OnItemRemoved (PathForItem (item));
+		}
+		
+		#endregion
+		
+		public event Action QuitCalled;
+		public event Action SettingsCalled;
+		public event Action AboutCalled;
+		
+		public static DBusManager Default { get; protected set; }
+		
+		static DBusManager ()
+		{
+			Default = new DBusManager ();
+		}
+		
+		private DBusManager () { }
+		
+		public void Initialize ()
+		{
+			Bus bus = Bus.Session;
+			
+			if (!(InitializePrivateBus (bus) | InitializeSharedBus (bus)))
+				return;
+			
+			DockServices.Helpers.HelperStatusChanged += delegate(object sender, HelperStatusChangedEventArgs e) {
+				// if a script has stopped running, trigger a refresh
+				if (!e.IsRunning)
+					ForceRefresh ();
+			};
+		}
+		
+		public void ForceRefresh ()
+		{
+			foreach (DockManagerDBusItem item in item_dict.Values)
+				item.TriggerConfirmation ();
+		}
+		
+		public void Shutdown ()
+		{
+			if (docky != null) {
+				docky.QuitCalled -= HandleQuitCalled;
+				docky.SettingsCalled -= HandleSettingsCalled;
+				docky.AboutCalled -= HandleAboutCalled;
+				
+				docky.Shutdown ();
+			}
 		}
 	}
 }

=== added file 'Docky.DBus/Docky.DBus/DockManagerDBus.cs'
--- Docky.DBus/Docky.DBus/DockManagerDBus.cs	1970-01-01 00:00:00 +0000
+++ Docky.DBus/Docky.DBus/DockManagerDBus.cs	2010-05-27 18:20:46 +0000
@@ -0,0 +1,122 @@
+//  
+//  Copyright (C) 2010 Robert Dyer
+// 
+//  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.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+
+using Docky.Items;
+
+namespace Docky.DBus
+{
+	public class DockManagerDBus : IDockManagerDBus
+	{
+		#region IDockyDBus implementation
+		public event ItemChangedHandler ItemAdded;
+		
+		public event ItemChangedHandler ItemRemoved;
+		
+		public string[] GetCapabilities ()
+		{
+			return new string[] {
+				//"dock-item-message",
+				"dock-item-tooltip",
+				"dock-item-badge",
+				//"dock-item-progress",
+				//"dock-item-visible",
+				"dock-item-icon-file",
+				"dock-item-attention",
+				"dock-item-waiting",
+				
+				"menu-item-with-label",
+				"menu-item-with-uri",
+				"menu-item-icon-name",
+				"menu-item-icon-file",
+				"menu-item-container-title",
+				
+				"x-docky-uses-timeout"
+			};
+		}
+		
+		public string[] GetItems ()
+		{
+			return DBusManager.Default.Items
+				.Select (adi => DBusManager.Default.PathForItem (adi))
+				.ToArray ();
+		}
+
+		public string[] GetItemsByName (string name)
+		{
+			return DBusManager.Default.Items
+				.OfType<ApplicationDockItem> ()
+				.Where (adi => adi.OwnedItem.GetString ("Name") == name)
+				.Select (adi => DBusManager.Default.PathForItem (adi))
+				.DefaultIfEmpty ("")
+				.ToArray ();
+		}
+
+		public string[] GetItemsByDesktopFile (string path)
+		{
+			return DBusManager.Default.Items
+				.OfType<ApplicationDockItem> ()
+				.Where (adi => adi.OwnedItem.Path == path)
+				.Select (adi => DBusManager.Default.PathForItem (adi))
+				.DefaultIfEmpty ("")
+				.ToArray ();
+		}
+		
+		public string[] GetItemsByPID (uint pid)
+		{
+			return DBusManager.Default.Items
+				.OfType<WnckDockItem> ()
+				.Where (wdi => wdi.Windows.Any (w => (uint) w.Pid == pid))
+				.Select (wdi => DBusManager.Default.PathForItem (wdi))
+				.DefaultIfEmpty ("")
+				.ToArray ();
+		}
+		
+		public string GetItemByXid (uint xid)
+		{
+			return DBusManager.Default.Items
+				.OfType<WnckDockItem> ()
+				.Where (wdi => wdi.Windows.Any (w => (uint) w.Xid == xid))
+				.Select (wdi => DBusManager.Default.PathForItem (wdi))
+				.DefaultIfEmpty ("")
+				.FirstOrDefault ();
+		}
+		
+		#endregion
+
+		public DockManagerDBus ()
+		{
+		}
+		
+		public void OnItemAdded (string path)
+		{
+			if (ItemAdded != null)
+				ItemAdded (path);
+		}
+		
+		public void OnItemRemoved (string path)
+		{
+			if (ItemRemoved != null)
+				ItemRemoved (path);
+		}
+	}
+}

=== added file 'Docky.DBus/Docky.DBus/DockManagerDBusItem.cs'
--- Docky.DBus/Docky.DBus/DockManagerDBusItem.cs	1970-01-01 00:00:00 +0000
+++ Docky.DBus/Docky.DBus/DockManagerDBusItem.cs	2010-05-27 18:20:46 +0000
@@ -0,0 +1,328 @@
+//  
+//  Copyright (C) 2010 Robert Dyer
+// 
+//  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.Collections.Generic;
+using System.Linq;
+
+using GLib;
+
+using org.freedesktop.DBus;
+using NDesk.DBus;
+
+using Docky.Items;
+using Docky.Menus;
+
+namespace Docky.DBus
+{
+	public struct ItemTuple
+	{
+		public string Name;
+		public string Icon;
+		public string Title;
+		
+		public ItemTuple (string name, string icon, string title)
+		{
+			Name = name;
+			Icon = icon;
+			Title = title;
+		}
+	}
+	
+	public class DockManagerDBusItem : IDockManagerDBusItem, IDisposable
+	{
+		uint timer;
+		Dictionary<uint, RemoteMenuEntry> items = new Dictionary<uint, RemoteMenuEntry> ();
+		Dictionary<uint, DateTime> update_time = new Dictionary<uint, DateTime> ();
+		
+		List<uint> known_ids = new List<uint> ();
+		
+		AbstractDockItem owner;
+		
+		string DesktopFile {
+			get {
+				if (owner is ApplicationDockItem)
+					return (owner as ApplicationDockItem).OwnedItem.Path;
+				return "";
+			}
+		}
+		
+		string Uri {
+			get {
+				if (owner is FileDockItem)
+					return (owner as FileDockItem).Uri;
+				return "";
+			}
+		}
+		
+		public DockManagerDBusItem (AbstractDockItem item)
+		{
+			owner = item;
+			
+			timer = GLib.Timeout.Add (4 * 60 * 1000, delegate {
+				TriggerConfirmation ();
+				return true;
+			});
+		}
+		
+		public void TriggerConfirmation ()
+		{
+			if (ItemConfirmationNeeded != null)
+				ItemConfirmationNeeded ();
+			
+			GLib.Timeout.Add (30 * 1000, delegate {
+				foreach (uint i in update_time
+					.Where (kvp => (DateTime.UtcNow - kvp.Value).TotalMinutes > 1)
+					.Select (kvp => kvp.Key))
+					RemoveMenuItem (i);
+				
+				return false;
+			});
+		}
+		
+		uint GetRandomID ()
+		{
+			Random rand = new Random ();
+			
+			uint number;
+			
+			do {
+				//FIXME should we ever get 100,000 items in here, I hope we crash, though we will likely get an infinite loop
+				number = (uint) rand.Next (0, 100000);
+			} while (known_ids.BinarySearch (number) >= 0);
+			
+			known_ids.Add (number);
+			known_ids.Sort ();
+			
+			return number;
+		}
+		
+		public event Action ItemConfirmationNeeded;
+		
+		public void ConfirmItem (uint item)
+		{
+			update_time[item] = DateTime.UtcNow;
+		}
+		
+		#region IDockManagerDBusItem implementation
+		
+		public object Get (string iface, string property)
+		{
+			if (iface != "org.freedesktop.DockItem")
+				return null;
+			
+			if (property == "DesktopFile")
+				return DesktopFile;
+			
+			if (property == "Uri")
+				return Uri;
+			
+			return null;
+		}
+		
+		public void Set (string iface, string property, object val)
+		{
+		}
+		
+		public IDictionary<string,object> GetAll (string iface)
+		{
+			if (iface != "org.freedesktop.DockItem")
+				return null;
+			
+			Dictionary<string, object> items = new Dictionary<string, object> ();
+			
+			items["DesktopFile"] = DesktopFile;
+			items["Uri"] = Uri;
+			
+			return items;
+		}
+		
+		#endregion
+		
+		#region IDockManagerDBusItem implementation
+		
+		public event MenuItemActivatedHandler MenuItemActivated;
+		
+		public uint AddMenuItem (IDictionary<string, object> dict)
+		{
+			string uri = "";
+			if (dict.ContainsKey ("uri"))
+				uri = (string) dict ["uri"];
+			
+			string title = "";
+			if (dict.ContainsKey ("container-title"))
+				title = (string) dict ["container-title"];
+			
+			uint number = GetRandomID ();
+			
+			if (uri.Length > 0) {
+				RemoteFileMenuEntry rem = new RemoteFileMenuEntry (number, FileFactory.NewForUri (uri), title);
+				
+				AddToList (rem, number);
+			} else {
+				string label = "";
+				if (dict.ContainsKey ("label"))
+					label = (string) dict ["label"];
+				
+				string iconName = "";
+				if (dict.ContainsKey ("icon-name"))
+					iconName = (string) dict ["icon-name"];
+				
+				string iconFile = "";
+				if (dict.ContainsKey ("icon-file"))
+					iconFile = (string) dict ["icon-file"];
+				
+				RemoteMenuEntry rem;
+				if (iconFile.Length > 0)
+					rem = new RemoteMenuEntry (number, label, iconFile, title);
+				else
+					rem = new RemoteMenuEntry (number, label, iconName, title);
+				rem.Clicked += HandleActivated;
+				
+				AddToList (rem, number);
+			}
+			
+			return number;
+		}
+		
+		public void RemoveMenuItem (uint item)
+		{
+			if (items.ContainsKey (item)) {
+				RemoteMenuEntry entry = items[item];
+				entry.Clicked -= HandleActivated;
+				
+				items.Remove (item);
+				
+				owner.RemoteMenuItems.Remove (entry);
+			}
+			
+			known_ids.Remove (item);
+		}
+		
+		public void UpdateDockItem (IDictionary<string, object> dict)
+		{
+			foreach (string key in dict.Keys)
+			{
+				if (key == "tooltip") {
+					owner.SetRemoteText ((string) dict [key]);
+				} else if (key == "badge") {
+					owner.SetRemoteBadgeText ((string) dict [key]);
+				} else if (key == "icon-file") {
+					if (owner is IconDockItem)
+						(owner as IconDockItem).SetRemoteIcon ((string) dict [key]);
+				} else if (key == "attention") {
+					if ((bool) dict [key])
+						owner.State |= ItemState.Urgent;
+					else
+						owner.State &= ~ItemState.Urgent;
+				} else if (key == "waiting") {
+					if ((bool) dict [key])
+						owner.State |= ItemState.Wait;
+					else
+						owner.State &= ~ItemState.Wait;
+				}
+			}
+		}
+		
+		#endregion
+		
+		private void AddToList (RemoteMenuEntry entry, uint id)
+		{
+			items[id] = entry;
+			update_time[id] = DateTime.UtcNow;
+			
+			//TODO Insert items into list... this is stupid but whatever fix later
+			foreach (MenuItem item in items.Values)
+				owner.RemoteMenuItems.Remove (item);
+			
+			MenuListContainer _container = MenuListContainer.Footer + 1;
+			var groupedItems = items.Values
+				.GroupBy (rmi => rmi.Title)
+				.OrderBy (g => g.Key);
+			
+			foreach (var itemGroup in groupedItems) {
+				MenuListContainer container;
+				
+				switch (itemGroup.Key.ToLower ()) {
+				case "actions":
+					container = MenuListContainer.Actions;
+					break;
+				case "relateditems":
+					container = MenuListContainer.RelatedItems;
+					break;
+				case "windows":
+					container = MenuListContainer.Windows;
+					break;
+				case "header":
+					container = MenuListContainer.Header;
+					break;
+				case "footer":
+					container = MenuListContainer.Footer;
+					break;
+				default:
+					container = _container;
+					owner.RemoteMenuItems.SetContainerTitle (container, itemGroup.Key);
+					break;
+				}
+				
+				foreach (MenuItem item in itemGroup.OrderBy (i => i.Text)) {
+					owner.RemoteMenuItems[container].Add (item);
+				}
+				_container++;
+			}
+		}
+		
+		public ItemTuple GetItem (uint item)
+		{
+			if (!items.ContainsKey (item))
+				return new ItemTuple ("", "", "");
+			
+			RemoteMenuEntry entry = items[item];
+			return new ItemTuple (entry.Text, entry.Icon, entry.Title);
+		}
+			
+		void HandleActivated (object sender, EventArgs args)
+		{
+			if (!(sender is RemoteMenuEntry))
+				return;
+			
+			if (MenuItemActivated != null)
+				MenuItemActivated ((sender as RemoteMenuEntry).ID);
+		}
+		
+		#region IDisposable implementation
+		
+		public void Dispose ()
+		{
+			if (timer > 0)
+				GLib.Source.Remove (timer);
+			
+			known_ids.Clear ();
+			update_time.Clear ();
+			
+			foreach (RemoteMenuEntry m in items.Values) {
+				m.Clicked -= HandleActivated;
+				m.Dispose ();
+			}
+			items.Clear ();
+			
+			owner = null;
+		}
+		
+		#endregion
+	}
+}

=== modified file 'Docky.DBus/Docky.DBus/DockyDBus.cs'
--- Docky.DBus/Docky.DBus/DockyDBus.cs	2010-05-22 09:31:09 +0000
+++ Docky.DBus/Docky.DBus/DockyDBus.cs	2010-05-27 18:20:46 +0000
@@ -32,64 +32,21 @@
 		public event Action AboutCalled;
 		
 		#region IDockyDBus implementation
-		public event ItemChangedHandler ItemAdded;
-		
-		public event ItemChangedHandler ItemRemoved;
 		
 		public event Action ShuttingDown;
 		
-		public string[] DockItemPaths ()
-		{
-			return DBusManager.Default.Items
-				.Select (adi => DBusManager.Default.PathForItem (adi))
-				.ToArray ();
-		}
-
-		public string DockItemPathForDesktopID (string id)
-		{
-			return DBusManager.Default.Items
-				.OfType<ApplicationDockItem> ()
-				.Where (adi => adi.OwnedItem.DesktopID == id)
-				.Select (adi => DBusManager.Default.PathForItem (adi))
-				.DefaultIfEmpty ("")
-				.FirstOrDefault ();
-		}
-
-		public string DockItemPathForDesktopFile (string path)
-		{
-			return DBusManager.Default.Items
-				.OfType<ApplicationDockItem> ()
-				.Where (adi => adi.OwnedItem.Path == path)
-				.Select (adi => DBusManager.Default.PathForItem (adi))
-				.DefaultIfEmpty ("")
-				.FirstOrDefault ();
-		}
-		
-		public string DockItemPathForWindowXID (uint xid)
-		{
-			return DBusManager.Default.Items
-				.OfType<WnckDockItem> ()
-				.Where (wdi => wdi.Windows.Any (w => (uint) w.Xid == xid))
-				.Select (wdi => DBusManager.Default.PathForItem (wdi))
-				.DefaultIfEmpty ("")
-				.FirstOrDefault ();
-		}
-		
-		
 		public void ShowAbout ()
 		{
 			if (AboutCalled != null)
 				AboutCalled ();
 		}
 		
-		
 		public void ShowSettings ()
 		{
 			if (SettingsCalled != null)
 				SettingsCalled ();
 		}
 		
-		
 		public void Quit ()
 		{
 			if (QuitCalled != null)
@@ -97,27 +54,11 @@
 		}
 		
 		#endregion
-
-		public DockyDBus ()
-		{
-		}
 		
 		public void Shutdown ()
 		{
 			if (ShuttingDown != null)
 				ShuttingDown ();
 		}
-		
-		public void OnItemAdded (string path)
-		{
-			if (ItemAdded != null)
-				ItemAdded (path);
-		}
-		
-		public void OnItemRemoved (string path)
-		{
-			if (ItemRemoved != null)
-				ItemRemoved (path);
-		}
 	}
 }

=== removed file 'Docky.DBus/Docky.DBus/DockyDBusItem.cs'
--- Docky.DBus/Docky.DBus/DockyDBusItem.cs	2010-05-08 22:40:25 +0000
+++ Docky.DBus/Docky.DBus/DockyDBusItem.cs	1970-01-01 00:00:00 +0000
@@ -1,357 +0,0 @@
-//  
-//  Copyright (C) 2009 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
-//  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.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Text;
-
-using GLib;
-
-using Docky.Items;
-using Docky.Menus;
-
-namespace Docky.DBus
-{
-	public struct ItemTuple
-	{
-		public string Name;
-		public string Icon;
-		public string Title;
-		
-		public ItemTuple (string name, string icon, string title)
-		{
-			Name = name;
-			Icon = icon;
-			Title = title;
-		}
-	}
-	
-	public class DockyDBusItem : IDockyDBusItem, IDisposable
-	{
-		uint timer;
-		Dictionary<uint, RemoteMenuEntry> items;
-		Dictionary<uint, DateTime> update_time;
-		
-		List<uint> known_ids;
-		
-		AbstractDockItem owner;
-		
-		public DockyDBusItem (AbstractDockItem item)
-		{
-			owner = item;
-			known_ids = new List<uint> ();
-			items = new Dictionary<uint, RemoteMenuEntry> ();
-			update_time = new Dictionary<uint, DateTime> ();
-			
-			timer = GLib.Timeout.Add (4 * 60 * 1000, delegate {
-				TriggerConfirmation ();
-				return true;
-			});
-		}
-		
-		public void TriggerConfirmation ()
-		{
-			if (ItemConfirmationNeeded != null)
-				ItemConfirmationNeeded ();
-			
-			GLib.Timeout.Add (30 * 1000, delegate {
-				foreach (uint i in update_time
-					.Where (kvp => (DateTime.UtcNow - kvp.Value).TotalMinutes > 1)
-					.Select (kvp => kvp.Key))
-					RemoveItem (i);
-				
-				return false;
-			});
-		}
-		
-		uint GetRandomID ()
-		{
-			Random rand = new Random ();
-			
-			uint number;
-			
-			do {
-				//FIXME should we ever get 100,000 items in here, I hope we crash, though we will likely get an infinite loop
-				number = (uint) rand.Next (0, 100000);
-			} while (known_ids.BinarySearch (number) >= 0);
-			
-			known_ids.Add (number);
-			known_ids.Sort ();
-			
-			return number;
-		}
-		
-		#region IDockyDBusMenus implementation
-		public event MenuItemActivatedHandler MenuItemActivated;
-		
-		public event Action ItemConfirmationNeeded;
-		
-		public string Name {
-			get {
-				return owner.ShortName;
-			}
-		}
-		
-		public string BadgeText {
-			get {
-				return owner.BadgeText;
-			}
-			set {
-				owner.SetRemoteBadgeText (value);
-			}
-		}
-		
-		public string Text {
-			get {
-				return owner.HoverText;
-			}
-			set {
-				owner.SetRemoteText (value);
-			}
-		}
-		
-		public string Icon {
-			get {
-				if (CanSetIcon)
-					return (owner as IconDockItem).Icon;
-				return "custom";
-			}
-			set {
-				if (!CanSetIcon)
-					return;
-				
-				(owner as IconDockItem).SetRemoteIcon (value);
-			}
-		}
-
-		public bool CanSetIcon {
-			get {
-				return owner is IconDockItem;
-			}
-		}
-		
-		public bool OwnsDesktopFile {
-			get {
-				return owner is ApplicationDockItem;
-			}
-		}
-		
-		public bool OwnsUri {
-			get {
-				return owner is FileDockItem;
-			}
-		}
-		
-		public bool Attention { 
-			get { return (owner.State & ItemState.Urgent) == ItemState.Urgent; }
-		}
-		
-		public bool Wait {
-			get { return (owner.State & ItemState.Wait) == ItemState.Wait; }
-		}
-		
-		public string DesktopFile {
-			get {
-				if (owner is ApplicationDockItem)
-					return (owner as ApplicationDockItem).OwnedItem.Path;
-				return "";
-			}
-		}
-		
-		public string Uri {
-			get {
-				if (owner is FileDockItem)
-					return (owner as FileDockItem).Uri;
-				return "";
-			}
-		}
-		
-		public uint[] Items {
-			get {
-				return items.Keys.ToArray ();
-			}
-		}
-		
-		public uint AddMenuItem (string name, string icon, string title)
-		{
-			uint number = GetRandomID ();
-			
-			RemoteMenuEntry rem = new RemoteMenuEntry (number, name, icon, title);
-			rem.Clicked += HandleActivated;
-			
-			AddToList (rem, number);
-			
-			return number;
-		}
-		
-		public uint AddFileMenuItem (string uri, string title)
-		{			
-			uint number = GetRandomID ();
-			
-			RemoteFileMenuEntry rem = new RemoteFileMenuEntry (number, FileFactory.NewForUri (uri), title);
-			
-			AddToList (rem, number);
-			
-			return number;
-		}
-		
-		private void AddToList (RemoteMenuEntry entry, uint id)
-		{
-			items[id] = entry;
-			update_time[id] = DateTime.UtcNow;
-			
-			//TODO Insert items into list... this is stupid but whatever fix later
-			foreach (MenuItem item in items.Values)
-				owner.RemoteMenuItems.Remove (item);
-			
-			MenuListContainer _container = MenuListContainer.Footer + 1;
-			var groupedItems = items.Values
-				.GroupBy (rmi => rmi.Title)
-				.OrderBy (g => g.Key);
-			
-			foreach (var itemGroup in groupedItems) {
-				MenuListContainer container;
-				
-				switch (itemGroup.Key.ToLower ()) {
-				case "actions":
-					container = MenuListContainer.Actions;
-					break;
-				case "relateditems":
-					container = MenuListContainer.RelatedItems;
-					break;
-				case "windows":
-					container = MenuListContainer.Windows;
-					break;
-				case "header":
-					container = MenuListContainer.Header;
-					break;
-				case "footer":
-					container = MenuListContainer.Footer;
-					break;
-				default:
-					container = _container;
-					owner.RemoteMenuItems.SetContainerTitle (container, itemGroup.Key);
-					break;
-				}
-				
-				foreach (MenuItem item in itemGroup.OrderBy (i => i.Text)) {
-					owner.RemoteMenuItems[container].Add (item);
-				}
-				_container++;
-			}
-		}
-		
-		public void RemoveItem (uint item)
-		{
-			
-			if (items.ContainsKey (item)) {
-				RemoteMenuEntry entry = items[item];
-				entry.Clicked -= HandleActivated;
-				
-				items.Remove (item);
-				
-				owner.RemoteMenuItems.Remove (entry);
-			}
-			
-			known_ids.Remove (item);
-		}
-		
-		public void ConfirmItem (uint item)
-		{
-			update_time[item] = DateTime.UtcNow;
-		}
-		
-		public void SetAttention ()
-		{
-			owner.State |= ItemState.Urgent;
-		}
-		
-		public void UnsetAttention ()
-		{
-			owner.State &= ~ItemState.Urgent;
-		}
-
-		public void SetWaiting ()
-		{
-			owner.State |= ItemState.Wait;
-		}
-		
-		public void UnsetWaiting ()
-		{
-			owner.State &= ~ItemState.Wait;
-		}
-		
-		public void ResetBadgeText ()
-		{
-			owner.SetRemoteBadgeText ("");
-		}
-		
-		public void ResetText ()
-		{
-			owner.SetRemoteText ("");
-		}
-		
-		public void ResetIcon ()
-		{
-			if (!CanSetIcon)
-				return;
-			
-			(owner as IconDockItem).SetRemoteIcon ("");
-		}
-		
-		public ItemTuple GetItem (uint item)
-		{
-			if (!items.ContainsKey (item))
-				return new ItemTuple ("", "", "");
-			
-			RemoteMenuEntry entry = items[item];
-			return new ItemTuple (entry.Text, entry.Icon, entry.Title);
-		}
-		
-		#endregion
-			
-		void HandleActivated (object sender, EventArgs args)
-		{
-			if (!(sender is RemoteMenuEntry))
-				return;
-			
-			if (MenuItemActivated != null)
-				MenuItemActivated ((sender as RemoteMenuEntry).ID);
-		}
-		
-		#region IDisposable implementation
-		public void Dispose ()
-		{
-			if (timer > 0)
-				GLib.Source.Remove (timer);
-			
-			known_ids.Clear ();
-			update_time.Clear ();
-			
-			foreach (RemoteMenuEntry m in items.Values) {
-				m.Clicked -= HandleActivated;
-				m.Dispose ();
-			}
-			items.Clear ();
-			
-			owner = null;
-		}
-		#endregion
-	}
-}

=== added file 'Docky.DBus/Docky.DBus/IDockManagerDBus.cs'
--- Docky.DBus/Docky.DBus/IDockManagerDBus.cs	1970-01-01 00:00:00 +0000
+++ Docky.DBus/Docky.DBus/IDockManagerDBus.cs	2010-05-27 18:20:46 +0000
@@ -0,0 +1,46 @@
+//  
+//  Copyright (C) 2010 Robert Dyer
+// 
+//  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 org.freedesktop.DBus;
+using NDesk.DBus;
+
+namespace Docky.DBus
+{
+	public delegate void ItemChangedHandler (string path);
+
+	[Interface("org.freedesktop.DockManager")]
+	public interface IDockManagerDBus
+	{
+		event ItemChangedHandler ItemAdded;
+		
+		event ItemChangedHandler ItemRemoved;
+		
+		string[] GetCapabilities ();
+		
+		string[] GetItems ();
+		
+		string[] GetItemsByName (string name);
+		
+		string[] GetItemsByDesktopFile (string path);
+		
+		string[] GetItemsByPID (uint id);
+		
+		string GetItemByXid (uint xid);
+	}
+}

=== added file 'Docky.DBus/Docky.DBus/IDockManagerDBusItem.cs'
--- Docky.DBus/Docky.DBus/IDockManagerDBusItem.cs	1970-01-01 00:00:00 +0000
+++ Docky.DBus/Docky.DBus/IDockManagerDBusItem.cs	2010-05-27 18:20:46 +0000
@@ -0,0 +1,43 @@
+//  
+//  Copyright (C) 2010 Robert Dyer
+// 
+//  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.Collections.Generic;
+
+using org.freedesktop.DBus;
+using NDesk.DBus;
+
+namespace Docky.DBus
+{
+	public delegate void MenuItemActivatedHandler (uint menuHandle);
+	
+	[Interface ("org.freedesktop.DockItem")]
+	public interface IDockManagerDBusItem : Properties
+	{
+		event MenuItemActivatedHandler MenuItemActivated;
+		
+		event Action ItemConfirmationNeeded;
+
+		uint AddMenuItem (IDictionary<string, object> dict);
+		
+		void RemoveMenuItem (uint item);
+		
+		void UpdateDockItem (IDictionary<string, object> dict);
+		
+		void ConfirmItem (uint item);
+	}
+}

=== modified file 'Docky.DBus/Docky.DBus/IDockyDBus.cs'
--- Docky.DBus/Docky.DBus/IDockyDBus.cs	2009-12-10 10:24:59 +0000
+++ Docky.DBus/Docky.DBus/IDockyDBus.cs	2010-05-27 18:20:46 +0000
@@ -1,5 +1,5 @@
 //  
-//  Copyright (C) 2009 Jason Smith
+//  Copyright (C) 2009 Jason Smith, Robert Dyer
 // 
 //  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
@@ -22,25 +22,11 @@
 
 namespace Docky.DBus
 {
-	public delegate void ItemChangedHandler (string path);
-
 	[Interface("org.gnome.Docky")]
 	public interface IDockyDBus
 	{
 		event Action ShuttingDown;
 		
-		event ItemChangedHandler ItemAdded;
-		
-		event ItemChangedHandler ItemRemoved;
-		
-		string[] DockItemPaths ();
-		
-		string DockItemPathForDesktopID (string id);
-		
-		string DockItemPathForDesktopFile (string path);
-		
-		string DockItemPathForWindowXID (uint xid);
-		
 		void ShowAbout ();
 		
 		void ShowSettings ();

=== removed file 'Docky.DBus/Docky.DBus/IDockyDBusItem.cs'
--- Docky.DBus/Docky.DBus/IDockyDBusItem.cs	2009-12-19 00:32:26 +0000
+++ Docky.DBus/Docky.DBus/IDockyDBusItem.cs	1970-01-01 00:00:00 +0000
@@ -1,70 +0,0 @@
-//  
-//  Copyright (C) 2009 Jason Smithm, 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 org.freedesktop.DBus;
-using NDesk.DBus;
-
-namespace Docky.DBus
-{
-	public delegate void MenuItemActivatedHandler (uint menuHandle);
-	
-	public delegate void DockItemActivatedHandler (uint menuHandle, uint button);
-	
-	[Interface ("org.gnome.Docky.Item")]
-	public interface IDockyDBusItem
-	{
-		bool OwnsDesktopFile { get; }
-		bool OwnsUri { get; }
-		bool CanSetIcon { get; }
-		bool Attention { get; }
-		bool Wait { get; }
-		
-		string BadgeText { get; set; }
-		string Text { get; set; }
-		string Icon { get; set; }
-		
-		string Name { get; }
-		string DesktopFile { get; }
-		string Uri { get; }
-		
-		uint[] Items { get; }
-		
-		event Action ItemConfirmationNeeded;
-		
-		event MenuItemActivatedHandler MenuItemActivated;
-
-		uint AddMenuItem (string name, string icon, string title);
-		uint AddFileMenuItem (string uri, string title);
-		
-		void RemoveItem (uint item);
-		void ConfirmItem (uint item);
-		
-		void SetAttention ();
-		void UnsetAttention ();
-		
-		void SetWaiting ();
-		void UnsetWaiting ();
-		
-		void ResetBadgeText ();
-		void ResetText ();
-		void ResetIcon ();
-		
-		ItemTuple GetItem (uint item);
-	}
-}

=== modified file 'Docky.DBus/Docky.DBus/RemoteFileMenuEntry.cs'
--- Docky.DBus/Docky.DBus/RemoteFileMenuEntry.cs	2010-04-07 03:23:15 +0000
+++ Docky.DBus/Docky.DBus/RemoteFileMenuEntry.cs	2010-05-27 18:20:46 +0000
@@ -24,10 +24,8 @@
 
 namespace Docky.DBus
 {
-
 	public class RemoteFileMenuEntry : RemoteMenuEntry
 	{
-
 		public RemoteFileMenuEntry (uint id, GLib.File file, string groupTitle) : base(id, file.Basename, "", groupTitle)
 		{
 			Clicked += delegate {

=== modified file 'Docky.DBus/Makefile.am'
--- Docky.DBus/Makefile.am	2009-12-14 12:45:10 +0000
+++ Docky.DBus/Makefile.am	2010-05-27 18:20:46 +0000
@@ -6,10 +6,12 @@
 
 FILES = \
 	Docky.DBus/DBusManager.cs \
+	Docky.DBus/DockManagerDBus.cs \
+	Docky.DBus/DockManagerDBusItem.cs \
 	Docky.DBus/DockyDBus.cs \
-	Docky.DBus/DockyDBusItem.cs \
+	Docky.DBus/IDockManagerDBus.cs \
+	Docky.DBus/IDockManagerDBusItem.cs \
 	Docky.DBus/IDockyDBus.cs \
-	Docky.DBus/IDockyDBusItem.cs \
 	Docky.DBus/RemoteMenuEntry.cs \
 	Docky.DBus/RemoteFileMenuEntry.cs
 

=== modified file 'Docky.Services/Docky.Services/Helper.cs'
--- Docky.Services/Docky.Services/Helper.cs	2010-05-19 21:55:12 +0000
+++ Docky.Services/Docky.Services/Helper.cs	2010-05-27 18:20:46 +0000
@@ -74,13 +74,15 @@
 		public Helper (File file)
 		{
 			File = file;
-			IsUser = file.Path.StartsWith ("/home/");
+			IsUser = file.Path.StartsWith (HelperService.UserDir.Path);
 			
 			GLib.File DataFile;
 			if (IsUser)
 				DataFile = HelperService.UserMetaDir;
+			else if (file.Path.StartsWith (HelperService.SysDir.Path))
+				DataFile = HelperService.SysMetaDir;
 			else
-				DataFile = HelperService.SysMetaDir;
+				DataFile = HelperService.SysLocalMetaDir;
 			
 			DataFile = DataFile.GetChild (File.Basename + ".info");
 			

=== modified file 'Docky.Services/Docky.Services/HelperService.cs'
--- Docky.Services/Docky.Services/HelperService.cs	2010-05-17 01:35:03 +0000
+++ Docky.Services/Docky.Services/HelperService.cs	2010-05-27 18:20:46 +0000
@@ -42,13 +42,21 @@
 	
 	public class HelperService
 	{
-		public static File UserScriptsDir = DockServices.Paths.UserDataFolder.GetChild ("helpers");
-		public static File UserMetaDir = HelperService.UserScriptsDir.GetChild ("metadata");
-		public static File SysScriptsDir = DockServices.Paths.SystemDataFolder.GetChild ("helpers");
-		public static File SysMetaDir = HelperService.SysScriptsDir.GetChild ("metadata");
+		public static File UserDir = DockServices.Paths.UserDataFolder;
+		public static File UserMetaDir = UserDir.GetChild ("metadata");
+		static File UserScriptsDir = UserDir.GetChild ("scripts");
+		
+		public static File SysDir = FileFactory.NewForPath ("/usr/share/dockmanager/");
+		public static File SysMetaDir = SysDir.GetChild ("metadata");
+		static File SysScriptsDir = SysDir.GetChild ("scripts");
+		
+		public static File SysLocalDir = FileFactory.NewForPath ("/usr/local/share/dockmanager/");
+		public static File SysLocalMetaDir = SysLocalDir.GetChild ("metadata");
+		static File SysLocalScriptsDir = SysLocalDir.GetChild ("scripts");
 		
 		IEnumerable<GLib.File> HelperDirs = new [] {
 			UserScriptsDir,
+			SysLocalScriptsDir,
 			SysScriptsDir,
 		}.Where (dir => dir.Exists).Distinct (new FileEqualityComparer ());
 		

=== modified file 'Makefile.am'
--- Makefile.am	2009-12-14 06:34:21 +0000
+++ Makefile.am	2010-05-27 18:20:46 +0000
@@ -5,7 +5,6 @@
 SUBDIRS = \
 	. \
 	data \
-	scripts \
 	lib \
 	po \
 	Docky.CairoHelper \

=== modified file 'configure.ac'
--- configure.ac	2010-05-12 23:32:30 +0000
+++ configure.ac	2010-05-27 18:20:46 +0000
@@ -178,10 +178,6 @@
 lib/gio-sharp/Makefile
 lib/gio-sharp/generator/Makefile
 lib/gio-sharp/gio/Makefile
-scripts/Makefile
-scripts/docky/Makefile
-scripts/docky/docky.py
-scripts/metadata/Makefile
 Docky/Makefile
 Docky.CairoHelper/Makefile
 Docky.DBus/Makefile

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2010-04-06 01:29:36 +0000
+++ data/Makefile.am	2010-05-27 18:20:46 +0000
@@ -1,8 +1,6 @@
 SUBDIRS = icons themes
 
 EXTRA_DIST = docky.desktop.in \
-	albumoverlay_jewel.png \
-	albumoverlay_vinyl.png \
 	sun.svg \
 	wind.svg \
 	temp.svg \
@@ -19,8 +17,6 @@
 poof_DATA = poof.png \
 	sun.svg \
 	wind.svg \
-	temp.svg \
-	albumoverlay_jewel.png \
-	albumoverlay_vinyl.png
+	temp.svg
 
 @INTLTOOL_DESKTOP_RULE@

=== removed file 'data/albumoverlay_jewel.png'
Binary files data/albumoverlay_jewel.png	2010-01-14 10:59:51 +0000 and data/albumoverlay_jewel.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/albumoverlay_vinyl.png'
Binary files data/albumoverlay_vinyl.png	2010-01-14 10:59:51 +0000 and data/albumoverlay_vinyl.png	1970-01-01 00:00:00 +0000 differ
=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2010-05-16 23:03:05 +0000
+++ po/POTFILES.in	2010-05-27 18:20:46 +0000
@@ -46,4 +46,3 @@
 StandardPlugins/Weather/src/WeatherDocklet.cs
 StandardPlugins/Weather/src/WeatherForecast.cs
 StandardPlugins/Weather/src/WeatherPainter.cs
-scripts/zeitgeist_docky.py

=== modified file 'po/POTFILES.skip'
--- po/POTFILES.skip	2009-12-10 11:08:31 +0000
+++ po/POTFILES.skip	2010-05-27 18:20:46 +0000
@@ -1,2 +1,3 @@
 data/docky.desktop.in
+Docky.DBus/Docky.DBus/DockManagerDBus.cs
 Docky.Windowing/Windowing/WindowMatcher.cs

=== removed directory 'scripts'
=== removed file 'scripts/Makefile.am'
--- scripts/Makefile.am	2010-05-25 18:19:27 +0000
+++ scripts/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-scriptdir = $(datadir)/docky/helpers
-
-dist_script_SCRIPTS = \
-	banshee_control.py	\
-	deluge_badge.py		\
-	emesene_control.py	\
-	gajim_badge.py		\
-	gtg_menus.py		\
-	liferea_badge.py	\
-	open_terminal_here.py	\
-	pidgin_control.py	\
-	rhythmbox_control.py	\
-	tomboy_menus.py		\
-	transmission_badge.py	\
-	tsclient_menus.py	\
-	zeitgeist_docky.py	\
-	zeitgeist_journal.py
-
-SUBDIRS = \
-	docky \
-	metadata

=== removed file 'scripts/banshee_control.py'
--- scripts/banshee_control.py	2010-05-12 05:59:32 +0000
+++ scripts/banshee_control.py	1970-01-01 00:00:00 +0000
@@ -1,321 +0,0 @@
-#!/usr/bin/env python
-
-#  
-#  Copyright (C) 2009-2010 Jason Smith, Rico Tzschichholz
-# 
-#  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/>.
-#
-
-import atexit
-import gobject
-import glib
-import dbus
-import dbus.glib
-import sys
-import os
-
-try:
-	import gtk
-	from docky.docky import DockyItem, DockySink
-	from docky.docky import DOCKY_DATADIR
-	from signal import signal, SIGTERM
-	from sys import exit
-except ImportError, e:
-	print e
-	exit()
-
-bansheebus = "org.bansheeproject.Banshee"
-playerpath = "/org/bansheeproject/Banshee/PlayerEngine"
-playeriface = "org.bansheeproject.Banshee.PlayerEngine"
-
-controlpath = "/org/bansheeproject/Banshee/PlaybackController"
-controliface = "org.bansheeproject.Banshee.PlaybackController"
-
-enable_art_icon = True;
-enable_badge_text = True;
-
-album_art_tmpfile = "/tmp/docky_%s_banshee_helper.png" % os.getenv('USERNAME')
-
-# 0 - none, 1- jewel, 2 - vinyl)
-overlay = 2
-
-class DockyBansheeItem(DockyItem):
-	def __init__(self, path):
-		DockyItem.__init__(self, path)
-		self.timer = 0
-		self.player = None
-		self.control = None
-		
-		self.duration_secs = 0
-		self.songinfo = None
-		self.current_arturl = ""
-		self.current_arturl_mtime = 0
-				
-		self.bus.add_signal_receiver(self.name_owner_changed_cb,
-                                             dbus_interface='org.freedesktop.DBus',
-                                             signal_name='NameOwnerChanged')
-                                             
-		obj = self.bus.get_object ("org.freedesktop.DBus", "/org/freedesktop/DBus")
-		self.bus_interface = dbus.Interface(obj, "org.freedesktop.DBus")
-		
-		self.bus_interface.ListNames (reply_handler=self.list_names_handler, error_handler=self.list_names_error_handler)
-	
-		self.bus.add_signal_receiver(self.signal_EventChanged, "EventChanged",  playeriface, bansheebus, playerpath)
-		self.bus.add_signal_receiver(self.signal_StateChanged, "StateChanged",  playeriface, bansheebus, playerpath)
-
-	def list_names_handler(self, names):
-		if bansheebus in names:
-			self.init_banshee_objects()
-			self.set_menu_buttons()
-			self.update_text()			
-			self.update_badge()
-			self.update_icon()
-
-	def list_names_error_handler(self, error):
-		print "error getting bus names - %s" % str(error)
-	
-	def name_owner_changed_cb(self, name, old_owner, new_owner):
-		if name == bansheebus:
-			if new_owner:
-				self.init_banshee_objects()
-			else:
-				self.player = None
-				self.control = None
-				if self.timer > 0:
-					gobject.source_remove (self.timer)
-					self.timer = 0
-				self.set_menu_buttons()
-				self.update_text()			
-				self.update_badge()
-				self.update_icon()
-	
-	def init_banshee_objects(self):
-		obj = self.bus.get_object(bansheebus, playerpath)
-		self.player = dbus.Interface(obj, playeriface)
-		
-		obj = self.bus.get_object(bansheebus, controlpath)
-		self.control = dbus.Interface(obj, controliface)
-		
-		if self.player:
-			self.update_songinfo()
-
-		if not self.timer > 0:
-			self.timer = gobject.timeout_add (1000, self.update_badge)
-
-	def clear_menu_buttons(self):
-		for k, v in self.id_map.iteritems():
-			try:
-				self.iface.RemoveItem(k)
-			except:
-				break;	
-	
-	def set_menu_buttons(self):
-		self.clear_menu_buttons()
-		
-		if not self.player:
-			return
-
-		self.add_menu_item("Previous", "media-skip-backward")
-		if self.banshee_is_playing():
-			self.add_menu_item("Pause", "media-playback-pause")
-		else:
-			self.add_menu_item("Play", "media-playback-start")
-		self.add_menu_item("Next", "media-skip-forward")
-	
-	def signal_EventChanged(self, event, st, value):
-		print "EventChanged: %s" % (event)	
-		if (event in ["startofstream", "trackinfoupdated"]):
-			self.update_songinfo();
-			self.update_text()
-			self.update_badge()
-			self.update_icon()
-		elif (event in ["endofstream"]):
-			self.update_icon()
-			self.update_text()
-		elif (event in ["seek"]):
-			self.update_badge()
-
-	def signal_StateChanged(self, state):
-		print "StateChanged: %s" % (state)	
-		self.set_menu_buttons()
-		self.update_text()
-			
-	def update_songinfo(self):
-		if self.player:
-			try:
-				song = self.player.GetCurrentTrack()
-				self.duration_secs = self.player.GetLength() / 1000
-				if self.duration_secs > 0:
-					self.songinfo = '%s - %s (%i:%02i)' % (song.get("artist", "Unknown"), song.get("name", "Unknown"), self.duration_secs / 60, self.duration_secs % 60)
-				else:
-					self.songinfo = '%s - %s' % (song.get("artist", "Unknown"), song.get("name", "Unknown"))
-			except dbus.DBusException, e:
-				self.duration_secs = 0
-				self.songinfo = None
-			return
-		self.duration_secs = 0
-		self.songinfo = None
-	
-	def update_icon(self):
-		if not self.player:
-			self.current_arturl = ""
-			self.iface.ResetIcon()
-			return False
-			
-		if not enable_art_icon:
-			return True
-		
-		if self.banshee_is_playing():
-			arturl = self.get_album_art_path()
-			# Add overlay to cover
-			if os.path.isfile(arturl):
-				if self.current_arturl == arturl and self.current_arturl_mtime == os.stat(arturl).st_mtime:
-					return True
-				self.current_arturl = arturl
-				self.current_arturl_mtime = os.stat(arturl).st_mtime
-				self.iface.SetIcon(self.get_album_art_overlay_path(arturl))
-			else:
-				self.current_arturl = ""
-				self.iface.ResetIcon()
-		else:
-			self.current_arturl = ""
-			self.iface.ResetIcon()
-		return True
-		
-	def get_album_art_path(self):
-		artwork_id = self.player.GetCurrentTrack().get("artwork-id")
-
-		if not self.player or not artwork_id:
-			return ""
-
-		arturl = os.path.expanduser("~/.cache/media-art/%s.jpg" % artwork_id)
-		if not os.path.isfile(arturl):
-			arturl = os.path.expanduser("~/.cache/album-art/%s.jpg" % artwork_id)
-
-		return arturl
-
-	def get_album_art_overlay_path(self, picfile):
-		if overlay == 0:
-			return picfile
-
-		try:
-			pb = gtk.gdk.pixbuf_new_from_file(picfile)
-		except Exception, e:
-			print e
-			return picfile
-		
-		pb_result = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, True, 8, 250, 250)
-		pb_result.fill(0x00000000)
-
-		if overlay == 1:
-			overlayfile = os.path.join(DOCKY_DATADIR, "albumoverlay_jewel.png")
-			pb.composite(pb_result, 30, 21, 200, 200, 30, 21, 200.0/pb.get_width(), 200.0/pb.get_height(), gtk.gdk.INTERP_BILINEAR, 255)
-		elif overlay == 2:
-			overlayfile = os.path.join(DOCKY_DATADIR, "albumoverlay_vinyl.png")
-			pb.composite(pb_result, 3, 26, 190, 190, 3, 26, 190.0/pb.get_width(), 190.0/pb.get_height(), gtk.gdk.INTERP_BILINEAR, 255)
-		else:
-			return picfile
-
-		pb_overlay = gtk.gdk.pixbuf_new_from_file_at_size(overlayfile, 250, 250)
-		pb_overlay.composite(pb_result, 0, 0, 250, 250, 0, 0, 1, 1, gtk.gdk.INTERP_BILINEAR, 255)
-		pb_result.save(album_art_tmpfile, "png", {})
-		
-		return album_art_tmpfile
-
-	def update_text(self):
-		if not self.player:
-			self.iface.ResetText()
-
-		if self.banshee_is_playing() and self.songinfo:
-			self.iface.SetText(self.songinfo)
-		else:
-			self.iface.ResetText()
-	
-	def update_badge(self):
-		if not self.player:
-			self.iface.ResetBadgeText()
-			return False
-
-		if not enable_badge_text:
-			return True
-		
-		if self.banshee_is_playing():
-			#if song length is 0 then counting up instead of down
-			if self.duration_secs > 0:
-				position = self.duration_secs - self.player.GetPosition() / 1000
-			else:
-				position = self.player.GetPosition() / 1000
-			string = '%i:%02i' % (position / 60, position % 60)
-			self.iface.SetBadgeText(string)
-		else:
-			self.iface.ResetBadgeText()
-		return True
-	
-	def menu_pressed(self, menu_id):
-		if self.id_map[menu_id] == "Play":
-			self.banshee_play()
-		elif self.id_map[menu_id] == "Pause":
-			self.banshee_pause()
-		elif self.id_map[menu_id] == "Next":
-			self.banshee_next()
-		elif self.id_map[menu_id] == "Previous":
-			self.banshee_prev()
-		
-	def add_menu_item(self, name, icon):
-		menu_id = self.iface.AddMenuItem(name, icon, "")
-		self.id_map[menu_id] = name
-		
-	def banshee_play(self):
-		if self.player:
-			self.player.Play()
-		
-	def banshee_pause(self):
-		if self.player:
-			self.player.Pause()
-	
-	def banshee_next(self):
-		if self.control:
-			self.control.Next(False)
-		
-	def banshee_prev(self):
-		if self.control:
-			self.control.Previous(False)
-		
-	def banshee_is_playing(self):
-		if self.player:
-			try:
-				return self.player.GetCurrentState() == "playing"
-			except dbus.DBusException, e:
-				return False
-		return False
-	
-
-class DockyBansheeSink(DockySink):
-	def item_path_found(self, pathtoitem, item):
-		if item.GetOwnsDesktopFile() and item.GetDesktopFile().endswith ("banshee-1.desktop"):
-			self.items[pathtoitem] = DockyBansheeItem(pathtoitem)
-
-dockysink = DockyBansheeSink()
-
-def cleanup ():
-	dockysink.dispose ()
-
-if __name__ == "__main__":
-	mainloop = gobject.MainLoop(is_running=True)
-
-	atexit.register (cleanup)
-	signal(SIGTERM, lambda signum, stack_frame: exit(1))
-
-	while mainloop.is_running():
-		mainloop.run()

=== removed file 'scripts/deluge_badge.py'
--- scripts/deluge_badge.py	2010-05-22 08:22:02 +0000
+++ scripts/deluge_badge.py	1970-01-01 00:00:00 +0000
@@ -1,101 +0,0 @@
-#!/usr/bin/env python
-
-#  
-#  Copyright (C) 2010 Rico Tzschichholz
-# 
-#  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/>.
-#
-
-import atexit
-import gobject
-import dbus
-import dbus.glib
-import glib
-import sys
-import os
-import math
-
-try:
-	from deluge.ui.client import sclient
-	from docky.docky import DockyItem, DockySink
-	from signal import signal, SIGTERM
-	from sys import exit
-except ImportError, e:
-	print e
-	exit()
-
-ShowUploadRate = False
-
-
-def bytes2ratestr(bytes):
-	for factor, suffix in (
-		(1024 ** 5, 'P'),
-		(1024 ** 4, 'T'), 
-		(1024 ** 3, 'G'), 
-		(1024 ** 2, 'M'), 
-		(1024 ** 1, 'K'),
-		(1024 ** 0, 'B')):
-		if bytes >= factor:
-			break
-	amount = int(bytes / factor)
-	return str(amount) + suffix
-	
-
-class DockyDelugeItem(DockyItem):
-	def __init__(self, path):
-		DockyItem.__init__(self, path)
-		
-		self.timer = 0
-		
-		sclient.set_core_uri()
-	
-		if not self.timer > 0:
-			self.timer = gobject.timeout_add (2000, self.update_badge)
-
-	def update_badge(self):
-		rate = 0
-		try:
-			if ShowUploadRate:
-				rate = round(sclient.get_upload_rate())
-			else:	
-				rate = round(sclient.get_download_rate())
-	
-			if rate > 0:
-				self.iface.SetBadgeText("%s" % bytes2ratestr(rate))
-			else:
-				self.iface.ResetBadgeText()
-			return True
-		except Exception, e:
-			print e
-			self.iface.ResetBadgeText()
-			return False
-	
-
-class DockyDelugeSink(DockySink):
-	def item_path_found(self, pathtoitem, item):
-		if item.GetOwnsDesktopFile() and item.GetDesktopFile().endswith ("deluge.desktop"):
-			self.items[pathtoitem] = DockyDelugeItem(pathtoitem)
-
-dockysink = DockyDelugeSink()
-
-def cleanup ():
-	dockysink.dispose ()
-
-if __name__ == "__main__":
-	mainloop = gobject.MainLoop(is_running=True)
-
-	atexit.register (cleanup)
-	signal(SIGTERM, lambda signum, stack_frame: exit(1))
-
-	mainloop.run()

=== removed directory 'scripts/docky'
=== removed file 'scripts/docky/Makefile.am'
--- scripts/docky/Makefile.am	2010-02-26 08:30:46 +0000
+++ scripts/docky/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-pkgpython_PYTHON = \
-	__init__.py	\
-	docky.py

=== removed file 'scripts/docky/__init__.py'
=== removed file 'scripts/docky/docky.py.in'
--- scripts/docky/docky.py.in	2010-05-02 19:39:52 +0000
+++ scripts/docky/docky.py.in	1970-01-01 00:00:00 +0000
@@ -1,126 +0,0 @@
-#!/usr/bin/env python
-
-#  
-#  Copyright (C) 2009 Jason Smith, Robert Dyer
-# 
-#  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/>.
-#
-
-import gobject
-import time
-import glib
-import dbus
-import dbus.glib
-import sys
-import urllib
-import os
-
-dockypath  = '/org/gnome/Docky'
-dockybus   = 'org.gnome.Docky'
-dockyiface = 'org.gnome.Docky'
-itemiface  = 'org.gnome.Docky.Item'
-
-DOCKY_DATADIR = "@expanded_datadir@/@PACKAGE@"
-
-class DockyItem():
-	def __init__(self, path):
-		self.path = path
-		self.bus = dbus.SessionBus()
-		self.id_map = {}
-		
-		try:
-			obj = self.bus.get_object(dockybus, self.path)
-			self.iface = dbus.Interface(obj, itemiface)
-
-			self.bus.add_signal_receiver(self.menu_pressed_signal, "MenuItemActivated", itemiface, dockybus, self.path)
-			self.bus.add_signal_receiver(self.item_confirmation_needed, "ItemConfirmationNeeded", itemiface, dockybus, self.path)
-		except dbus.DBusException, e:
-			print "DockyItem(): %s" % e
-			sys.exit(0)
-
-	def menu_pressed_signal(self, menu_id):
-		if self.id_map.has_key(menu_id):
-			self.menu_pressed(menu_id)
-	
-	def item_confirmation_needed (self):
-		for k,v in self.id_map.iteritems():
-			self.iface.ConfirmItem(k)
-	
-	def dispose(self):
-		try:
-			self.iface.ResetText()
-			self.iface.ResetBadgeText()
-			self.iface.ResetIcon()
-			for k, v in self.id_map.iteritems():
-				self.iface.RemoveItem(k)
-		except dbus.DBusException, e:
-			#print "DockyItem(): %s" % e
-			return
-	
-	def menu_pressed(self, menu_id):
-		pass
-
-class DockySink():
-	def __init__(self):
-		self.bus = dbus.SessionBus()
-		self.items = {}
-		self.disposed = False;
-
-		try:
-			obj = self.bus.get_object(dockybus, dockypath)
-			self._iface = dbus.Interface(obj, dockyiface)
-
-			paths = self._iface.DockItemPaths()
-
-			self.bus.add_signal_receiver(self.item_added,   "ItemAdded",    dockyiface, dockybus, dockypath)
-			self.bus.add_signal_receiver(self.item_removed, "ItemRemoved",  dockyiface, dockybus, dockypath)
-			self.bus.add_signal_receiver(self.shut_down,    "ShuttingDown", dockyiface, dockybus, dockypath)
-
-			for pathtoitem in paths:
-				obj = self.bus.get_object(dockybus, pathtoitem)
-				item = dbus.Interface(obj, itemiface)
-				self.item_path_found(pathtoitem, item)
-
-			self.bus.add_signal_receiver(self.name_owner_changed_cb, dbus_interface='org.freedesktop.DBus', signal_name='NameOwnerChanged')
-		except dbus.DBusException, e:
-			print "DockySink(): %s" % e
-			sys.exit(0)
-
-	def name_owner_changed_cb(self, name, old_owner, new_owner):
-		if name == dockybus and not new_owner:
-			print "DockyDBus %s is gone, quitting now..." % name
-			self.shut_down()				
-
-	def item_added(self, path):
-		if self.disposed:
-			return;
-		obj = self.bus.get_object(dockybus, path)
-		item = dbus.Interface(obj, itemiface)
-		self.item_path_found(path, item)
-
-	def item_removed(self, path):
-		if self.disposed:
-			return;
-		if path in self.items:
-			self.items[path].dispose()
-			del self.items[path]
-	
-	def shut_down(self):
-		gobject.idle_add(quit, 1)
-	
-	def dispose(self):
-		self.disposed = True;
-		for path, item in self.items.iteritems():
-			item.dispose()
-

=== removed file 'scripts/emesene_control.py'
--- scripts/emesene_control.py	2010-03-12 12:01:41 +0000
+++ scripts/emesene_control.py	1970-01-01 00:00:00 +0000
@@ -1,105 +0,0 @@
-#!/usr/bin/env python
-
-#  
-#  Copyright (C) 2010 Tom Cowell, Rico Tzschichholz
-# 
-#  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/>.
-#
-
-import atexit
-import gobject
-import glib
-import dbus
-import dbus.glib
-import sys
-import os
-
-try:
-	from docky.docky import DockyItem, DockySink
-	from signal import signal, SIGTERM
-	from sys import exit
-except ImportError, e:
-	print e
-	exit()
-
-emesenebus = "org.emesene.dbus"
-emesenepath = "/org/emesene/dbus"
-emeseneiface = "org.emesene.dbus"
-
-class DockyEmeseneItem(DockyItem):
-	def __init__(self, path):
-		DockyItem.__init__(self, path)
-		self.emesene = None
-
-		self.bus.add_signal_receiver(self.name_owner_changed_cb, dbus_interface='org.freedesktop.DBus', signal_name = 'NameOwnerChanged')
-		obj = self.bus.get_object("org.freedesktop.DBus", "/org/freedesktop/DBus")
-		self.bus_interface = dbus.Interface(obj, "org.freedesktop.DBus")
-
-		self.bus_interface.ListNames (reply_handler=self.list_names_handler, error_handler=self.list_names_error_handler)
-
-		self.bus.add_signal_receiver(self.conversation_updated, "unread_messages", emeseneiface, emesenebus, emesenepath)
-	
-	def list_names_handler(self, names):
-		if emesenebus in names:
-			self.init_emesene_objects()
-			self.update_badge()
-
-	def list_names_error_handler(self, error):
-		print "error getting bus names - %s" % str(error)
-
-	def name_owner_changed_cb(self, name, old_owner, new_owner):
-		if name == emesenebus:
-			if new_owner:
-				self.init_emesene_objects()
-			else:
-				self.emesene = None
-				self.update_badge()
-
-	def init_emesene_objects(self):
-		obj = self.bus.get_object(emesenebus, emesenepath)
-		self.emesene = dbus.Interface(obj, emeseneiface)
-
-	def conversation_updated(self, count):
-		self.update_badge()
-
-	def update_badge(self):
-		if not self.emesene:
-			self.iface.ResetBadgeText()
-			return False
-
-		count = self.emesene.get_message_count()
-		if count > 0:
-			self.iface.SetBadgeText("%s" % count)
-		else:
-			self.iface.ResetBadgeText()
-
-		return True		
-
-class DockyEmeseneSink(DockySink):
-	def item_path_found(self, pathtoitem, item):
-		if item.GetOwnsDesktopFile() and item.GetDesktopFile().endswith ("emesene.desktop"):
-			self.items[pathtoitem] = DockyEmeseneItem(pathtoitem)
-
-emesenesink = DockyEmeseneSink()
-
-def cleanup():
-	emesenesink.dispose()
-
-if __name__ == "__main__":
-	mainloop = gobject.MainLoop(is_running=True)
-	
-	atexit.register (cleanup)
-	signal(SIGTERM, lambda signum, stack_frame: exit(1))
-	
-	mainloop.run()

=== removed file 'scripts/gajim_badge.py'
--- scripts/gajim_badge.py	2010-01-19 07:21:10 +0000
+++ scripts/gajim_badge.py	1970-01-01 00:00:00 +0000
@@ -1,118 +0,0 @@
-#!/usr/bin/env python
-
-#  
-#  Copyright (C) 2010 Rico Tzschichholz
-#                2010 Stefan Bethge
-#
-#  Started from liferea_badge.py
-# 
-#  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/>.
-#
-
-import atexit
-import gobject
-import dbus
-import dbus.glib
-import glib
-import sys
-import os
-
-try:
-	from docky.docky import DockyItem, DockySink
-	from signal import signal, SIGTERM
-	from sys import exit
-except ImportError, e:
-	print e
-	exit()
-
-gajimbus = "org.gajim.dbus"
-gajimpath = "/org/gajim/dbus/RemoteObject"
-gajimiface = "org.gajim.dbus.RemoteInterface"
-	
-class DockyGajimItem(DockyItem):
-	def __init__(self, path):
-		DockyItem.__init__(self, path)
-		self.timer = 0
-		self.gajim = None
-		
-		self.bus.add_signal_receiver(self.name_owner_changed_cb,
-				dbus_interface='org.freedesktop.DBus',
-				signal_name='NameOwnerChanged')
-		
-		obj = self.bus.get_object ("org.freedesktop.DBus", "/org/freedesktop/DBus")
-		self.bus_interface = dbus.Interface(obj, "org.freedesktop.DBus")
-		
-		self.bus_interface.ListNames (reply_handler=self.list_names_handler, error_handler=self.list_names_error_handler)
-
-		self.bus.add_signal_receiver(self.signal_new_message, "NewMessage", gajimiface, gajimbus, gajimpath)
-
-	def list_names_handler(self, names):
-		if gajimbus in names:
-			self.init_gajim_objects()
-			self.update_badge()
-
-	def list_names_error_handler(self, error):
-		print "error getting bus names - %s" % str(error)
-	
-	def name_owner_changed_cb(self, name, old_owner, new_owner):
-		if name == gajimbus:
-			if new_owner:
-				self.init_gajim_objects()
-			else:
-				self.gajim = None
-				if self.timer > 0:
-					gobject.source_remove (self.timer)
-					self.timer = 0
-				self.update_badge()
-	
-	def init_gajim_objects(self):
-		obj = self.bus.get_object(gajimbus, gajimpath)
-		self.gajim = dbus.Interface(obj, gajimiface)
-
-		if not self.timer > 0:
-			self.timer = gobject.timeout_add (5000, self.update_badge)
-
-	def signal_new_message(self, details):
-		self.update_badge()
-
-	def update_badge(self):
-		if not self.gajim:
-			self.iface.ResetBadgeText()
-			return False
-		
-		items_unread = self.gajim.get_unread_msgs_number()
-
-		if int(items_unread) > 0:
-			self.iface.SetBadgeText("%s" % items_unread)
-		else:
-			self.iface.ResetBadgeText()
-		return True
-
-class DockyGajimSink(DockySink):
-	def item_path_found(self, pathtoitem, item):
-		if item.GetOwnsDesktopFile() and item.GetDesktopFile().endswith ("gajim.desktop"):
-			self.items[pathtoitem] = DockyGajimItem(pathtoitem)
-
-dockysink = DockyGajimSink()
-
-def cleanup ():
-	dockysink.dispose ()
-
-if __name__ == "__main__":
-	mainloop = gobject.MainLoop(is_running=True)
-
-	atexit.register (cleanup)
-	signal(SIGTERM, lambda signum, stack_frame: exit(1))
-
-	mainloop.run()

=== removed file 'scripts/gtg_menus.py'
--- scripts/gtg_menus.py	2010-02-09 07:38:49 +0000
+++ scripts/gtg_menus.py	1970-01-01 00:00:00 +0000
@@ -1,125 +0,0 @@
-#!/usr/bin/env python
-
-#  
-#  Copyright (C) 2010 Rico Tzschichholz
-# 
-#  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/>.
-#
-
-#  Notes:
-#  * Getting Things GNOME! 0.2 or higher is required for dbus support
-
-import atexit
-import gobject
-import glib
-import dbus
-import dbus.glib
-import sys
-import os
-
-try:
-	from docky.docky import DockyItem, DockySink
-	from signal import signal, SIGTERM
-	from sys import exit
-except ImportError, e:
-	exit()
-
-gtgbus = "org.GTG"
-gtgpath = "/org/GTG"
-gtgiface = "org.GTG"
-
-class DockyGTGItem(DockyItem):
-	def __init__(self, path):
-		DockyItem.__init__(self, path)
-		self.gtg = None
-		
-		self.bus.add_signal_receiver(self.name_owner_changed_cb,
-                                             dbus_interface='org.freedesktop.DBus',
-                                             signal_name='NameOwnerChanged')
-                                             
-		obj = self.bus.get_object ("org.freedesktop.DBus", "/org/freedesktop/DBus")
-		self.bus_interface = dbus.Interface(obj, "org.freedesktop.DBus")
-		
-		self.bus_interface.ListNames (reply_handler=self.list_names_handler, error_handler=self.list_names_error_handler)
-	
-	def list_names_handler(self, names):
-		if gtgbus in names:
-			self.init_gtg_objects()
-			self.set_menu_buttons()
-
-	def list_names_error_handler(self, error):
-		print "error getting bus names - %s" % str(error)
-	
-	def name_owner_changed_cb(self, name, old_owner, new_owner):
-		if name == gtgbus:
-			if new_owner:
-				self.init_gtg_objects()
-			else:
-				self.gtg = None
-			self.set_menu_buttons()
-	
-	def init_gtg_objects(self):
-		obj = self.bus.get_object(gtgbus, gtgpath)
-		self.gtg = dbus.Interface(obj, gtgiface)
-		
-	def clear_menu_buttons(self):
-		for k, v in self.id_map.iteritems():
-			try:
-				self.iface.RemoveItem(k)
-			except:
-				break;	
-	
-	def set_menu_buttons(self):
-		self.clear_menu_buttons()
-		
-		if not self.gtg:
-			return
-
-		self.add_menu_item ("New Task", "list-add", "NewTask", "Task Controls")
-		self.add_menu_item ("Open Tasks List", "gtg", "OpenWindow", "Task Controls")
-
-	def menu_pressed(self, menu_id):
-		if not menu_id in self.id_map:
-			return	
-		
-		menu_id = self.id_map[menu_id]
-		
-		if menu_id == "NewTask":
-			self.gtg.open_new_task()
-		elif menu_id == "OpenWindow":
-			self.gtg.show_task_browser()
-		
-	def add_menu_item(self, name, icon, ident, title):
-		menu_id = self.iface.AddMenuItem(name, icon, title)
-		self.id_map[menu_id] = ident
-		
-		
-class DockyGTGSink(DockySink):
-	def item_path_found(self, pathtoitem, item):
-		if item.GetOwnsDesktopFile() and item.GetDesktopFile().endswith ("gtg.desktop"):
-			self.items[pathtoitem] = DockyGTGItem(pathtoitem)
-
-
-dockysink = DockyGTGSink()
-
-def cleanup ():
-	dockysink.dispose ()
-
-if __name__ == "__main__":
-	mainloop = gobject.MainLoop(is_running=True)
-
-	atexit.register (cleanup)
-	signal(SIGTERM, lambda signum, stack_frame: exit(1))
-
-	mainloop.run()

=== removed file 'scripts/liferea_badge.py'
--- scripts/liferea_badge.py	2010-03-11 09:33:42 +0000
+++ scripts/liferea_badge.py	1970-01-01 00:00:00 +0000
@@ -1,111 +0,0 @@
-#!/usr/bin/env python
-
-#  
-#  Copyright (C) 2010 Rico Tzschichholz
-# 
-#  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/>.
-#
-
-import atexit
-import gobject
-import dbus
-import dbus.glib
-import glib
-import sys
-import os
-
-try:
-	from docky.docky import DockyItem, DockySink
-	from signal import signal, SIGTERM
-	from sys import exit
-except ImportError, e:
-	print e
-	exit()
-
-lifereabus = "org.gnome.feed.Reader"
-readerpath = "/org/gnome/feed/Reader"
-readeriface = "org.gnome.feed.Reader"
-	
-class DockyLifereaItem(DockyItem):
-	def __init__(self, path):
-		DockyItem.__init__(self, path)
-		self.timer = 0
-		self.reader = None
-				
-		self.bus.add_signal_receiver(self.name_owner_changed_cb,
-                                             dbus_interface='org.freedesktop.DBus',
-                                             signal_name='NameOwnerChanged')
-                                             
-		obj = self.bus.get_object ("org.freedesktop.DBus", "/org/freedesktop/DBus")
-		self.bus_interface = dbus.Interface(obj, "org.freedesktop.DBus")
-		
-		self.bus_interface.ListNames (reply_handler=self.list_names_handler, error_handler=self.list_names_error_handler)
-
-	def list_names_handler(self, names):
-		if lifereabus in names:
-			self.init_liferea_objects()
-			self.update_badge()
-
-	def list_names_error_handler(self, error):
-		print "error getting bus names - %s" % str(error)
-	
-	def name_owner_changed_cb(self, name, old_owner, new_owner):
-		if name == lifereabus:
-			if new_owner:
-				self.init_liferea_objects()
-			else:
-				self.reader = None
-				if self.timer > 0:
-					gobject.source_remove (self.timer)
-					self.timer = 0
-				self.update_badge()
-	
-	def init_liferea_objects(self):
-		obj = self.bus.get_object(lifereabus, readerpath)
-		self.reader = dbus.Interface(obj, readeriface)
-		
-		if not self.timer > 0:
-			self.timer = gobject.timeout_add (10000, self.update_badge)
-
-	def update_badge(self):
-		if not self.reader:
-			self.iface.ResetBadgeText()
-			return False
-		
-		items_unread = self.reader.GetUnreadItems()
-		#items_new = self.reader.GetNewItems()
-		if items_unread > 0:
-			self.iface.SetBadgeText("%s" % items_unread)
-		else:
-			self.iface.ResetBadgeText()
-			
-		return True
-
-class DockyLifereaSink(DockySink):
-	def item_path_found(self, pathtoitem, item):
-		if item.GetOwnsDesktopFile() and item.GetDesktopFile().endswith ("liferea.desktop"):
-			self.items[pathtoitem] = DockyLifereaItem(pathtoitem)
-
-dockysink = DockyLifereaSink()
-
-def cleanup ():
-	dockysink.dispose ()
-
-if __name__ == "__main__":
-	mainloop = gobject.MainLoop(is_running=True)
-
-	atexit.register (cleanup)
-	signal(SIGTERM, lambda signum, stack_frame: exit(1))
-
-	mainloop.run()

=== removed directory 'scripts/metadata'
=== removed file 'scripts/metadata/Makefile.am'
--- scripts/metadata/Makefile.am	2010-05-25 18:19:27 +0000
+++ scripts/metadata/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-scriptdir = $(datadir)/docky/helpers/metadata
-
-dist_script_DATA = \
-	banshee_control.py.info	\
-	deluge_badge.py.info	\
-	emesene_control.py.info \
-	gajim_badge.py.info	\
-	gtg_menus.py.info	\
-	liferea_badge.py.info	\
-	open_terminal_here.py.info	\
-	pidgin_control.py.info	\
-	rhythmbox_control.py.info	\
-	tomboy_menus.py.info	\
-	transmission_badge.py.info	\
-	tsclient_menus.py.info	\
-	zeitgeist_docky.py.info	\
-	zeitgeist_journal.py.info

=== removed file 'scripts/metadata/banshee_control.py.info'
--- scripts/metadata/banshee_control.py.info	2009-12-23 16:35:51 +0000
+++ scripts/metadata/banshee_control.py.info	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-NAME="Banshee Controls"
-DESCRIPTION="Control Banshee media playback"
-ICON="banshee"

=== removed file 'scripts/metadata/deluge_badge.py.info'
--- scripts/metadata/deluge_badge.py.info	2010-01-26 07:54:16 +0000
+++ scripts/metadata/deluge_badge.py.info	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-NAME="Deluge"
-DESCRIPTION="Show transfer rates"
-ICON="deluge"

=== removed file 'scripts/metadata/emesene_control.py.info'
--- scripts/metadata/emesene_control.py.info	2010-03-11 09:33:42 +0000
+++ scripts/metadata/emesene_control.py.info	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-NAME="Emesene Controls"
-DESCRIPTION="See your message count status on Emesene"
-ICON="emesene"

=== removed file 'scripts/metadata/gajim_badge.py.info'
--- scripts/metadata/gajim_badge.py.info	2010-01-18 10:10:16 +0000
+++ scripts/metadata/gajim_badge.py.info	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-NAME="Gajim"
-DESCRIPTION="Shows new messages count"
-ICON="gajim"

=== removed file 'scripts/metadata/gtg_menus.py.info'
--- scripts/metadata/gtg_menus.py.info	2010-02-09 07:38:49 +0000
+++ scripts/metadata/gtg_menus.py.info	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-NAME="Getting Things GNOME!"
-DESCRIPTION="Access your tasks"
-ICON="gtg"

=== removed file 'scripts/metadata/liferea_badge.py.info'
--- scripts/metadata/liferea_badge.py.info	2010-01-11 14:01:04 +0000
+++ scripts/metadata/liferea_badge.py.info	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-NAME="Liferea"
-DESCRIPTION="Shows unread messages count"
-ICON="liferea"

=== removed file 'scripts/metadata/open_terminal_here.py.info'
--- scripts/metadata/open_terminal_here.py.info	2009-12-23 23:48:42 +0000
+++ scripts/metadata/open_terminal_here.py.info	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-NAME="Open Terminal Here"
-DESCRIPTION="Opens a terminal at the selected location"
-ICON="gnome-terminal"

=== removed file 'scripts/metadata/pidgin_control.py.info'
--- scripts/metadata/pidgin_control.py.info	2009-12-23 16:35:51 +0000
+++ scripts/metadata/pidgin_control.py.info	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-NAME="Pidgin Controls"
-DESCRIPTION="Control your availability and connectivity status on Pidgin"
-ICON="pidgin"

=== removed file 'scripts/metadata/rhythmbox_control.py.info'
--- scripts/metadata/rhythmbox_control.py.info	2009-12-23 16:58:04 +0000
+++ scripts/metadata/rhythmbox_control.py.info	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-NAME="Rhythmbox Controls"
-DESCRIPTION="Control Rhythmbox media playback"
-ICON="rhythmbox"

=== removed file 'scripts/metadata/tomboy_menus.py.info'
--- scripts/metadata/tomboy_menus.py.info	2009-12-23 16:35:51 +0000
+++ scripts/metadata/tomboy_menus.py.info	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-NAME="Tomboy Notes"
-DESCRIPTION="Access your Tomboy notes"
-ICON="tomboy"

=== removed file 'scripts/metadata/transmission_badge.py.info'
--- scripts/metadata/transmission_badge.py.info	2010-02-26 08:30:46 +0000
+++ scripts/metadata/transmission_badge.py.info	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-NAME="Transmission"
-DESCRIPTION="Show transfer rates"
-ICON="transmission"

=== removed file 'scripts/metadata/tsclient_menus.py.info'
--- scripts/metadata/tsclient_menus.py.info	2010-05-25 18:19:27 +0000
+++ scripts/metadata/tsclient_menus.py.info	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-NAME="Terminal Server Client"
-DESCRIPTION="Jump directly to Terminal Server Client bookmarks"
-ICON="tsclient"

=== removed file 'scripts/metadata/zeitgeist_docky.py.info'
--- scripts/metadata/zeitgeist_docky.py.info	2009-12-23 16:35:51 +0000
+++ scripts/metadata/zeitgeist_docky.py.info	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-NAME="Zeitgeist Integration"
-DESCRIPTION="Interfaces with Zeitgeist to supply a list of most used items for an application"

=== removed file 'scripts/metadata/zeitgeist_journal.py.info'
--- scripts/metadata/zeitgeist_journal.py.info	2009-12-23 16:35:51 +0000
+++ scripts/metadata/zeitgeist_journal.py.info	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-NAME="Zeitgeist Journal"
-DESCRIPTION="Provides a journal of all activity for the selected application supplied by Zeitgeist"

=== removed file 'scripts/open_terminal_here.py'
--- scripts/open_terminal_here.py	2010-05-22 20:59:42 +0000
+++ scripts/open_terminal_here.py	1970-01-01 00:00:00 +0000
@@ -1,75 +0,0 @@
-#!/usr/bin/env python
-
-#  
-#  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/>.
-#
-
-import atexit
-import gconf
-import gobject
-import glib
-import sys
-import urllib
-import os
-
-try:
-	from docky.docky import DockyItem, DockySink
-	from signal import signal, SIGTERM
-	from sys import exit
-except ImportError, e:
-	exit()
-
-class DockyTerminalItem(DockyItem):
-	def __init__(self, path):
-		DockyItem.__init__(self, path)
-		
-		client = gconf.client_get_default()
-		self.terminal = client.get_string("/desktop/gnome/applications/terminal/exec")
-		if self.terminal == None:
-			self.terminal = "gnome-terminal"
-		
-		self.path = urllib.unquote(str(self.iface.GetUri ()[7:]))
-		if not os.path.isdir (self.path):
-			self.path = os.path.dirname (self.path)
-		
-		self.add_menu_item("Open Terminal Here", "terminal")
-
-	def menu_pressed(self, menu_id):
-		if self.id_map[menu_id] == "Open Terminal Here":
-			os.chdir(self.path);
-			os.system ('%s &' % self.terminal)
-		
-	def add_menu_item(self, name, icon):
-		menu_id = self.iface.AddMenuItem(name, icon, "actions")
-		self.id_map[menu_id] = name
-			
-class DockyTerminalSink(DockySink):
-	def item_path_found(self, pathtoitem, item):
-		if item.GetOwnsUri() and item.GetUri().startswith ("file://"):
-			self.items[pathtoitem] = DockyTerminalItem(pathtoitem)
-
-dockysink = DockyTerminalSink()
-
-def cleanup ():
-	dockysink.dispose ()
-
-if __name__ == "__main__":
-	mainloop = gobject.MainLoop(is_running=True)
-
-	atexit.register (cleanup)
-	signal(SIGTERM, lambda signum, stack_frame: exit(1))
-
-	mainloop.run()

=== removed file 'scripts/pidgin_control.py'
--- scripts/pidgin_control.py	2010-02-04 20:02:24 +0000
+++ scripts/pidgin_control.py	1970-01-01 00:00:00 +0000
@@ -1,179 +0,0 @@
-#!/usr/bin/env python
-
-#  
-#  Copyright (C) 2009-2010 Jason Smith, Rico Tzschichholz
-#                2010 Lukasz Piepiora
-#
-#  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/>.
-#
-
-import atexit
-import gobject
-import dbus
-import dbus.glib
-import glib
-import sys
-import os
-
-try:
-	from docky.docky import DockyItem, DockySink
-	from signal import signal, SIGTERM
-	from sys import exit
-except ImportError, e:
-	exit()
-
-pidginbus = "im.pidgin.purple.PurpleService"
-pidginpath = "/im/pidgin/purple/PurpleObject"
-pidginitem = "im.pidgin.purple.PurpleInterface"
-
-class PidginSink():
-	def __init__(self):
-		bus = dbus.SessionBus()
-		obj = bus.get_object (pidginbus, pidginpath)
-		self.iface = dbus.Interface (obj, pidginitem)
-		
-	def IsConnected(self):
-		status = self.iface.PurpleSavedstatusGetCurrent()	
-		return not self.iface.PurpleSavedstatusGetType(status) == 1
-
-	def IsAway(self):
-		status = self.iface.PurpleSavedstatusGetCurrent()	
-		return not self.iface.PurpleSavedstatusGetType(status) == 5
-		
-	def Available(self):
-		new_status = self.iface.PurpleSavedstatusNew("", 2)
-		self.iface.PurpleSavedstatusActivate(new_status)
-	
-	def Disconnect(self):
-		new_status = self.iface.PurpleSavedstatusNew("", 1)
-		self.iface.PurpleSavedstatusActivate(new_status)	
-	
-	def Away(self):
-		new_status = self.iface.PurpleSavedstatusNew("", 5)
-		self.iface.PurpleSavedstatusActivate(new_status)
-		
-class DockyPidginItem(DockyItem):
-	def __init__(self, path):
-		DockyItem.__init__(self, path)
-		self.pidgin = None
-		
-		self.bus.add_signal_receiver(self.name_owner_changed_cb,
-				dbus_interface='org.freedesktop.DBus',
-				signal_name='NameOwnerChanged')
-		
-		obj = self.bus.get_object ("org.freedesktop.DBus", "/org/freedesktop/DBus")
-		self.bus_interface = dbus.Interface(obj, "org.freedesktop.DBus")
-		
-		self.bus_interface.ListNames (reply_handler=self.list_names_handler, error_handler=self.list_names_error_handler)
-		
-		self.bus.add_signal_receiver(self.status_changed, "AccountStatusChanged", pidginitem, pidginbus, pidginpath)
-		self.bus.add_signal_receiver(self.conversation_updated, "ConversationUpdated", pidginitem, pidginbus, pidginpath)
-
-	def list_names_handler(self, names):
-		if pidginbus in names:
-			self.init_pidgin_objects()
-			self.set_menu_buttons()
-			self.update_badge()
-
-	def list_names_error_handler(self, error):
-		print "error getting bus names - %s" % str(error)
-	
-	def name_owner_changed_cb(self, name, old_owner, new_owner):
-		if name == pidginbus:
-			if new_owner:
-				self.init_pidgin_objects()
-			else:
-				self.pidgin = None
-			self.set_menu_buttons()
-			self.update_badge()
-	
-	def init_pidgin_objects(self):
-		self.pidgin = PidginSink()
-
-	def status_changed(self, a, b, c):
-		self.set_menu_buttons()
-		self.update_badge()
-	
-	def conversation_updated(self, conv, type):
-		self.update_badge()
-
-	def clear_menu_buttons(self):
-		for k, v in self.id_map.iteritems():
-			try:
-				self.iface.RemoveItem(k)
-			except:
-				break;	
-	
-	def set_menu_buttons(self):
-		self.clear_menu_buttons()
-				
-		if not self.pidgin or not self.iface:
-			return
-
-		if self.pidgin.IsConnected():
-			if self.pidgin.IsAway():
-				self.add_menu_item ("Set Away", "/usr/share/pixmaps/pidgin/status/16/away.png", "", "Away")
-			else:
-				self.add_menu_item ("Set Available", "/usr/share/pixmaps/pidgin/status/16/available.png", "", "Connect")
-			self.add_menu_item ("Disconnect", "/usr/share/pixmaps/pidgin/status/16/offline.png", "", "Disconnect")
-		else:
-			self.add_menu_item ("Connect", "/usr/share/pixmaps/pidgin/status/16/available.png", "", "Connect")
-		
-	def update_badge(self):
-		if not self.pidgin:
-			self.iface.ResetBadgeText()
-			return False
-		
-		convs = self.pidgin.iface.PurpleGetConversations()
-		count = 0
-		for conv in convs:
-			count = count + self.pidgin.iface.PurpleConversationGetData(conv, "unseen-count")
-		if count:
-			self.iface.SetBadgeText("%s" % count)
-		else:
-			self.iface.ResetBadgeText()
-		return True
-	
-	def menu_pressed(self, menu_id):
-		menu_id = self.id_map[menu_id]
-		
-		if menu_id == "Connect":
-			self.pidgin.Available()
-		elif menu_id == "Disconnect":
-			self.pidgin.Disconnect()
-		elif menu_id == "Away":
-			self.pidgin.Away()
-				
-	def add_menu_item(self, name, icon, group, ident):
-		menu_id = self.iface.AddMenuItem(name, icon, group)
-		self.id_map[menu_id] = ident
-		
-	
-class DockyPidginSink(DockySink):
-	def item_path_found(self, pathtoitem, item):
-		if item.GetOwnsDesktopFile() and item.GetDesktopFile().endswith ("pidgin.desktop"):
-			self.items[pathtoitem] = DockyPidginItem(pathtoitem)
-
-dockysink = DockyPidginSink()
-
-def cleanup ():
-	dockysink.dispose ()
-
-if __name__ == "__main__":
-	mainloop = gobject.MainLoop(is_running=True)
-
-	atexit.register (cleanup)
-	signal(SIGTERM, lambda signum, stack_frame: exit(1))
-
-	mainloop.run()

=== removed file 'scripts/rhythmbox_control.py'
--- scripts/rhythmbox_control.py	2010-05-12 05:59:32 +0000
+++ scripts/rhythmbox_control.py	1970-01-01 00:00:00 +0000
@@ -1,391 +0,0 @@
-#!/usr/bin/env python
-
-#  
-#  Copyright (C) 2009-2010 Jason Smith, Rico Tzschichholz
-# 
-#  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/>.
-#
-
-import atexit
-import gobject
-import glib
-import dbus
-import dbus.glib
-import sys
-import os
-
-try:
-	import gtk
-	import urllib2
-	from docky.docky import DockyItem, DockySink
-	from docky.docky import DOCKY_DATADIR
-	from signal import signal, SIGTERM
-	from sys import exit
-except ImportError, e:
-	print e
-	exit()
-
-enable_art_icon = True;
-enable_badge_text = True;
-
-art_icon_from_tag = True
-try:
-	import mutagen.mp3
-	import mutagen.mp4
-	from mutagen.id3 import ID3
-	#from mutagen.flac import FLAC
-except	ImportError, e:
-	print "python-mutagen not available - art-icon from id3v2 tag turned off"
-	art_icon_from_tag = False
-
-
-rhythmboxbus = "org.gnome.Rhythmbox"
-playerpath = "/org/gnome/Rhythmbox/Player"
-playeriface = "org.gnome.Rhythmbox.Player"
-
-shellpath = "/org/gnome/Rhythmbox/Shell"
-shelliface = "org.gnome.Rhythmbox.Shell"
-
-album_art_tmpfile = "/tmp/docky_%s_rhythmbox_helper.png" % os.getenv('USERNAME')
-album_art_file = "/tmp/docky_%s_rhythmbox_helper.original.png" % os.getenv('USERNAME')
-
-# 0 - none, 1- jewel, 2 - vinyl)
-overlay = 2
-
-class DockyRhythmboxItem(DockyItem):
-	def __init__(self, path):
-		DockyItem.__init__(self, path)
-
-		self.player = None
-		self.shell = None
-
-		self.elapsed_secs = 0
-		self.duration_secs = 0
-		self.songinfo = None
-		self.cover_basename = ""
-		self.current_arturl = ""
-		self.current_arturl_mtime = 0
-
-		self.bus.add_signal_receiver(self.name_owner_changed_cb,
-                                             dbus_interface='org.freedesktop.DBus',
-                                             signal_name='NameOwnerChanged')
-                                             
-		obj = self.bus.get_object ("org.freedesktop.DBus", "/org/freedesktop/DBus")
-		self.bus_interface = dbus.Interface(obj, "org.freedesktop.DBus")
-		
-		self.bus_interface.ListNames (reply_handler=self.list_names_handler, error_handler=self.list_names_error_handler)
-
-		self.bus.add_signal_receiver(self.signal_playingChanged, "playingChanged",  playeriface, rhythmboxbus, playerpath)
-		self.bus.add_signal_receiver(self.signal_elapsedChanged, "elapsedChanged",  playeriface, rhythmboxbus, playerpath)
-		self.bus.add_signal_receiver(self.signal_playingUriChanged, "playingUriChanged",  playeriface, rhythmboxbus, playerpath)
-	
-	def list_names_handler(self, names):
-		if rhythmboxbus in names:
-			self.init_rhythmbox_objects()
-			self.set_menu_buttons()
-			self.update_text()
-			self.update_badge()
-			self.update_icon()
-	
-			
-	def list_names_error_handler(self, error):
-		print "error getting bus names - %s" % str(error)
-	
-	
-	def name_owner_changed_cb(self, name, old_owner, new_owner):
-		if name == rhythmboxbus:
-			if new_owner:
-				self.init_rhythmbox_objects()
-			else:
-				self.player = None
-				self.shell = None
-			self.set_menu_buttons()
-			self.update_text()
-			self.update_badge()
-			self.update_icon()
-	
-	
-	def init_rhythmbox_objects(self):
-		obj = self.bus.get_object(rhythmboxbus, playerpath)
-		self.player = dbus.Interface(obj, playeriface)
-
-		obj = self.bus.get_object(rhythmboxbus, shellpath)
-		self.shell = dbus.Interface(obj, shelliface)
-
-		if self.player and self.shell:
-			self.update_songinfo(self.player.getPlayingUri())
-
-	def clear_menu_buttons(self):
-		for k, v in self.id_map.iteritems():
-			try:
-				self.iface.RemoveItem(k)
-			except:
-				break;	
-	
-	def set_menu_buttons(self):
-		self.clear_menu_buttons()
-				
-		if not self.player:
-			return
-			
-		self.add_menu_item("Previous", "media-skip-backward")
-		if self.rhythmbox_is_playing():
-			self.add_menu_item("Pause", "media-playback-pause")
-		else:
-			self.add_menu_item("Play", "media-playback-start")
-		self.add_menu_item("Next", "media-skip-forward")
-	
-	def signal_playingChanged(self, state):
-		self.set_menu_buttons()
-		self.update_text()
-		self.update_icon()
-
-	def signal_elapsedChanged(self, value):
-		self.elapsed_secs = value
-		self.update_badge()
-
-	def signal_playingUriChanged(self, newuri):
-		self.update_songinfo(newuri)
-		self.update_text()
-
-	def update_songinfo(self, uri):
-		if self.shell:
-			try:
-				song = dict(self.shell.getSongProperties(uri))
-				self.duration_secs = song.get("duration")
-				if self.duration_secs > 0:
-					self.songinfo = '%s - %s (%i:%02i)' % (song.get("artist", "Unknown"), song.get("title", "Unknown"), song.get("duration") / 60, song.get("duration") % 60)
-				else:
-					self.songinfo = '%s - %s' % (song.get("artist", "Unknown"), song.get("title", "Unknown"))
-				self.cover_basename = "%s - %s" % (song.get("artist"), song.get("album"))
-			except dbus.DBusException, e:
-				self.duration_secs = 0
-				self.songinfo = None
-				self.cover_basename = ""
-			return
-		self.duration_secs = 0
-		self.songinfo = None
-
-	def update_icon(self):
-		if not self.player:
-			self.current_arturl = ""
-			self.iface.ResetIcon()
-			return False
-			
-		if not enable_art_icon:
-			return True
-		
-		if self.rhythmbox_is_playing():
-			arturl = self.get_album_art_path()
-			# Add overlay to cover
-			if os.path.isfile(arturl):
-				if self.current_arturl == arturl and self.current_arturl_mtime == os.stat(arturl).st_mtime:
-					return True
-				self.current_arturl = arturl
-				self.current_arturl_mtime = os.stat(arturl).st_mtime
-				self.iface.SetIcon(self.get_album_art_overlay_path(arturl))
-			else:
-				self.current_arturl = ""
-				self.iface.ResetIcon()
-		else:
-			self.current_arturl = ""
-			self.iface.ResetIcon()
-		return True
-		
-	def get_album_art_path(self):
-		if not self.player or not self.shell:
-			return ""
-
-		arturl = ""
-		playinguri = self.player.getPlayingUri()
-		filename = urllib2.unquote(playinguri).replace("file://", "");
-
-		#1. Look in song folder
-		#TODO need to replace some things, this is very weird
-		coverdir = os.path.dirname(filename)
-		covernames = ["cover.jpg", "cover.png", "Cover.jpg", "Cover.png", 
-			"album.jpg", "album.png", "Album.jpg", "Album.png", 
-			"albumart.jpg", "albumart.png", "Albumart.jpg", "Albumart.png", 
-			".folder.jpg", ".folder.png", ".Folder.jpg", ".Folder.png", 
-			"folder.jpg", "folder.png", "Folder.jpg", "Folder.png"]
-		for covername in covernames:
-			arturl = os.path.join(coverdir, covername)
-			if os.path.isfile(arturl):
-				return arturl
-
-		#2. Check rhythmbox dbus song properties
-		arturl = str(self.shell.getSongProperties(playinguri).get("rb:coverArt-uri", ""))
-		if not arturl == "":
-			return arturl
-
-		#3. Look for cached cover
-		arturl = os.path.expanduser("~/.cache/rhythmbox/covers/%s.jpg" % self.cover_basename)
-
-		#4. Look for image in tags
-		if art_icon_from_tag:
-			image_data = None
-			loader = gtk.gdk.PixbufLoader()
-			properties = self.shell.getSongProperties(playinguri)
-			mimetype = properties["mimetype"]
-			if mimetype == "application/x-id3":
-				try:
-					f = ID3(filename)
-				except:
-					print "No ID3 tags in %s" % filename
-					return arturl
-				apicframes = f.getall("APIC")
-				if len(apicframes) >= 1:
-					frame = apicframes[0]
-					image_data = frame.data
-					
-			elif mimetype == "audio/x-aac":
-				try:
-					f = mutagen.mp4.MP4(filename)
-				except:
-					print "MP4 couldn't open %s" % filename
-					return arturl
-					
-				if "covr" in f.tags:
-					covertag = f.tags["covr"][0]
-					image_data = covertag
-					
-			elif mimetype == "audio/x-flac":
-				#f = FLAC(filename)
-				print "cover from FLAC not implemented"
-					
-			if image_data:
-				try:
-					loader.write(image_data)
-					loader.close()
-					pixbuf = loader.get_pixbuf()
-					pixbuf.scale_simple(250, 250, gtk.gdk.INTERP_NEAREST).save(album_art_file, "png", {})
-					return album_art_file
-				except Exception, e:
-					print "problem with image_data from %s" % filename
-					print e
-			try:
-				loader.close()
-			except:
-				return arturl
-			
-		return arturl
-	
-	def get_album_art_overlay_path(self, picfile):
-		if overlay == 0:
-			return picfile
-
-		try:
-			pb = gtk.gdk.pixbuf_new_from_file(picfile)
-		except Exception, e:
-			print e
-			return picfile
-		
-		pb_result = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, True, 8, 250, 250)
-		pb_result.fill(0x00000000)
-
-		if overlay == 1:
-			overlayfile = os.path.join(DOCKY_DATADIR, "albumoverlay_jewel.png")
-			pb.composite(pb_result, 30, 21, 200, 200, 30, 21, 200.0/pb.get_width(), 200.0/pb.get_height(), gtk.gdk.INTERP_BILINEAR, 255)
-		elif overlay == 2:
-			overlayfile = os.path.join(DOCKY_DATADIR, "albumoverlay_vinyl.png")
-			pb.composite(pb_result, 3, 26, 190, 190, 3, 26, 190.0/pb.get_width(), 190.0/pb.get_height(), gtk.gdk.INTERP_BILINEAR, 255)
-		else:
-			return picfile
-
-		pb_overlay = gtk.gdk.pixbuf_new_from_file_at_size(overlayfile, 250, 250)
-		pb_overlay.composite(pb_result, 0, 0, 250, 250, 0, 0, 1, 1, gtk.gdk.INTERP_BILINEAR, 255)
-		pb_result.save(album_art_tmpfile, "png", {})
-		
-		return album_art_tmpfile
-		
-	def update_text(self):
-		if not self.shell or not self.player:
-			self.iface.ResetText()
-
-		if self.rhythmbox_is_playing() and self.songinfo:
-			self.iface.SetText(self.songinfo)
-		else:
-			self.iface.ResetText()
-
-	def update_badge(self):
-		if not self.player:
-			self.iface.ResetBadgeText()
-		
-		if not enable_badge_text:
-			return True
-		
-		if self.rhythmbox_is_playing():
-			#if song length is 0 then counting up instead of down
-			if self.duration_secs > 0:
-				position = self.duration_secs - self.elapsed_secs
-			else:
-				position = self.elapsed_secs
-			string = '%i:%02i' % (position / 60, position % 60)
-			self.iface.SetBadgeText(string)
-		else:
-			self.iface.ResetBadgeText()
-	
-	def menu_pressed(self, menu_id):
-		if self.id_map[menu_id] == "Play":
-			self.rhythmbox_playPause()
-		elif self.id_map[menu_id] == "Pause":
-			self.rhythmbox_playPause()
-		elif self.id_map[menu_id] == "Next":
-			self.rhythmbox_next()
-		elif self.id_map[menu_id] == "Previous":
-			self.rhythmbox_prev()
-		
-	def add_menu_item(self, name, icon):
-		menu_id = self.iface.AddMenuItem(name, icon, "")
-		self.id_map[menu_id] = name
-		
-	def rhythmbox_playPause(self):
-		if self.player:
-			self.player.playPause(True)
-		
-	def rhythmbox_next(self):
-		if self.player:
-			self.player.next()
-		
-	def rhythmbox_prev(self):
-		if self.player:
-			self.player.previous()
-	
-	def rhythmbox_is_playing(self):
-		if self.player:
-			try:
-				return self.player.getPlaying() == 1
-			except dbus.DBusException, e:
-				return False		
-		return False
-		
-class DockyRhythmboxSink(DockySink):
-	def item_path_found(self, pathtoitem, item):
-		if item.GetOwnsDesktopFile() and item.GetDesktopFile().endswith ("rhythmbox.desktop"):
-			self.items[pathtoitem] = DockyRhythmboxItem(pathtoitem)
-
-dockysink = DockyRhythmboxSink()
-
-def cleanup ():
-	dockysink.dispose ()
-
-if __name__ == "__main__":
-	mainloop = gobject.MainLoop(is_running=True)
-
-	atexit.register (cleanup)
-	
-	signal(SIGTERM, lambda signum, stack_frame: exit(1))
-
-	while mainloop.is_running():
-		mainloop.run()

=== removed file 'scripts/tomboy_menus.py'
--- scripts/tomboy_menus.py	2010-01-16 20:53:23 +0000
+++ scripts/tomboy_menus.py	1970-01-01 00:00:00 +0000
@@ -1,146 +0,0 @@
-#!/usr/bin/env python
-
-#  
-#  Copyright (C) 2009-2010 Jason Smith, Rico Tzschichholz
-# 
-#  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/>.
-#
-
-import atexit
-import gobject
-import glib
-import dbus
-import dbus.glib
-import sys
-import os
-
-try:
-	from docky.docky import DockyItem, DockySink
-	from signal import signal, SIGTERM
-	from sys import exit
-except ImportError, e:
-	exit()
-
-tomboybus = "org.gnome.Tomboy"
-tomboypath = "/org/gnome/Tomboy/RemoteControl"
-tomboyiface = "org.gnome.Tomboy.RemoteControl"
-
-class DockyTomboyItem(DockyItem):
-	def __init__(self, path):
-		DockyItem.__init__(self, path)
-		self.tomboy = None
-		
-		self.bus.add_signal_receiver(self.name_owner_changed_cb,
-                                             dbus_interface='org.freedesktop.DBus',
-                                             signal_name='NameOwnerChanged')
-                                             
-		obj = self.bus.get_object ("org.freedesktop.DBus", "/org/freedesktop/DBus")
-		self.bus_interface = dbus.Interface(obj, "org.freedesktop.DBus")
-		
-		self.bus_interface.ListNames (reply_handler=self.list_names_handler, error_handler=self.list_names_error_handler)
-	
-		self.bus.add_signal_receiver(self.note_added, "NoteAdded", tomboyiface, tomboybus, tomboypath)
-		self.bus.add_signal_receiver(self.note_deleted, "NoteDeleted", tomboyiface, tomboybus, tomboypath)
-		self.bus.add_signal_receiver(self.note_changed, "NoteChanged", tomboyiface, tomboybus, tomboypath)
-	
-	def list_names_handler(self, names):
-		if tomboybus in names:
-			self.init_tomboy_objects()
-			self.set_menu_buttons()
-
-	def list_names_error_handler(self, error):
-		print "error getting bus names - %s" % str(error)
-	
-	def name_owner_changed_cb(self, name, old_owner, new_owner):
-		if name == tomboybus:
-			if new_owner:
-				self.init_tomboy_objects()
-			else:
-				self.tomboy = None
-
-			self.set_menu_buttons()
-	
-	def init_tomboy_objects(self):
-		obj = self.bus.get_object(tomboybus, tomboypath)
-		self.tomboy = dbus.Interface(obj, tomboyiface)
-		
-	def note_added (self, note):
-		self.set_menu_buttons()
-		
-	def note_deleted (self, note, a):
-		self.set_menu_buttons()
-	
-	def note_changed (self, note):
-		self.set_menu_buttons()
-	
-	def clear_menu_buttons(self):
-		for k, v in self.id_map.iteritems():
-			try:
-				self.iface.RemoveItem(k)
-			except:
-				break;	
-	
-	def set_menu_buttons(self):
-		self.clear_menu_buttons()
-		
-		if not self.tomboy:
-			return
-
-		self.add_menu_item ("Create New Note", "tomboy", "New", "Tomboy Controls")
-		self.add_menu_item ("Find Note...", "gtk-find", "Find", "Tomboy Controls")
-		
-		for note in self.get_tomboy_menu_notes ():
-			self.add_menu_item (self.tomboy.GetNoteTitle(note), "tomboy", note, "Notes")
-		
-	def get_tomboy_menu_notes(self):
-		notes = self.tomboy.ListAllNotes()
-		notes.sort(key=self.tomboy.GetNoteChangeDate)
-		notes.reverse()
-		return notes[:9]
-		
-	def menu_pressed(self, menu_id):
-		if not menu_id in self.id_map:
-			return	
-		
-		menu_id = self.id_map[menu_id]
-		
-		if menu_id == "New":
-			newnote = self.tomboy.CreateNote()
-			self.tomboy.DisplayNote(newnote)
-		elif menu_id == "Find":
-			self.tomboy.DisplaySearch()
-		else:
-			self.tomboy.DisplayNote(menu_id)
-		
-	def add_menu_item(self, name, icon, ident, title):
-		menu_id = self.iface.AddMenuItem(name, icon, title)
-		self.id_map[menu_id] = ident
-		
-class DockyTomboySink(DockySink):
-	def item_path_found(self, pathtoitem, item):
-		if item.GetOwnsDesktopFile() and item.GetDesktopFile().endswith ("tomboy.desktop"):
-			self.items[pathtoitem] = DockyTomboyItem(pathtoitem)
-
-dockysink = DockyTomboySink()
-
-def cleanup ():
-	dockysink.dispose ()
-
-if __name__ == "__main__":
-	mainloop = gobject.MainLoop(is_running=True)
-
-	atexit.register (cleanup)
-	signal(SIGTERM, lambda signum, stack_frame: exit(1))
-
-	mainloop.run()

=== removed file 'scripts/transmission_badge.py'
--- scripts/transmission_badge.py	2010-02-26 08:30:46 +0000
+++ scripts/transmission_badge.py	1970-01-01 00:00:00 +0000
@@ -1,125 +0,0 @@
-#!/usr/bin/env python
-
-#  
-#  Copyright (C) 2010 Dan Korostelev, Rico Tzschichholz
-# 
-#  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/>.
-#
-
-import atexit
-import dbus
-import gobject
-
-try:
-	from docky.docky import DockyItem, DockySink
-	from signal import signal, SIGTERM
-	from sys import exit
-	import urllib2
-	import json
-except ImportError, e:
-	print e
-	exit()
-
-transmissionbus = "com.transmissionbt.Transmission"
-transmissionrpcurl = "http://localhost:9091/transmission/rpc"
-UPDATE_DELAY = 2000 # 2 secs
-
-
-def bytes2ratestr(bytes):
-	for factor, suffix in (
-		(1024 ** 5, 'P'),
-		(1024 ** 4, 'T'), 
-		(1024 ** 3, 'G'), 
-		(1024 ** 2, 'M'), 
-		(1024 ** 1, 'K'),
-		(1024 ** 0, 'B')):
-		if bytes >= factor:
-			break
-	amount = int(bytes / factor)
-	return str(amount) + suffix
-
-
-class DockyTransmissionItem(DockyItem):
-
-	def __init__(self, path):
-		DockyItem.__init__(self, path)
-		self.request = urllib2.Request(transmissionrpcurl+'?method=session-stats')
-		self.timer = 0
-
-		self.bus.add_signal_receiver(self.name_owner_changed_cb,
-		                             dbus_interface='org.freedesktop.DBus',
-		                             signal_name='NameOwnerChanged',
-		                             arg0=transmissionbus)
-			
-		self.start_polling()
-		self.update_badge()
-
-	def start_polling(self):
-		if not self.timer > 0:
-			self.timer = gobject.timeout_add(UPDATE_DELAY, self.update_badge)
-
-	def stop_polling(self):
-		if self.timer > 0:
-			gobject.source_remove(self.timer)
-			self.timer = 0
-
-	def name_owner_changed_cb(self, name, old_owner, new_owner):
-		if new_owner:
-			# transmission started, resume polling
-			self.start_polling()
-			self.update_badge()
-		else:
-			# transmission stopped, stop polling and remove badge
-			self.stop_polling()
-			self.iface.ResetBadgeText()
-
-	def update_badge(self):
-		try:
-			for i in range(2): # first try can be getting session id
-				try:
-					response = urllib2.urlopen(self.request)
-					break # if no error, we don't need second try
-				except urllib2.HTTPError, e:
-					if e.code == 409 and 'X-Transmission-Session-Id' in e.headers:
-						self.request.add_header('X-Transmission-Session-Id', e.headers['X-Transmission-Session-Id'])
-			result = json.load(response)
-			#Select Download Speed
-			speed = result['arguments']['downloadSpeed']
-			if speed:
-				self.iface.SetBadgeText(bytes2ratestr(speed))
-			else:
-				self.iface.ResetBadgeText()
-			return True
-		except Exception as e:
-			self.stop_polling()
-			self.iface.ResetBadgeText()
-
-
-class DockyTransmissionSink(DockySink):
-	def item_path_found(self, pathtoitem, item):
-		if item.GetOwnsDesktopFile() and item.GetDesktopFile().endswith("transmission.desktop"):
-			self.items[pathtoitem] = DockyTransmissionItem(pathtoitem)
-
-transmissionsink = DockyTransmissionSink()
-
-def cleanup ():
-	transmissionsink.dispose ()
-
-if __name__ == '__main__':
-	mainloop = gobject.MainLoop(is_running=True)
-	
-	atexit.register (cleanup)
-	signal(SIGTERM, lambda signum, stack_frame: exit(1))
-	
-	mainloop.run()

=== removed file 'scripts/tsclient_menus.py'
--- scripts/tsclient_menus.py	2010-05-25 18:19:27 +0000
+++ scripts/tsclient_menus.py	1970-01-01 00:00:00 +0000
@@ -1,140 +0,0 @@
-#!/usr/bin/env python
-
-#  
-#  Copyright (C) 2010 James Hewitt
-# 
-#  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/>.
-#
-
-import atexit
-import gobject
-import glib
-import sys
-import os
-
-try:
-	from docky.docky import DockyItem, DockySink
-	from signal import signal, SIGTERM
-	from sys import exit
-	from subprocess import Popen
-except ImportError, e:
-	exit()
-
-monitor_with_inotify = True
-try:
-	import pyinotify
-except ImportError, e:
-	print "pyinotify not available - not monitoring for new configurations"
-	monitor_with_inotify = False
-
-rdp_bookmark_dir = os.path.expanduser("~/.tsclient") 
-
-class TsclientItem(DockyItem):
-	def __init__(self, path):
-		DockyItem.__init__(self, path)
-		self.file_map = {}
-		self.read_files()
-
-		if monitor_with_inotify:
-			wm = pyinotify.WatchManager()
-			handler = TsclientMonitor(item=self)
-			notifier = GobjectNotifier(wm, default_proc_fun=handler)
-			wm.add_watch(rdp_bookmark_dir, pyinotify.ALL_EVENTS)
-
-	def read_files(self):
-		files = os.listdir(rdp_bookmark_dir)
-		for filename in files:
-			self.add_file(filename)
-
-	def add_file(self, name):
-		if name[-4:] == ".rdp":
-			menu_id = self.iface.AddMenuItem(name[:-4], "tsclient", "Bookmarks")
-			self.id_map[menu_id] = name
-			self.file_map[name] = menu_id
-
-	def remove_file(self, name):
-		if name[-4:] == ".rdp":
-			menu_id = self.file_map[name]
-			self.iface.RemoveItem(menu_id)
-			del self.id_map[menu_id]
-			del self.file_map[name]
-
-	def menu_pressed(self, menu_id):
-		if self.id_map[menu_id] != None:
-			filename = os.path.join(rdp_bookmark_dir, self.id_map[menu_id])
-			if os.path.isfile(filename):
-				self.start_tsclient(filename)
-
-	def start_tsclient(self, filename):
-		Popen(["tsclient", "-x", filename])
-
-if monitor_with_inotify:
-	class GobjectNotifier(pyinotify.Notifier):
-		"""
-		This notifier uses a gobject io watch to trigger event processing.
-
-		"""
-		def __init__(self, watch_manager, default_proc_fun=None, read_freq=0, threshold=0, timeout=None):
-			"""
-			Initializes the gobject notifier. See the
-			Notifier class for the meaning of the parameters.
-
-			"""
-			pyinotify.Notifier.__init__(self, watch_manager, default_proc_fun, read_freq, threshold, timeout)
-			gobject.io_add_watch(self._fd, gobject.IO_IN|gobject.IO_PRI, self.handle_read)
-
-		def handle_read(self, source, condition):
-			"""
-			When gobject tells us we can read from the fd, we proceed processing
-			events. This method can be overridden for handling a notification
-			differently.
-
-			"""
-			self.read_events()
-			self.process_events()
-			return True
-
-	class TsclientMonitor(pyinotify.ProcessEvent):
-		def my_init(self, item):
-			self._item = item
-
-		def process_IN_CREATE(self, event):
-			self._item.add_file(event.name)
-
-		def process_IN_DELETE(self, event):
-			self._item.remove_file(event.name)
-
-		def process_IN_MOVED_FROM(self, event):
-			self._item.remove_file(event.name)
-
-		def process_IN_MOVED_TO(self, event):
-			self._item.add_file(event.name)
-
-class TsclientSink(DockySink):
-	def item_path_found(self, pathtoitem, item):
-		if item.GetOwnsDesktopFile() and item.GetDesktopFile().endswith("tsclient.desktop"):
-			self.items[pathtoitem] = TsclientItem(pathtoitem)
-
-tscsink = TsclientSink()
-
-def cleanup():
-	tscsink.dispose()
-
-if __name__ == "__main__":
-	mainloop = gobject.MainLoop(is_running=True)
-
-	atexit.register(cleanup)
-	signal(SIGTERM, lambda signum, stack_frame: exit(1))
-
-	mainloop.run()

=== removed file 'scripts/zeitgeist_docky.py'
--- scripts/zeitgeist_docky.py	2010-04-26 10:23:32 +0000
+++ scripts/zeitgeist_docky.py	1970-01-01 00:00:00 +0000
@@ -1,153 +0,0 @@
-#!/usr/bin/env python
-
-#  
-#  Copyright (C) 2009 Jason Smith, Seif Lotfy
-# 
-#  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/>.
-#
-
-import atexit
-import gobject
-import time
-import glib
-import dbus
-import gtk
-import dbus.glib
-import sys
-import urllib
-import os
-
-try:
-	from docky.docky import DockyItem, DockySink
-	from zeitgeist.client import ZeitgeistClient
-	from zeitgeist.datamodel import Event, Subject, Interpretation, Manifestation, StorageState
-	from signal import signal, SIGTERM
-	from sys import exit
-except ImportError, e:
-	exit()
-
-try:
-	CLIENT = ZeitgeistClient()
-	version = [int(x) for x in CLIENT.get_version()]
-	MIN_VERSION = [0, 3, 2, 0]
-	if version < MIN_VERSION:
-		print "PLEASE USE ZEITGEIST 0.3.2 or above"
-		exit()
-		
-
-except RuntimeError, e:
-	print "Unable to connect to Zeitgeist, won't send events. Reason: '%s'" %e
-	exit()
-	
-class MostUsedProvider():
-	def __init__(self):
-		self._zg = CLIENT
-		self.results = []
-
-	def get_path_most_used(self, path, handler, is_directoy=True):
-		today = time.time() * 1000
-		delta = (today - 14 * 86400000)
-
-		def exists(uri):
-		 	return not uri.startswith("file://") or os.path.exists(urllib.unquote(str(uri[7:])))
-
-		def _handle_find_events(ids):
-			self._zg.get_events(ids, _handle_get_events)
-
-		def _handle_get_events(events):
-			uris = []
-			uris_counter = {}
-			for event in events:
-				for subject in event.subjects:
-					if exists(subject.uri):
-						if not subject.uri in uris:
-							uris.append(subject.uri)
-							uris_counter[subject.uri] = 0
-						uris_counter[subject.uri] += 1
-						
-			counter = []
-			for k, v in uris_counter.iteritems():
-				counter.append((v, k))
-			counter.sort(reverse = True)
-
-			recent =[]
-			temp = [i[1] for i in counter]
-			for uri in uris:
-				if not uri in temp[0:5]:
-					recent.append(uri)
-			results = []
-			results.append(recent[0:5])
-
-			results.append(counter[0:5])
-			handler(results)
-		
-		event = Event()
-		if is_directoy:
-			subject = Subject()
-			subject.set_origin(path)
-			event.set_subjects([subject])
-			self._zg.find_events_for_templates([event],_handle_get_events, [delta, today], StorageState.Any, 0, 0) 
-		else:
-			path = "application://" + path.split("/")[-1]
-			event.set_actor(path)
-			self._zg.find_events_for_templates([event],_handle_get_events, [delta, today], StorageState.Any, 0, 0)  
-
-
-class DockyZGItem(DockyItem):
-	def __init__(self, path):
-		DockyItem.__init__(self, path)
-		self.mostusedprovider = MostUsedProvider()
-		self.update_most_used()
-	
-	def update_most_used(self):
-		self.uri = ""
-		if self.iface.GetOwnsUri():
-			self.uri = self.iface.GetUri();
-		elif self.iface.GetOwnsDesktopFile():
-			self.uri = self.iface.GetDesktopFile()
-		else:
-			return
-		self.mostusedprovider.get_path_most_used (self.uri, self._handle_get_most_used, self.iface.GetOwnsUri ())
-
-	def _handle_get_most_used(self, results):
-		uris = results[0]
-		if len(uris) > 0:
-			for subject in uris:
-				menu_id = self.iface.AddFileMenuItem(subject ,"Other Recently Used Items")
-				self.id_map[menu_id] = subject
-		uris = results[1]
-		if len(uris) > 0:
-			for subject in uris:
-				menu_id = self.iface.AddFileMenuItem(subject[1], "Most Used Items")
-				self.id_map[menu_id] = subject
-
-class DockyZGSink(DockySink):
-	def item_path_found(self, pathtoitem, item):
-		if item.GetOwnsUri() or item.GetOwnsDesktopFile():
-			self.items[pathtoitem] = DockyZGItem(pathtoitem)
-
-dockysink = DockyZGSink()
-
-def cleanup ():
-	dockysink.dispose ()
-
-if __name__ == "__main__":
-	mainloop = gobject.MainLoop(is_running=True)
-
-	atexit.register (cleanup)
-	
-	signal(SIGTERM, lambda signum, stack_frame: exit(1))
-
-	while mainloop.is_running():
-	    mainloop.run()

=== removed file 'scripts/zeitgeist_journal.py'
--- scripts/zeitgeist_journal.py	2010-02-01 07:27:33 +0000
+++ scripts/zeitgeist_journal.py	1970-01-01 00:00:00 +0000
@@ -1,512 +0,0 @@
-#!/usr/bin/env python
-# -.- coding: utf-8 -.-
-
-# Zeitgeist
-#
-# Copyright © 2009 Seif Lotfy <[e-mail]>
-# Copyright © 2009 Siegfried Gevatter <[e-mail]>
-#
-# 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 Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import os.path
-import gobject
-import sys
-import urllib
-import datetime
-import time
-import os
-import gtk
-import gnome.ui
-import atexit
-
-try:
-	from docky.docky import DockyItem, DockySink
-	from zeitgeist.client import ZeitgeistClient
-	from zeitgeist.datamodel import Event, Subject, Interpretation, Manifestation, StorageState
-	from signal import signal, SIGTERM
-	from sys import exit
-except ImportError, e:
-	exit()
-
-try:
-	CLIENT = ZeitgeistClient()
-	version = [int(x) for x in CLIENT.get_version()]
-	MIN_VERSION = [0, 3, 1, 0]
-	if version < MIN_VERSION:
-		print "PLEASE USE ZEITGEIST 0.3.1 or above"
-		exit()
-
-except RuntimeError, e:
-	print "Unable to connect to Zeitgeist, won't send events. Reason: '%s'" %e
-	exit()
-
-INTERPRETATION = {
-		"http://zeitgeist-project.com/schema/1.0/core#VisitEvent":"OPENED",
-		"http://zeitgeist-project.com/schema/1.0/core#ModifyEvent":"SAVED",
-		"http://zeitgeist-project.com/schema/1.0/core#CreateEvent":"CREATED"
-		}
-
-class LaunchManager:
-    """
-    A program lauching utility which handles opening a URI or executing a
-    program or .desktop launcher, handling variable expansion in the Exec
-    string.
-
-    Adds the launched URI or launcher to the ~/.recently-used log. Sets a
-    DESKTOP_STARTUP_ID environment variable containing useful information such
-    as the URI which caused the program execution and a timestamp.
-
-    See the startup notification spec for more information on
-    DESKTOP_STARTUP_IDs.
-    """
-    
-    def __init__(self):
-        self.recent_model = None
-
-    def _get_recent_model(self):
-        # FIXME: This avoids import cycles
-        if not self.recent_model:
-            import zeitgeist_recent
-            self.recent_model = zeitgeist_recent.recent_model
-        return self.recent_model
-    
-    def launch_uri(self, uri, mimetype = None):
-        assert uri, "Must specify URI to launch"
-    
-        child = os.fork()
-        if not child:
-            # Inside forked child
-            os.setsid()
-            os.environ['zeitgeist_LAUNCHER'] = uri
-            os.environ['DESKTOP_STARTUP_ID'] = self.make_startup_id(uri)
-            os.spawnlp(os.P_NOWAIT, "gnome-open", "gnome-open", uri)
-            os._exit(0)
-        else:
-            os.wait()
-            if not mimetype:
-                mimetype = "application/octet-stream"
-            try:
-                # Use XDG to lookup mime type based on file name.
-                # gtk_recent_manager_add_full requires it.
-                import xdg.Mime
-                mimetype = xdg.Mime.get_type_by_name(uri)
-                if mimetype:
-                    mimetype = str(mimetype)
-                return mimetype
-            except (ImportError, NameError):
-                # No mimetype found for URI: %s
-                pass
-        return child
-    
-    def get_local_path(self, uri):
-        scheme, path = urllib.splittype(uri)
-        if scheme == None:
-            return uri
-        elif scheme == "file":
-            path = urllib.url2pathname(path)
-            if path[:3] == "///":
-                path = path[2:]
-            return path
-        return None
-    
-    def launch_command_with_uris(self, command, uri_list, launcher_uri = None):
-        if command.rfind("%U") > -1:
-            uri_str = ""
-            for uri in uri_list:
-                uri_str = uri_str + " " + uri
-                return self.launch_command(command.replace("%U", uri_str), launcher_uri)
-        elif command.rfind("%F") > -1:
-            file_str = ""
-            for uri in uri_list:
-                uri = self.get_local_path(self, uri)
-                if uri:
-                    file_str = file_str + " " + uri
-                else:
-                    # Command does not support non-file URLs
-                    pass
-            return self.launch_command(command.replace("%F", file_str), launcher_uri)
-        elif command.rfind("%u") > -1:
-            startup_ids = []
-            for uri in uri_list:
-                startup_ids.append(self.launch_command(command.replace("%u", uri), launcher_uri))
-            else:
-                return self.launch_command(command.replace("%u", ""), launcher_uri)
-            return startup_ids
-        elif command.rfind("%f") > -1:
-            startup_ids = []
-            for uri in uri_list:
-                uri = self.get_local_path(self, uri)
-                if uri:
-                    startup_ids.append(self.launch_command(command.replace("%f", uri),
-                                                           launcher_uri))
-                else:
-                    #print " !!! Command does not support non-file URLs: ", command
-                    pass
-            else:
-                return self.launch_command(command.replace("%f", ""), launcher_uri)
-            return startup_ids
-        else:
-            return self.launch_command(command, launcher_uri)
-    
-    def make_startup_id(self, key, ev_time = None):
-        if not ev_time:
-            ev_time = gtk.get_current_event_time()
-        if not key:
-            return "zeitgeist_TIME%d" % ev_time
-        else:
-            return "zeitgeist:%s_TIME%d" % (key, ev_time)
-
-    def parse_startup_id(self, id):
-        if id and id.startswith("zeitgeist:"):
-            try:
-                uri = id[len("zeitgeist:"):id.rfind("_TIME")]
-                timestamp = id[id.rfind("_TIME") + len("_TIME"):]
-                return (uri, timestamp)
-            except IndexError:
-                pass
-        return (None, None)
-
-    def launch_command(self, command, launcher_uri = None):
-        startup_id = self.make_startup_id(launcher_uri)
-        child = os.fork()
-        if not child:
-            # Inside forked child
-            os.setsid()
-            os.environ['DESKTOP_STARTUP_ID'] = startup_id
-            if launcher_uri:
-                os.environ['zeitgeist_LAUNCHER'] = launcher_uri
-            os.system(command)
-            os._exit(0)
-        else:
-            os.wait()
-           
-            return (child, startup_id)
-
-class IconFactory():
-    """
-    Icon lookup swiss-army knife (from menutreemodel.py)
-    """
-    
-    def __init__(self):
-        self.icon_dict={}
-    
-    def load_icon_from_path(self, icon_path, icon_size=None):
-        try:
-            if icon_size:
-                icon = gtk.gdk.pixbuf_new_from_file_at_size(icon_path,
-                    int(icon_size), int(icon_size))
-                return icon
-            else:
-                return gtk.gdk.pixbuf_new_from_file(icon_path)
-        except Exception:
-            pass
-        return None
-    
-    def load_icon_from_data_dirs(self, icon_value, icon_size=None):
-        data_dirs = None
-        if os.environ.has_key("XDG_DATA_DIRS"):
-            data_dirs = os.environ["XDG_DATA_DIRS"]
-        if not data_dirs:
-            data_dirs = "/usr/local/share/:/usr/share/"
-
-        for data_dir in data_dirs.split(":"):
-            retval = self.load_icon_from_path(os.path.join(data_dir, "pixmaps", icon_value),
-                                              icon_size)
-            if retval:
-                return retval
-            
-            retval = self.load_icon_from_path(os.path.join(data_dir, "icons", icon_value),
-                                              icon_size)
-            if retval:
-                return retval
-        return None
-    
-    def transparentize(self, pixbuf, percent):
-        pixbuf = pixbuf.add_alpha(False, '0', '0', '0')
-        for row in pixbuf.get_pixels_array():
-            for pix in row:
-                pix[3] = min(int(pix[3]), 255 - (percent * 0.01 * 255))
-        return pixbuf
-    
-    def greyscale(self, pixbuf):
-        pixbuf = pixbuf.copy()
-        for row in pixbuf.get_pixels_array():
-            for pix in row:
-                pix[0] = pix[1] = pix[2] = (int(pix[0]) + int(pix[1]) + int(pix[2])) / 3
-        return pixbuf
-    
-    def load_icon(self, icon_value, icon_size, force_size=True, cache=True):
-        if not self.icon_dict.has_key(str(icon_value)+str(icon_size)) or not cache:
-            try:
-                if isinstance(icon_value, gtk.gdk.Pixbuf):
-                    return icon_value
-                elif os.path.isabs(icon_value):
-                    icon = self.load_icon_from_path(icon_value, icon_size)
-                    if icon:
-                        return icon
-                    icon_name = os.path.basename(icon_value)
-                else:
-                    icon_name = icon_value
-                
-                if icon_name.endswith(".png"):
-                    icon_name = icon_name[:-len(".png")]
-                elif icon_name.endswith(".xpm"):
-                    icon_name = icon_name[:-len(".xpm")]
-                elif icon_name.endswith(".svg"):
-                    icon_name = icon_name[:-len(".svg")]
-                
-                icon = None
-                info = icon_theme.lookup_icon(icon_name, icon_size, gtk.ICON_LOOKUP_USE_BUILTIN)
-                if info:
-                    if icon_name.startswith("gtk-"):
-                        icon = info.load_icon()
-                    elif info.get_filename():
-                        icon = self.load_icon_from_path(info.get_filename(), icon_size)
-                else:
-                    icon = self.load_icon_from_data_dirs(icon_value, icon_size) 
-                
-                if cache:
-                    self.icon_dict[str(icon_value)+str(icon_size)] = icon
-                return icon
-            except Exception:
-                self.icon_dict[str(icon_value)+str(icon_size)] = None
-                return None
-        else:
-            return self.icon_dict[str(icon_value)+str(icon_size)]
-    
-    def load_image(self, icon_value, icon_size, force_size=True):
-        pixbuf = self.load_icon(icon_value, icon_size, force_size)
-        img = gtk.Image()
-        img.set_from_pixbuf(pixbuf)
-        img.show()
-        return img
-
-    def make_icon_frame(self, thumb, icon_size = None, blend = False):
-        border = 1
-
-        mythumb = gtk.gdk.Pixbuf(thumb.get_colorspace(),
-                                 True,
-                                 thumb.get_bits_per_sample(),
-                                 thumb.get_width(),
-                                 thumb.get_height())
-        mythumb.fill(0x00000080) # black, 50% transparent
-        if blend:
-            thumb.composite(mythumb, 0.5, 0.5,
-                            thumb.get_width(), thumb.get_height(),
-                            0.5, 0.5,
-                            0.5, 0.5,
-                            gtk.gdk.INTERP_NEAREST,
-                            256)
-        thumb.copy_area(border, border,
-                        thumb.get_width() - (border * 2), thumb.get_height() - (border * 2),
-                        mythumb,
-                        border, border)
-        return mythumb
-    
-    
-class Thumbnailer:
-    
-    def __init__(self):
-        self.icon_dict={}
-
-    def get_icon(self, subject, icon_size, timestamp = 0):
-        
-        uri = subject.uri
-        if not self.icon_dict.get(uri+str(icon_size)):
-            cached_icon = self._lookup_or_make_thumb(uri, subject.mimetype,
-                icon_size, timestamp)
-            self.icon_dict[uri+str(icon_size)] = cached_icon
-        
-        return self.icon_dict[uri+str(icon_size)]
-
-    def _lookup_or_make_thumb(self, uri, mimetype, icon_size, timestamp):
-        icon_name, icon_type = \
-                   gnome.ui.icon_lookup(icon_theme, thumb_factory, uri, mimetype, 0)
-        try:
-            if icon_type == gnome.ui.ICON_LOOKUP_RESULT_FLAGS_THUMBNAIL or \
-                   thumb_factory.has_valid_failed_thumbnail(uri,int(timestamp)):
-                # Use existing thumbnail
-                thumb = icon_factory.load_icon(icon_name, icon_size)
-            elif self._is_local_uri(uri):
-                # Generate a thumbnail for local files only
-                thumb = thumb_factory.generate_thumbnail(uri, mimetype)
-                thumb_factory.save_thumbnail(thumb, uri, timestamp)
-
-            if thumb:
-                thumb = icon_factory.make_icon_frame(thumb, icon_size)
-                return thumb
-            
-        except Exception:
-            pass
-
-        return icon_factory.load_icon(icon_name, icon_size)
-
-    def _is_local_uri(self, uri):
-        # NOTE: gnomevfs.URI.is_local seems to hang for some URIs (e.g. ssh
-        #        or http).  So look in a list of local schemes which comes
-        #        directly from gnome_vfs_uri_is_local_scheme.
-        scheme, path = urllib.splittype(self.get_uri() or "")
-        return not scheme or scheme in ("file", "help", "ghelp", "gnome-help", "trash",
-                                        "man", "info", "hardware", "search", "pipe",
-                                        "gnome-trash")
-
-class CellRendererPixbuf(gtk.CellRendererPixbuf):
-    
-    __gsignals__ = {
-        'toggled': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
-        (gobject.TYPE_STRING,))
-    }
-    def __init__(self):
-        gtk.CellRendererPixbuf.__init__(self)
-        self.set_property('mode', gtk.CELL_RENDERER_MODE_ACTIVATABLE)
-    
-    def do_activate(self, event, widget, path, background_area, cell_area, flags):
-        model = widget.get_model()
-        self.emit("toggled",path)
-
-icon_theme = gtk.icon_theme_get_default()
-icon_factory = IconFactory()
-thumbnailer = Thumbnailer()
-thumb_factory = gnome.ui.ThumbnailFactory("normal")
-launcher = LaunchManager()
-
-
-from zeitgeist.datamodel import Event, Subject, Interpretation, Manifestation, StorageState
-
-class Window(gtk.Window):
-	def __init__(self, CLIENT):
-		gtk.Window.__init__(self)
-		self.view = DataIconView()
-		scroll = gtk.ScrolledWindow()
-		scroll.add_with_viewport(self.view)
-		self.add(scroll)
-		scroll.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
-		self._zg = CLIENT
-		self.set_size_request(600,480)
-		self.show_all()
-
-	def load_events(self, start=0, end=0, actor=None):
-		self.set_title("Journal for "+actor)
-		def exists(uri):
-			return not uri.startswith("file://") or os.path.exists(urllib.unquote(str(uri[7:])))
-
-		def _handle_find_events(ids):
-			self._zg.get_events(ids, _handle_get_events)
-
-		def _handle_get_events(events):
-			uris = []
-			for event in events:
-				for subject in event.subjects:
-					if exists(subject.uri):
-						self.view.append_object(event)
-		
-		event = Event()
-		event.set_actor(actor)
-		self._zg.find_events_for_templates([event],_handle_get_events, [start, end], StorageState.Any, 0, 4) 
-
-
-class DataIconView(gtk.TreeView):
-	def __init__(self):
-		gtk.TreeView.__init__(self)
-		self.store = gtk.TreeStore(gtk.gdk.Pixbuf,
-					str,	#TIME
-					str,	#INTERPRETATION
-					str,	#Subject_TEXT
-					gobject.TYPE_PYOBJECT
-					)
-
-		# Icon 
-		icon_cell = gtk.CellRendererPixbuf()
-		icon_cell.set_property("yalign", 0.5)
-		icon_column = gtk.TreeViewColumn("Icon",icon_cell,pixbuf=0)
-		
-		time_cell = gtk.CellRendererText()
-		time_column = gtk.TreeViewColumn("Time", time_cell, markup=1)
-				
-		interp_cell = gtk.CellRendererText()
-		interp_column = gtk.TreeViewColumn("Interpretation", interp_cell, markup=2)
-		
-		subject_cell = gtk.CellRendererText()
-		subject_column = gtk.TreeViewColumn("Subject", subject_cell, markup=3)
-		
-		self.append_column(time_column)
-		self.append_column(icon_column)
-		self.append_column(subject_column)
-		self.append_column(interp_column)
-		self.set_model(self.store)
-
-		self.set_headers_visible(False)
-		self.iter = {"uri":None, "iter":None}
-
-	def clear(self):
-		self.store.clear()
-
-	def append_object(self, event):
-
-		icon = thumbnailer.get_icon(event.subjects[0], 32)
-		date = int(event.timestamp)/1000
-		date = datetime.datetime.fromtimestamp(date).strftime("%H:%M:%S		%A, %D") 
-
-		iterator = None
-		if self.iter["uri"] == event.subjects[0].uri:
-			self.store.append(self.iter["iter"], 
-						[icon,
-						date,
-						INTERPRETATION[event.interpretation],
-						event.subjects[0].text,
-						event])
-		else:
-			iterator = None
-			self.iter["uri"] = event.subjects[0].uri
-			self.iter["iter"] = self.store.append(None, [icon,
-								date,
-								INTERPRETATION[event.interpretation],
-								event.subjects[0].text,
-								event])
-
-class DockyJournalItem(DockyItem):
-	def __init__(self, path):
-		DockyItem.__init__(self, path)
-		menu_id = self.iface.AddMenuItem("Journal", "document-open-recent", "")
-		self.id_map[menu_id] = "Journal"
-		self.uri = ""
-		if self.iface.GetOwnsUri():
-			self.uri = self.iface.GetUri()
-		else:
-			self.uri = self.iface.GetDesktopFile()
-
-	def menu_pressed(self, menu_id):
-		if self.id_map[menu_id] == "Journal":
-			window = Window(CLIENT)
-			window.load_events(0, time.time() * 1000, self.uri)
-			
-class DockyJournalSink(DockySink):
-	def item_path_found(self, pathtoitem, item):
-		if item.GetOwnsUri() or item.GetOwnsDesktopFile():
-			self.items[pathtoitem] = DockyJournalItem(pathtoitem)
-
-dockysink = DockyJournalSink()
-
-def cleanup ():
-	dockysink.dispose ()
-
-if __name__ == "__main__":
-	mainloop = gobject.MainLoop(is_running=True)
-
-	atexit.register (cleanup)
-	
-	signal(SIGTERM, lambda signum, stack_frame: exit(1))
-
-	while mainloop.is_running():
-	    mainloop.run()