Bug#344522: patch

[Lucas Nussbaum]

Attached is a simple patch that fixes this bug. It would really be great
if it could go into the next release.
-- 
| Lucas Nussbaum
| lucas at lucas-nussbaum.net   http://www.lucas-nussbaum.net/ |
| jabber: lucas at nussbaum.fr             GPG: 1024D/023B3F4F |
-------------- next part --------------
--- gtetrinet-0.7.9.orig/gtetrinet.schemas
+++ gtetrinet-0.7.9/gtetrinet.schemas
@@ -1326,6 +1326,18 @@
       </locale>
     </schema>
 
+    <schema>
+      <key>/schemas/apps/gtetrinet/player/gamemode</key>
+      <applyto>/apps/gtetrinet/player/gamemode</applyto>
+      <owner>gtetrinet</owner>
+      <type>bool</type>
+      <default>0</default>
+      
+      <locale name="C">
+        <short>Original (false) or Tetrifast (true) game mode.</short>
+        <long>Choose between original (false) or tetrifast (true) game mode.</long>
+      </locale>
+    </schema>
 
     <schema>
       <key>/schemas/apps/gtetrinet/keys/right</key>
only in patch2:
unchanged:
--- gtetrinet-0.7.9.orig/src/config.c
+++ gtetrinet-0.7.9/src/config.c
@@ -237,6 +237,9 @@
         GTET_O_STRCPY(team, p);
         g_free(p);
     }
+	 
+    /* get the game mode */
+    gamemode = gconf_client_get_bool (gconf_client, "/apps/gtetrinet/player/gamemode", NULL);
 
     /* get the keys */
     p = gconf_client_get_string (gconf_client, "/apps/gtetrinet/keys/right", NULL);
only in patch2:
unchanged:
--- gtetrinet-0.7.9.orig/src/dialogs.c
+++ gtetrinet-0.7.9/src/dialogs.c
@@ -189,7 +189,6 @@
 static GtkWidget *passwordlabel, *teamnamelabel;
 static GtkWidget *originalradio, *tetrifastradio;
 static GSList *gametypegroup;
-static int oldgamemode;
 
 void connectdialog_button (GtkDialog *dialog, gint button)
 {
@@ -256,11 +255,11 @@
         gconf_client_set_string (gconf_client, "/apps/gtetrinet/player/team",
                                  gtk_entry_get_text (GTK_ENTRY(gnome_entry_gtk_entry(GNOME_ENTRY(teamnameentry)))),
                                  NULL);
+        gconf_client_set_bool (gconf_client, "/apps/gtetrinet/player/gamemode", gamemode, NULL);
 
         g_free (nick);
         break;
     case GTK_RESPONSE_CANCEL:
-        gamemode = oldgamemode;
         gtk_widget_destroy (connectdialog);
         break;
     }
@@ -317,9 +316,6 @@
     }
     connecting = TRUE;
 
-    /* save some stuff */
-    oldgamemode = gamemode;
-
     /* make dialog that asks for address/nickname */
     connectdialog = gtk_dialog_new_with_buttons (_("Connect to server"),
                                                  GTK_WINDOW (app),