Merge lp:~ricotz/plank/launcherentry-items into lp:plank

[Rico Tzschichholz]

[Robert Dyer (psybers)]

critical() doesnt stop execution, right? Just logs?

review: Needs Information

[Rico Tzschichholz (ricotz)]

> critical() doesnt stop execution, right? Just logs?

Yes, it just logs. "error (...)" is the one which stops and triggers a crash.

[Robert Dyer (psybers)]

Haven't tested the functionality, but code looks clean.

review: Approve

=== modified file 'lib/Items/ApplicationDockItemProvider.vala'
--- lib/Items/ApplicationDockItemProvider.vala	2013-02-27 14:22:26 +0000
+++ lib/Items/ApplicationDockItemProvider.vala	2013-03-19 20:55:35 +0000
@@ -249,7 +249,7 @@
 				var active_workspace = Wnck.Screen.get_default ().get_active_workspace ();
 				foreach (var item in internal_items) {
 					var transient = (item as TransientDockItem);
-					item.IsVisible = (transient == null
+					item.IsVisible = (transient == null || transient.App == null
 						|| WindowControl.has_window_on_workspace (transient.App, active_workspace));
 				}
 			} else {
@@ -292,7 +292,8 @@
 		
 		void app_closed (DockItem remove)
 		{
-			if (remove is TransientDockItem)
+			if (remove is TransientDockItem
+				&& !(remove.ProgressVisible || remove.CountVisible))
 				remove_item (remove);
 		}
 		
@@ -503,6 +504,7 @@
 				return;
 			
 			// Reset item since there is no new NameOwner
+			TransientDockItem? transient_item = null;
 			foreach (var item in internal_items) {
 				var app_item = item as ApplicationDockItem;
 				if (app_item == null)
@@ -512,9 +514,16 @@
 					continue;
 				
 				app_item.unity_reset ();
+				transient_item = item as TransientDockItem;
+				
 				controller.renderer.animated_draw ();
 				break;
 			}
+			
+			// Remove item which only exists because of the presence of
+			// this removed LauncherEntry interface
+			if (transient_item != null && transient_item.App == null)
+				remove_item (transient_item);
 		}
 		
 		void handle_update_request (string sender_name, Variant parameters)
@@ -533,35 +542,54 @@
 			
 			Logger.verbose ("Unity.handle_update_request (processing update for %s)", app_uri);
 			
-			ApplicationDockItem current_item = null;
+			ApplicationDockItem? current_item = null;
 			foreach (var item in internal_items) {
 				var app_item = item as ApplicationDockItem;
 				if (app_item == null)
 					continue;
 				
-				if (app_item.get_unity_dbusname () == sender_name) {
+				if (app_item.get_unity_dbusname () == sender_name
+					|| app_item.get_unity_application_uri () == app_uri) {
 					current_item = app_item;
 					break;
 				}
 			}
 			
-			// If don't know this app yet create a new entry
-			if (current_item == null)
-				foreach (var item in internal_items) {
-					var app_item = item as ApplicationDockItem;
-					if (app_item == null)
-						continue;
-					
-					if (app_item.get_unity_application_uri () == app_uri) {
-						current_item = app_item;
-						break;
-					}
-				}
-			
 			// Update our entry and trigger a redraw
 			if (current_item != null) {
 				current_item.unity_update (sender_name, prop_iter);
-				controller.renderer.animated_draw ();
+				
+				// Remove item which progress-bar/badge is gone and only existed
+				// because of the presence of this LauncherEntry interface
+				var transient_item = current_item as TransientDockItem;
+				if (transient_item != null && transient_item.App == null
+					&& !(transient_item.ProgressVisible || transient_item.CountVisible))
+					remove_item (transient_item);
+				else
+					controller.renderer.animated_draw ();
+			} else {
+				// Find a matching desktop-file and create new TransientDockItem for this LauncherEntry
+				foreach (var folder in Paths.DataDirFolders) {
+					var applications_folder = folder.get_child ("applications");
+					if (!applications_folder.query_exists ())
+						continue;
+					
+					var desktop_file = applications_folder.get_child (app_uri.replace ("application://", ""));
+					if (!desktop_file.query_exists ())
+						continue;
+					
+					current_item = new TransientDockItem.with_launcher (desktop_file.get_uri ());
+					current_item.unity_update (sender_name, prop_iter);
+					
+					// Only add item if there is actually a visible progress-bar or badge
+					if (current_item.ProgressVisible || current_item.CountVisible)
+						add_item (current_item);
+					
+					break;
+				}
+				
+				if (current_item == null)
+					warning ("Matching application for '%s' not found or not installed!", app_uri);
 			}
 		}
 	}

=== modified file 'lib/Items/DockItemPreferences.vala'
--- lib/Items/DockItemPreferences.vala	2013-01-29 19:53:59 +0000
+++ lib/Items/DockItemPreferences.vala	2013-03-19 20:55:35 +0000
@@ -30,6 +30,15 @@
 		/**
 		 * {@inheritDoc}
 		 */
+		public DockItemPreferences.with_launcher (string launcher)
+		{
+			base ();
+			Launcher = launcher;
+		}
+		
+		/**
+		 * {@inheritDoc}
+		 */
 		public DockItemPreferences.with_file (GLib.File file)
 		{
 			base.with_file (file);

=== modified file 'lib/Items/TransientDockItem.vala'
--- lib/Items/TransientDockItem.vala	2012-05-31 09:34:52 +0000
+++ lib/Items/TransientDockItem.vala	2013-03-19 20:55:35 +0000
@@ -30,15 +30,26 @@
 			GLib.Object (Prefs: new DockItemPreferences (), App: app);
 		}
 		
+		public TransientDockItem.with_launcher (string launcher_uri)
+		{
+			GLib.Object (Prefs: new DockItemPreferences.with_launcher (launcher_uri), App: null);
+		}
+		
 		construct
 		{
-			var launcher = App.get_desktop_file ();
-			if (launcher == null || launcher == "") {
-				Text = App.get_name ();
-				ForcePixbuf = WindowControl.get_app_icon (App);
+			if (App != null) {
+				var launcher = App.get_desktop_file ();
+				if (launcher == null || launcher == "") {
+					Text = App.get_name ();
+					ForcePixbuf = WindowControl.get_app_icon (App);
+				} else {
+					Prefs.Launcher = launcher;
+					load_from_launcher ();
+				}
+			} else if (Prefs.Launcher != null) {
+				load_from_launcher ();
 			} else {
-				Prefs.Launcher = launcher;
-				load_from_launcher ();
+				critical ("No source of information for this item available");
 			}
 		}
 		

=== modified file 'lib/libplank.symbols'
--- lib/libplank.symbols	2013-03-18 13:50:05 +0000
+++ lib/libplank.symbols	2013-03-19 20:55:35 +0000
@@ -289,11 +289,13 @@
 plank_items_dock_item_preferences_construct
 plank_items_dock_item_preferences_construct_with_file
 plank_items_dock_item_preferences_construct_with_filename
+plank_items_dock_item_preferences_construct_with_launcher
 plank_items_dock_item_preferences_get_Launcher
 plank_items_dock_item_preferences_get_type
 plank_items_dock_item_preferences_new
 plank_items_dock_item_preferences_new_with_file
 plank_items_dock_item_preferences_new_with_filename
+plank_items_dock_item_preferences_new_with_launcher
 plank_items_dock_item_preferences_set_Launcher
 plank_items_dock_item_provider_add_item
 plank_items_dock_item_provider_add_item_without_signaling