[chronojump] person photo does not depend on videoOn anymore

[Xavier de Blas <xaviblas src gnome org>]

commit 269b525ba8b220a127a7ce9d1637ec5a7dd93b14
Author: Xavier de Blas <xaviblas gmail com>
Date:   Mon Jan 14 10:46:27 2013 +0100

    person photo does not depend on videoOn anymore

 src/gui/chronojump.cs |    9 ++++-----
 src/gui/person.cs     |   16 +++++-----------
 2 files changed, 9 insertions(+), 16 deletions(-)
---
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index acc58c5..ccd9893 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -2327,7 +2327,7 @@ public partial class ChronoJumpWindow
 	
 	private void on_recuperate_person_clicked (object o, EventArgs args) {
 		Log.WriteLine("recuperate person");
-		personRecuperateWin = PersonRecuperateWindow.Show(app1, currentSession, prefsDigitsNumber, videoOn);
+		personRecuperateWin = PersonRecuperateWindow.Show(app1, currentSession, prefsDigitsNumber);
 		personRecuperateWin.FakeButtonDone.Clicked += new EventHandler(on_recuperate_person_accepted);
 	}
 
@@ -2350,7 +2350,7 @@ public partial class ChronoJumpWindow
 		
 	private void on_recuperate_persons_from_session_clicked (object o, EventArgs args) {
 		Log.WriteLine("recuperate persons from other session");
-		personsRecuperateFromOtherSessionWin = PersonsRecuperateFromOtherSessionWindow.Show(app1, currentSession, videoOn);
+		personsRecuperateFromOtherSessionWin = PersonsRecuperateFromOtherSessionWindow.Show(app1, currentSession);
 		personsRecuperateFromOtherSessionWin.FakeButtonDone.Clicked += new EventHandler(on_recuperate_persons_from_session_accepted);
 	}
 	
@@ -2374,7 +2374,7 @@ public partial class ChronoJumpWindow
 	private void on_person_add_single_activate (object o, EventArgs args) {
 		personAddModifyWin = PersonAddModifyWindow.Show(app1, 
 				currentSession, new Person(-1), 
-				prefsDigitsNumber, false, videoOn); //don't comes from recuperate window
+				prefsDigitsNumber, false); //don't comes from recuperate window
 		//-1 means we are adding a new person
 		//if we were modifying it will be it's uniqueID
 		
@@ -2468,7 +2468,7 @@ public partial class ChronoJumpWindow
 		Log.WriteLine("modify person");
 		//personAddModifyWin = PersonAddModifyWindow.Show(app1, currentSession, currentPerson.UniqueID, prefsDigitsNumber);
 		personAddModifyWin = PersonAddModifyWindow.Show(app1, currentSession, currentPerson, 
-				prefsDigitsNumber, false, videoOn); //don't comes from recuperate window
+				prefsDigitsNumber, false); //don't comes from recuperate window
 		personAddModifyWin.FakeButtonAccept.Clicked += new EventHandler(on_edit_current_person_accepted);
 	}
 	
@@ -2575,7 +2575,6 @@ public partial class ChronoJumpWindow
 				askDeletion, weightPercentPreferred, heightPreferred, metersSecondsPreferred,
 				//System.Threading.Thread.CurrentThread.CurrentUICulture.ToString(),
 				SqlitePreferences.Select("language")
-				//, volumeOn, videoOn
 				);
 		myWin.Button_accept.Clicked += new EventHandler(on_preferences_accepted);
 	}
diff --git a/src/gui/person.cs b/src/gui/person.cs
index 83c075a..9d32c84 100644
--- a/src/gui/person.cs
+++ b/src/gui/person.cs
@@ -61,7 +61,6 @@ public class PersonRecuperateWindow {
 	protected int columnId = 0;
 	protected int firstColumn = 0;
 	protected int pDN;
-	protected bool videoOn;
 	
 	public Gtk.Button fakeButtonDone;
 
@@ -98,13 +97,12 @@ public class PersonRecuperateWindow {
 		treeview_person_recuperate.Selection.Changed += onSelectionEntry;
 	}
 	
-	static public PersonRecuperateWindow Show (Gtk.Window parent, Session currentSession, int pDN, bool videoOn)
+	static public PersonRecuperateWindow Show (Gtk.Window parent, Session currentSession, int pDN)
 	{
 		if (PersonRecuperateWindowBox == null) {
 			PersonRecuperateWindowBox = new PersonRecuperateWindow (parent, currentSession);
 		}
 		PersonRecuperateWindowBox.pDN = pDN;
-		PersonRecuperateWindowBox.videoOn = videoOn;
 
 		PersonRecuperateWindowBox.person_recuperate.Show ();
 		
@@ -252,7 +250,7 @@ public class PersonRecuperateWindow {
 			Person person = SqlitePerson.Select(Convert.ToInt32(selected));
 
 			personAddModifyWin = PersonAddModifyWindow.Show(
-					parent, currentSession, person, pDN, true, videoOn); //comes from recuperate window
+					parent, currentSession, person, pDN, true); //comes from recuperate window
 			personAddModifyWin.FakeButtonAccept.Clicked += new EventHandler(on_edit_current_person_accepted);
 		}
 	}
@@ -366,14 +364,13 @@ public class PersonsRecuperateFromOtherSessionWindow : PersonRecuperateWindow
 		treeview_person_recuperate.Selection.Changed += onSelectionEntry;
 	}
 
-	static public new PersonsRecuperateFromOtherSessionWindow Show (Gtk.Window parent, Session currentSession, bool videoOn)
+	static public new PersonsRecuperateFromOtherSessionWindow Show (Gtk.Window parent, Session currentSession)
 	{
 		if (PersonsRecuperateFromOtherSessionWindowBox == null) {
 			PersonsRecuperateFromOtherSessionWindowBox = 
 				new PersonsRecuperateFromOtherSessionWindow (parent, currentSession);
 		}
 		PersonsRecuperateFromOtherSessionWindowBox.person_recuperate.Show ();
-		PersonsRecuperateFromOtherSessionWindowBox.videoOn = videoOn;
 		
 		return PersonsRecuperateFromOtherSessionWindowBox;
 	}
@@ -574,7 +571,7 @@ public class PersonsRecuperateFromOtherSessionWindow : PersonRecuperateWindow
 					Person person = SqlitePerson.Select(
 							Convert.ToInt32(treeview_person_recuperate.Model.GetValue(iter, 1)) );
 					personAddModifyWin = PersonAddModifyWindow.Show(
-							parent, currentSession, person, pDN, true, videoOn); //comes from recuperate window
+							parent, currentSession, person, pDN, true); //comes from recuperate window
 					PersonAddModifyWindow.MakeVisible();
 					personAddModifyWin.FakeButtonAccept.Clicked += new EventHandler(on_edit_current_person_accepted);
 					personAddModifyWin.FakeButtonCancel.Clicked += new EventHandler(on_edit_current_person_cancelled);
@@ -858,7 +855,6 @@ public class PersonAddModifyWindow
 	[Widget] Gtk.Button button_zoom;
 	[Widget] Gtk.Image image_photo_mini;
 	[Widget] Gtk.Image image_zoom;
-	[Widget] Gtk.Button button_take_photo;
 
 	[Widget] Gtk.Button button_accept;
 	[Widget] Gtk.Button button_cancel;
@@ -1123,7 +1119,7 @@ public class PersonAddModifyWindow
 	}
 	
 	static public PersonAddModifyWindow Show (Gtk.Window parent, 
-			Session mySession, Person currentPerson, int pDN, bool comesFromRecuperateWin, bool videoOn)
+			Session mySession, Person currentPerson, int pDN, bool comesFromRecuperateWin)
 	{
 		if (comesFromRecuperateWin) 
 			PersonAddModifyWindowBox = null;
@@ -1135,8 +1131,6 @@ public class PersonAddModifyWindow
 		PersonAddModifyWindowBox.pDN = pDN;
 		PersonAddModifyWindowBox.comesFromRecuperateWin = comesFromRecuperateWin;
 
-		PersonAddModifyWindowBox.button_take_photo.Sensitive = videoOn;
-
 		//No more hide cancel button.
 		//Better to show it and allow to not recuperate if user changes his mind
 		//if(comesFromRecuperateWin)