Imported Upstream version 0.90+20120429

1 files changed, 24 insertions, 22 deletions

diff --git a/gtkgame.c b/gtkgame.c
index 3833cca..86a7422 100644
--- a/gtkgame.c
+++ b/gtkgame.c
@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: gtkgame.c,v 1.853 2012/01/08 22:44:05 plm Exp $
+ * $Id: gtkgame.c,v 1.856 2012/04/28 16:40:18 plm Exp $
  */
 
 #include "config.h"
@@ -525,7 +525,7 @@ GtkWidget *pwAnalysis;
 GtkWidget *pwCommentary;
 static moverecord *pmrAnnotation;
 GtkAccelGroup *pagMain;
-#if (GTK_MAJOR_VERSION < 3) && (GTK_MINOR_VERSION < 12)
+#if ! GTK_CHECK_VERSION(2,12,0)
 GtkTooltips *ptt;
 #endif
 #if (USE_GTKUIMANAGER)
@@ -3991,7 +3991,7 @@ extern void InitGTK(int *argc, char ***argv)
 	pif = gtk_icon_factory_new();
 	gtk_icon_factory_add_default(pif);
 
-#if (GTK_MAJOR_VERSION < 3) && (GTK_MINOR_VERSION < 12)
+#if ! GTK_CHECK_VERSION(2,12,0)
 	ptt = gtk_tooltips_new();
 #endif
 
@@ -6487,21 +6487,21 @@ extern void GTKSet( void *p ) {
 		    gtk_check_menu_item_set_active( GTK_CHECK_MENU_ITEM(
 			gtk_ui_manager_get_widget (puim,
 			"/MainMenu/GameMenu/SetTurnMenu/SetTurnPlayer1" ) ), TRUE );
+	    enable_menu ( gtk_ui_manager_get_widget (puim, "/MainMenu/GameMenu/Roll" ),
+			  ms.fMove == ms.fTurn &&
+			  ap[ ms.fMove ].pt == PLAYER_HUMAN );
 	}
-        enable_menu ( gtk_ui_manager_get_widget (puim, "/MainMenu/GameMenu/Roll" ),
-                      ms.fMove == ms.fTurn &&
-                      ap[ ms.fMove ].pt == PLAYER_HUMAN );
-
 #else
 
-	if( ms.fTurn >= 0 )
+	if( ms.fTurn >= 0 ) {
 	    gtk_check_menu_item_set_active( GTK_CHECK_MENU_ITEM(
 		gtk_item_factory_get_widget_by_action( pif, CMD_SET_TURN_0 +
 						       ms.fTurn ) ), TRUE );
 
-        enable_menu ( gtk_item_factory_get_widget ( pif, "/Game/Roll" ),
-                      ms.fMove == ms.fTurn &&
-                      ap[ ms.fMove ].pt == PLAYER_HUMAN );
+	    enable_menu ( gtk_item_factory_get_widget ( pif, "/Game/Roll" ),
+			  ms.fMove == ms.fTurn &&
+			  ap[ ms.fMove ].pt == PLAYER_HUMAN );
+	}
 
 #endif
 	fAutoCommand = FALSE;
@@ -6517,10 +6517,11 @@ extern void GTKSet( void *p ) {
 		"/MainMenu/FileMenu/Save" ), plGame != NULL );
 	enable_menu( gtk_ui_manager_get_widget (puim,
 		"/MainMenu/GameMenu" ), ms.gs == GAME_PLAYING );
-	enable_menu( gtk_ui_manager_get_widget (puim,
-		"/MainMenu/GameMenu/Roll" ),
-		ms.fMove == ms.fTurn &&
-		ap[ ms.fMove ].pt == PLAYER_HUMAN );
+	if( ms.fTurn >= 0 )
+	  enable_menu( gtk_ui_manager_get_widget (puim,
+						  "/MainMenu/GameMenu/Roll" ),
+		       ms.fMove == ms.fTurn &&
+		       ap[ ms.fMove ].pt == PLAYER_HUMAN );
 
 	gtk_widget_set_sensitive( gtk_ui_manager_get_widget (puim,
 		"/MainMenu/GoMenu/NextRoll" ), plGame != NULL );
@@ -6624,9 +6625,10 @@ extern void GTKSet( void *p ) {
 	enable_sub_menu( gtk_item_factory_get_widget( pif, "/Game" ),
 			 ms.gs == GAME_PLAYING );
 
-        enable_menu ( gtk_item_factory_get_widget ( pif, "/Game/Roll" ),
-                      ms.fMove == ms.fTurn &&
-                      ap[ ms.fMove ].pt == PLAYER_HUMAN );
+	if( ms.fTurn >= 0 )
+	  enable_menu ( gtk_item_factory_get_widget ( pif, "/Game/Roll" ),
+			ms.fMove == ms.fTurn &&
+			ap[ ms.fMove ].pt == PLAYER_HUMAN );
 
 	gtk_widget_set_sensitive( gtk_item_factory_get_widget_by_action(
 	    pif, CMD_NEXT_ROLL ), plGame != NULL );
@@ -7071,7 +7073,7 @@ static GtkWidget *CreateList(void)
 		renderer = gtk_cell_renderer_text_new();
 		g_object_set(renderer, "xalign", 1.0, NULL);
 		column = gtk_tree_view_column_new_with_attributes("", renderer, "text", i, NULL);
-		gtk_tree_view_column_set_alignment  (column, 0.97);
+		gtk_tree_view_column_set_alignment  (column, 0.97f);
 		gtk_tree_view_append_column(GTK_TREE_VIEW(view), column);
 	}
 	gtk_tree_view_column_set_title (gtk_tree_view_get_column (GTK_TREE_VIEW(view), 1), ap[0].szName);
@@ -7509,14 +7511,14 @@ extern void *GTKCalibrationStart( void ) {
 
 	ProcessEvents();
 
-    g_object_unref( pwResult );
+    g_object_ref( G_OBJECT( pwResult) );
 
     return pwResult;
 }
 
 extern void GTKCalibrationUpdate( void *context, float rEvalsPerSec ) {
 
-    char sz[ 32 ];
+    gchar sz[ 32 ];
 
     sprintf( sz, "%.0f", rEvalsPerSec );
     gtk_label_set_text( GTK_LABEL( context ), sz );
@@ -7526,7 +7528,7 @@ extern void GTKCalibrationUpdate( void *context, float rEvalsPerSec ) {
 
 extern void GTKCalibrationEnd( void *context ) {
 
-    g_object_unref( GTK_WIDGET( context ) );
+    g_object_unref( G_OBJECT( context ) );
 
     gtk_widget_destroy( gtk_widget_get_toplevel( GTK_WIDGET( context ) ) );