cheese r639 - in branches/cheese-vala: . src

[jhaitsma svn gnome org]

Author: jhaitsma
Date: Tue Apr  8 21:46:01 2008
New Revision: 639
URL: http://svn.gnome.org/viewvc/cheese?rev=639&view=rev

Log:
Be compatible with vala 0.2.0


Modified:
   branches/cheese-vala/   (props changed)
   branches/cheese-vala/src/cheese-window.vala
   branches/cheese-vala/src/cheese.vala

Modified: branches/cheese-vala/src/cheese-window.vala
==============================================================================
--- branches/cheese-vala/src/cheese-window.vala	(original)
+++ branches/cheese-vala/src/cheese-window.vala	Tue Apr  8 21:46:01 2008
@@ -113,23 +113,23 @@
 	const ActionEntry[] action_entries_main = {
   		{"Cheese", null, N_("_Cheese")},
 		{"Edit", null, N_("_Edit")},
-  		{"RemoveAll", null, N_("Move all to Trash"), null, null, (GLib.Callback)on_move_all_media_to_trash},
+  		{"RemoveAll", null, N_("Move all to Trash"), null, null, on_move_all_media_to_trash},
 
 		{"Help", null, N_("_Help")},
 
-  		{"Quit", STOCK_QUIT, null, null, null, (GLib.Callback)on_quit},
-  		{"HelpContents", STOCK_HELP, N_("_Contents"), "F1", N_("Help on this application"), (GLib.Callback)on_help},
-  		{"About", STOCK_ABOUT, null, null, null, (GLib.Callback)on_about}
+  		{"Quit", STOCK_QUIT, null, null, null, on_quit},
+  		{"HelpContents", STOCK_HELP, N_("_Contents"), "F1", N_("Help on this application"), on_help},
+  		{"About", STOCK_ABOUT, null, null, null, on_about}
 	};
 
 
 
 	const ToggleActionEntry[] action_entries_countdown = {
-  		{"Countdown", null, N_("Countdown"), null, null, (GLib.Callback)on_set_countdown, false}
+  		{"Countdown", null, N_("Countdown"), null, null, on_set_countdown, false}
 	};
 
 	const ToggleActionEntry[] action_entries_effects = {
-		{"Effects", null, N_("_Effects"), null, null, (GLib.Callback)on_effect_button, false}
+		{"Effects", null, N_("_Effects"), null, null, on_effect_button, false}
 	};
 
 	const RadioActionEntry[] action_entries_toggle = {
@@ -138,33 +138,33 @@
 	};
 
 	const ActionEntry[] action_entries_file = {
-		{"Open", STOCK_OPEN, N_("_Open"), "<control>O", null, (GLib.Callback)on_file_open},
-		{"SaveAs", STOCK_SAVE_AS, N_("Save _As..."), "<control>S", null, (GLib.Callback)on_file_save_as},
-  		{"MoveToTrash", "user-trash", N_("Move to _Trash"), "Delete", null, (GLib.Callback)on_move_to_trash}
+		{"Open", STOCK_OPEN, N_("_Open"), "<control>O", null, on_file_open},
+		{"SaveAs", STOCK_SAVE_AS, N_("Save _As..."), "<control>S", null, on_file_save_as},
+  		{"MoveToTrash", "user-trash", N_("Move to _Trash"), "Delete", null, on_move_to_trash}
 	};
 
 	const ActionEntry[] action_entries_photo = {
-		{"TakePhoto", null, N_("_Take a photo"), "space", null, (GLib.Callback)on_action_button}
+		{"TakePhoto", null, N_("_Take a photo"), "space", null, on_take_photo_action}
 	};
 
 	const ToggleActionEntry[] action_entries_video = {
-		{"TakeVideo", null, N_("_Recording"), "space", null, (GLib.Callback)on_action_button, false}
+		{"TakeVideo", null, N_("_Recording"), "space", null, on_recording_action, false}
 	};
 
 	const ActionEntry[] action_entries_account_photo = {
-  		{"SetAsAccountPhoto", null, N_("_Set As Account Photo"), null, null, (GLib.Callback)on_account_photo}
+  		{"SetAsAccountPhoto", null, N_("_Set As Account Photo"), null, null, on_account_photo}
 	};
 
 	const ActionEntry[] action_entries_mail = {
-  		{"SendByMail", null, N_("Send by _Mail"), null, null, (GLib.Callback)on_send_by_mail}
+  		{"SendByMail", null, N_("Send by _Mail"), null, null, on_send_by_mail}
 	};
 
 	const ActionEntry[] action_entries_fspot = {
-  		{"ExportToFSpot", null, N_("Export to F-_Spot"), null, null, (GLib.Callback)on_export_to_fspot}
+  		{"ExportToFSpot", null, N_("Export to F-_Spot"), null, null, on_export_to_fspot}
 	};
 
 	const ActionEntry[] action_entries_flickr = {
-  		{"ExportToFlickr", null, N_("Export to _Flickr"), null, null, (GLib.Callback)on_export_to_flickr}
+  		{"ExportToFlickr", null, N_("Export to _Flickr"), null, null, on_export_to_flickr}
 	};
 
 
@@ -196,10 +196,10 @@
 	void on_help (Action action) {
 	}
 
-	void on_set_countdown (ToggleAction action) {
+	void on_set_countdown (Action action) {
 	}
 
-	void on_effect_button (ToggleAction action) {
+	void on_effect_button (Action action) {
 	}
 
 	void on_file_open (Action action) {
@@ -211,6 +211,12 @@
 	void on_move_to_trash (Action action) {
 	}
 
+	void on_take_photo_action (Action action) {
+	}
+
+	void on_recording_action (Action action) {
+	}
+
 	void on_action_button (Button button) {
 	}
 

Modified: branches/cheese-vala/src/cheese.vala
==============================================================================
--- branches/cheese-vala/src/cheese.vala	(original)
+++ branches/cheese-vala/src/cheese.vala	Tue Apr  8 21:46:01 2008
@@ -51,8 +51,7 @@
 			context.set_help_enabled (true);
 			context.add_main_entries (options, null);
 			context.add_group (Gtk.get_option_group (true));
-			OptionGroup *gst_opt_group = Gst.init_get_option_group ();
-			context.add_group (gst_opt_group);
+			context.add_group (Gst.init_get_option_group ());
 			context.parse (ref args);
 		} catch (OptionError e) {
 			stdout.printf ("%s\n", e.message);