little bugfix :)

diff --git a/ChangeLog b/ChangeLog
index 34cc1946033e8e5b6e3d6a18d9be73796904b0a3..cac312e24d9147ef3a8ebf55cf43527eb1342177 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2003-02-11  Dani Carbonell  <bocata@panete.net>
+
+       * src/gtetrinet.c (main): fixed a bug when quitting GTetrinet when
+       there were blocks drew.
+       
+       * src/tetrinet.c (tetrinet_key): removed a lot of commented and
+       useless code.
+       (tetrinet_inmessage): marked a string for translating.
+       
+       * po/POTFILES.in: added src/client.c.
+
 2003-02-10  Dani Carbonell  <bocata@panete.net>
 
        * src/Makefile.am: added -DGDK_DISABLE_DEPRECATED to the compilation

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 002efd0e8a305cda44ae24595c99cf97bb0a6cd0..e5ba79f530696dc6764532099e53b81012dc3099 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,4 +1,5 @@
 src/commands.c
+src/client.c
 src/config.c
 src/dialogs.c
 src/fields.c

diff --git a/src/client.c b/src/client.c
index f79e3461c1ff614b116694b4df2d019bdb92170a..996bdaad1b92d0b34dd69202febf9f1e9426d66b 100644 (file)
--- a/src/client.c
+++ b/src/client.c
@@ -234,7 +234,7 @@ void client_process (void)
     GTET_O_STRCPY(errmsg, "noconnecting ");
 
     if (errno)        GTET_O_STRCAT(errmsg, strerror (errno));
-    else if (h_errno) GTET_O_STRCAT(errmsg, _("Could not resolve host."));
+    else if (h_errno) GTET_O_STRCAT(errmsg, _("Couldn't resolve hostname."));
 
     client_inmessage (errmsg);
     

diff --git a/src/gtetrinet.c b/src/gtetrinet.c
index 14ce08cc53d497bdbc8c829fccc06df3636bfa14..2f3daeadfd0cac2a782aa2e9cdd5901cd35e9b60 100644 (file)
--- a/src/gtetrinet.c
+++ b/src/gtetrinet.c
@@ -298,9 +298,9 @@ int main (int argc, char *argv[])
     /* gtk_main() */
     gtk_main ();
 
+    client_disconnect ();
     /* cleanup */
     fields_cleanup ();
-    client_disconnect (); /* kills the client process */
     sound_stopmidi ();
 
     return 0;

diff --git a/src/tetrinet.c b/src/tetrinet.c
index c6c0bcd91fe833d68de3d8f0f6f9f967f9bb47b0..cd46e5d9184d35a27d83f226593ac89e0c72d51a 100644 (file)
--- a/src/tetrinet.c
+++ b/src/tetrinet.c
@@ -179,7 +179,7 @@ void tetrinet_inmessage (enum inmsg_type msgtype, char *data)
         break;
     case IN_DISCONNECT:
         if (!connected) {
-            data = "Server disconnected";
+            data = _("Server disconnected");
             goto connecterror;
         }
         if (ingame) tetrinet_endgame ();
@@ -1520,47 +1520,6 @@ int tetrinet_key (int keyval)
     }
 notfieldkey:
     if (!ingame) return FALSE;
-    /* gmsg keys */
-/*    if (gmsgstate == 1) {
-        fields_gmsginputactivate (TRUE);
-        switch (keyval) {
-        case GDK_Return:
-            {
-                char buf[256];
-                const char *s;
-                gchar *locale_s;
-                s = fields_gmsginputtext ();
-                if (strlen(s) > 0) {
-                    if (strncmp("/me ", s, 4) == 0) {
-                        g_snprintf (buf, sizeof(buf), "* %s %s", nick, s+4);
-                        locale_s = g_locale_from_utf8 (buf, -1, NULL, NULL, NULL);
-                        client_outmessage (OUT_GMSG, locale_s);
-                    }
-                    else {
-                        g_snprintf (buf, sizeof(buf), "<%s> %s", nick, s);
-                        locale_s = g_locale_from_utf8 (buf, -1, NULL, NULL, NULL);
-                        client_outmessage (OUT_GMSG, locale_s);
-                    }
-                    g_free (locale_s);
-                }
-                fields_gmsginput (FALSE);
-                fields_gmsginputclear ();
-                gmsgstate = 0;
-            }
-            break;
-        case GDK_Escape:
-            gmsgstate = 2;
-            fields_gmsginput (FALSE);
-            break;
-        case GDK_BackSpace:
-            fields_gmsginputback ();
-            break;
-        default:
-            fields_gmsginputadd (str);
-            break;
-        }
-        return TRUE;
-    }*/
     if (gdk_keyval_to_lower (keyval) == keys[K_GAMEMSG]) {
         fields_gmsginput (TRUE);
         gmsgstate = 1;