[gnome-games] libgames-support: Remove games-runtime.c

From: Robert Ancell <rancell src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-games] libgames-support: Remove games-runtime.c
Date: Sun, 1 Jan 2012 03:17:55 +0000 (UTC)
commit ba2837a797f1ca705da40661ced681d10ddfb7f7
Author: Robert Ancell <robert ancell canonical com>
Date:   Sun Jan 1 14:17:06 2012 +1100

    libgames-support: Remove games-runtime.c

 glines/src/glines.c                         |    6 -
 gnect/src/connect4.c                        |    2 -
 gnect/src/gfx.c                             |    2 -
 gnect/src/main.c                            |    6 -
 gnibbles/src/bonus.c                        |    2 -
 gnibbles/src/gnibbles.c                     |    1 -
 gnibbles/src/main.c                         |    6 -
 gnibbles/src/worm.c                         |    1 -
 gnobots2/src/gameconfig.c                   |    2 -
 gnobots2/src/gnobots.c                      |    6 -
 gnobots2/src/graphics.c                     |    1 -
 gnobots2/src/properties.c                   |    1 -
 gnomine/src/gnomine.vala                    |    5 -
 gnotski/src/gnotski.c                       |    6 -
 gtali/src/gyahtzee.c                        |    6 -
 libgames-support/GnomeGamesSupport-1.0.vapi |   29 --
 libgames-support/Makefile.am                |    4 +-
 libgames-support/games-files.c              |    2 -
 libgames-support/games-runtime.c            |  482 ---------------------------
 libgames-support/games-runtime.h            |   70 ----
 libgames-support/games-scores-backend.c     |    4 +-
 libgames-support/games-show.c               |    2 -
 libgames-support/games-stock.c              |    7 +-
 mahjongg/src/mahjongg.vala                  |    4 -
 24 files changed, 5 insertions(+), 652 deletions(-)
---
diff --git a/glines/src/glines.c b/glines/src/glines.c
index 6039a46..811d10d 100644
--- a/glines/src/glines.c
+++ b/glines/src/glines.c
@@ -38,7 +38,6 @@
 #include <libgames-support/games-files.h>
 #include <libgames-support/games-gridframe.h>
 #include <libgames-support/games-preimage.h>
-#include <libgames-support/games-runtime.h>
 #include <libgames-support/games-scores.h>
 #include <libgames-support/games-scores-dialog.h>
 #include <libgames-support/games-settings.h>
@@ -1506,9 +1505,6 @@ main (int argc, char *argv[])
   gboolean retval;
   GError *error = NULL;
 
-  if (!games_runtime_init ("glines"))
-    return 1;
-
 #ifdef ENABLE_SETGID
   setgid_io_init ();
 #endif
@@ -1620,7 +1616,5 @@ main (int argc, char *argv[])
 
   g_settings_sync();
 
-  games_runtime_shutdown ();
-
   return 0;
 }
diff --git a/gnect/src/connect4.c b/gnect/src/connect4.c
index beb51c8..71de751 100644
--- a/gnect/src/connect4.c
+++ b/gnect/src/connect4.c
@@ -36,8 +36,6 @@
 #include <zlib.h>
 #include <gtk/gtk.h>
 
-#include <libgames-support/games-runtime.h>
-
 #include "connect4.h"
 #include "pnsearch.h"
 #include "proto.h"
diff --git a/gnect/src/gfx.c b/gnect/src/gfx.c
index 595913b..9114f92 100644
--- a/gnect/src/gfx.c
+++ b/gnect/src/gfx.c
@@ -30,8 +30,6 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include <libgames-support/games-runtime.h>
-
 #include "main.h"
 #include "theme.h"
 #include "prefs.h"
diff --git a/gnect/src/main.c b/gnect/src/main.c
index 56f3272..9d273b2 100644
--- a/gnect/src/main.c
+++ b/gnect/src/main.c
@@ -31,7 +31,6 @@
 
 #include <libgames-support/games-conf.h>
 #include <libgames-support/games-gridframe.h>
-#include <libgames-support/games-runtime.h>
 #include <libgames-support/games-stock.h>
 #include <libgames-support/games-fullscreen-action.h>
 
@@ -1356,9 +1355,6 @@ main (int argc, char *argv[])
   gboolean retval;
   GError *error = NULL;
 
-  if (!games_runtime_init ("gnect"))
-    return 1;
-
   context = g_option_context_new (NULL);
   g_option_context_add_group (context, gtk_get_option_group (TRUE));
   retval = g_option_context_parse (context, &argc, &argv, &error);
@@ -1391,7 +1387,5 @@ main (int argc, char *argv[])
 
   games_conf_shutdown ();
 
-  games_runtime_shutdown ();
-
   return 0;
 }
diff --git a/gnibbles/src/bonus.c b/gnibbles/src/bonus.c
index d42ad19..2e4b26d 100644
--- a/gnibbles/src/bonus.c
+++ b/gnibbles/src/bonus.c
@@ -26,8 +26,6 @@
 #include <clutter/clutter.h>
 #include <clutter-gtk/clutter-gtk.h>
 
-#include <libgames-support/games-runtime.h>
-
 #include "gnibbles.h"
 #include "bonus.h"
 #include "properties.h"
diff --git a/gnibbles/src/gnibbles.c b/gnibbles/src/gnibbles.c
index b49d55f..6ec3c22 100644
--- a/gnibbles/src/gnibbles.c
+++ b/gnibbles/src/gnibbles.c
@@ -30,7 +30,6 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <clutter/clutter.h>
 
-#include <libgames-support/games-runtime.h>
 #include <libgames-support/games-scores-dialog.h>
 #include <libgames-support/games-scores.h>
 
diff --git a/gnibbles/src/main.c b/gnibbles/src/main.c
index 61050ca..85ecd5b 100644
--- a/gnibbles/src/main.c
+++ b/gnibbles/src/main.c
@@ -32,7 +32,6 @@
 
 #include <libgames-support/games-conf.h>
 #include <libgames-support/games-gridframe.h>
-#include <libgames-support/games-runtime.h>
 #include <libgames-support/games-scores.h>
 #include <libgames-support/games-stock.h>
 #include <libgames-support/games-pause-action.h>
@@ -890,9 +889,6 @@ main (int argc, char **argv)
   gboolean retval;
   GError *error = NULL;
 
-  if (!games_runtime_init ("gnibbles"))
-    return 1;
-
 #ifdef ENABLE_SETGID
   setgid_io_init ();
 #endif
@@ -947,7 +943,5 @@ main (int argc, char **argv)
   gnibbles_properties_destroy (properties);
   games_conf_shutdown ();
 
-  games_runtime_shutdown ();
-
   return 0;
 }
diff --git a/gnibbles/src/worm.c b/gnibbles/src/worm.c
index c4bdabf..a4eec24 100644
--- a/gnibbles/src/worm.c
+++ b/gnibbles/src/worm.c
@@ -28,7 +28,6 @@
 #include <stdlib.h>
 #include <math.h>
 
-#include <libgames-support/games-runtime.h>
 #include <clutter-gtk/clutter-gtk.h>
 
 #include "main.h"
diff --git a/gnobots2/src/gameconfig.c b/gnobots2/src/gameconfig.c
index cb430dd..28262df 100644
--- a/gnobots2/src/gameconfig.c
+++ b/gnobots2/src/gameconfig.c
@@ -29,8 +29,6 @@
 
 #include <gtk/gtk.h>
 
-#include <libgames-support/games-runtime.h>
-
 #include "gameconfig.h"
 #include "gbdefs.h"
 
diff --git a/gnobots2/src/gnobots.c b/gnobots2/src/gnobots.c
index d3f1fa8..cff4607 100644
--- a/gnobots2/src/gnobots.c
+++ b/gnobots2/src/gnobots.c
@@ -30,7 +30,6 @@
 
 #include <libgames-support/games-conf.h>
 #include <libgames-support/games-gridframe.h>
-#include <libgames-support/games-runtime.h>
 #include <libgames-support/games-scores.h>
 #include <libgames-support/games-scores-dialog.h>
 #include <libgames-support/games-stock.h>
@@ -143,9 +142,6 @@ main (int argc, char *argv[])
   gboolean retval;
   GError *error = NULL;
 
-  if (!games_runtime_init ("gnobots2"))
-    return 1;
-
   gettimeofday (&tv, NULL);
   srand (tv.tv_usec);
 
@@ -294,8 +290,6 @@ main (int argc, char *argv[])
 
   games_conf_shutdown ();
 
-  games_runtime_shutdown ();
-
   return 0;
 }
 
diff --git a/gnobots2/src/graphics.c b/gnobots2/src/graphics.c
index 7fc94fd..ed180a9 100644
--- a/gnobots2/src/graphics.c
+++ b/gnobots2/src/graphics.c
@@ -26,7 +26,6 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include <libgames-support/games-preimage.h>
-#include <libgames-support/games-runtime.h>
 #include <libgames-support/games-scores.h>
 #include <libgames-support/games-scores-dialog.h>
 
diff --git a/gnobots2/src/properties.c b/gnobots2/src/properties.c
index 54de13b..a4e0053 100644
--- a/gnobots2/src/properties.c
+++ b/gnobots2/src/properties.c
@@ -33,7 +33,6 @@
 #include <libgames-support/games-scores.h>
 #include <libgames-support/games-scores-dialog.h>
 #include <libgames-support/games-conf.h>
-#include <libgames-support/games-runtime.h>
 
 #include "properties.h"
 #include "gameconfig.h"
diff --git a/gnomine/src/gnomine.vala b/gnomine/src/gnomine.vala
index 12b67fa..e7ac8d1 100644
--- a/gnomine/src/gnomine.vala
+++ b/gnomine/src/gnomine.vala
@@ -765,9 +765,6 @@ public class GnoMine : Gtk.Application
 
     public static int main (string[] args)
     {
-        if (!GnomeGamesSupport.runtime_init ("gnomine"))
-            return Posix.EXIT_FAILURE;
-
 #if ENABLE_SETGID
         GnomeGamesSupport.setgid_io_init ();
 #endif
@@ -795,8 +792,6 @@ public class GnoMine : Gtk.Application
 
         Settings.sync ();
 
-        GnomeGamesSupport.runtime_shutdown ();
-
         return result;
     }
 }
diff --git a/gnotski/src/gnotski.c b/gnotski/src/gnotski.c
index 9e5b676..fbd7dfc 100644
--- a/gnotski/src/gnotski.c
+++ b/gnotski/src/gnotski.c
@@ -31,7 +31,6 @@
 #include <libgames-support/games-conf.h>
 #include <libgames-support/games-gridframe.h>
 #include <libgames-support/games-preimage.h>
-#include <libgames-support/games-runtime.h>
 #include <libgames-support/games-scores.h>
 #include <libgames-support/games-scores-dialog.h>
 #include <libgames-support/games-stock.h>
@@ -463,9 +462,6 @@ main (int argc, char **argv)
   gboolean retval;
   GError *error = NULL;
 
-  if (!games_runtime_init ("gnotski"))
-    return 1;
-
 #ifdef ENABLE_SETGID
   setgid_io_init ();
 #endif
@@ -534,8 +530,6 @@ main (int argc, char **argv)
 
   games_conf_shutdown ();
 
-  games_runtime_shutdown ();
-
   return 0;
 }
 
diff --git a/gtali/src/gyahtzee.c b/gtali/src/gyahtzee.c
index 452e8fc..5bea19e 100644
--- a/gtali/src/gyahtzee.c
+++ b/gtali/src/gyahtzee.c
@@ -48,7 +48,6 @@
 #include <libgames-support/games-scores.h>
 #include <libgames-support/games-scores-dialog.h>
 #include <libgames-support/games-conf.h>
-#include <libgames-support/games-runtime.h>
 
 #include "yahtzee.h"
 #include "gyahtzee.h"
@@ -880,9 +879,6 @@ main (int argc, char *argv[])
   gboolean retval;
   GError *error = NULL;
 
-  if (!games_runtime_init ("gtali"))
-    return 1;
-
 #ifdef ENABLE_SETGID
   setgid_io_init ();
 #endif
@@ -1023,8 +1019,6 @@ main (int argc, char *argv[])
 
   games_conf_shutdown ();
 
-  games_runtime_shutdown ();
-
   exit(0);
 }
 
diff --git a/libgames-support/GnomeGamesSupport-1.0.vapi b/libgames-support/GnomeGamesSupport-1.0.vapi
index 86f432a..106918f 100644
--- a/libgames-support/GnomeGamesSupport-1.0.vapi
+++ b/libgames-support/GnomeGamesSupport-1.0.vapi
@@ -56,35 +56,6 @@ namespace GnomeGamesSupport
     [CCode (cheader_filename = "games-setgid-io.h", cname = "setgid_io_init")]
     public static void setgid_io_init ();
 
-    [CCode (cprefix = "GAMES_RUNTIME_", cheader_filename = "games-runtime.h")]
-    public enum RuntimeDirectory
-    {
-        PREFIX,
-        DATA_DIRECTORY,
-        COMMON_DATA_DIRECTORY,
-        PKG_DATA_DIRECTORY,
-        SCORES_DIRECTORY,
-        LOCALE_DIRECTORY,
-        COMMON_PIXMAP_DIRECTORY,
-        PRERENDERED_CARDS_DIRECTORY,
-        SCALABLE_CARDS_DIRECTORY,
-        ICON_THEME_DIRECTORY,
-        PIXMAP_DIRECTORY,
-        SOUND_DIRECTORY,
-        GAME_DATA_DIRECTORY,
-        GAME_GAMES_DIRECTORY,
-        GAME_PIXMAP_DIRECTORY,
-        GAME_THEME_DIRECTORY,
-        GAME_HELP_DIRECTORY,
-        LAST_DIRECTORY,
-        FIRST_DERIVED_DIRECTORY
-    }
-
-    [CCode (cheader_filename = "games-runtime.h")]
-    public static bool runtime_init (string name);
-    [CCode (cheader_filename = "games-runtime.h")]
-    public static void runtime_shutdown ();
-
     [CCode (cheader_filename = "games-settings.h")]    
     public static void settings_bind_window_state (string path, Gtk.Window window);
 
diff --git a/libgames-support/Makefile.am b/libgames-support/Makefile.am
index a6d3813..6dc5580 100644
--- a/libgames-support/Makefile.am
+++ b/libgames-support/Makefile.am
@@ -13,8 +13,6 @@ BUILT_SOURCES = \
 libgames_support_la_SOURCES =		\
 	games-conf.c			\
 	games-conf.h			\
-	games-runtime.c			\
-	games-runtime.h			\
 	games-show.c			\
 	games-show.h			\
 	games-stock.c			\
@@ -70,7 +68,9 @@ libgames_support_la_CPPFLAGS = \
 	-DPREFIX="\"$(prefix)\"" \
 	-DDATADIR="\"$(datadir)\""				\
 	-DCOMMON_DATADIR="\"$(datadir)/gnome-games-common\""	\
+	-DICON_THEME_DIRECTORY="\"$(datadir)/icons\""				\
 	-DSCORESDIR="\"$(scoredir)\""				\
+	-DLOCALE_DIRECTORY="\"$(datadir)/locale\""				\
 	$(AM_CPPFLAGS)
 
 libgames_support_la_CFLAGS = 	\
diff --git a/libgames-support/games-files.c b/libgames-support/games-files.c
index 6b577e6..072ac3c 100644
--- a/libgames-support/games-files.c
+++ b/libgames-support/games-files.c
@@ -40,8 +40,6 @@
 #endif
 #endif
 
-#include "games-runtime.h"
-
 #include "games-files.h"
 
 G_DEFINE_TYPE (GamesFileList, games_file_list, G_TYPE_OBJECT)
diff --git a/libgames-support/games-scores-backend.c b/libgames-support/games-scores-backend.c
index 25d828f..4a1b8c2 100644
--- a/libgames-support/games-scores-backend.c
+++ b/libgames-support/games-scores-backend.c
@@ -29,7 +29,6 @@
 #include "games-score.h"
 #include "games-scores.h"
 #include "games-scores-backend.h"
-#include "games-runtime.h"
 
 #ifdef ENABLE_SETGID
 #include "games-setgid-io.h"
@@ -93,8 +92,7 @@ games_scores_backend_new (GamesScoreStyle style,
   backend->priv->timestamp = 0;
   backend->priv->style = style;
   backend->priv->scores_list = NULL;
-  backend->priv->filename = g_build_filename (games_runtime_get_directory (GAMES_RUNTIME_SCORES_DIRECTORY),
-                                              fullname, NULL);
+  backend->priv->filename = g_build_filename (SCORESDIR, fullname, NULL);
   g_free (fullname);
 
   backend->priv->fd = -1;
diff --git a/libgames-support/games-show.c b/libgames-support/games-show.c
index 5cf172b..5c30897 100644
--- a/libgames-support/games-show.c
+++ b/libgames-support/games-show.c
@@ -28,8 +28,6 @@
 #include <io.h>
 #endif /* G_OS_WIN32 */
 
-#include "games-runtime.h"
-
 #include "games-show.h"
 
 /**
diff --git a/libgames-support/games-stock.c b/libgames-support/games-stock.c
index e598a38..c61ad8f 100644
--- a/libgames-support/games-stock.c
+++ b/libgames-support/games-stock.c
@@ -27,8 +27,6 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
-#include "games-runtime.h"
-
 #include "games-stock.h"
 
 typedef struct {
@@ -302,8 +300,7 @@ games_stock_init (void)
    * for icons as well as the standard search paths.
    */
   /* FIXME: multi-head! */
-  gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
-                                     games_runtime_get_directory (GAMES_RUNTIME_ICON_THEME_DIRECTORY));
+  gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (), ICON_THEME_DIRECTORY);
  
   gtk_stock_add_static (games_stock_items, G_N_ELEMENTS (games_stock_items));
 }
@@ -356,5 +353,5 @@ games_get_license_version (const gchar * game_name,
 gchar *
 games_get_license (const gchar * game_name)
 {
-  return games_get_license_version (game_name, games_runtime_get_gpl_version ());
+  return games_get_license_version (game_name, 2);
 }
diff --git a/mahjongg/src/mahjongg.vala b/mahjongg/src/mahjongg.vala
index effc432..21d97c4 100644
--- a/mahjongg/src/mahjongg.vala
+++ b/mahjongg/src/mahjongg.vala
@@ -786,8 +786,6 @@ public class Mahjongg : Gtk.Application
             return Posix.EXIT_FAILURE;
         }
 
-        if (!GnomeGamesSupport.runtime_init ("mahjongg"))
-            return Posix.EXIT_FAILURE;
 #if ENABLE_SETGID
         GnomeGamesSupport.setgid_io_init ();
 #endif
@@ -803,8 +801,6 @@ public class Mahjongg : Gtk.Application
 
         Settings.sync();
 
-        GnomeGamesSupport.runtime_shutdown ();
-
         return result;
     }
 }
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]