gnome-games r7212 - trunk/aisleriot

[chpe svn gnome org]

Author: chpe
Date: Sun Jan 13 22:09:01 2008
New Revision: 7212
URL: http://svn.gnome.org/viewvc/gnome-games?rev=7212&view=rev

Log:
Fix code intentations.
Remove setting the minimum size in aisleriot_board_init since we now
have a size-request handler for that.


Modified:
   trunk/aisleriot/board.c

Modified: trunk/aisleriot/board.c
==============================================================================
--- trunk/aisleriot/board.c	(original)
+++ trunk/aisleriot/board.c	Sun Jan 13 22:09:01 2008
@@ -3216,14 +3216,13 @@
   if (G_UNLIKELY (priv->show_focus &&
                   priv->focus_slot != NULL &&
                   GTK_WIDGET_HAS_FOCUS (widget))) {
-    gboolean interior_focus = priv->interior_focus;
     GdkRectangle focus_rect;
 
     /* Check whether this needs to be drawn */
     if (gdk_region_rect_in (region, &priv->focus_rect) == GDK_OVERLAP_RECTANGLE_OUT)
       goto expose_done;
 
-    if (interior_focus) {
+    if (priv->interior_focus) {
       focus_rect = priv->focus_rect;
     } else {
       get_rect_by_slot_and_card (board,
@@ -3238,7 +3237,7 @@
                      GTK_WIDGET_STATE (widget),
                      &priv->focus_rect,
                      widget,
-                     NULL,
+                     NULL /* FIXME ? */,
                      focus_rect.x,
                      focus_rect.y,
                      focus_rect.width,
@@ -3283,11 +3282,6 @@
                          GDK_BUTTON_RELEASE_MASK);
   /* FIMXEchpe: no need for motion events on maemo, unless we explicitly activate drag mode */
 
-  /* This only enforces the minimum size. It is actually set using the
-   * window size.
-   */
-  gtk_widget_set_size_request (widget, BOARD_MIN_WIDTH, BOARD_MIN_HEIGHT);
-
 #ifdef HAVE_MAEMO
   gtk_widget_tap_and_hold_setup (widget, NULL, NULL, GTK_TAP_AND_HOLD_PASS_PRESS);
 #endif
@@ -3338,9 +3332,9 @@
 
 static void
 aisleriot_board_get_property (GObject *object,
-			   guint prop_id,
-			   GValue *value,
-			   GParamSpec *pspec)
+                              guint prop_id,
+                              GValue *value,
+                              GParamSpec *pspec)
 {
   AisleriotBoard *board = AISLERIOT_BOARD (object);
   AisleriotBoardPrivate *priv = board->priv;
@@ -3356,9 +3350,9 @@
 
 static void
 aisleriot_board_set_property (GObject *object,
-			   guint prop_id,
-			   const GValue *value,
-			   GParamSpec *pspec)
+                              guint prop_id,
+                              const GValue *value,
+                              GParamSpec *pspec)
 {
   AisleriotBoard *board = AISLERIOT_BOARD (object);
   AisleriotBoardPrivate *priv = board->priv;