gnome-games r8036 - trunk/same-gnome

[thomashpa svn gnome org]

Author: thomashpa
Date: Wed Oct 15 11:34:48 2008
New Revision: 8036
URL: http://svn.gnome.org/viewvc/gnome-games?rev=8036&view=rev

Log:
Rip out optional libgnome stuff

Modified:
   trunk/same-gnome/same-gnome.c
   trunk/same-gnome/ui.c

Modified: trunk/same-gnome/same-gnome.c
==============================================================================
--- trunk/same-gnome/same-gnome.c	(original)
+++ trunk/same-gnome/same-gnome.c	Wed Oct 15 11:34:48 2008
@@ -11,13 +11,8 @@
 #include <stdlib.h>
 
 #include <glib/gi18n.h>
-
 #include <gtk/gtk.h>
 
-#ifdef HAVE_GNOME
-#include <gnome.h>
-#endif /* HAVE_GNOME */
-
 #include <libgames-support/games-conf.h>
 #include <libgames-support/games-gridframe.h>
 #include <libgames-support/games-stock.h>
@@ -143,12 +138,8 @@
     {NULL, '\0', 0, 0, NULL, NULL, NULL}
   };
 
-#ifdef HAVE_GNOME
-  GnomeProgram *program;
-#else
   gboolean retval;
   GError *error = NULL;
-#endif
 
 #if defined(HAVE_GNOME) || defined(HAVE_RSVG_GNOMEVFS)
   /* If we're going to use gnome-vfs, we need to init threads before
@@ -163,9 +154,9 @@
   setgid_io_init ();
 
   /* Initialise i18n. */
-  bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
-  textdomain (GETTEXT_PACKAGE);
+  bindtextdomain (GETTEXT_PACKAGE, games_runtime_get_directory (GAMES_RUNTIME_LOCALE_DIRECTORY));
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+  textdomain (GETTEXT_PACKAGE);
 
   context = g_option_context_new (NULL);
 #if GLIB_CHECK_VERSION (2, 12, 0)
@@ -173,13 +164,6 @@
 #endif
 
   g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE);
-
-#ifdef HAVE_GNOME
-  program =
-    gnome_program_init (APPNAME, VERSION, LIBGNOMEUI_MODULE, argc, argv,
-			GNOME_PARAM_APP_DATADIR, DATADIR,
-			GNOME_PARAM_GOPTION_CONTEXT, context, NULL);
-#else
   g_option_context_add_group (context, gtk_get_option_group (TRUE));
 
   retval = g_option_context_parse (context, &argc, &argv, &error);
@@ -189,7 +173,6 @@
     g_error_free (error);
     exit (1);
   }
-#endif /* HAVE_GNOME */
 
   g_set_application_name (_(APPNAME_LONG));
 
@@ -212,10 +195,6 @@
 
   games_conf_shutdown ();
 
-#ifdef HAVE_GNOME
-  g_object_unref (program);
-#endif /* HAVE_GNOME */
-
   games_runtime_shutdown ();
 
   return 0;

Modified: trunk/same-gnome/ui.c
==============================================================================
--- trunk/same-gnome/ui.c	(original)
+++ trunk/same-gnome/ui.c	Wed Oct 15 11:34:48 2008
@@ -11,10 +11,6 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
-#ifdef HAVE_GNOME
-#include <libgnome/gnome-help.h>
-#endif /* HAVE_GNOME */
-
 #include <libgames-support/games-conf.h>
 #include <libgames-support/games-files.h>
 #include <libgames-support/games-gridframe.h>