Merge lp:~henning-wehrmann/conky-manager/conky-manager into lp:conky-manager

[heng]

Changed ListStore to Gtk.ListStore to avoid ambiguity and build on vala 0.28.0

Unmerged revisions

133. By heng on 2015-04-13

changed ListStore to Gtk.ListStore to avoid ambiguity

=== modified file 'src/EditThemeWindow.vala'
--- src/EditThemeWindow.vala	2014-07-13 18:02:09 +0000
+++ src/EditThemeWindow.vala	2015-04-13 10:43:20 +0000
@@ -107,7 +107,7 @@
 			(cell as Gtk.CellRendererText).text = type;
 		});
 		
-		ListStore store = new ListStore(1, typeof(string));
+		Gtk.ListStore store = new Gtk.ListStore(1, typeof(string));
 		TreeIter iter;
 		store.append(out iter);
 		store.set (iter, 0, _("None"));
@@ -166,7 +166,7 @@
 			(cell as Gtk.CellRendererText).text = type;
 		});
 		
-		store = new ListStore(1, typeof(string));
+		store = new Gtk.ListStore(1, typeof(string));
 		foreach(string option in App.bg_scaling){
 			store.append(out iter);
 			store.set (iter, 0, option);
@@ -266,7 +266,7 @@
 
 	private void cell_widget_enable_toggled (string path){
 		TreeIter iter;
-		ListStore model = (ListStore)tv_widget.model;
+		Gtk.ListStore model = (Gtk.ListStore)tv_widget.model;
 		bool enabled;
 
 		model.get_iter_from_string (out iter, path);
@@ -276,7 +276,7 @@
 	}
 	
 	private void tv_widget_refresh(){
-		ListStore model = new ListStore(2, typeof(bool), typeof(ConkyRC));
+		Gtk.ListStore model = new Gtk.ListStore(2, typeof(bool), typeof(ConkyRC));
 		
 		var list = new Gee.ArrayList<string>();
 		
@@ -357,7 +357,7 @@
 		
 		string txt = "";
 		
-		ListStore model = (ListStore)tv_widget.model;
+		Gtk.ListStore model = (Gtk.ListStore)tv_widget.model;
 		TreeIter iter;
 		bool enabled;
 		ConkyRC rc;

=== modified file 'src/EditWidgetWindow.vala'
--- src/EditWidgetWindow.vala	2014-07-01 15:03:15 +0000
+++ src/EditWidgetWindow.vala	2015-04-13 10:43:20 +0000
@@ -114,7 +114,7 @@
 		
 		//populate
 		TreeIter iter;
-		ListStore model = new Gtk.ListStore (2, typeof (string), typeof (string));
+		Gtk.ListStore model = new Gtk.ListStore (2, typeof (string), typeof (string));
 		model.append (out iter);
 		model.set (iter,0,_("Top Left"),1,"top_left");
 		model.append (out iter);

=== modified file 'src/SettingsWindow.vala'
--- src/SettingsWindow.vala	2014-07-01 15:03:15 +0000
+++ src/SettingsWindow.vala	2015-04-13 10:43:20 +0000
@@ -227,7 +227,7 @@
 	}
 
 	private void tv_folders_refresh(){
-		ListStore model = new ListStore(1, typeof(string));
+		Gtk.ListStore model = new Gtk.ListStore(1, typeof(string));
 		TreeIter iter;
 		foreach	(string path in folder_list_user){
 			model.append(out iter);