diff -crN ./gnome-games/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-games/Makefile.am *** ./gnome-games/Makefile.am Tue Jun 3 13:35:42 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-games/Makefile.am Wed Nov 19 16:46:24 2003 *************** *** 26,41 **** gnobots2 \ gnibbles SUBDIRS = \ ! $(always_built_SUBDIRS) \ ! $(cxx_DIRS) \ ! $(guile_DIRS) DIST_SUBDIRS = \ ! $(always_built_SUBDIRS) \ ! aisleriot \ ! blackjack \ ! gnometris EXTRA_DIST = \ gnome-games.spec.in \ --- 26,49 ---- gnobots2 \ gnibbles + #SUBDIRS = \ + # $(always_built_SUBDIRS) \ + # $(cxx_DIRS) \ + # $(guile_DIRS) + SUBDIRS = \ ! $(always_built_SUBDIRS) \ ! $(guile_DIRS) ! ! #DIST_SUBDIRS = \ ! # $(always_built_SUBDIRS) \ ! # aisleriot \ ! # blackjack \ ! # gnometris DIST_SUBDIRS = \ ! $(always_built_SUBDIRS) \ ! aisleriot EXTRA_DIST = \ gnome-games.spec.in \ diff -crN ./gnome-games/freecell/src/io-gtk.h /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-games/freecell/src/io-gtk.h *** ./gnome-games/freecell/src/io-gtk.h Thu Jan 1 01:00:00 1970 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-games/freecell/src/io-gtk.h Tue Jul 8 17:48:15 2003 *************** *** 0 **** --- 1,50 ---- + /* io-gtk.h -- + Copyright (C) 1998 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and'or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + USA */ + + /* Written by Changwoo Ryu . */ + + #ifndef __FREECELL_IO_GTK_H + #define __FREECELL_IO_GTK_H + + #include + + #include "card.h" + #include "game.h" + + /* IO interface. */ + + void io_gtk_init (void); + void io_gtk_loop (void); + + void callback_restart (GtkWidget *widget, GdkEvent *event); + void callback_new (GtkWidget *widget, GdkEvent *event); + void callback_new_with_seed (GtkWidget *widget, GdkEvent *event); + void callback_score (GtkWidget *widget, GdkEvent *event); + void callback_undo (GtkWidget *widget, GdkEvent *event); + void callback_option (GtkWidget *widget, GdkEvent *event); + gboolean callback_exit (GtkWidget *widget, GdkEvent *event); + void callback_rule (GtkWidget *widget, GdkEvent *event); + void callback_about (GtkWidget *widget, GdkEvent *event); + + #endif /* __FREECELL_IO_GTK_H */ + + + + + + diff -crN ./gnome-games/gnect/src/main.h /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-games/gnect/src/main.h *** ./gnome-games/gnect/src/main.h Fri May 9 12:39:09 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-games/gnect/src/main.h Thu Oct 16 16:10:04 2003 *************** *** 18,34 **** #define APPNAME "gnect" ! #ifdef G_HAVE_ISO_VARARGS ! #ifdef GNECT_DEBUG ! #define DEBUG_PRINT(level, ...) if (debugging & level) g_printerr(APPNAME ": " __VA_ARGS__) ! #else ! #define DEBUG_PRINT(level, ...) ! #endif ! ! #define ERROR_PRINT(...) g_printerr(APPNAME ": error: " __VA_ARGS__) ! #define WARNING_PRINT(...) g_printerr(APPNAME ": warning: " __VA_ARGS__) ! ! #elif defined(G_HAVE_GNUC_VARARGS) #ifdef GNECT_DEBUG #define DEBUG_PRINT(level, args...) if (debugging & level) g_printerr(APPNAME ": " args) --- 18,25 ---- #define APPNAME "gnect" ! /* On AIX, xlC does not handle var args macros (which is a C99 feature) */ ! #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L #ifdef GNECT_DEBUG #define DEBUG_PRINT(level, args...) if (debugging & level) g_printerr(APPNAME ": " args) *************** *** 42,50 **** #endif #endif ! #define ERROR_PRINT g_error ! #define WARNING_PRINT g_warning ! #endif #define BASE_PIXMAP_DIR GNECT_DATA_DIR "pixmaps" G_DIR_SEPARATOR_S #define PACKAGE_PIXMAP_DIR BASE_PIXMAP_DIR APPNAME G_DIR_SEPARATOR_S --- 33,49 ---- #endif #endif ! ! #define ERROR_PRINT(args...) g_printerr(APPNAME ": error: " args) ! #define WARNING_PRINT(args...) g_printerr(APPNAME ": warning: " args) ! ! #else /* __STDC_VERSION__ >= 199901L */ ! ! static inline void DEBUG_PRINT (int level, ...) { } ! static inline void ERROR_PRINT (const char* format, ...) { } ! static inline void WARNING_PRINT (const char* format, ...) { } ! ! #endif /* __STDC_VERSION__ >= 199901L */ #define BASE_PIXMAP_DIR GNECT_DATA_DIR "pixmaps" G_DIR_SEPARATOR_S #define PACKAGE_PIXMAP_DIR BASE_PIXMAP_DIR APPNAME G_DIR_SEPARATOR_S diff -crN ./gnome-games/gnome-stones/main.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-games/gnome-stones/main.c *** ./gnome-games/gnome-stones/main.c Tue Jul 22 09:39:29 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-games/gnome-stones/main.c Wed Nov 19 16:47:16 2003 *************** *** 74,104 **** N_("Game to play"), N_("FILENAME")}, {NULL, '\0', 0, NULL, 0} }; - - /****************************************************************************/ - /* The menus */ - static GnomeUIInfo game_menu[]; - static GnomeUIInfo help_menu[]; - static GnomeUIInfo settings_menu[]; - static GnomeUIInfo main_menu[]; - - /****************************************************************************/ static void curtain_start (GStonesCave *cave); - static void game_start_cb (GtkWidget *widget, gpointer data); - static void show_scores_dialog (gint pos); static void menu_set_sensitive (gboolean state); /****************************************************************************/ /* Image stuff */ --- 74,146 ---- N_("Game to play"), N_("FILENAME")}, {NULL, '\0', 0, NULL, 0} }; /****************************************************************************/ static void curtain_start (GStonesCave *cave); static void game_start_cb (GtkWidget *widget, gpointer data); static void show_scores_dialog (gint pos); static void menu_set_sensitive (gboolean state); + static void + game_stop_cb (GtkWidget *widget, gpointer data); + + static void + game_pause_cb (GtkWidget *widget, gpointer data); + + static void + show_scores_cb (GtkWidget *widget, gpointer data); + + static void + quit_cb (GtkWidget *widget, gpointer data); + + static void + about_cb (GtkWidget *widget, gpointer data); + + static void + preferences_cb (GtkWidget *widget, gpointer data); + + + /*****************************************************************************/ + /* Menu definitions */ + + static GnomeUIInfo game_menu[]= { + GNOMEUIINFO_MENU_NEW_GAME_ITEM(game_start_cb, NULL), + GNOMEUIINFO_MENU_END_GAME_ITEM(game_stop_cb, NULL), + GNOMEUIINFO_SEPARATOR, + GNOMEUIINFO_MENU_PAUSE_GAME_ITEM (game_pause_cb, NULL), + GNOMEUIINFO_SEPARATOR, + GNOMEUIINFO_MENU_SCORES_ITEM(show_scores_cb, NULL), + GNOMEUIINFO_SEPARATOR, + GNOMEUIINFO_MENU_QUIT_ITEM(quit_cb, NULL), + GNOMEUIINFO_END + }; + + static GnomeUIInfo help_menu[]= { + GNOMEUIINFO_HELP(APP_NAME), + GNOMEUIINFO_MENU_ABOUT_ITEM(about_cb, NULL), + GNOMEUIINFO_END + }; + + static GnomeUIInfo settings_menu[]= { + GNOMEUIINFO_MENU_PREFERENCES_ITEM(preferences_cb, NULL), + GNOMEUIINFO_END + }; + + static GnomeUIInfo main_menu[]= + { + GNOMEUIINFO_MENU_GAME_TREE(game_menu), + GNOMEUIINFO_MENU_SETTINGS_TREE(settings_menu), + GNOMEUIINFO_MENU_HELP_TREE(help_menu), + GNOMEUIINFO_END + }; + /****************************************************************************/ /* Image stuff */ *************** *** 1116,1160 **** gtk_widget_show (about); } - - - /*****************************************************************************/ - /* Menu definitions */ - - - static GnomeUIInfo game_menu[]= { - GNOMEUIINFO_MENU_NEW_GAME_ITEM(game_start_cb, NULL), - GNOMEUIINFO_MENU_END_GAME_ITEM(game_stop_cb, NULL), - GNOMEUIINFO_ITEM_STOCK(N_("_Restart level"), N_("Restart the current level"), level_restart_cb, GTK_STOCK_REFRESH), - GNOMEUIINFO_SEPARATOR, - GNOMEUIINFO_MENU_PAUSE_GAME_ITEM (game_pause_cb, NULL), - GNOMEUIINFO_SEPARATOR, - GNOMEUIINFO_MENU_SCORES_ITEM(show_scores_cb, NULL), - GNOMEUIINFO_SEPARATOR, - GNOMEUIINFO_MENU_QUIT_ITEM(quit_cb, NULL), - GNOMEUIINFO_END - }; - - static GnomeUIInfo help_menu[]= { - GNOMEUIINFO_HELP(APP_NAME), - GNOMEUIINFO_MENU_ABOUT_ITEM(about_cb, NULL), - GNOMEUIINFO_END - }; - - static GnomeUIInfo settings_menu[]= { - GNOMEUIINFO_MENU_PREFERENCES_ITEM(preferences_cb, NULL), - GNOMEUIINFO_END - }; - - static GnomeUIInfo main_menu[]= - { - GNOMEUIINFO_MENU_GAME_TREE(game_menu), - GNOMEUIINFO_MENU_SETTINGS_TREE(settings_menu), - GNOMEUIINFO_MENU_HELP_TREE(help_menu), - GNOMEUIINFO_END - }; - - /*****************************************************************************/ /* Menu sensitivity code. */ static void menu_set_sensitive (gboolean state) --- 1158,1163 ---- diff -crN ./gnome-games/gnome-stones/object.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-games/gnome-stones/object.c *** ./gnome-games/gnome-stones/object.c Fri Jun 20 03:19:20 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-games/gnome-stones/object.c Thu Oct 16 16:10:29 2003 *************** *** 31,36 **** --- 31,38 ---- #include #include + #define SOEXT ("." G_MODULE_SUFFIX) + #define SOEXT_LEN (strlen (SOEXT)) /*****************************************************************************/ diff -crN ./gnome-games/gnometris/gnome-canvas-pimage.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-games/gnometris/gnome-canvas-pimage.c *** ./gnome-games/gnometris/gnome-canvas-pimage.c Mon Jul 28 00:48:10 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-games/gnometris/gnome-canvas-pimage.c Thu Oct 16 16:10:51 2003 *************** *** 38,44 **** ARG_X, ARG_Y, ARG_WIDTH, ! ARG_HEIGHT, }; --- 38,44 ---- ARG_X, ARG_Y, ARG_WIDTH, ! ARG_HEIGHT }; diff -crN ./gnome-games/gnotravex/gnotravex.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-games/gnotravex/gnotravex.c *** ./gnome-games/gnotravex/gnotravex.c Sat Aug 2 08:08:01 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-games/gnotravex/gnotravex.c Tue Mar 30 13:41:04 2004 *************** *** 80,86 **** enum { gameover, paused, ! playing, }; gint size = 3; --- 80,86 ---- enum { gameover, paused, ! playing }; gint size = 3; *************** *** 563,569 **** return; font_size = (tile_size / 5) * PANGO_SCALE * 0.8; ! markup = g_strdup_printf ("%d", font_size, value); layout = gtk_widget_create_pango_layout (space, ""); pango_layout_set_markup (layout, markup, -1); --- 563,569 ---- return; font_size = (tile_size / 5) * PANGO_SCALE * 0.8; ! markup = g_strdup_printf ("%d", font_size, value); layout = gtk_widget_create_pango_layout (space, ""); pango_layout_set_markup (layout, markup, -1); diff -crN ./gnome-games/gnotski/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-games/gnotski/Makefile.am *** ./gnome-games/gnotski/Makefile.am Sun Jun 22 02:10:07 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-games/gnotski/Makefile.am Thu Oct 16 16:11:07 2003 *************** *** 1,6 **** ! ! ! pixmapdir=$(datadir)/pixmaps Gamesdir=$(datadir)/applications --- 1,4 ---- ! scoredir=$(localstatedir)/games pixmapdir=$(datadir)/pixmaps Gamesdir=$(datadir)/applications diff -crN ./gnome-games/gnotski/help/C/gnotski-C.omf /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-games/gnotski/help/C/gnotski-C.omf *** ./gnome-games/gnotski/help/C/gnotski-C.omf Thu Sep 12 02:08:05 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-games/gnotski/help/C/gnotski-C.omf Tue Jul 8 17:53:54 2003 *************** *** 1,5 **** ! --- 1,5 ---- ! diff -crN ./gnome-games/gtali/gtali.schemas.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-games/gtali/gtali.schemas.in *** ./gnome-games/gtali/gtali.schemas.in Mon Aug 4 00:17:40 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-games/gtali/gtali.schemas.in Tue Jan 20 10:58:16 2004 *************** *** 54,61 **** gtali list string - [Human,Wilber,Bill,Monica,Kenneth,Janet] --- 54,61 ---- gtali list string + [Human,Wilber,Bill,Monica,Kenneth,Janet] diff -crN ./gnome-games/gtali/yahtzee.h /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-games/gtali/yahtzee.h *** ./gnome-games/gtali/yahtzee.h Sun Aug 3 06:31:33 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-games/gtali/yahtzee.h Thu Oct 16 16:11:15 2003 *************** *** 17,23 **** #define _(s) (s) #define N_(s) (s) #else ! #include /* What else can I use here ? */ #endif #define COMPUTER_DELAY 1 /* sec */ --- 17,23 ---- #define _(s) (s) #define N_(s) (s) #else ! #include #endif #define COMPUTER_DELAY 1 /* sec */ diff -crN ./gnome-games/mahjongg/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-games/mahjongg/Makefile.am *** ./gnome-games/mahjongg/Makefile.am Sat Jul 5 01:19:03 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-games/mahjongg/Makefile.am Thu Oct 16 16:11:22 2003 *************** *** 1,6 **** ! ! ! pixmapdir = $(datadir)/pixmaps/mahjongg bgdir = $(datadir)/pixmaps/mahjongg/bg Gamesdir = $(datadir)/applications --- 1,4 ---- ! scoredir=$(localstatedir)/games pixmapdir = $(datadir)/pixmaps/mahjongg bgdir = $(datadir)/pixmaps/mahjongg/bg Gamesdir = $(datadir)/applications diff -crN ./gnome-games/mahjongg/gnome-canvas-pimage.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-games/mahjongg/gnome-canvas-pimage.c *** ./gnome-games/mahjongg/gnome-canvas-pimage.c Mon Jul 28 00:49:34 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-games/mahjongg/gnome-canvas-pimage.c Thu Oct 16 16:11:30 2003 *************** *** 38,44 **** ARG_X, ARG_Y, ARG_WIDTH, ! ARG_HEIGHT, }; --- 38,44 ---- ARG_X, ARG_Y, ARG_WIDTH, ! ARG_HEIGHT }; diff -crN ./gnome-games/mahjongg/mahjongg.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-games/mahjongg/mahjongg.c *** ./gnome-games/mahjongg/mahjongg.c Thu Aug 7 10:51:29 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-games/mahjongg/mahjongg.c Thu Oct 16 16:11:38 2003 *************** *** 510,516 **** } } gnome_canvas_update_now(GNOME_CANVAS(canvas)); ! //FIXME apply in the GUI } static void --- 510,516 ---- } } gnome_canvas_update_now(GNOME_CANVAS(canvas)); ! /* FIXME apply in the GUI */ } static void *************** *** 543,549 **** } } gnome_canvas_update_now(GNOME_CANVAS(canvas)); ! //FIXME apply in the GUI } static void --- 543,549 ---- } } gnome_canvas_update_now(GNOME_CANVAS(canvas)); ! /* FIXME apply in the GUI */ } static void