gnome-games r7598 - branches/gnome-2-22/aisleriot

[chpe svn gnome org]

Author: chpe
Date: Tue Apr  8 23:13:15 2008
New Revision: 7598
URL: http://svn.gnome.org/viewvc/gnome-games?rev=7598&view=rev

Log:
	* board.c: (aisleriot_board_error_bell),
	(aisleriot_board_class_init): Fix the build without ENABLE_KEYNAV.
	Also use gtk_widget_error_bell on hildon/maemo4.

Modified:
   branches/gnome-2-22/aisleriot/ChangeLog
   branches/gnome-2-22/aisleriot/board.c

Modified: branches/gnome-2-22/aisleriot/board.c
==============================================================================
--- branches/gnome-2-22/aisleriot/board.c	(original)
+++ branches/gnome-2-22/aisleriot/board.c	Tue Apr  8 23:13:15 2008
@@ -888,18 +888,14 @@
 
 /* helper functions */
 
-#ifdef ENABLE_KEYNAV
-
 static void
 aisleriot_board_error_bell (AisleriotBoard *board)
 {
-#if GTK_CHECK_VERSION (2, 12, 0)
+#if GTK_CHECK_VERSION (2, 12, 0) || (defined (HAVE_HILDON) && !defined(HAVE_MAEMO_3))
   gtk_widget_error_bell (GTK_WIDGET (board));
 #endif
 }
 
-#endif /* ENABLE_KEYNAV */
-
 /* Work out new sizes and spacings for the cards. */
 static void
 aisleriot_board_setup_geometry (AisleriotBoard *board)
@@ -2627,6 +2623,8 @@
   requisition->height = BOARD_MIN_HEIGHT;
 }
 
+#ifdef ENABLE_KEYNAV
+
 static gboolean
 aisleriot_board_focus (GtkWidget *widget,
                        GtkDirectionType direction)
@@ -2659,6 +2657,8 @@
   return GTK_WIDGET_CLASS (aisleriot_board_parent_class)->focus (widget, direction);
 }
 
+#endif /* ENABLE_KEYNAV */
+
 /* The gtkwidget.c focus in/out handlers queue a shallow draw;
  * that's ok for us but maybe we want to optimise this a bit to
  * only do it if we have a focus to draw/erase?
@@ -3466,7 +3466,9 @@
   widget_class->direction_changed = aisleriot_board_direction_changed;
   widget_class->size_allocate = aisleriot_board_size_allocate;
   widget_class->size_request = aisleriot_board_size_request;
+#ifdef ENABLE_KEYNAV
   widget_class->focus = aisleriot_board_focus;
+#endif /* ENABLE_KEYNAV */
   widget_class->focus_in_event = aisleriot_board_focus_in;
   widget_class->focus_out_event = aisleriot_board_focus_out;
   widget_class->button_press_event = aisleriot_board_button_press;