Remove compile warnings.

diff --git a/ChangeLog b/ChangeLog
index 790bd7a32673a0f76ff8260d2ede8e5ae4c2454d..4329db8acb11f4d13011229eff4698c93b13c9c5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+2003-02-06  Jordi Mallach  <jordi@sindominio.net>
+
+       * src/config.c (config_loadconfig): remove unused variable.
+       (sound_midi_player_changed): remove unused parameter warnings.
+       (sound_enable_sound_changed): likewise.
+       (sound_enable_midi_changed): likewise.
+       (themes_theme_dir_changed): likewise.
+       (keys_down_changed): likewise.
+       (keys_left_changed): likewise.
+       (keys_right_changed): likewise.
+       (keys_drop_changed): likewise.
+       (keys_rotate_left_changed): likewise.
+       (keys_rotate_right_changed): likewise.
+       (keys_message_changed): likewise.
+       (keys_discard_changed): likewise.
+       * src/dialogs.c (teamdialog_new): remove unused variable.
+       (prefdialog_response): remove unused variable and parameter warnings.
+       * src/fields.c (gmsginput_activate): remove parameters.
+       (fields_eatkey): remove unused function.
+       * src/gtetrinet (switch_focus): remove unused parameter warning.
+       (main): add a cast to gcofn_client_notify_add.
+       (keypress): remove obsolete parameter to tetrinet_key().
+       (switch_focus): remove unused paramater warnings.
+       * src/tetrinet.c (tetrinet_key): remove unused parameter.
+
 2003-02-04  Jordi Mallach  <jordi@sindominio.net>
 
        * NEWS, configure.in: released gtetrinet 0.6.0.

diff --git a/src/config.c b/src/config.c
index 85c3449f8facded017e255d77176a7761870ca5a..a4e11be85bf808db1cbfc86cefea8a1d66dc10b1 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -164,7 +164,6 @@ int config_getthemeinfo (char *themedir, char *name, char *author, char *desc)
 
 void config_loadconfig (void)
 {
-    unsigned int k;
     int l;
     gchar *p;
     
@@ -314,9 +313,12 @@ void load_theme (const gchar *theme_dir)
 void
 sound_midi_player_changed (GConfClient *client,
                            guint cnxn_id,
-                           GConfEntry *entry,
-                           gpointer user_data)
+                           GConfEntry *entry)
 {
+
+  client = client;     /* Suppress compile warnings */
+  cnxn_id = cnxn_id;   /* Suppress compile warnings */
+
   GTET_O_STRCPY (midicmd, gconf_value_get_string (gconf_entry_get_value (entry)));
   if (ingame)
   {
@@ -328,9 +330,12 @@ sound_midi_player_changed (GConfClient *client,
 void
 sound_enable_sound_changed (GConfClient *client,
                             guint cnxn_id,
-                            GConfEntry *entry,
-                            gpointer user_data)
+                            GConfEntry *entry)
 {
+
+  client = client;     /* Suppress compile warnings */
+  cnxn_id = cnxn_id;   /* Suppress compile warnings */
+
   soundenable = gconf_value_get_bool (gconf_entry_get_value (entry));
   if (!soundenable)
     gconf_client_set_bool (gconf_client, "/apps/gtetrinet/sound/enable_midi", FALSE, NULL);
@@ -339,9 +344,12 @@ sound_enable_sound_changed (GConfClient *client,
 void
 sound_enable_midi_changed (GConfClient *client,
                            guint cnxn_id,
-                           GConfEntry *entry,
-                           gpointer user_data)
+                           GConfEntry *entry)
 {
+
+  client = client;     /* Suppress compile warnings */
+  cnxn_id = cnxn_id;   /* Suppress compile warnings */
+
   midienable = gconf_value_get_bool (gconf_entry_get_value (entry));
   if (!midienable)
     sound_stopmidi ();
@@ -350,81 +358,108 @@ sound_enable_midi_changed (GConfClient *client,
 void
 themes_theme_dir_changed (GConfClient *client,
                           guint cnxn_id,
-                          GConfEntry *entry,
-                          gpointer user_data)
+                          GConfEntry *entry)
 {
+
+  client = client;     /* Suppress compile warnings */
+  cnxn_id = cnxn_id;   /* Suppress compile warnings */
+
   load_theme (gconf_value_get_string (gconf_entry_get_value (entry)));
 }
 
 void
 keys_down_changed (GConfClient *client,
                    guint cnxn_id,
-                   GConfEntry *entry,
-                   gpointer user_data)
+                   GConfEntry *entry)
 {
+
+  client = client;     /* Suppress compile warnings */
+  cnxn_id = cnxn_id;   /* Suppress compile warnings */
+
   keys[K_DOWN] = gdk_keyval_to_lower (gdk_keyval_from_name (gconf_value_get_string (gconf_entry_get_value (entry))));
 }
 
 void
 keys_left_changed (GConfClient *client,
                    guint cnxn_id,
-                   GConfEntry *entry,
-                   gpointer user_data)
+                   GConfEntry *entry)
 {
+
+  client = client;     /* Suppress compile warnings */
+  cnxn_id = cnxn_id;   /* Suppress compile warnings */
+
   keys[K_LEFT] = gdk_keyval_to_lower (gdk_keyval_from_name (gconf_value_get_string (gconf_entry_get_value (entry))));
 }
 
 void
 keys_right_changed (GConfClient *client,
                     guint cnxn_id,
-                    GConfEntry *entry,
-                    gpointer user_data)
+                    GConfEntry *entry)
 {
+
+  client = client;     /* Suppress compile warnings */
+  cnxn_id = cnxn_id;   /* Suppress compile warnings */
+
   keys[K_RIGHT] = gdk_keyval_to_lower (gdk_keyval_from_name (gconf_value_get_string (gconf_entry_get_value (entry))));
 }
 
 void
 keys_drop_changed (GConfClient *client,
                    guint cnxn_id,
-                   GConfEntry *entry,
-                   gpointer user_data)
+                   GConfEntry *entry)
 {
+
+  client = client;     /* Suppress compile warnings */
+  cnxn_id = cnxn_id;   /* Suppress compile warnings */
+
   keys[K_DROP] = gdk_keyval_to_lower (gdk_keyval_from_name (gconf_value_get_string (gconf_entry_get_value (entry))));
 }
 
 void
 keys_rotate_left_changed (GConfClient *client,
                           guint cnxn_id,
-                          GConfEntry *entry,
-                          gpointer user_data)
+                          GConfEntry *entry)
 {
+
+  client = client;     /* Suppress compile warnings */
+  cnxn_id = cnxn_id;   /* Suppress compile warnings */
+
   keys[K_ROTLEFT] = gdk_keyval_to_lower (gdk_keyval_from_name (gconf_value_get_string (gconf_entry_get_value (entry))));
 }
 
 void
 keys_rotate_right_changed (GConfClient *client,
                            guint cnxn_id,
-                           GConfEntry *entry,
-                           gpointer user_data)
+                           GConfEntry *entry)
 {
+
+  client = client;     /* Suppress compile warnings */
+  cnxn_id = cnxn_id;   /* Suppress compile warnings */
+
   keys[K_ROTRIGHT] = gdk_keyval_to_lower (gdk_keyval_from_name (gconf_value_get_string (gconf_entry_get_value (entry))));
 }
 
 void
 keys_message_changed (GConfClient *client,
                    guint cnxn_id,
-                   GConfEntry *entry,
-                   gpointer user_data)
+                   GConfEntry *entry)
 {
+
+  client = client;     /* Suppress compile warnings */
+  cnxn_id = cnxn_id;   /* Suppress compile warnings */
+
   keys[K_GAMEMSG] = gdk_keyval_to_lower (gdk_keyval_from_name (gconf_value_get_string (gconf_entry_get_value (entry))));
 }
 
 void
 keys_discard_changed (GConfClient *client,
                    guint cnxn_id,
-                   GConfEntry *entry,
-                   gpointer user_data)
+                   GConfEntry *entry)
 {
+
+  client = client;     /* Suppress compile warnings */
+  cnxn_id = cnxn_id;   /* Suppress compile warnings */
+
   keys[K_DISCARD] = gdk_keyval_to_lower (gdk_keyval_from_name (gconf_value_get_string (gconf_entry_get_value (entry))));
 }
 

diff --git a/src/config.h b/src/config.h
index 1baa90f5599fb28b0a7fdc279c805faabbaaf1db..5fae7052e6216dd8b55c7220809b146d03c8a9ba 100644 (file)
--- a/src/config.h
+++ b/src/config.h
@@ -14,74 +14,62 @@ extern void config_saveconfig (void);
 void
 sound_midi_player_changed (GConfClient *client,
                            guint cnxn_id,
-                           GConfEntry *entry,
-                           gpointer user_data);
+                           GConfEntry *entry);
 
 void
 sound_enable_sound_changed (GConfClient *client,
                             guint cnxn_id,
-                            GConfEntry *entry,
-                            gpointer user_data);
+                            GConfEntry *entry);
 
 void
 sound_enable_midi_changed (GConfClient *client,
                            guint cnxn_id,
-                           GConfEntry *entry,
-                           gpointer user_data);
+                           GConfEntry *entry);
 
 void
 themes_theme_dir_changed (GConfClient *client,
                           guint cnxn_id,
-                          GConfEntry *entry,
-                          gpointer user_data);
+                          GConfEntry *entry);
                           
 void
 keys_down_changed (GConfClient *client,
                    guint cnxn_id,
-                   GConfEntry *entry,
-                   gpointer user_data);
+                   GConfEntry *entry);
 
 void
 keys_left_changed (GConfClient *client,
                    guint cnxn_id,
-                   GConfEntry *entry,
-                   gpointer user_data);
+                   GConfEntry *entry);
 
 void
 keys_right_changed (GConfClient *client,
                     guint cnxn_id,
-                    GConfEntry *entry,
-                    gpointer user_data);
+                    GConfEntry *entry);
 
 void
 keys_drop_changed (GConfClient *client,
                    guint cnxn_id,
-                   GConfEntry *entry,
-                   gpointer user_data);
+                   GConfEntry *entry);
 
 void
 keys_rotate_left_changed (GConfClient *client,
                           guint cnxn_id,
-                          GConfEntry *entry,
-                          gpointer user_data);
+                          GConfEntry *entry);
 
 void
 keys_rotate_right_changed (GConfClient *client,
                            guint cnxn_id,
-                           GConfEntry *entry,
-                           gpointer user_data);
+                           GConfEntry *entry);
 
 void
 keys_message_changed (GConfClient *client,
                    guint cnxn_id,
-                   GConfEntry *entry,
-                   gpointer user_data);
+                   GConfEntry *entry);
 
 void
 keys_discard_changed (GConfClient *client,
                    guint cnxn_id,
-                   GConfEntry *entry,
-                   gpointer user_data);
+                   GConfEntry *entry);
 
 #define GTETRINET_THEMES GTETRINET_DATA"/themes"
 #define DEFAULTTHEME GTETRINET_THEMES"/default/"

diff --git a/src/dialogs.c b/src/dialogs.c
index 005fad096793252fc062f969bf3814b326852ff2..68c3193e8582bb869b0fd4a8271a060b15ac4f17 100644 (file)
--- a/src/dialogs.c
+++ b/src/dialogs.c
@@ -142,7 +142,7 @@ void teamdialog_button (GtkWidget *button, gint response, gpointer data)
 
 void teamdialog_new (void)
 {
-    GtkWidget *hbox, *buttonbox, *widget, *entry;
+    GtkWidget *hbox, *widget, *entry;
     gchar *team_utf8 = g_locale_to_utf8 (team, -1, NULL, NULL, NULL);
   
     if (team_dialog != NULL)
@@ -773,6 +773,9 @@ void prefdialog_themelist ()
 void prefdialog_response (GtkDialog *dialog,
                           gint arg1)
 {
+
+  dialog = dialog;     /* Supress compile warning */
+
   switch (arg1)
   {
     case GTK_RESPONSE_CLOSE: prefdialog_destroy (); break;
@@ -788,7 +791,6 @@ void prefdialog_new (void)
     GtkListStore *keys_store = gtk_list_store_new (4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT, G_TYPE_STRING);
     GtkCellRenderer *renderer = gtk_cell_renderer_text_new ();
     GtkTreeSelection *theme_selection;
-    int i;
   
     if (prefdialog != NULL)
     {

diff --git a/src/fields.c b/src/fields.c
index 5c32da94a15cf11e64f18c8b2a6505510e72b042..ca3c82f42a69a81bc3612695acc8519f628306e8 100644 (file)
--- a/src/fields.c
+++ b/src/fields.c
@@ -50,8 +50,7 @@ static gint fields_specials_expose (void);
 static void fields_refreshfield (int field);
 static void fields_drawblock (int field, int x, int y, char block);
 
-static gint fields_eatkey (GtkWidget *widget);
-static void gmsginput_activate (GtkEntry *entry, gpointer data);
+static void gmsginput_activate (void);
 
 static GdkPixmap *blockpix;
 
@@ -588,7 +587,7 @@ void fields_gmsginputactivate (int t)
         { /* do nothing */; }
 }
 
-void gmsginput_activate (GtkEntry *entry, gpointer data)
+void gmsginput_activate (void)
 {
     gchar *locale_s, buf[256];
     const gchar *s;
@@ -625,9 +624,3 @@ const char *fields_gmsginputtext (void)
 {
     return gtk_entry_get_text (GTK_ENTRY(gmsginput));
 }
-
-gint fields_eatkey (GtkWidget *widget)
-{
-    g_signal_stop_emission_by_name (G_OBJECT(widget), "key-press-event");
-    return TRUE;
-}

diff --git a/src/gtetrinet.c b/src/gtetrinet.c
index 211a08f52c7474896295ef4475656b6e9cd0f024..c23dc519aca46729748c8deb36cd986ada6843ff 100644 (file)
--- a/src/gtetrinet.c
+++ b/src/gtetrinet.c
@@ -54,8 +54,7 @@ gint keypress (GtkWidget *widget, GdkEventKey *key);
 gint keyrelease (GtkWidget *widget, GdkEventKey *key);
 void switch_focus (GtkNotebook *notebook,
                    GtkNotebookPage *page,
-                   guint page_num,
-                   gpointer user_data);
+                   guint page_num);
 
 static GtkWidget *pfields, *pparty, *pwinlist;
 static GtkWidget *winlistwidget, *partywidget, *fieldswidget;
@@ -193,40 +192,51 @@ int main (int argc, char *argv[])
 
     /* Request notification of change for these gconf keys */
     gconf_client_notify_add (gconf_client, "/apps/gtetrinet/sound/midi_player",
-                             sound_midi_player_changed, NULL, NULL, NULL);
+                             (GConfClientNotifyFunc) sound_midi_player_changed,
+                            NULL, NULL, NULL);
                              
     gconf_client_notify_add (gconf_client, "/apps/gtetrinet/sound/enable_sound",
-                             sound_enable_sound_changed, NULL, NULL, NULL);
+                             (GConfClientNotifyFunc) sound_enable_sound_changed,
+                            NULL, NULL, NULL);
                              
     gconf_client_notify_add (gconf_client, "/apps/gtetrinet/sound/enable_midi",
-                             sound_enable_midi_changed, NULL, NULL, NULL);
+                             (GConfClientNotifyFunc) sound_enable_midi_changed,
+                            NULL, NULL, NULL);
                              
     gconf_client_notify_add (gconf_client, "/apps/gtetrinet/themes/theme_dir",
-                             themes_theme_dir_changed, NULL, NULL, NULL);
+                             (GConfClientNotifyFunc) themes_theme_dir_changed,
+                            NULL, NULL, NULL);
 
     gconf_client_notify_add (gconf_client, "/apps/gtetrinet/keys/down",
-                             keys_down_changed, NULL, NULL, NULL);
+                             (GConfClientNotifyFunc) keys_down_changed, NULL, NULL, NULL);
 
     gconf_client_notify_add (gconf_client, "/apps/gtetrinet/keys/left",
-                             keys_left_changed, NULL, NULL, NULL);
+                             (GConfClientNotifyFunc) keys_left_changed,
+                            NULL, NULL, NULL);
 
     gconf_client_notify_add (gconf_client, "/apps/gtetrinet/keys/right",
-                             keys_right_changed, NULL, NULL, NULL);
+                             (GConfClientNotifyFunc) keys_right_changed,
+                            NULL, NULL, NULL);
 
     gconf_client_notify_add (gconf_client, "/apps/gtetrinet/keys/rotate_left",
-                             keys_rotate_left_changed, NULL, NULL, NULL);
+                             (GConfClientNotifyFunc) keys_rotate_left_changed,
+                            NULL, NULL, NULL);
 
     gconf_client_notify_add (gconf_client, "/apps/gtetrinet/keys/rotate_right",
-                             keys_rotate_right_changed, NULL, NULL, NULL);
+                             (GConfClientNotifyFunc) keys_rotate_right_changed,
+                            NULL, NULL, NULL);
 
     gconf_client_notify_add (gconf_client, "/apps/gtetrinet/keys/drop",
-                             keys_drop_changed, NULL, NULL, NULL);
+                             (GConfClientNotifyFunc) keys_drop_changed, NULL,
+                            NULL, NULL);
 
     gconf_client_notify_add (gconf_client, "/apps/gtetrinet/keys/discard",
-                             keys_discard_changed, NULL, NULL, NULL);
+                             (GConfClientNotifyFunc) keys_discard_changed,
+                            NULL, NULL, NULL);
 
     gconf_client_notify_add (gconf_client, "/apps/gtetrinet/keys/message",
-                             keys_message_changed, NULL, NULL, NULL);
+                             (GConfClientNotifyFunc) keys_message_changed,
+                            NULL, NULL, NULL);
 
     /* load settings */
     config_loadconfig ();
@@ -446,7 +456,7 @@ gint keypress (GtkWidget *widget, GdkEventKey *key)
       g_signal_stop_emission_by_name (G_OBJECT(widget), "key-press-event");
     }
 
-    if (game_area && tetrinet_key (key->keyval, key->string))
+    if (game_area && tetrinet_key (key->keyval))
     {
       g_signal_stop_emission_by_name (G_OBJECT(widget), "key-press-event");
       return TRUE;
@@ -610,9 +620,12 @@ void unblock_keyboard_signal (void)
 
 void switch_focus (GtkNotebook *notebook,
                    GtkNotebookPage *page,
-                   guint page_num,
-                   gpointer user_data)
+                   guint page_num)
 {
+
+    notebook = notebook;       /* Suppress compile warnings */
+    page = page;               /* Suppress compile warnings */
+
     if (connected)
       switch (page_num)
       {

diff --git a/src/tetrinet.c b/src/tetrinet.c
index f4bbd57f40895e6fa9a8bb2188a214b012f7f1a7..c6c0bcd91fe833d68de3d8f0f6f9f967f9bb47b0 100644 (file)
--- a/src/tetrinet.c
+++ b/src/tetrinet.c
@@ -1501,7 +1501,7 @@ gint tetrinet_removelinestimeout (void)
 }
 
 /* return TRUE if key is processed, FALSE if not */
-int tetrinet_key (int keyval, char *str)
+int tetrinet_key (int keyval)
 {
     if (spectating) {
         /* spectator keys */

diff --git a/src/tetrinet.h b/src/tetrinet.h
index a7d8d6e8a877158d47b7e6daa02e234504cee3bd..991fbe14cddce5d2aaf662c74c07b00e6dbc3fde 100644 (file)
--- a/src/tetrinet.h
+++ b/src/tetrinet.h
@@ -21,7 +21,7 @@ extern void tetrinet_updatefield (FIELD field);
 extern void tetrinet_sendfield (int reset);
 extern void tetrinet_resendfield (void);
 extern void tetrinet_redrawfields (void);
-extern int tetrinet_key (int keyval, char *str);
+extern int tetrinet_key (int keyval);
 extern void tetrinet_upkey (int keyval);
 
 extern void tetrinet_startgame (void);