[gnome-games] gnibbles: Fix GSEAL issues

[Thomas Hindoe Paaboel Andersen <thomashpa src gnome org>]

commit 06761b84a64b6880204bbddc3f6255f8a5a1e6e8
Author: Thomas Hindoe Paaboel Andersen <phomes gmail com>
Date:   Tue Sep 29 22:53:18 2009 +0200

    gnibbles: Fix GSEAL issues

 gnibbles/gnibbles.c    |   24 ++++++++------
 gnibbles/main.c        |   80 +++++++++++++++++++++++++----------------------
 gnibbles/preferences.c |   21 +++++++-----
 3 files changed, 68 insertions(+), 57 deletions(-)
---
diff --git a/gnibbles/gnibbles.c b/gnibbles/gnibbles.c
index 7a30232..5546ca6 100644
--- a/gnibbles/gnibbles.c
+++ b/gnibbles/gnibbles.c
@@ -28,6 +28,7 @@
 #include <gdk/gdkkeysyms.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
+#include <libgames-support/games-gtk-compat.h>
 #include <libgames-support/games-runtime.h>
 #include <libgames-support/games-scores-dialog.h>
 #include <libgames-support/games-scores.h>
@@ -134,8 +135,8 @@ gnibbles_copy_pixmap (GdkDrawable * drawable, gint which, gint x, gint y,
   }
 
   gdk_draw_pixbuf (GDK_DRAWABLE (drawable),
-		   drawing_area->style->
-		   fg_gc[GTK_WIDGET_STATE (drawing_area)], copy_buf, 0, 0,
+		   gtk_widget_get_style (drawing_area)->
+		   fg_gc[gtk_widget_get_state (drawing_area)], copy_buf, 0, 0,
 		   x * properties->tilesize, y * properties->tilesize, size,
 		   size, GDK_RGB_DITHER_NORMAL, 0, 0);
 }
@@ -143,14 +144,14 @@ gnibbles_copy_pixmap (GdkDrawable * drawable, gint which, gint x, gint y,
 void
 gnibbles_draw_pixmap (gint which, gint x, gint y)
 {
-  gnibbles_copy_pixmap (drawing_area->window, which, x, y, FALSE);
+  gnibbles_copy_pixmap (gtk_widget_get_window (drawing_area), which, x, y, FALSE);
   gnibbles_copy_pixmap (buffer_pixmap, which, x, y, FALSE);
 }
 
 void
 gnibbles_draw_big_pixmap (gint which, gint x, gint y)
 {
-  gnibbles_copy_pixmap (drawing_area->window, which, x, y, TRUE);
+  gnibbles_copy_pixmap (gtk_widget_get_window (drawing_area), which, x, y, TRUE);
   gnibbles_copy_pixmap (buffer_pixmap, which, x, y, TRUE);
 }
 
@@ -169,8 +170,9 @@ gnibbles_draw_big_pixmap_buffer (gint which, gint x, gint y)
 void
 gnibbles_load_logo (GtkWidget * window)
 {
-  gint width = drawing_area->allocation.width;
-  gint height = drawing_area->allocation.height;
+  GtkAllocation allocation;
+
+  gtk_widget_get_allocation (window, &allocation);
 
   if (GTK_WIDGET_REALIZED (drawing_area) == FALSE)
     return;
@@ -179,7 +181,7 @@ gnibbles_load_logo (GtkWidget * window)
     g_object_unref (logo_pixmap);
   logo_pixmap =
     gnibbles_load_pixmap_file (window, "gnibbles-logo.svg",
-			       width, height);
+			       allocation.width, allocation.height);
 }
 
 void
@@ -342,10 +344,10 @@ gnibbles_load_level (GtkWidget * window, gint level)
     }
   }
 
-  gdk_draw_drawable (GDK_DRAWABLE (drawing_area->window),
-                     drawing_area->style->
-                     fg_gc[GTK_WIDGET_STATE (drawing_area)], buffer_pixmap, 0,
-                     0, 0, 0, BOARDWIDTH * properties->tilesize,
+  gdk_draw_drawable (GDK_DRAWABLE (gtk_widget_get_window (drawing_area)),
+                     gtk_widget_get_style (drawing_area)->
+                     fg_gc[gtk_widget_get_state (drawing_area)], buffer_pixmap,
+                     0, 0, 0, 0, BOARDWIDTH * properties->tilesize,
                      BOARDHEIGHT * properties->tilesize);
 
   fclose (in);
diff --git a/gnibbles/main.c b/gnibbles/main.c
index 5a826bb..6d33769 100644
--- a/gnibbles/main.c
+++ b/gnibbles/main.c
@@ -122,7 +122,7 @@ static void
 hide_cursor (void)
 {
   if (pointers.current != pointers.invisible) {
-    gdk_window_set_cursor (drawing_area->window, pointers.invisible);
+    gdk_window_set_cursor (gtk_widget_get_window (drawing_area), pointers.invisible);
     pointers.current = pointers.invisible;
   }
 }
@@ -179,7 +179,7 @@ static void
 show_cursor (void)
 {
   if (pointers.current != NULL) {
-    gdk_window_set_cursor (drawing_area->window, NULL);
+    gdk_window_set_cursor (gtk_widget_get_window (drawing_area), NULL);
     pointers.current = NULL;
   }
 }
@@ -265,8 +265,8 @@ about_cb (GtkAction * action, gpointer data)
 static gint
 expose_event_cb (GtkWidget * widget, GdkEventExpose * event)
 {
-  gdk_draw_drawable (GDK_DRAWABLE (widget->window),
-		     widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
+  gdk_draw_drawable (GDK_DRAWABLE (gtk_widget_get_window (widget)),
+		     gtk_widget_get_style (widget)->fg_gc[gtk_widget_get_state (widget)],
 		     buffer_pixmap, event->area.x, event->area.y,
 		     event->area.x, event->area.y, event->area.width,
 		     event->area.height);
@@ -309,9 +309,9 @@ draw_board (void)
   for (i = 0; i < warpmanager->numwarps; i++)
     gnibbles_warp_draw_buffer (warpmanager->warps[i]);
 
-  gdk_draw_drawable (GDK_DRAWABLE (drawing_area->window),
-		     drawing_area->style->
-		     fg_gc[GTK_WIDGET_STATE (drawing_area)], buffer_pixmap, 0,
+  gdk_draw_drawable (GDK_DRAWABLE (gtk_widget_get_window (drawing_area)),
+		     gtk_widget_get_style (drawing_area)->
+		     fg_gc[gtk_widget_get_state (drawing_area)], buffer_pixmap, 0,
 		     0, 0, 0, BOARDWIDTH * properties->tilesize,
 		     BOARDHEIGHT * properties->tilesize);
 
@@ -350,13 +350,13 @@ configure_event_cb (GtkWidget * widget, GdkEventConfigure * event)
   /* Recreate the buffer pixmap. */
   if (buffer_pixmap)
     g_object_unref (G_OBJECT (buffer_pixmap));
-  buffer_pixmap = gdk_pixmap_new (drawing_area->window,
+  buffer_pixmap = gdk_pixmap_new (gtk_widget_get_window (drawing_area),
 				  BOARDWIDTH * properties->tilesize,
 				  BOARDHEIGHT * properties->tilesize, -1);
 
   /* Erase the buffer pixmap. */
   gdk_draw_rectangle (buffer_pixmap,
-		      drawing_area->style->black_gc,
+		      gtk_widget_get_style (drawing_area)->black_gc,
 		      TRUE, 0, 0,
 		      BOARDWIDTH * properties->tilesize,
 		      BOARDHEIGHT * properties->tilesize);
@@ -903,17 +903,18 @@ setup_window (void)
 
   drawing_area = gtk_drawing_area_new ();
 
-  cursor_dot_pm = gdk_pixmap_create_from_data (window->window, "\0", 1, 1, 1,
-					       &drawing_area->style->
+  cursor_dot_pm = gdk_pixmap_create_from_data (gtk_widget_get_window (window),
+					       "\0", 1, 1, 1,
+					       &gtk_widget_get_style (drawing_area)->
 					       fg[GTK_STATE_ACTIVE],
-					       &drawing_area->style->
+					       &gtk_widget_get_style (drawing_area)->
 					       bg[GTK_STATE_ACTIVE]);
 
   pointers.invisible =
     gdk_cursor_new_from_pixmap (cursor_dot_pm, cursor_dot_pm,
-				&drawing_area->style->fg[GTK_STATE_ACTIVE],
-				&drawing_area->style->bg[GTK_STATE_ACTIVE], 0,
-				0);
+				&gtk_widget_get_style (drawing_area)->fg[GTK_STATE_ACTIVE],
+				&gtk_widget_get_style (drawing_area)->bg[GTK_STATE_ACTIVE],
+				0, 0);
 
   gtk_container_add (GTK_CONTAINER (packing), drawing_area);
 #ifdef GGZ_CLIENT
@@ -968,12 +969,15 @@ render_logo (void)
   PangoFontDescription * pfd;
   int size;
   static int width, height;
+  GtkAllocation allocation;
+
+  gtk_widget_get_allocation (drawing_area, &allocation);
 
   zero_board ();
 
   gdk_draw_pixbuf (GDK_DRAWABLE (buffer_pixmap),
-		   drawing_area->style->
-		   fg_gc[GTK_WIDGET_STATE (drawing_area)], logo_pixmap, 0, 0,
+		   gtk_widget_get_style (drawing_area)->
+		   fg_gc[gtk_widget_get_state (drawing_area)], logo_pixmap, 0, 0,
 		   0, 0, BOARDWIDTH * properties->tilesize,
 		   BOARDHEIGHT * properties->tilesize, GDK_RGB_DITHER_NORMAL,
 		   0, 0);
@@ -982,39 +986,41 @@ render_logo (void)
   layout = pango_layout_new (context);
   pfd = pango_context_get_font_description (context);
   size = pango_font_description_get_size (pfd);
-  pango_font_description_set_size (pfd, 
-		(size * drawing_area->allocation.width) / 100);
+  pango_font_description_set_size (pfd, (size * allocation.width) / 100);
   pango_font_description_set_family (pfd, "Sans");
   pango_font_description_set_weight(pfd, PANGO_WEIGHT_BOLD); 
   pango_layout_set_font_description (layout, pfd);
   pango_layout_set_text (layout, _("Nibbles"), -1);
   pango_layout_get_pixel_size(layout, &width, &height);  
 
-  gdk_draw_layout (GDK_DRAWABLE (buffer_pixmap), drawing_area->style->black_gc,  
-		   (drawing_area->allocation.width - width) * 0.5 + 3, 
-		   (drawing_area->allocation.height * 0.72) + 3, layout);
-  gdk_draw_layout (GDK_DRAWABLE (buffer_pixmap), drawing_area->style->white_gc,  
-		   (drawing_area->allocation.width - width) * 0.5, 
-		   (drawing_area->allocation.height * 0.72), layout);
+  gdk_draw_layout (GDK_DRAWABLE (buffer_pixmap),
+		   gtk_widget_get_style (drawing_area)->black_gc,
+		   (allocation.width - width) * 0.5 + 3,
+		   (allocation.height * 0.72) + 3, layout);
+  gdk_draw_layout (GDK_DRAWABLE (buffer_pixmap),
+		   gtk_widget_get_style (drawing_area)->white_gc,
+		   (allocation.width - width) * 0.5,
+		   (allocation.height * 0.72), layout);
 
-  pango_font_description_set_size (pfd, 
-		(size * drawing_area->allocation.width) / 400);
+  pango_font_description_set_size (pfd, (size * allocation.width) / 400);
   pango_layout_set_font_description (layout, pfd);
   /* Translators: This string will be included in the intro screen, so don't make sure it fits! */
   pango_layout_set_text (layout, _("A worm game for GNOME."), -1);
   pango_layout_get_pixel_size(layout, &width, &height);  
 
-  gdk_draw_layout (GDK_DRAWABLE (buffer_pixmap), drawing_area->style->black_gc,
-		   (drawing_area->allocation.width - width) * 0.5 + 2, 
-                   (drawing_area->allocation.height * 0.94) + 2, layout);
-  gdk_draw_layout (GDK_DRAWABLE (buffer_pixmap), drawing_area->style->white_gc,
-		   (drawing_area->allocation.width - width) * 0.5,
-                   (drawing_area->allocation.height * 0.94), layout);
+  gdk_draw_layout (GDK_DRAWABLE (buffer_pixmap),
+		   gtk_widget_get_style (drawing_area)->black_gc,
+		   (allocation.width - width) * 0.5 + 2,
+                   (allocation.height * 0.94) + 2, layout);
+  gdk_draw_layout (GDK_DRAWABLE (buffer_pixmap),
+		   gtk_widget_get_style (drawing_area)->white_gc,
+		   (allocation.width - width) * 0.5,
+                   (allocation.height * 0.94), layout);
 
 
-  gdk_draw_drawable (GDK_DRAWABLE (drawing_area->window),
-		     drawing_area->style->
-		     fg_gc[GTK_WIDGET_STATE (drawing_area)], buffer_pixmap, 
+  gdk_draw_drawable (GDK_DRAWABLE (gtk_widget_get_window (drawing_area)),
+		     gtk_widget_get_style (drawing_area)->
+		     fg_gc[gtk_widget_get_state (drawing_area)], buffer_pixmap, 
 		     0, 0, 0, 0, BOARDWIDTH * properties->tilesize,
 		     BOARDHEIGHT * properties->tilesize);
 
@@ -1073,7 +1079,7 @@ main (int argc, char **argv)
 
   gtk_widget_show (window);
 
-  buffer_pixmap = gdk_pixmap_new (drawing_area->window,
+  buffer_pixmap = gdk_pixmap_new (gtk_widget_get_window (drawing_area),
 				  BOARDWIDTH * properties->tilesize,
 				  BOARDHEIGHT * properties->tilesize, -1);
 #ifdef GGZ_CLIENT
diff --git a/gnibbles/preferences.c b/gnibbles/preferences.c
index 49c5e33..548eeb1 100644
--- a/gnibbles/preferences.c
+++ b/gnibbles/preferences.c
@@ -85,7 +85,7 @@ game_speed_cb (GtkWidget * widget, gpointer data)
   if (!pref_dialog)
     return;
 
-  if (GTK_TOGGLE_BUTTON (widget)->active) {
+  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))) {
     gnibbles_properties_set_speed (GPOINTER_TO_INT (data));
   }
 }
@@ -112,7 +112,7 @@ random_order_cb (GtkWidget * widget, gpointer data)
   if (!pref_dialog)
     return;
 
-  value = GTK_TOGGLE_BUTTON (widget)->active;
+  value = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
 
   gtk_widget_set_sensitive (start_level_label, !value);
   gtk_widget_set_sensitive (start_level_spin_button, !value);
@@ -128,7 +128,7 @@ fake_bonus_cb (GtkWidget * widget, gpointer data)
   if (!pref_dialog)
     return;
 
-  value = GTK_TOGGLE_BUTTON (widget)->active;
+  value = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
 
   gnibbles_properties_set_fakes (value);
 }
@@ -141,7 +141,7 @@ sound_cb (GtkWidget * widget, gpointer data)
   if (!pref_dialog)
     return;
 
-  value = GTK_TOGGLE_BUTTON (widget)->active;
+  value = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
 
   gnibbles_properties_set_sound (value);
 }
@@ -200,10 +200,11 @@ worm_relative_movement_cb (GtkWidget * widget, gpointer data)
 
   i = GPOINTER_TO_INT (data);
 
-  set_worm_controls_sensitivity (i, GTK_TOGGLE_BUTTON (widget)->active);
+  set_worm_controls_sensitivity
+    (i, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)));
 
   gnibbles_properties_set_worm_relative_movement
-    (i, GTK_TOGGLE_BUTTON (widget)->active);
+    (i, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)));
 }
 
 void
@@ -243,12 +244,14 @@ gnibbles_preferences_cb (GtkWidget * widget, gpointer data)
 					     GTK_RESPONSE_CLOSE, NULL);
   gtk_dialog_set_has_separator (GTK_DIALOG (pref_dialog), FALSE);
   gtk_container_set_border_width (GTK_CONTAINER (pref_dialog), 5);
-  gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (pref_dialog)->vbox), 2);
+  gtk_box_set_spacing
+    (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (pref_dialog))), 2);
 
   notebook = gtk_notebook_new ();
   gtk_container_set_border_width (GTK_CONTAINER (notebook), 5);
-  gtk_container_add (GTK_CONTAINER (GTK_DIALOG (pref_dialog)->vbox),
-		     notebook);
+  gtk_container_add
+    (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (pref_dialog))),
+     notebook);
 
   label = gtk_label_new (_("Game"));
   table = gtk_table_new (1, 2, FALSE);