From 410965575fa1039cbcc6c6ef7f7ef316438118ed Mon Sep 17 00:00:00 2001
From: Conor Curran <conor.curran@canonical.com>
Date: Wed, 7 Jul 2010 13:22:18 +0100
Subject: alot of work around the title menu stuff

---
 src/player-item.vala | 33 +--------------------------------
 1 file changed, 1 insertion(+), 32 deletions(-)

(limited to 'src/player-item.vala')

diff --git a/src/player-item.vala b/src/player-item.vala
index 88e1dd3..171c140 100644
--- a/src/player-item.vala
+++ b/src/player-item.vala
@@ -22,8 +22,7 @@ using Gee;
 
 public class PlayerItem : Dbusmenu.Menuitem
 {
-
-	public MprisController mpris_adaptor;
+	public PlayerController owner {get; construct;}
 	public string item_type { get; construct; }
 
 	public PlayerItem(string type)
@@ -32,7 +31,6 @@ public class PlayerItem : Dbusmenu.Menuitem
 	}
 	
 	construct {
-		debug("in the base constructor for %s", item_type); 
 		this.property_set(MENUITEM_PROP_TYPE, item_type);
 	}
 
@@ -68,15 +66,8 @@ public class PlayerItem : Dbusmenu.Menuitem
 				this.property_set_bool(property, v.get_boolean());
 			}
 		}
-		// TODO: not working
-		//this.check_layout();
 	}	
 
-	public void set_adaptor(MprisController adaptor)
-	{
-		this.mpris_adaptor = adaptor;		
-	}
-
 	private static bool ensure_valid_updates(HashTable<string, Value?> data, HashSet<string> attributes)
 	{
 		if(data == null){
@@ -99,27 +90,5 @@ public class PlayerItem : Dbusmenu.Menuitem
 		return result;
 	}
 
-	
-	//----- Custom constructors for player items ----------------//
-	// Title item
-	//public static PlayerItem new_title_item(dynamic string name)
-	//{
-	//	PlayerItem item = new PlayerItem();
-	//	item.property_set(MENUITEM_PROP_LABEL, name);					
-	//	item.property_set(MENUITEM_PROP_ICON_NAME, "applications-multimedia");			
-	//	return item;		
-	//}
-
-	// Separator item
-	public static PlayerItem new_separator_item()
-	{
-		PlayerItem separator = new PlayerItem(CLIENT_TYPES_SEPARATOR);
-		//separator.property_set(MENUITEM_PROP_TYPE, CLIENT_TYPES_SEPARATOR);					
-		return separator;
-	}	
-
-	public virtual void check_layout(){
-		warning("this should not be hit");
-	}
 }
 
-- 
cgit v1.2.3