Port gtk_signal_connect instances to g_signal_connect.

diff --git a/ChangeLog b/ChangeLog
index c674dd05950915a939a5caa0a493e9d1903c728c..90763f2168080d788dd7ea2d269c6138bf8339c7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-01-05  Jordi Mallach  <jordi@sindominio.net>
+
+       * TODO: updated.
+
+       * src/dialog.c: port gtk_signal_connect instances to g_signal_connect.
+       * src/fields.c: likewise.
+       * src/gtetrinet: likewise.
+
 2003-01-05  Jordi Mallach  <jordi@sindominio.net>
 
        * src/commands.c: update copyright notices... happy new year.

diff --git a/TODO b/TODO
index 343d1400ebe8a7ad014972cd0b8c64c3c3f92e75..e864330b234ee10af414981ba0800bad22861aeb 100644 (file)
--- a/TODO
+++ b/TODO
@@ -5,7 +5,9 @@ GTetrinet's TODO list
 - GNOME2 port issues:
   + preferences dialog (gconf)
   + keybindings
-  + multiple about windows (raise already open window)
   + playfields messages cleared when games start
-  + problem when typing composed letters (á) in fields messages.
-- Make gtetrinet resizeable (at least the fields messages bit).
+  + problem when typing composed letters (á) in fields messages
+  + add real tooltips
+  + port deprecated widgets (-DGTK_DISABLE_DEPRECATED)
+- Make gtetrinet resizeable (at least the fields messages bit)
+- Write a User Manual

diff --git a/src/Makefile.am b/src/Makefile.am
index 1db138210c22a33a15058f0bc71f0865b57e8567..d75705b8dd86f3b55f962c82396906f23b640baf 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,7 +4,7 @@ localedir = $(datadir)/locale
 
 GTET_DEBUG = -Wall -W -Wno-unused -g3 -O0
 
-INCLUDES = -DLOCALEDIR=\"$(localedir)\" -DPIXMAPSDIR=\""$(datadir)/pixmaps"\" $(GTET_CFLAGS) $(GTET_DEBUG)
+INCLUDES = -DLOCALEDIR=\"$(localedir)\" -DPIXMAPSDIR=\""$(datadir)/pixmaps"\" -DGTK_DISABLE_DEPRECATED $(GTET_CFLAGS) $(GTET_DEBUG)
 LDADD = $(GTET_LIBS)
 AM_CPPFLAGS = -DGTETRINET_DATA=\"$(pkgdatadir)\"
 

diff --git a/src/dialogs.c b/src/dialogs.c
index ad16b1614584ebdadec00bc2f9998a47dca203d7..0130ee4e8056b0a857a77fc34242a323663a0864 100644 (file)
--- a/src/dialogs.c
+++ b/src/dialogs.c
@@ -87,9 +87,9 @@ void connectingdialog_new (void)
 
     timeouttag = gtk_timeout_add (20, (GtkFunction)connectingdialog_timeout,
                                   NULL);
-    gtk_signal_connect (GTK_OBJECT(connectingdialog), "clicked",
+    g_signal_connect (G_OBJECT(connectingdialog), "clicked",
                         GTK_SIGNAL_FUNC(connectingdialog_button), NULL);
-    gtk_signal_connect (GTK_OBJECT(connectingdialog), "delete_event",
+    g_signal_connect (G_OBJECT(connectingdialog), "delete_event",
                         GTK_SIGNAL_FUNC(connectingdialog_delete), NULL);
     gtk_widget_show (connectingdialog);
 }
@@ -145,7 +145,7 @@ void teamdialog_new (void)
     gtk_box_pack_start (GTK_BOX(GNOME_DIALOG(dialog)->vbox),
                         table, TRUE, TRUE, 0);
     /* pass the entry in the data pointer */
-    gtk_signal_connect (GTK_OBJECT(dialog), "clicked",
+    g_signal_connect (G_OBJECT(dialog), "clicked",
                         GTK_SIGNAL_FUNC(teamdialog_button), (gpointer)entry);
     gtk_widget_show (dialog);
 }
@@ -241,7 +241,7 @@ void connectdialog_new (void)
                                       GNOME_STOCK_BUTTON_CANCEL,
                                       NULL);
     gnome_dialog_set_default (GNOME_DIALOG(connectdialog), 0);
-    gtk_signal_connect (GTK_OBJECT(connectdialog), "clicked",
+    g_signal_connect (G_OBJECT(connectdialog), "clicked",
                         GTK_SIGNAL_FUNC(connectdialog_button), NULL);
 
     /* main table */
@@ -362,13 +362,13 @@ void connectdialog_new (void)
 
     gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON(spectatorcheck), spectating);
     connectdialog_spectoggle (spectatorcheck, NULL);
-    gtk_signal_connect (GTK_OBJECT(connectdialog), "destroy",
+    g_signal_connect (G_OBJECT(connectdialog), "destroy",
                         GTK_SIGNAL_FUNC(connectdialog_destroy), NULL);
-    gtk_signal_connect (GTK_OBJECT(spectatorcheck), "toggled",
+    g_signal_connect (G_OBJECT(spectatorcheck), "toggled",
                         GTK_SIGNAL_FUNC(connectdialog_spectoggle), NULL);
-    gtk_signal_connect (GTK_OBJECT(originalradio), "toggled",
+    g_signal_connect (G_OBJECT(originalradio), "toggled",
                         GTK_SIGNAL_FUNC(connectdialog_originaltoggle), NULL);
-    gtk_signal_connect (GTK_OBJECT(tetrifastradio), "toggled",
+    g_signal_connect (G_OBJECT(tetrifastradio), "toggled",
                         GTK_SIGNAL_FUNC(connectdialog_tetrifasttoggle), NULL);
     gtk_widget_show (connectdialog);
 }
@@ -394,7 +394,7 @@ gint key_dialog (char *msg)
     gtk_box_pack_start (GTK_BOX(GNOME_DIALOG(dialog)->vbox),
                         label, TRUE, TRUE, GNOME_PAD_SMALL);
     gnome_dialog_set_close (GNOME_DIALOG(dialog), TRUE);
-    gtk_signal_connect (GTK_OBJECT(dialog), "key_press_event",
+    g_signal_connect (G_OBJECT(dialog), "key_press_event",
                         GTK_SIGNAL_FUNC(key_dialog_callback), NULL);
     gtk_widget_set_events (dialog, GDK_KEY_PRESS_MASK);
     keydialog_key = 0;
@@ -811,12 +811,12 @@ void prefdialog_new (void)
     gtk_widget_show (label);
 
     button = gtk_button_new_with_label (_("Change key..."));
-    gtk_signal_connect (GTK_OBJECT(button), "clicked",
+    g_signal_connect (G_OBJECT(button), "clicked",
                         GTK_SIGNAL_FUNC (prefdialog_changekey), NULL);
     gtk_widget_show (button);
 
     button1 = gtk_button_new_with_label (_("Restore defaults"));
-    gtk_signal_connect (GTK_OBJECT(button1), "clicked",
+    g_signal_connect (G_OBJECT(button1), "clicked",
                         GTK_SIGNAL_FUNC (prefdialog_restorekeys), NULL);
     gtk_widget_show (button1);
 
@@ -874,7 +874,7 @@ void prefdialog_new (void)
     gtk_widget_show (label);
 
     button = gtk_button_new_with_label (_("Restore defaults"));
-    gtk_signal_connect (GTK_OBJECT(button), "clicked",
+    g_signal_connect (G_OBJECT(button), "clicked",
                         GTK_SIGNAL_FUNC (prefdialog_restoremidi), NULL);
     gtk_widget_show (button);
 

diff --git a/src/fields.c b/src/fields.c
index ada94a8ee70c503597661b77c7e5a8aed3fa3778..f3f0c76fa0ac11fcc0c6520de92467fd7b6f0b93 100644 (file)
--- a/src/fields.c
+++ b/src/fields.c
@@ -164,7 +164,7 @@ GtkWidget *fields_page_contents (void)
             /* the field */
             fieldwidgets[i] = gtk_drawing_area_new ();
             /* attach the signals */
-            gtk_signal_connect (GTK_OBJECT(fieldwidgets[i]), "expose_event",
+            g_signal_connect (G_OBJECT(fieldwidgets[i]), "expose_event",
                                 GTK_SIGNAL_FUNC(fields_expose_event), (gpointer)i);
             gtk_widget_set_events (fieldwidgets[i], GDK_EXPOSURE_MASK);
             /* set the size */
@@ -196,7 +196,7 @@ GtkWidget *fields_page_contents (void)
     border = gtk_frame_new (NULL);
     gtk_frame_set_shadow_type (GTK_FRAME(border), GTK_SHADOW_IN);
     nextpiecewidget = gtk_drawing_area_new ();
-    gtk_signal_connect (GTK_OBJECT(nextpiecewidget), "expose_event",
+    g_signal_connect (G_OBJECT(nextpiecewidget), "expose_event",
                         GTK_SIGNAL_FUNC(fields_nextpiece_expose), NULL);
     gtk_widget_set_events (nextpiecewidget, GDK_EXPOSURE_MASK);
     gtk_drawing_area_size (GTK_DRAWING_AREA(nextpiecewidget), BLOCKSIZE*9/2, BLOCKSIZE*9/2);
@@ -254,7 +254,7 @@ GtkWidget *fields_page_contents (void)
     border = gtk_frame_new (NULL);
     gtk_frame_set_shadow_type (GTK_FRAME(border), GTK_SHADOW_IN);
     specialwidget = gtk_drawing_area_new ();
-    gtk_signal_connect (GTK_OBJECT(specialwidget), "expose_event",
+    g_signal_connect (G_OBJECT(specialwidget), "expose_event",
                         GTK_SIGNAL_FUNC(fields_specials_expose), NULL);
     gtk_drawing_area_size (GTK_DRAWING_AREA(specialwidget), BLOCKSIZE*18, BLOCKSIZE);
     gtk_widget_show (specialwidget);
@@ -311,7 +311,7 @@ GtkWidget *fields_page_contents (void)
     gmsginput = gtk_entry_new_with_max_length (128);
     gtk_widget_show (gmsginput);
     /* eat up key messages */
-    gtk_signal_connect (GTK_OBJECT(gmsginput), "key_press_event",
+    g_signal_connect (G_OBJECT(gmsginput), "key_press_event",
                         GTK_SIGNAL_FUNC(fields_eatkey), NULL);
     gtk_table_attach (GTK_TABLE(table2), gmsginput, 0, 1, 1, 2,
                       GTK_FILL | GTK_EXPAND, 0, 0, 0);

diff --git a/src/gtetrinet.c b/src/gtetrinet.c
index cb725b6cc4a99cebc6aca0136f1e5402d190c4bc..de5757314e9cb74b07354d9513ffb51819c6d8a0 100644 (file)
--- a/src/gtetrinet.c
+++ b/src/gtetrinet.c
@@ -152,11 +152,11 @@ int main (int argc, char *argv[])
     /* create the main window */
     app = gnome_app_new (APPID, APPNAME);
 
-    gtk_signal_connect (GTK_OBJECT(app), "destroy",
+    g_signal_connect (G_OBJECT(app), "destroy",
                         GTK_SIGNAL_FUNC(destroymain), NULL);
-    gtk_signal_connect (GTK_OBJECT(app), "key_press_event",
+    g_signal_connect (G_OBJECT(app), "key_press_event",
                         GTK_SIGNAL_FUNC(keypress), NULL);
-    gtk_signal_connect (GTK_OBJECT(app), "key_release_event",
+    g_signal_connect (G_OBJECT(app), "key_release_event",
                         GTK_SIGNAL_FUNC(keyrelease), NULL);
     gtk_widget_set_events (app, GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK);
 
@@ -216,7 +216,7 @@ int main (int argc, char *argv[])
     gtk_notebook_append_page (GTK_NOTEBOOK(notebook), pwinlist, label);
 
     /* add signal to focus the text entry when switching to the partyline page*/
-    gtk_signal_connect (GTK_OBJECT (notebook), "switch_page",
+    g_signal_connect (G_OBJECT (notebook), "switch_page",
                    GTK_SIGNAL_FUNC (partyline_switch_entryfocus),
                    NULL);
 
@@ -453,9 +453,9 @@ void move_current_page_to_window (void)
     gtk_container_set_border_width (GTK_CONTAINER (newWindow), 0);
 
     /* Attach key events to window */
-    gtk_signal_connect (GTK_OBJECT(newWindow), "key_press_event",
+    g_signal_connect (G_OBJECT(newWindow), "key_press_event",
                         GTK_SIGNAL_FUNC(keypress), NULL);
-    gtk_signal_connect (GTK_OBJECT(newWindow), "key_release_event",
+    g_signal_connect (G_OBJECT(newWindow), "key_release_event",
                         GTK_SIGNAL_FUNC(keyrelease), NULL);
     gtk_widget_set_events (newWindow, GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK);
     gtk_window_set_policy (GTK_WINDOW(newWindow), FALSE, TRUE, FALSE);
@@ -470,7 +470,7 @@ void move_current_page_to_window (void)
     gtk_widget_reparent (child, newWindow);
 
     /* Pass ID of parent (to put widget back) to window's destroy */
-    gtk_signal_connect (GTK_OBJECT(newWindow), "destroy",
+    g_signal_connect (G_OBJECT(newWindow), "destroy",
                         GTK_SIGNAL_FUNC(destroy_page_window),
                         (gpointer)(pageData));