cheese r1197 - branches/cheese-vala/src

[jhaitsma svn gnome org]

Author: jhaitsma
Date: Fri Feb 27 19:01:08 2009
New Revision: 1197
URL: http://svn.gnome.org/viewvc/cheese?rev=1197&view=rev

Log:
Make some updates to make cheese-vala compile with new vala
Not compiling yet but getting there


Modified:
   branches/cheese-vala/src/Makefile.am
   branches/cheese-vala/src/cheese-thumb-view.vala
   branches/cheese-vala/src/cheese-webcam.vala
   branches/cheese-vala/src/cheese-window.vala

Modified: branches/cheese-vala/src/Makefile.am
==============================================================================
--- branches/cheese-vala/src/Makefile.am	(original)
+++ branches/cheese-vala/src/Makefile.am	Fri Feb 27 19:01:08 2009
@@ -34,6 +34,7 @@
 cheese_VALASOURCES = \
 	cheese.vala \
 	cheese-audio.vala \
+	cheese-effect-chooser.vala \
 	cheese-flash.vala \
 	cheese-window.vala \
 	cheese-thumb-view.vala \

Modified: branches/cheese-vala/src/cheese-thumb-view.vala
==============================================================================
--- branches/cheese-vala/src/cheese-thumb-view.vala	(original)
+++ branches/cheese-vala/src/cheese-thumb-view.vala	Fri Feb 27 19:01:08 2009
@@ -169,8 +169,8 @@
 			}
 		}
 		if (store.remove (iter)) {
-			var path = store.get_path (iter);
-			select_path (path);		
+			var p = store.get_path (iter);
+			select_path (p);		
 		}
 	}
 

Modified: branches/cheese-vala/src/cheese-webcam.vala
==============================================================================
--- branches/cheese-vala/src/cheese-webcam.vala	(original)
+++ branches/cheese-vala/src/cheese-webcam.vala	Fri Feb 27 19:01:08 2009
@@ -21,25 +21,29 @@
 
 using Gst, Gtk, Gdk, Gee, Hal, DBus;
 
+public enum Cheese.Effect {
+	NO_EFFECT       = (0),
+	MAUVE           = (1 << 0),
+	NOIR_BLANC      = (1 << 1),
+	SATURATION      = (1 << 2),
+	HULK            = (1 << 3),
+	VERTICAL_FLIP   = (1 << 4),
+	HORIZONTAL_FLIP = (1 << 5),
+	SHAGADELIC      = (1 << 6),
+	VERTIGO         = (1 << 7),
+	EDGE            = (1 << 8),
+	DICE            = (1 << 9),
+	WARP            = (1 << 10)
+}
+
+
+
+
 public class Cheese.Webcam : GLib.Object {
 
+
 	public signal void photo_saved ();
 	public signal void video_saved ();
-
-	public enum Effect {
-		NO_EFFECT       = (0),
-		MAUVE           = (1 << 0),
-		NOIR_BLANC      = (1 << 1),
-		SATURATION      = (1 << 2),
-		HULK            = (1 << 3),
-		VERTICAL_FLIP   = (1 << 4),
-		HORIZONTAL_FLIP = (1 << 5),
-		SHAGADELIC      = (1 << 6),
-		VERTIGO         = (1 << 7),
-		EDGE            = (1 << 8),
-		DICE            = (1 << 9),
-		WARP            = (1 << 10)
-	}
 		
 	public class FrameRate : GLib.Object {
 		public int numerator;
@@ -452,7 +456,7 @@
 					var ret = pipeline.get_state (null, null, 10*SECOND);
 					/* Check if any error messages were posted on the bus */
 					var bus = pipeline.get_bus ();
-					weak Gst.Message msg;
+					Gst.Message msg;
 					msg = bus.poll (Gst.MessageType.ERROR, 0);
 
 					if ((msg == null) && (ret == StateChangeReturn.SUCCESS)) {

Modified: branches/cheese-vala/src/cheese-window.vala
==============================================================================
--- branches/cheese-vala/src/cheese-window.vala	(original)
+++ branches/cheese-vala/src/cheese-window.vala	Fri Feb 27 19:01:08 2009
@@ -521,8 +521,8 @@
   g_signal_connect (cheese_window->thumb_view, "button_press_event",
                     G_CALLBACK (cheese_window_button_press_event_cb), cheese_window);
 */
-			AboutDialog.set_email_hook (on_handle_email_link, null);
-			AboutDialog.set_url_hook (on_handle_url_link, null);
+			AboutDialog.set_email_hook (on_handle_email_link);
+			AboutDialog.set_url_hook (on_handle_url_link);
 
 			window.show_all ();