[gnome-games/gsoc-seed-games] Revert "[lightsoff] Clean up naming in main GtkBuilder file"

[Tim Horton <hortont src gnome org>]

commit 938e695a37ddd60472be0f94cad7244dc1a5e2e7
Author: Tim Horton <hortont svn gnome org>
Date:   Wed Jul 1 23:36:47 2009 -0400

    Revert "[lightsoff] Clean up naming in main GtkBuilder file"
    
    I made a poor merge mistake, and paid for it...
    
    This reverts commit 3adabe8ba970a0619f9e0dc5736225ae833bf9c3.

 lightsoff/main-window.ui |   36 ++++++++++++++++++------------------
 lightsoff/main.js.in     |    4 ++--
 2 files changed, 20 insertions(+), 20 deletions(-)
---
diff --git a/lightsoff/main-window.ui b/lightsoff/main-window.ui
index 2b8b218..382cc02 100644
--- a/lightsoff/main-window.ui
+++ b/lightsoff/main-window.ui
@@ -1,55 +1,55 @@
 <?xml version="1.0"?>
 <interface>
   <requires lib="gtk+" version="2.14"/>
-  <object class="GtkWindow" id="game_window">
+  <!-- interface-naming-policy project-wide -->
+  <object class="GtkWindow" id="window1">
     <property name="title" translatable="yes">Lights Off</property>
-    <property name="resizable">False</property>
     <accel-groups>
-      <group name="accel_group"/>
+      <group name="accelgroup1"/>
     </accel-groups>
     <child>
-      <object class="GtkVBox" id="game_vbox">
+      <object class="GtkVBox" id="vbox1">
         <property name="visible">True</property>
         <property name="orientation">vertical</property>
         <child>
-          <object class="GtkMenuBar" id="menu_bar">
+          <object class="GtkMenuBar" id="menubar2">
             <property name="visible">True</property>
             <child>
-              <object class="GtkMenuItem" id="game_menu_item">
+              <object class="GtkMenuItem" id="menuitem5">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">_Game</property>
                 <property name="use_underline">True</property>
                 <child type="submenu">
-                  <object class="GtkMenu" id="game_menu">
+                  <object class="GtkMenu" id="menu4">
                     <property name="visible">True</property>
                     <child>
-                      <object class="GtkImageMenuItem" id="new_game_item">
+                      <object class="GtkImageMenuItem" id="imagemenuitem11">
                         <signal name="activate" handler="reset_score"/>
                         <property name="label">games-new-game</property>
                         <property name="visible">True</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
-                        <property name="accel_group">accel_group</property>
+                        <property name="accel_group">accelgroup1</property>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkImageMenuItem" id="show_preferences_item">
+                      <object class="GtkImageMenuItem" id="imagemenuitem12">
                         <signal name="activate" handler="show_settings"/>
                         <property name="label">gtk-preferences</property>
                         <property name="visible">True</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
-                        <property name="accel_group">accel_group</property>
+                        <property name="accel_group">accelgroup1</property>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkImageMenuItem" id="quit_item">
+                      <object class="GtkImageMenuItem" id="imagemenuitem15">
                         <signal name="activate" handler="quit"/>
                         <property name="label">gtk-quit</property>
                         <property name="visible">True</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
-                        <property name="accel_group">accel_group</property>
+                        <property name="accel_group">accelgroup1</property>
                       </object>
                     </child>
                   </object>
@@ -57,21 +57,21 @@
               </object>
             </child>
             <child>
-              <object class="GtkMenuItem" id="help_menu_item">
+              <object class="GtkMenuItem" id="menuitem8">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">_Help</property>
                 <property name="use_underline">True</property>
                 <child type="submenu">
-                  <object class="GtkMenu" id="help_menu">
+                  <object class="GtkMenu" id="menu6">
                     <property name="visible">True</property>
                     <child>
-                      <object class="GtkImageMenuItem" id="show_about_item">
+                      <object class="GtkImageMenuItem" id="imagemenuitem20">
                         <signal name="activate" handler="show_about"/>
                         <property name="label">gtk-about</property>
                         <property name="visible">True</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
-                        <property name="accel_group">accel_group</property>
+                        <property name="accel_group">accelgroup1</property>
                       </object>
                     </child>
                   </object>
@@ -90,5 +90,5 @@
       </object>
     </child>
   </object>
-  <object class="GtkAccelGroup" id="accel_group"/>
+  <object class="GtkAccelGroup" id="accelgroup1"/>
 </interface>
diff --git a/lightsoff/main.js.in b/lightsoff/main.js.in
index a66ce22..fff7d9d 100755
--- a/lightsoff/main.js.in
+++ b/lightsoff/main.js.in
@@ -39,10 +39,10 @@ b = new Gtk.Builder();
 b.add_from_file(file_prefix + "/main-window.ui");
 b.connect_signals(handlers);
 
-var window = b.get_object("game_window");
+var window = b.get_object("window1");
 var clutter_embed = new GtkClutter.Embed();
 window.signal.hide.connect(Gtk.main_quit);
-b.get_object("game_vbox").pack_start(clutter_embed, true, true);
+b.get_object("vbox1").pack_start(clutter_embed, true, true);
 
 var stage = clutter_embed.get_stage();
 stage.color = {alpha:255};