gnome-games r8202 - in trunk: aisleriot blackjack/src gnect/src gnibbles gnobots2 gnometris gnomine gtali iagno libgames-support mahjongg windows/nsis/include

From: chpe svn gnome org
To: svn-commits-list gnome org
Subject: gnome-games r8202 - in trunk: aisleriot blackjack/src gnect/src gnibbles gnobots2 gnometris gnomine gtali iagno libgames-support mahjongg windows/nsis/include
Date: Sun, 26 Oct 2008 14:45:53 +0000 (UTC)
Author: chpe
Date: Sun Oct 26 14:45:52 2008
New Revision: 8202
URL: http://svn.gnome.org/viewvc/gnome-games?rev=8202&view=rev

Log:
Build with *_DISABLE_DEPRECATED and *_DISABLE_SINGLE_INCLUDES.
Add some missing includes.

Modified:
   trunk/aisleriot/board.h
   trunk/aisleriot/clutter-embed.c
   trunk/aisleriot/game.h
   trunk/aisleriot/sol.c
   trunk/aisleriot/stats-dialog.h
   trunk/aisleriot/util.h
   trunk/aisleriot/window.h
   trunk/blackjack/src/dialog.cpp
   trunk/gnect/src/gfx.c
   trunk/gnect/src/ggz-network.c
   trunk/gnect/src/main.c
   trunk/gnibbles/boni.c
   trunk/gnibbles/bonus.c
   trunk/gnibbles/main.c
   trunk/gnibbles/preferences.c
   trunk/gnibbles/warpmanager.c
   trunk/gnobots2/game.c
   trunk/gnobots2/gnobots.c
   trunk/gnobots2/properties.c
   trunk/gnobots2/sound.c
   trunk/gnobots2/statusbar.c
   trunk/gnometris/tetris.cpp
   trunk/gnomine/gnomine.c
   trunk/gnomine/minefield.c
   trunk/gnomine/minefield.h
   trunk/gtali/gyahtzee.c
   trunk/iagno/ggz-network.c
   trunk/iagno/gnothello.c
   trunk/libgames-support/games-clock.h
   trunk/libgames-support/games-conf.c
   trunk/libgames-support/games-conf.h
   trunk/libgames-support/games-controls.h
   trunk/libgames-support/games-dlg-chat.c
   trunk/libgames-support/games-dlg-players.c
   trunk/libgames-support/games-frame.h
   trunk/libgames-support/games-scores-dialog.h
   trunk/libgames-support/games-stock.c
   trunk/libgames-support/games-stock.h
   trunk/libgames-support/render-cards.c
   trunk/mahjongg/drawing.c
   trunk/mahjongg/drawing.h
   trunk/windows/nsis/include/win_environment_functions.nsh

Modified: trunk/aisleriot/board.h
==============================================================================
--- trunk/aisleriot/board.h	(original)
+++ trunk/aisleriot/board.h	Sun Oct 26 14:45:52 2008
@@ -20,7 +20,7 @@
 #ifndef AISLERIOT_BOARD_H
 #define AISLERIOT_BOARD_H
 
-#include <gtk/gtkdrawingarea.h>
+#include <gtk/gtk.h>
 #include "game.h"
 
 G_BEGIN_DECLS

Modified: trunk/aisleriot/clutter-embed.c
==============================================================================
--- trunk/aisleriot/clutter-embed.c	(original)
+++ trunk/aisleriot/clutter-embed.c	Sun Oct 26 14:45:52 2008
@@ -43,7 +43,7 @@
 #include <glib-object.h>
 
 #include <gdk/gdk.h>
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
 
 #include <clutter/clutter-main.h>
 #include <clutter/clutter-stage.h>

Modified: trunk/aisleriot/game.h
==============================================================================
--- trunk/aisleriot/game.h	(original)
+++ trunk/aisleriot/game.h	Sun Oct 26 14:45:52 2008
@@ -21,7 +21,7 @@
 
 #include <libguile.h>
 
-#include <gdk/gdktypes.h>
+#include <gdk/gdk.h>
 
 #include <libgames-support/games-card.h>
 

Modified: trunk/aisleriot/sol.c
==============================================================================
--- trunk/aisleriot/sol.c	(original)
+++ trunk/aisleriot/sol.c	Sun Oct 26 14:45:52 2008
@@ -26,13 +26,10 @@
 
 #include <libguile.h>
 
+#include <glib.h>
 #include <glib/gi18n.h>
-#include <glib/gthread.h>
 
-#include <gtk/gtkaboutdialog.h>
-#include <gtk/gtkicontheme.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmessagedialog.h>
+#include <gtk/gtk.h>
 
 #ifdef HAVE_CLUTTER
 #include <clutter/clutter-main.h>

Modified: trunk/aisleriot/stats-dialog.h
==============================================================================
--- trunk/aisleriot/stats-dialog.h	(original)
+++ trunk/aisleriot/stats-dialog.h	Sun Oct 26 14:45:52 2008
@@ -19,7 +19,7 @@
 #ifndef AISLERIOT_STATS_DIALOG_H
 #define AISLERIOT_STATS_DIALOG_H
 
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 
 #include "conf.h"
 

Modified: trunk/aisleriot/util.h
==============================================================================
--- trunk/aisleriot/util.h	(original)
+++ trunk/aisleriot/util.h	Sun Oct 26 14:45:52 2008
@@ -20,7 +20,7 @@
 #define UTIL_H
 
 #include <glib.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
   

Modified: trunk/aisleriot/window.h
==============================================================================
--- trunk/aisleriot/window.h	(original)
+++ trunk/aisleriot/window.h	Sun Oct 26 14:45:52 2008
@@ -19,7 +19,7 @@
 #ifndef AISLERIOT_WINDOW_H
 #define AISLERIOT_WINDOW_H
 
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 #ifdef HAVE_HILDON
 #ifdef HAVE_MAEMO_3

Modified: trunk/blackjack/src/dialog.cpp
==============================================================================
--- trunk/blackjack/src/dialog.cpp	(original)
+++ trunk/blackjack/src/dialog.cpp	Sun Oct 26 14:45:52 2008
@@ -122,7 +122,7 @@
         if (hint_dlg)
                 g_signal_connect (hint_dlg,
                                   "destroy",
-                                  (GtkSignalFunc) hint_destroy_callback,
+                                  (GCallback) hint_destroy_callback,
                                   NULL);
 
 	gtk_dialog_run (GTK_DIALOG (hint_dlg));

Modified: trunk/gnect/src/gfx.c
==============================================================================
--- trunk/gnect/src/gfx.c	(original)
+++ trunk/gnect/src/gfx.c	Sun Oct 26 14:45:52 2008
@@ -143,10 +143,9 @@
 		     tilesize);
 
   if (tile != TILE_CLEAR) {
-    gdk_pixbuf_render_to_drawable_alpha (pb_tileset, pm_display,
-					 os, 0, x, y, tilesize, tilesize,
-					 GDK_PIXBUF_ALPHA_BILEVEL, 128,
-					 GDK_RGB_DITHER_NORMAL, 0, 0);
+    gdk_draw_pixbuf (pm_display, NULL, pb_tileset,
+                     os, 0, x, y, tilesize, tilesize,
+                     GDK_RGB_DITHER_NORMAL, 0, 0);
   }
 
   if (refresh) {
@@ -248,11 +247,11 @@
 void
 gfx_expose (GdkRectangle * area)
 {
-  gdk_draw_pixmap (drawarea->window,
-		   gc,
-		   pm_display,
-		   area->x, area->y,
-		   area->x, area->y, area->width, area->height);
+  gdk_draw_drawable (GDK_DRAWABLE (drawarea->window),
+                     gc,
+                     pm_display,
+                     area->x, area->y,
+                     area->x, area->y, area->width, area->height);
 }
 
 

Modified: trunk/gnect/src/ggz-network.c
==============================================================================
--- trunk/gnect/src/ggz-network.c	(original)
+++ trunk/gnect/src/ggz-network.c	Sun Oct 26 14:45:52 2008
@@ -23,9 +23,9 @@
  * USA
  */
 
-
-
 #include <config.h>
+#include <sys/types.h>
+#include <unistd.h>
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>

Modified: trunk/gnect/src/main.c
==============================================================================
--- trunk/gnect/src/main.c	(original)
+++ trunk/gnect/src/main.c	Sun Oct 26 14:45:52 2008
@@ -23,6 +23,7 @@
  */
 
 #include <config.h>
+#include <stdlib.h>
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
@@ -347,7 +348,7 @@
   blink_n = n;
   blink_on = FALSE;
   anim = ANIM_BLINK;
-  timeout = gtk_timeout_add (SPEED_BLINK, (GSourceFunc) on_animate, NULL);
+  timeout = g_timeout_add (SPEED_BLINK, (GSourceFunc) on_animate, NULL);
 }
 
 
@@ -390,7 +391,7 @@
   if (timeout == 0)
     return;
   anim = ANIM_NONE;
-  gtk_timeout_remove (timeout);
+  g_source_remove (timeout);
   timeout = 0;
 }
 
@@ -728,7 +729,7 @@
     while (timeout)
       gtk_main_iteration ();
     anim = ANIM_HINT;
-    timeout = gtk_timeout_add (SPEED_MOVE, (GSourceFunc) on_animate, NULL);
+    timeout = g_timeout_add (SPEED_MOVE, (GSourceFunc) on_animate, NULL);
   } else {
     move_cursor (column_moveto);
   }
@@ -824,7 +825,7 @@
   gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (scorebox)->vbox), 2);
 
   g_signal_connect (GTK_OBJECT (scorebox), "destroy",
-		    GTK_SIGNAL_FUNC (gtk_widget_destroyed), &scorebox);
+		    G_CALLBACK (gtk_widget_destroyed), &scorebox);
 
   vbox = gtk_vbox_new (FALSE, 6);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
@@ -876,7 +877,7 @@
   gtk_misc_set_alignment (GTK_MISC (label_score[NOBODY]), 1, 0.5);
 
   g_signal_connect (GTK_DIALOG (scorebox), "response",
-		    GTK_SIGNAL_FUNC (on_dialog_close), NULL);
+		    G_CALLBACK (on_dialog_close), NULL);
 
   gtk_widget_show_all (scorebox);
 
@@ -1078,7 +1079,7 @@
     anim = ANIM_BLINK;
     blink_on = FALSE;
     blink_n = n;
-    timeout = gtk_timeout_add (SPEED_BLINK, (GSourceFunc) on_animate, NULL);
+    timeout = g_timeout_add (SPEED_BLINK, (GSourceFunc) on_animate, NULL);
     while (timeout)
       gtk_main_iteration ();
   }
@@ -1088,7 +1089,7 @@
     anim = ANIM_BLINK;
     blink_on = FALSE;
     blink_n = n;
-    timeout = gtk_timeout_add (SPEED_BLINK, (GSourceFunc) on_animate, NULL);
+    timeout = g_timeout_add (SPEED_BLINK, (GSourceFunc) on_animate, NULL);
     while (timeout)
       gtk_main_iteration ();
   }
@@ -1098,7 +1099,7 @@
     anim = ANIM_BLINK;
     blink_on = FALSE;
     blink_n = n;
-    timeout = gtk_timeout_add (SPEED_BLINK, (GSourceFunc) on_animate, NULL);
+    timeout = g_timeout_add (SPEED_BLINK, (GSourceFunc) on_animate, NULL);
     while (timeout)
       gtk_main_iteration ();
   }
@@ -1108,7 +1109,7 @@
     anim = ANIM_BLINK;
     blink_on = FALSE;
     blink_n = n;
-    timeout = gtk_timeout_add (SPEED_BLINK, (GSourceFunc) on_animate, NULL);
+    timeout = g_timeout_add (SPEED_BLINK, (GSourceFunc) on_animate, NULL);
     while (timeout)
       gtk_main_iteration ();
   }
@@ -1168,8 +1169,8 @@
 process_move (gint c)
 {
   if (timeout) {
-    gtk_timeout_add (SPEED_DROP,
-		     (GSourceFunc) next_move, GINT_TO_POINTER (c));
+    g_timeout_add (SPEED_DROP,
+	           (GSourceFunc) next_move, GINT_TO_POINTER (c));
     return;
 
   }
@@ -1181,8 +1182,8 @@
   } else {
     column_moveto = c;
     anim = ANIM_MOVE;
-    timeout = gtk_timeout_add (SPEED_MOVE,
-			       (GSourceFunc) on_animate, GINT_TO_POINTER (c));
+    timeout = g_timeout_add (SPEED_MOVE,
+                             (GSourceFunc) on_animate, GINT_TO_POINTER (c));
   }
 }
 
@@ -1201,9 +1202,9 @@
       row = 0;
       row_dropto = r;
       anim = ANIM_DROP;
-      timeout = gtk_timeout_add (SPEED_DROP,
-				 (GSourceFunc) on_animate,
-				 GINT_TO_POINTER (c));
+      timeout = g_timeout_add (SPEED_DROP,
+                               (GSourceFunc) on_animate,
+                               GINT_TO_POINTER (c));
     }
   } else {
     play_sound (SOUND_COLUMN_FULL);
@@ -1235,8 +1236,8 @@
       c = playgame (vstr, vboard) - 1;
       if (c < 0)
 	gameover = TRUE;
-      gtk_timeout_add (SPEED_DROP,
-		       (GSourceFunc) next_move, GINT_TO_POINTER (c));
+      g_timeout_add (SPEED_DROP,
+                     (GSourceFunc) next_move, GINT_TO_POINTER (c));
     }
   }
 }

Modified: trunk/gnibbles/boni.c
==============================================================================
--- trunk/gnibbles/boni.c	(original)
+++ trunk/gnibbles/boni.c	Sun Oct 26 14:45:52 2008
@@ -19,6 +19,8 @@
 
 #include <config.h>
 
+#include <stdlib.h>
+
 #include <gtk/gtk.h>
 
 #include <libgames-support/games-sound.h>

Modified: trunk/gnibbles/bonus.c
==============================================================================
--- trunk/gnibbles/bonus.c	(original)
+++ trunk/gnibbles/bonus.c	Sun Oct 26 14:45:52 2008
@@ -19,6 +19,8 @@
 
 #include <config.h>
 
+#include <stdlib.h>
+
 #include <gtk/gtk.h>
 
 #include "gnibbles.h"

Modified: trunk/gnibbles/main.c
==============================================================================
--- trunk/gnibbles/main.c	(original)
+++ trunk/gnibbles/main.c	Sun Oct 26 14:45:52 2008
@@ -495,8 +495,8 @@
     /*
      * main_id = gtk_timeout_add (GAMEDELAY * properties->gamespeed,
      * (GtkFunction) main_loop, NULL);
-     * keyboard_id = gtk_signal_connect (GTK_OBJECT (window),
-     * "key_press_event", GTK_SIGNAL_FUNC (key_press_cb),
+     * keyboard_id = g_signal_connect (GTK_OBJECT (window),
+     * "key_press_event", G_CALLBACK (key_press_cb),
      * NULL);
      * add_bonus_id = gtk_timeout_add (BONUSDELAY *
      * properties->gamespeed,

Modified: trunk/gnibbles/preferences.c
==============================================================================
--- trunk/gnibbles/preferences.c	(original)
+++ trunk/gnibbles/preferences.c	Sun Oct 26 14:45:52 2008
@@ -272,7 +272,7 @@
   gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
   if (properties->gamespeed == 4)
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
-  g_signal_connect (GTK_OBJECT (button), "toggled", GTK_SIGNAL_FUNC
+  g_signal_connect (GTK_OBJECT (button), "toggled", G_CALLBACK
 		    (game_speed_cb), (gpointer) 4);
 
   button = gtk_radio_button_new_with_label (gtk_radio_button_get_group
@@ -282,7 +282,7 @@
   gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
   if (properties->gamespeed == 3)
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
-  g_signal_connect (GTK_OBJECT (button), "toggled", GTK_SIGNAL_FUNC
+  g_signal_connect (GTK_OBJECT (button), "toggled", G_CALLBACK
 		    (game_speed_cb), (gpointer) 3);
 
   button = gtk_radio_button_new_with_label (gtk_radio_button_get_group
@@ -292,7 +292,7 @@
   gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
   if (properties->gamespeed == 2)
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
-  g_signal_connect (GTK_OBJECT (button), "toggled", GTK_SIGNAL_FUNC
+  g_signal_connect (GTK_OBJECT (button), "toggled", G_CALLBACK
 		    (game_speed_cb), (gpointer) 2);
 
   button = gtk_radio_button_new_with_label (gtk_radio_button_get_group
@@ -302,7 +302,7 @@
   gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
   if (properties->gamespeed == 1)
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
-  g_signal_connect (GTK_OBJECT (button), "toggled", GTK_SIGNAL_FUNC
+  g_signal_connect (GTK_OBJECT (button), "toggled", G_CALLBACK
 		    (game_speed_cb), (gpointer) 1);
 
 
@@ -321,7 +321,7 @@
     gtk_widget_set_sensitive (button, FALSE);
   if (properties->random)
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
-  g_signal_connect (GTK_OBJECT (button), "toggled", GTK_SIGNAL_FUNC
+  g_signal_connect (GTK_OBJECT (button), "toggled", G_CALLBACK
 		    (random_order_cb), NULL);
 
   button = gtk_check_button_new_with_mnemonic (_("_Enable fake bonuses"));
@@ -331,14 +331,14 @@
     gtk_widget_set_sensitive (button, FALSE);
   if (properties->fakes)
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
-  g_signal_connect (GTK_OBJECT (button), "toggled", GTK_SIGNAL_FUNC
+  g_signal_connect (GTK_OBJECT (button), "toggled", G_CALLBACK
 		    (fake_bonus_cb), NULL);
 
   button = gtk_check_button_new_with_mnemonic (_("E_nable sounds"));
   gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
   if (properties->sound)
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
-  g_signal_connect (GTK_OBJECT (button), "toggled", GTK_SIGNAL_FUNC
+  g_signal_connect (GTK_OBJECT (button), "toggled", G_CALLBACK
 		    (sound_cb), NULL);
 
   table2 = gtk_table_new (3, 2, FALSE);
@@ -374,7 +374,7 @@
     gtk_widget_set_sensitive (GTK_WIDGET (levelspinner), FALSE);
   gtk_table_attach_defaults (GTK_TABLE (table2), levelspinner, 1, 2, 0, 1);
   g_signal_connect (GTK_OBJECT (adjustment), "value_changed",
-		    GTK_SIGNAL_FUNC (start_level_cb), levelspinner);
+		    G_CALLBACK (start_level_cb), levelspinner);
 
   label2 = gtk_label_new_with_mnemonic (_("Number of _human players:"));
   gtk_misc_set_alignment (GTK_MISC (label2), 0, 0.5);
@@ -395,7 +395,7 @@
   if (running || ggz_network_mode)
     gtk_widget_set_sensitive (num_human, FALSE);
   g_signal_connect (GTK_OBJECT (adjustment), "value_changed",
-		    GTK_SIGNAL_FUNC (num_worms_cb), num_human);
+		    G_CALLBACK (num_worms_cb), num_human);
 
   label2 = gtk_label_new_with_mnemonic (_("Number of _AI players:"));
   gtk_misc_set_alignment (GTK_MISC (label2), 0, 0.5);
@@ -416,7 +416,7 @@
   if (running || ggz_network_mode)
     gtk_widget_set_sensitive (num_ai, FALSE);
   g_signal_connect (GTK_OBJECT (adjustment), "value_changed",
-		    GTK_SIGNAL_FUNC (num_worms_cb), num_ai);
+		    G_CALLBACK (num_worms_cb), num_ai);
 
   for (i = 0; i < NUMWORMS; i++) {
     char up_key[64];
@@ -479,7 +479,7 @@
     gtk_combo_box_append_text (GTK_COMBO_BOX (omenu), _("Purple"));
     gtk_combo_box_append_text (GTK_COMBO_BOX (omenu), _("Gray"));
     g_signal_connect (GTK_OBJECT (omenu), "changed",
-		      GTK_SIGNAL_FUNC (set_worm_color_cb),
+		      G_CALLBACK (set_worm_color_cb),
 		      GINT_TO_POINTER (i));
     gtk_combo_box_set_active (GTK_COMBO_BOX (omenu),
 			      properties->wormprops[i]->color - WORMRED);

Modified: trunk/gnibbles/warpmanager.c
==============================================================================
--- trunk/gnibbles/warpmanager.c	(original)
+++ trunk/gnibbles/warpmanager.c	Sun Oct 26 14:45:52 2008
@@ -19,6 +19,8 @@
 
 #include <config.h>
 
+#include <stdlib.h>
+
 #include <gtk/gtk.h>
 
 #include "gnibbles.h"

Modified: trunk/gnobots2/game.c
==============================================================================
--- trunk/gnobots2/game.c	(original)
+++ trunk/gnobots2/game.c	Sun Oct 26 14:45:52 2008
@@ -674,7 +674,7 @@
   create_game_timer ();
 
   g_signal_connect (GTK_OBJECT (app), "key_press_event",
-		    GTK_SIGNAL_FUNC (keyboard_cb), 0);
+		    G_CALLBACK (keyboard_cb), 0);
 
   start_new_game ();
 }

Modified: trunk/gnobots2/gnobots.c
==============================================================================
--- trunk/gnobots2/gnobots.c	(original)
+++ trunk/gnobots2/gnobots.c	Sun Oct 26 14:45:52 2008
@@ -23,9 +23,10 @@
 
 #include <sys/time.h>
 #include <string.h>
+#include <stdlib.h>
 
 #include <glib/gi18n.h>
-#include <glib/gthread.h>
+#include <glib.h>
 
 #include <libgames-support/games-conf.h>
 #include <libgames-support/games-gridframe.h>

Modified: trunk/gnobots2/properties.c
==============================================================================
--- trunk/gnobots2/properties.c	(original)
+++ trunk/gnobots2/properties.c	Sun Oct 26 14:45:52 2008
@@ -428,13 +428,10 @@
   GtkWidget *frame;
   GtkWidget *w;
   GtkWidget *controls_list;
-  GtkTooltips *tooltips;
 
   if (propbox)
     return;
 
-  tooltips = gtk_tooltips_new ();
-
   propbox = gtk_dialog_new_with_buttons (_("Robots Preferences"),
 					 GTK_WINDOW (app),
 					 GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -469,7 +466,7 @@
   g_signal_connect (G_OBJECT (typemenu), "changed",
 		    G_CALLBACK (type_selection), NULL);
   fill_typemenu (typemenu);
-  gtk_box_pack_start_defaults (GTK_BOX (hbox), typemenu);
+  gtk_box_pack_start (GTK_BOX (hbox), typemenu, TRUE, TRUE, 0);
 
   frame = games_frame_new (_("Options"));
   gtk_box_pack_start (GTK_BOX (cpage), frame, FALSE, FALSE, 0);
@@ -485,44 +482,36 @@
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (chkbox),
 				properties.safe_moves);
   g_signal_connect (G_OBJECT (chkbox), "clicked",
-		    (GtkSignalFunc) safe_cb, NULL);
+		    (GCallback) safe_cb, NULL);
   gtk_table_attach (GTK_TABLE (table), chkbox, 0, 1, 0, 1, GTK_FILL, 0, 0, 0);
-  gtk_tooltips_set_tip (tooltips, chkbox,
-			_("Prevent some dangerous moves"),
-			_
-			("Prevent accidental moves that result in getting killed."));
+  gtk_widget_set_tooltip_text (chkbox,
+                               _("Prevent accidental moves that result in getting killed."));
 
   chkbox = gtk_check_button_new_with_mnemonic (_("U_se super safe moves"));
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (chkbox),
 				properties.super_safe_moves);
   g_signal_connect (G_OBJECT (chkbox), "clicked",
-		    (GtkSignalFunc) super_safe_cb, NULL);
+		    (GCallback) super_safe_cb, NULL);
   gtk_table_attach (GTK_TABLE (table), chkbox, 0, 1, 1, 2, GTK_FILL, 0, 0, 0);
-  gtk_tooltips_set_tip (tooltips, chkbox,
-			_("Prevent all dangerous moves"),
-			_
-			("Prevents all moves that result in getting killed."));
+  gtk_widget_set_tooltip_text (chkbox,
+                               _("Prevents all moves that result in getting killed."));
 
   chkbox = gtk_check_button_new_with_mnemonic (_("_Enable sounds"));
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (chkbox), properties.sound);
   g_signal_connect (G_OBJECT (chkbox), "clicked",
-		    (GtkSignalFunc) sound_cb, NULL);
+		    (GCallback) sound_cb, NULL);
   gtk_table_attach (GTK_TABLE (table), chkbox, 1, 2, 0, 1, GTK_FILL, 0, 0, 0);
-  gtk_tooltips_set_tip (tooltips, chkbox,
-			_("Play sounds for major events"),
-			_
-			("Play sounds for events like winning a level and dying."));
+  gtk_widget_set_tooltip_text (chkbox,
+                               _("Play sounds for events like winning a level and dying."));
 
   chkbox = gtk_check_button_new_with_mnemonic (_("E_nable splats"));
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (chkbox),
 				properties.splats);
-  g_signal_connect (G_OBJECT (chkbox), "clicked", (GtkSignalFunc) splat_cb,
+  g_signal_connect (G_OBJECT (chkbox), "clicked", (GCallback) splat_cb,
 		    NULL);
   gtk_table_attach (GTK_TABLE (table), chkbox, 1, 2, 1, 2, GTK_FILL, 0, 0, 0);
-  gtk_tooltips_set_tip (tooltips, chkbox,
-			_("Play a sound when two robots collide"),
-			_
-			("Play the most common, and potentially the most annoying, sound."));
+  gtk_widget_set_tooltip_text (chkbox,
+                               _("Play the most common, and potentially the most annoying, sound."));
 
   label = gtk_label_new_with_mnemonic (_("Game"));
   gtk_notebook_append_page (GTK_NOTEBOOK (notebook), cpage, label);

Modified: trunk/gnobots2/sound.c
==============================================================================
--- trunk/gnobots2/sound.c	(original)
+++ trunk/gnobots2/sound.c	Sun Oct 26 14:45:52 2008
@@ -21,6 +21,8 @@
 
 #include <config.h>
 
+#include <gdk/gdk.h>
+
 #include <libgames-support/games-sound.h>
 
 #include "gbdefs.h"

Modified: trunk/gnobots2/statusbar.c
==============================================================================
--- trunk/gnobots2/statusbar.c	(original)
+++ trunk/gnobots2/statusbar.c	Sun Oct 26 14:45:52 2008
@@ -132,7 +132,7 @@
   if (statusbar == NULL)
     return FALSE;
 
-  gtk_widget_unref (statusbar);
+  g_object_unref (statusbar);
 
   statusbar = FALSE;
 

Modified: trunk/gnometris/tetris.cpp
==============================================================================
--- trunk/gnometris/tetris.cpp	(original)
+++ trunk/gnometris/tetris.cpp	Sun Oct 26 14:45:52 2008
@@ -223,8 +223,8 @@
 
 	GtkWidget *vb1 = gtk_vbox_new(FALSE, 0);
 	gtk_container_set_border_width(GTK_CONTAINER(vb1), 10);
-	gtk_box_pack_start_defaults(GTK_BOX(vb1), aspect_frame);
-	gtk_box_pack_start_defaults(GTK_BOX(hb), vb1);
+	gtk_box_pack_start(GTK_BOX(vb1), aspect_frame, TRUE, TRUE, 0);
+	gtk_box_pack_start(GTK_BOX(hb), vb1, TRUE, TRUE, 0);
 
 	setupPixmap();
 

Modified: trunk/gnomine/gnomine.c
==============================================================================
--- trunk/gnomine/gnomine.c	(original)
+++ trunk/gnomine/gnomine.c	Sun Oct 26 14:45:52 2008
@@ -24,6 +24,7 @@
  */
 
 #include <config.h>
+#include <stdlib.h>
 
 #include <string.h>
 
@@ -665,7 +666,7 @@
   if (fsize == 0)
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
   g_signal_connect (GTK_OBJECT (button), "clicked",
-		    GTK_SIGNAL_FUNC (size_radio_callback),
+		    G_CALLBACK (size_radio_callback),
 		    GINT_TO_POINTER (0));
   gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
 
@@ -675,7 +676,7 @@
   if (fsize == 1)
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
   g_signal_connect (GTK_OBJECT (button), "clicked",
-		    GTK_SIGNAL_FUNC (size_radio_callback),
+		    G_CALLBACK (size_radio_callback),
 		    GINT_TO_POINTER (1));
   gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
 
@@ -684,7 +685,7 @@
   if (fsize == 2)
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
   g_signal_connect (GTK_OBJECT (button), "clicked",
-		    GTK_SIGNAL_FUNC (size_radio_callback),
+		    G_CALLBACK (size_radio_callback),
 		    GINT_TO_POINTER (2));
   gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
 
@@ -693,7 +694,7 @@
   if (fsize == 3)
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
   g_signal_connect (GTK_OBJECT (button), "clicked",
-		    GTK_SIGNAL_FUNC (size_radio_callback),
+		    G_CALLBACK (size_radio_callback),
 		    GINT_TO_POINTER (3));
   gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
 
@@ -715,7 +716,7 @@
 
   mentry = gtk_spin_button_new_with_range (1, XSIZE_MAX * YSIZE_MAX, 1);
   g_signal_connect (GTK_OBJECT (mentry), "value-changed",
-		    GTK_SIGNAL_FUNC (nmines_spin_cb), NULL);
+		    G_CALLBACK (nmines_spin_cb), NULL);
   gtk_spin_button_set_value (GTK_SPIN_BUTTON (mentry), nmines);
   gtk_table_attach (GTK_TABLE (table2), mentry, 1, 2, 2, 3, 0, 0, 0, 0);
   fix_nmines (xsize, ysize);
@@ -728,7 +729,7 @@
 
   xentry = gtk_spin_button_new_with_range (XSIZE_MIN, XSIZE_MAX, 1);
   g_signal_connect (GTK_OBJECT (xentry), "value-changed",
-		    GTK_SIGNAL_FUNC (xsize_spin_cb), NULL);
+		    G_CALLBACK (xsize_spin_cb), NULL);
   gtk_spin_button_set_value (GTK_SPIN_BUTTON (xentry), xsize);
   gtk_table_attach (GTK_TABLE (table2), xentry, 1, 2, 0, 1, 0, 0, 0, 0);
   gtk_label_set_mnemonic_widget (GTK_LABEL (label2), xentry);
@@ -740,7 +741,7 @@
 
   yentry = gtk_spin_button_new_with_range (YSIZE_MIN, YSIZE_MAX, 1);
   g_signal_connect (GTK_OBJECT (yentry), "value-changed",
-		    GTK_SIGNAL_FUNC (ysize_spin_cb), NULL);
+		    G_CALLBACK (ysize_spin_cb), NULL);
   gtk_spin_button_set_value (GTK_SPIN_BUTTON (yentry), ysize);
   gtk_table_attach (GTK_TABLE (table2), yentry, 1, 2, 1, 2, 0, 0, 0, 0);
   gtk_label_set_mnemonic_widget (GTK_LABEL (label2), yentry);
@@ -753,7 +754,7 @@
   question_toggle =
     gtk_check_button_new_with_mnemonic (_("_Use \"I'm not sure\" flags"));
   g_signal_connect (GTK_OBJECT (question_toggle), "toggled",
-		    GTK_SIGNAL_FUNC (use_question_toggle_cb), NULL);
+		    G_CALLBACK (use_question_toggle_cb), NULL);
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (question_toggle),
 				use_question_marks);
   gtk_widget_show (question_toggle);
@@ -764,7 +765,7 @@
   overmine_toggle =
     gtk_check_button_new_with_mnemonic (_("_Use \"Too many flags\" warning"));
   g_signal_connect (GTK_OBJECT (overmine_toggle), "toggled",
-		    GTK_SIGNAL_FUNC (use_overmine_toggle_cb), NULL);
+		    G_CALLBACK (use_overmine_toggle_cb), NULL);
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (overmine_toggle),
 				use_overmine_warning);
   gtk_widget_show (overmine_toggle);

Modified: trunk/gnomine/minefield.c
==============================================================================
--- trunk/gnomine/minefield.c	(original)
+++ trunk/gnomine/minefield.c	Sun Oct 26 14:45:52 2008
@@ -1171,7 +1171,7 @@
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
   GtkObjectClass *object_class = GTK_OBJECT_CLASS (class);
 
-  parent_class = gtk_type_class (gtk_widget_get_type ());
+  parent_class = g_type_class_peek_parent (class);
 
   widget_class->realize = gtk_minefield_realize;
   widget_class->unrealize = gtk_minefield_unrealize;

Modified: trunk/gnomine/minefield.h
==============================================================================
--- trunk/gnomine/minefield.h	(original)
+++ trunk/gnomine/minefield.h	Sun Oct 26 14:45:52 2008
@@ -3,7 +3,7 @@
 #define __GTK_MINEFIELD_H__
 
 #include <gdk/gdk.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <glib.h>
 #include <games-preimage.h>
 

Modified: trunk/gtali/gyahtzee.c
==============================================================================
--- trunk/gtali/gyahtzee.c	(original)
+++ trunk/gtali/gyahtzee.c	Sun Oct 26 14:45:52 2008
@@ -35,6 +35,7 @@
  */
 #include <config.h>
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdarg.h>

Modified: trunk/iagno/ggz-network.c
==============================================================================
--- trunk/iagno/ggz-network.c	(original)
+++ trunk/iagno/ggz-network.c	Sun Oct 26 14:45:52 2008
@@ -21,6 +21,8 @@
 #include <config.h>
 
 #include <pwd.h>
+#include <sys/types.h>
+#include <unistd.h>
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>

Modified: trunk/iagno/gnothello.c
==============================================================================
--- trunk/iagno/gnothello.c	(original)
+++ trunk/iagno/gnothello.c	Sun Oct 26 14:45:52 2008
@@ -24,6 +24,7 @@
 #include <config.h>
 
 #include <string.h>
+#include <stdlib.h>
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>

Modified: trunk/libgames-support/games-clock.h
==============================================================================
--- trunk/libgames-support/games-clock.h	(original)
+++ trunk/libgames-support/games-clock.h	Sun Oct 26 14:45:52 2008
@@ -11,8 +11,8 @@
 #ifndef __GAMES_CLOCK_H__
 #define __GAMES_CLOCK_H__
 
-#include <glib/gmacros.h>
-#include <gtk/gtklabel.h>
+#include <glib.h>
+#include <gtk/gtk.h>
 #include <time.h>
 
 G_BEGIN_DECLS

Modified: trunk/libgames-support/games-conf.c
==============================================================================
--- trunk/libgames-support/games-conf.c	(original)
+++ trunk/libgames-support/games-conf.c	Sun Oct 26 14:45:52 2008
@@ -21,16 +21,13 @@
 #include <string.h>
 #include <errno.h>
 
+#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
 #ifdef HAVE_GNOME
 #include <gconf/gconf-client.h>
 #else
-#include <glib/gkeyfile.h>
-#include <gtk/gtkaccelmap.h>
-
 #define ACCELMAP_EXT "accels"
-
 #endif
 
 #include "games-marshal.h"

Modified: trunk/libgames-support/games-conf.h
==============================================================================
--- trunk/libgames-support/games-conf.h	(original)
+++ trunk/libgames-support/games-conf.h	Sun Oct 26 14:45:52 2008
@@ -20,7 +20,7 @@
 #define GAMES_CONF_H
 
 #include <glib.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/libgames-support/games-controls.h
==============================================================================
--- trunk/libgames-support/games-controls.h	(original)
+++ trunk/libgames-support/games-controls.h	Sun Oct 26 14:45:52 2008
@@ -8,7 +8,7 @@
 #ifndef __GAMES_CONTROLS_H__
 #define __GAMES_CONTROLS_H__
 
-#include "gtk/gtk.h"
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/libgames-support/games-dlg-chat.c
==============================================================================
--- trunk/libgames-support/games-dlg-chat.c	(original)
+++ trunk/libgames-support/games-dlg-chat.c	Sun Oct 26 14:45:52 2008
@@ -163,7 +163,7 @@
 		    G_CALLBACK (inputline_return), NULL);
 
   g_signal_connect (vbox, "destroy",
-		    GTK_SIGNAL_FUNC (gtk_widget_destroyed), &list->container);
+		    G_CALLBACK (gtk_widget_destroyed), &list->container);
 
   return vbox;
 }
@@ -195,16 +195,16 @@
 /*	"This does not seem to work" - Threepwood...
 	g_object_set_data_full(G_OBJECT(dialog),
 			       "chat_widget", chat_widget,
-			       (GtkDestroyNotify) gtk_widget_unref);*/
+			       (GDestroyNotify) gtk_widget_unref);*/
   gtk_box_pack_start (GTK_BOX (vbox), chat_widget, TRUE, TRUE, 0);
 
   /* 
    * Set up callbacks
    */
   g_signal_connect (dialog, "delete_event",
-		    GTK_SIGNAL_FUNC (gtk_widget_destroy), NULL);
+		    G_CALLBACK (gtk_widget_destroy), NULL);
   g_signal_connect (dialog, "response",
-		    GTK_SIGNAL_FUNC (gtk_widget_destroy), NULL);
+		    G_CALLBACK (gtk_widget_destroy), NULL);
 
   /* 
    * Done!
@@ -221,7 +221,7 @@
   } else {
     dlg_chat = create_dlg_chat (window);
     g_signal_connect (dlg_chat, "destroy",
-		      GTK_SIGNAL_FUNC (gtk_widget_destroyed), &dlg_chat);
+		      G_CALLBACK (gtk_widget_destroyed), &dlg_chat);
     gtk_widget_set_size_request (GTK_WIDGET (dlg_chat), 400, 150);
 
     gtk_widget_show (dlg_chat);

Modified: trunk/libgames-support/games-dlg-players.c
==============================================================================
--- trunk/libgames-support/games-dlg-players.c	(original)
+++ trunk/libgames-support/games-dlg-players.c	Sun Oct 26 14:45:52 2008
@@ -229,7 +229,7 @@
 
   /* FIXME:  This feature is not supported by gnome-games yet. 
    * g_signal_connect(tree, "button-press-event",
-   * GTK_SIGNAL_FUNC(player_list_button_event), NULL);
+   * G_CALLBACK(player_list_button_event), NULL);
    */
   update_player_list (tree);
 
@@ -245,7 +245,7 @@
   player_lists = list;
 
   g_signal_connect (list->this, "destroy",
-		    GTK_SIGNAL_FUNC (gtk_widget_destroyed), &list->this);
+		    G_CALLBACK (gtk_widget_destroyed), &list->this);
 
   return list->this;
 }
@@ -283,9 +283,9 @@
 #endif
 
   tree = create_player_list ();
-  gtk_widget_ref (tree);
+  g_object_ref_sink(tree);
   g_object_set_data_full (G_OBJECT (dialog), "tree", tree,
-			  (GtkDestroyNotify) gtk_widget_unref);
+			  (GDestroyNotify) g_object_unref);
   gtk_box_pack_start (GTK_BOX (vbox), tree, FALSE, FALSE, 0);
   gtk_widget_show (tree);
 
@@ -293,9 +293,9 @@
    * Set up callbacks
    */
   g_signal_connect (dialog, "delete_event",
-		    GTK_SIGNAL_FUNC (gtk_widget_destroy), NULL);
+		    G_CALLBACK (gtk_widget_destroy), NULL);
   g_signal_connect (dialog, "response",
-		    GTK_SIGNAL_FUNC (gtk_widget_destroy), NULL);
+		    G_CALLBACK (gtk_widget_destroy), NULL);
 
   /* 
    * Done!
@@ -312,7 +312,7 @@
   } else {
     dlg_players = create_dlg_players (window);
     g_signal_connect (dlg_players, "destroy",
-		      GTK_SIGNAL_FUNC (gtk_widget_destroyed), &dlg_players);
+		      G_CALLBACK (gtk_widget_destroyed), &dlg_players);
     gtk_widget_show (dlg_players);
   }
 }
@@ -418,13 +418,13 @@
 
     /* FIXME: what about bot/reservation seats? */
     info = gtk_menu_item_new_with_label (_("Info"));
-    gtk_widget_ref (info);
-    g_object_set_data_full (G_OBJECT (menu), "info", info, (GtkDestroyNotify)
-			    gtk_widget_unref);
+    g_object_ref_sink(info);
+    g_object_set_data_full (G_OBJECT (menu), "info", info, (GDestroyNotify)
+			    g_object_unref);
     gtk_container_add (GTK_CONTAINER (menu), info);
     gtk_widget_set_sensitive (info, FALSE);
     g_signal_connect (info, "activate",
-		      GTK_SIGNAL_FUNC (player_info_activate), which);
+		      G_CALLBACK (player_info_activate), which);
   }
 
   if ((sseat && strcasecmp (sseat->name, my_name))
@@ -434,13 +434,13 @@
 
     /* FIXME: you shouldn't be able to boot yourself */
     boot = gtk_menu_item_new_with_label (_("Boot player"));
-    gtk_widget_ref (boot);
-    g_object_set_data_full (G_OBJECT (menu), "boot", boot, (GtkDestroyNotify)
-			    gtk_widget_unref);
+    g_object_ref_sink(boot);
+    g_object_set_data_full (G_OBJECT (menu), "boot", boot, (GDestroyNotify)
+			    g_object_unref);
     gtk_container_add (GTK_CONTAINER (menu), boot);
     // gtk_widget_set_sensitive(boot, FALSE);
     g_signal_connect (boot, "activate",
-		      GTK_SIGNAL_FUNC (player_boot_activate), which);
+		      G_CALLBACK (player_boot_activate), which);
   }
 
   if (seat
@@ -456,13 +456,13 @@
       label = _("Move here");
 
     sit = gtk_menu_item_new_with_label (label);
-    gtk_widget_ref (sit);
-    g_object_set_data_full (G_OBJECT (menu), "sit", sit, (GtkDestroyNotify)
-			    gtk_widget_unref);
+    g_object_ref_sink(sit);
+    g_object_set_data_full (G_OBJECT (menu), "sit", sit, (GDestroyNotify)
+			    g_object_unref);
     gtk_container_add (GTK_CONTAINER (menu), sit);
     // gtk_widget_set_sensitive(sit, FALSE);
     g_signal_connect (sit, "activate",
-		      GTK_SIGNAL_FUNC (player_sit_activate), which);
+		      G_CALLBACK (player_sit_activate), which);
   }
 
   if (seat && (seat->type == GGZ_SEAT_OPEN
@@ -470,12 +470,12 @@
     GtkWidget *bot;
 
     bot = gtk_menu_item_new_with_label (_("Play with bot"));
-    gtk_widget_ref (bot);
-    g_object_set_data_full (G_OBJECT (menu), "bot", bot, (GtkDestroyNotify)
-			    gtk_widget_unref);
+    g_object_ref_sink(bot);
+    g_object_set_data_full (G_OBJECT (menu), "bot", bot, (GDestroyNotify)
+			    g_object_unref);
     gtk_container_add (GTK_CONTAINER (menu), bot);
     g_signal_connect (bot, "activate",
-		      GTK_SIGNAL_FUNC (player_bot_activate), which);
+		      G_CALLBACK (player_bot_activate), which);
   }
 
   if (seat && (seat->type == GGZ_SEAT_BOT || seat->type == GGZ_SEAT_RESERVED)) {
@@ -488,12 +488,12 @@
       label = _("Remove bot");
 
     open = gtk_menu_item_new_with_label (label);
-    gtk_widget_ref (open);
-    g_object_set_data_full (G_OBJECT (menu), "open", open, (GtkDestroyNotify)
-			    gtk_widget_unref);
+    g_object_ref_sink (open);
+    g_object_set_data_full (G_OBJECT (menu), "open", open, (GDestroyNotify)
+			    g_object_unref);
     gtk_container_add (GTK_CONTAINER (menu), open);
     g_signal_connect (open, "activate",
-		      GTK_SIGNAL_FUNC (player_open_activate), which);
+		      G_CALLBACK (player_open_activate), which);
   }
 
   gtk_widget_show_all (menu);

Modified: trunk/libgames-support/games-frame.h
==============================================================================
--- trunk/libgames-support/games-frame.h	(original)
+++ trunk/libgames-support/games-frame.h	Sun Oct 26 14:45:52 2008
@@ -20,7 +20,7 @@
 #ifndef __GAMES_FRAME_H__
 #define __GAMES_FRAME_H__
 
-#include <gtk/gtkframe.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/libgames-support/games-scores-dialog.h
==============================================================================
--- trunk/libgames-support/games-scores-dialog.h	(original)
+++ trunk/libgames-support/games-scores-dialog.h	Sun Oct 26 14:45:52 2008
@@ -22,7 +22,7 @@
 #ifndef GAMES_SCORES_DIALOG_H
 #define GAMES_SCORES_DIALOG_H
 
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 
 #include "games-score.h" /* For GamesScoreStyle. */
 #include "games-scores.h"

Modified: trunk/libgames-support/games-stock.c
==============================================================================
--- trunk/libgames-support/games-stock.c	(original)
+++ trunk/libgames-support/games-stock.c	Sun Oct 26 14:45:52 2008
@@ -27,7 +27,6 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkversion.h>
 
 #include "games-files.h"
 #include "games-runtime.h"

Modified: trunk/libgames-support/games-stock.h
==============================================================================
--- trunk/libgames-support/games-stock.h	(original)
+++ trunk/libgames-support/games-stock.h	Sun Oct 26 14:45:52 2008
@@ -22,12 +22,8 @@
 #ifndef __GAMES_STOCK_H__
 #define __GAMES_STOCK_H__
 
-#include <glib/gmacros.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkaction.h>
-#include <gtk/gtkuimanager.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkversion.h>
+#include <glib.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/libgames-support/render-cards.c
==============================================================================
--- trunk/libgames-support/render-cards.c	(original)
+++ trunk/libgames-support/render-cards.c	Sun Oct 26 14:45:52 2008
@@ -25,7 +25,6 @@
 #include <errno.h>
 
 #include <glib.h>
-#include <glib/gthread.h>
 
 #include <gtk/gtk.h>
 

Modified: trunk/mahjongg/drawing.c
==============================================================================
--- trunk/mahjongg/drawing.c	(original)
+++ trunk/mahjongg/drawing.c	Sun Oct 26 14:45:52 2008
@@ -18,7 +18,7 @@
 #include <config.h>
 
 #include <glib/gi18n.h>
-#include <gtk/gtkdrawingarea.h>
+#include <gtk/gtk.h>
 
 #include <libgames-support/games-preimage.h>
 #include <libgames-support/games-runtime.h>

Modified: trunk/mahjongg/drawing.h
==============================================================================
--- trunk/mahjongg/drawing.h	(original)
+++ trunk/mahjongg/drawing.h	Sun Oct 26 14:45:52 2008
@@ -10,7 +10,7 @@
 #ifndef DRAWING_H
 #define DRAWING_H
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 GtkWidget *create_mahjongg_board (void);
 void load_images (gchar * file);

Modified: trunk/windows/nsis/include/win_environment_functions.nsh
==============================================================================
--- trunk/windows/nsis/include/win_environment_functions.nsh	(original)
+++ trunk/windows/nsis/include/win_environment_functions.nsh	Sun Oct 26 14:45:52 2008
@@ -438,4 +438,4 @@
 Done:
 	Pop $R2
 	Exch $R1
-FunctionEnd
\ No newline at end of file
+FunctionEnd
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]