[gnome-games] [same-gnome-clutter] Remove "fly score" option, will merge functionality into 'zealous animation'

[Tim Horton <hortont src gnome org>]

commit c547ff7f750c05c42fdf5e8fcba9f88b9a98be13
Author: Tim Horton <hortont svn gnome org>
Date:   Sat Jul 18 17:11:56 2009 -0400

    [same-gnome-clutter] Remove "fly score" option, will merge functionality into 'zealous animation'

 same-gnome-clutter/data/settings.ui              |   13 -------------
 same-gnome-clutter/same-gnome-clutter.schemas.in |   12 ------------
 same-gnome-clutter/src/Settings.js               |   18 +-----------------
 3 files changed, 1 insertions(+), 42 deletions(-)
---
diff --git a/same-gnome-clutter/data/settings.ui b/same-gnome-clutter/data/settings.ui
index 9dd373b..789010e 100644
--- a/same-gnome-clutter/data/settings.ui
+++ b/same-gnome-clutter/data/settings.ui
@@ -204,19 +204,6 @@
                         <property name="position">0</property>
                       </packing>
                     </child>
-                    <child>
-                      <object class="GtkCheckButton" id="fly-score-checkbox">
-                        <property name="label" translatable="yes">Fly score increment (words!)</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="draw_indicator">True</property>
-                        <signal name="toggled" handler="set_fly_score"/>
-                      </object>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
                   </object>
                 </child>
               </object>
diff --git a/same-gnome-clutter/same-gnome-clutter.schemas.in b/same-gnome-clutter/same-gnome-clutter.schemas.in
index 19eb67a..f7d83c1 100644
--- a/same-gnome-clutter/same-gnome-clutter.schemas.in
+++ b/same-gnome-clutter/same-gnome-clutter.schemas.in
@@ -48,18 +48,6 @@
           <long>Use more flashy, but slower, animations.</long>
         </locale>
       </schema>
-      
-      <schema>
-        <key>/schemas/apps/same-gnome-clutter/fly_score</key>
-        <applyto>/apps/same-gnome-clutter/fly_score</applyto>
-        <owner>same-gnome-clutter</owner>
-        <type>bool</type>
-        <default>true</default>
-        <locale name="C">
-          <short>Fly score</short>
-          <long>Animate the number of points at the end of each move.</long>
-        </locale>
-      </schema>
 
   </schemalist>
   
diff --git a/same-gnome-clutter/src/Settings.js b/same-gnome-clutter/src/Settings.js
index 4e00b74..e46a8d1 100644
--- a/same-gnome-clutter/src/Settings.js
+++ b/same-gnome-clutter/src/Settings.js
@@ -8,12 +8,11 @@ ThemeLoader = imports.ThemeLoader;
 GConf.init(Seed.argv);
 
 // Defaults
-var theme, colors, zealous, fly_score, size;
+var theme, colors, zealous, size;
 var default_theme = "Tango";
 var default_size = 1;
 var default_colors = 3;
 var default_zealous = true;
-var default_fly_score = true;
 
 // Map theme names to themes
 var themes = ThemeLoader.load_themes();
@@ -28,7 +27,6 @@ try
 	size = gconf_client.get_int("/apps/same-gnome-clutter/size");
 	colors = gconf_client.get_int("/apps/same-gnome-clutter/colors");
 	zealous = gconf_client.get_bool("/apps/same-gnome-clutter/zealous");
-	fly_score = gconf_client.get_bool("/apps/same-gnome-clutter/fly_score");
 	
 	if(colors < 2 || colors > 4)
 		colors = default_colors;
@@ -97,19 +95,6 @@ handlers = {
 			print("Couldn't save settings to GConf.");
 		}
 	},
-	set_fly_score: function(widget, ud)
-	{
-		fly_score = widget.active;
-		
-		try
-		{
-			gconf_client.set_bool("/apps/same-gnome-clutter/fly_score", fly_score);
-		}
-		catch(e)
-		{
-			print("Couldn't save settings to GConf.");
-		}
-	},
 	update_size: function(widget, ud)
 	{
 		new_size = widget.get_active();
@@ -171,7 +156,6 @@ function show_settings()
 	b.get_object("size-selector").set_active(size);
 	b.get_object("colors-spinner").value = colors;
 	b.get_object("zealous-checkbox").active = zealous;
-	b.get_object("fly-score-checkbox").active = fly_score;
 	
 	settings_dialog = b.get_object("dialog1");
 	settings_dialog.set_transient_for(main.window);