Merge lp:~seif/plank/zeitgeist into lp:~zeitgeist/plank/zeitgeist

[Seif Lotfy]

This patch respects the maximum allows items in the dock.
The ApplicationDockItemProvider (ADP) asks for the maximum number (num_events) of items the dock can show on the screen
The behaviour is as follows.
It then queries for Zeitgeist for the (num_events/3) most popular applications used within the last 60 days.
This way if x of the num_events/3 Applications are already in the dock, it displays only num_events/3 - x, thus not overpopulating the dock. So if we have all the most used apps already open or pinned in the dock, the dock does not add more stuff.

[Rico Tzschichholz (ricotz)]

review: Approve

=== modified file 'lib/Items/ApplicationDockItemProvider.vala'
--- lib/Items/ApplicationDockItemProvider.vala	2013-04-17 09:24:56 +0000
+++ lib/Items/ApplicationDockItemProvider.vala	2013-04-29 10:04:26 +0000
@@ -71,9 +71,6 @@
 			
 			load_items ();
 			add_running_apps ();
-#if HAVE_ZEITGEIST || HAVE_ZEITGEIST2
-			update_suggested_apps ();
-#endif
 			update_visible_items ();
 			serialize_item_positions ();
 			
@@ -111,8 +108,13 @@
 				null, null, null, DBusSignalFlags.NONE, handle_entry_signal);
 			dbus_name_owner_changed_signal_id = connection.signal_subscribe ("org.freedesktop.DBus", "org.freedesktop.DBus",
 				"NameOwnerChanged", "/org/freedesktop/DBus", null, DBusSignalFlags.NONE, handle_name_owner_changed);
+
+#if HAVE_ZEITGEIST || HAVE_ZEITGEIST2
+			Idle.add (() => {
+				update_suggested_apps ();
+				return false;
+			});
 			
-#if HAVE_ZEITGEIST || HAVE_ZEITGEIST2
 			// FIXME Update suggested apps in a "proper" interval
 			Timeout.add_seconds (3600, () => {
 				update_suggested_apps ();
@@ -312,7 +314,10 @@
 		void update_suggested_apps ()
 		{
 			Logger.verbose ("ApplicationDockItemProvider.update_suggested_apps ()");
-			
+			var num_events = controller.position_manager.MaxItemCount / 3;
+
+			if (visible_items.size >= controller.position_manager.MaxItemCount - num_events)
+				return;
 #if HAVE_ZEITGEIST
 			var templates = new PtrArray ();
 #else
@@ -324,26 +329,6 @@
 			var time_range = new TimeRange (start, now);
 			
 			var event = new Event ();
-			
-			// Filter-out application-uris of already available pinned applications
-			foreach (var item in internal_items) {
-				unowned ApplicationDockItem? app_item = (item as ApplicationDockItem);
-				if (app_item == null || (item is TransientDockItem))
-					continue;
-				var app_uri = app_item.get_unity_application_uri ();
-				if (app_uri == null)
-					continue;
-#if HAVE_ZEITGEIST
-				var subject = new Subject ();
-				subject.set_uri ("!%s".printf (app_uri));
-#else
-				var subject = new Subject.full ("!%s".printf (app_uri));
-#endif
-				event.add_subject (subject);
-				
-				print ("filter %s\n", app_uri);
-			}
-			
 #if HAVE_ZEITGEIST
 			var subject = new Subject ();
 			subject.set_uri ("application://*");
@@ -353,7 +338,7 @@
 			event.add_subject (subject);
 			templates.add (event);
 			
-			zglog.find_events.begin (time_range, templates, StorageState.ANY, 4,
+			zglog.find_events.begin (time_range, templates, StorageState.ANY, num_events,
 				ResultType.MOST_POPULAR_SUBJECTS, null, (obj, res) => {
 				ResultSet events = zglog.find_events.end (res);
 				bool needs_update = false;