gnome-games r8200 - trunk/libgames-support



Author: thomashpa
Date: Sun Oct 26 10:24:29 2008
New Revision: 8200
URL: http://svn.gnome.org/viewvc/gnome-games?rev=8200&view=rev

Log:
more libgnome removal

Modified:
   trunk/libgames-support/games-conf.c
   trunk/libgames-support/games-dlg-chat.c
   trunk/libgames-support/games-dlg-players.c

Modified: trunk/libgames-support/games-conf.c
==============================================================================
--- trunk/libgames-support/games-conf.c	(original)
+++ trunk/libgames-support/games-conf.c	Sun Oct 26 10:24:29 2008
@@ -25,8 +25,6 @@
 
 #ifdef HAVE_GNOME
 #include <gconf/gconf-client.h>
-#include <libgnome/gnome-program.h>
-#include <libgnomeui/gnome-app-helper.h>
 #else
 #include <glib/gkeyfile.h>
 #include <gtk/gtkaccelmap.h>
@@ -225,13 +223,6 @@
 {
   char *conf_file;
 
-#ifdef HAVE_GNOME
-  if (gnome_program_get ())
-    return; /* Nothing to do, since gnome_program_init already loaded the accel map */
-
-  /* Fall back to our custom loading code if the game doesn't use GnomeProgram (e.g. aisleriot) */
-#endif
-
   conf_file = games_conf_get_accel_map_path (conf, FALSE);
   if (!conf_file)
     return;
@@ -245,15 +236,6 @@
 {
   char *conf_file;
 
-#ifdef HAVE_GNOME
-  /* Save the accel map */
-  if (gnome_program_get ()) {
-    gnome_accelerators_sync ();
-    return;
-  }
-  /* Fall back to our custom saving code if the game doesn't use GnomeProgram (e.g. aisleriot) */
-#endif
-
   conf_file = games_conf_get_accel_map_path (conf, TRUE);
   if (!conf_file)
     return;

Modified: trunk/libgames-support/games-dlg-chat.c
==============================================================================
--- trunk/libgames-support/games-dlg-chat.c	(original)
+++ trunk/libgames-support/games-dlg-chat.c	Sun Oct 26 10:24:29 2008
@@ -26,10 +26,13 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 
-#include "config.h"
-#include <gnome.h>
+#include <config.h>
+
 #include <stdio.h>
 
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
+
 #include <ggzmod.h>
 
 #include "games-dlg-chat.h"

Modified: trunk/libgames-support/games-dlg-players.c
==============================================================================
--- trunk/libgames-support/games-dlg-players.c	(original)
+++ trunk/libgames-support/games-dlg-players.c	Sun Oct 26 10:24:29 2008
@@ -24,12 +24,13 @@
  */
 
 #include <config.h>
-#include <gnome.h>
+
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>
 #include <strings.h>		/* For strcasecmp */
 
+#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
 #include "games-dlg-players.h"



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]