[cheese/cheese-vala] more 0.7 vala updates

[Jaap A. Haitsma <jhaitsma src gnome org>]

commit 4ced23589146b8ea8d13c6bd988d286da613309a
Author: Jaap A. Haitsma <jaap haitsma org>
Date:   Sun Apr 19 00:18:26 2009 +0200

    more 0.7 vala updates
---
 src/cheese-thumb-view.vala |    6 +++---
 src/cheese-webcam.vala     |   18 ++++++++++--------
 src/cheese-window.vala     |   12 ++++++------
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/cheese-thumb-view.vala b/src/cheese-thumb-view.vala
index 8969e62..280bf4c 100644
--- a/src/cheese-thumb-view.vala
+++ b/src/cheese-thumb-view.vala
@@ -89,7 +89,7 @@ public class Cheese.ThumbView : IconView {
 		weak GLib.List<TreePath> l;
 		l = get_selected_items ();
 
-		for (int i; i < l.length (); i++) {
+		for (int i = 0; i < l.length (); i++) {
 			weak TreePath tree_path = l.nth_data (i);
 			var filename = get_filename_from_tree_path (tree_path);
 			filename_list.add (filename);
@@ -104,7 +104,7 @@ public class Cheese.ThumbView : IconView {
 		string filename;
 
 		model.get_iter (out iter, path);
-		model.get (iter, Column.URL, filename);
+		model.get (iter, Column.URL, out filename);
 		return filename;
 	}
 		
@@ -121,7 +121,7 @@ public class Cheese.ThumbView : IconView {
 			return;
 		}
 
-		TimeVal mtime;
+		var mtime = new TimeVal ();
 		file_info.get_modification_time (mtime);
 		
 		var uri = file.get_uri();
diff --git a/src/cheese-webcam.vala b/src/cheese-webcam.vala
index df0e556..a667229 100644
--- a/src/cheese-webcam.vala
+++ b/src/cheese-webcam.vala
@@ -108,7 +108,7 @@ public class Cheese.Webcam : GLib.Object {
 	
 	ArrayList<Device> devices = new ArrayList<Device> ();
 	Pipeline pipeline; 
-  	Gst.Bus  bus;
+//  	Gst.Bus  bus;
 	/* We build the active pipeline by linking the appropriate pipelines 
 	   listed below */
 	Gst.Bin webcam_source_bin;
@@ -122,13 +122,13 @@ public class Cheese.Webcam : GLib.Object {
 	Element video_file_sink;
 	dynamic Element photo_sink;
 	Element audio_source;
-	Element audio_enc;
-	Element video_enc;
+//	Element audio_enc;
+//	Element video_enc;
 
 	Element effect_filter;
 	Element csp_post_effect;
 
-	ulong photo_handler_id;
+//	ulong photo_handler_id;
 
 	bool is_recording = false;
 	bool pipeline_is_playing = false;
@@ -235,7 +235,9 @@ public class Cheese.Webcam : GLib.Object {
 	}
 	
 	public void set_effect (Effect effect) {
-		string rgb_effects, yuv_effects;
+		// JAH why is this necessary
+		string rgb_effects = "";
+                string yuv_effects = "";
 		
 		for (int i = 0; i < EFFECT_TO_PIPELINE.length; i++) {
 			if ((effect & EFFECT_TO_PIPELINE[i].effect) != 0) {
@@ -295,9 +297,8 @@ public class Cheese.Webcam : GLib.Object {
 	}
 
 	void get_video_devices_from_hal () throws WebcamError {		
-		RawError dbus_error;
+		var dbus_error =  RawError ();
 		
-		dbus_error.init ();
 		var hal = new Hal.Context ();
 
 		if (hal == null)
@@ -464,7 +465,8 @@ public class Cheese.Webcam : GLib.Object {
 						pipeline.set_state (State.PAUSED);
 						device.gstreamer_element_name = GSTREAMER_VIDEO_SOURCES[i];
 						var src = ((Gst.Bin)pipeline).get_by_name ("source");
-						string name;
+						// JAH is "" necessary?
+						string name = "";
 						src.get ("device-name", ref name);
 						if (name == null)
 							name = "Unknown";
diff --git a/src/cheese-window.vala b/src/cheese-window.vala
index 359aafd..562ce10 100644
--- a/src/cheese-window.vala
+++ b/src/cheese-window.vala
@@ -45,8 +45,8 @@ public class Cheese.CheeseWindow : Builder {
 	bool is_recording = false;
 
 	string media_path;
-  	string video_filename;
-  	string photo_filename;
+//  	string video_filename;
+//  	string photo_filename;
 
 	Webcam webcam;
 	Mode mode;
@@ -55,7 +55,7 @@ public class Cheese.CheeseWindow : Builder {
 	const string GCONF_WEBCAM_KEY = "/apps/cheese/webcam";
 	const string GCONF_SELECTED_EFFECTS_KEY = "/apps/cheese/selected_effects";
 
-	weak GConf.Client gconf_client = GConf.Client.get_default ();
+//	weak GConf.Client gconf_client = GConf.Client.get_default ();
 
 	Window window;
 	Notebook notebook;
@@ -65,11 +65,11 @@ public class Cheese.CheeseWindow : Builder {
 	VBox video_vbox;
 
 	Widget effect_frame;
-	Widget effect_chooser;
+//	Widget effect_chooser;
 	Widget throbber_frame;
-	Widget throbber;
+//	Widget throbber;
 	Widget countdown_frame;
-	Widget countdown;
+//	Widget countdown;
 
 	Container thumb_container;
 	ThumbView thumb_view;