gnome-games r7984 - trunk/libgames-support

[chpe svn gnome org]

Author: chpe
Date: Wed Oct  8 20:02:11 2008
New Revision: 7984
URL: http://svn.gnome.org/viewvc/gnome-games?rev=7984&view=rev

Log:
Refactor accel map loading code to load the accel map from
.config/gnome-games/${game}.accels even in the HAVE_GNOME case,
if the game doesn't use GnomeProgram (e.g. aisleriot).

Modified:
   trunk/libgames-support/games-conf.c

Modified: trunk/libgames-support/games-conf.c
==============================================================================
--- trunk/libgames-support/games-conf.c	(original)
+++ trunk/libgames-support/games-conf.c	Wed Oct  8 20:02:11 2008
@@ -25,6 +25,7 @@
 
 #ifdef HAVE_GNOME
 #include <gconf/gconf-client.h>
+#include <libgnome/gnome-program.h>
 #include <libgnomeui/gnome-app-helper.h>
 #else
 #include <glib/gkeyfile.h>
@@ -169,6 +170,100 @@
   return FALSE;
 }
 
+#ifndef HAVE_HILDON
+
+static char *
+games_conf_get_accel_map_path (GamesConf *conf,
+                               gboolean ensure_dir_exists)
+{
+  GamesConfPrivate *priv = conf->priv;
+  char *game_name, *conf_dir;
+  char *conf_file = NULL;
+
+  game_name = g_ascii_strdown (priv->game_name, -1);
+
+#ifdef HAVE_GNOME
+  conf_dir = g_build_filename (g_get_home_dir (), ".gnome2", "accels", NULL);
+#else
+  conf_dir = g_build_filename (g_get_user_config_dir (), "gnome-games", NULL);
+#endif
+  if (!conf_dir)
+    goto loser;
+
+  /* Mode 0700 per the XDG basedir spec */
+  if (ensure_dir_exists &&
+      g_mkdir_with_parents (conf_dir, 0700) < 0) {
+    int err = errno;
+
+    if (err != EEXIST) {
+      g_warning ("Failed to create config directory \"%s\": %s\n", conf_dir, g_strerror (err));
+      goto loser;
+    }
+  }
+
+#ifdef HAVE_GNOME
+  conf_file = g_build_filename (conf_dir, game_name, NULL);
+#else
+{
+  char *accelmap_filename;
+
+  accelmap_filename = g_strdup_printf ("%s.%s", game_name, ACCELMAP_EXT);
+  conf_file = g_build_filename (conf_dir, accelmap_filename, NULL);
+  g_free (accelmap_filename);
+}
+#endif
+
+loser:
+  g_free (conf_dir);
+  g_free (game_name);
+
+  return conf_file;
+}
+
+static void
+games_conf_load_accel_map (GamesConf *conf)
+{
+  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;
+
+  gtk_accel_map_load (conf_file);
+  g_free (conf_file);
+}
+
+static void
+games_conf_save_accel_map (GamesConf *conf)
+{
+  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;
+
+  gtk_accel_map_save (conf_file);
+  g_free (conf_file);
+}
+
+#endif /* !HAVE_HILDON */
+
 #ifdef HAVE_GNOME
 
 static void
@@ -258,9 +353,6 @@
 #ifndef HAVE_GNOME
   char *conf_file;
   GError *error = NULL;
-#ifndef HAVE_HILDON
-  char *accelmap_filename;
-#endif /* !HAVE_HILDON */
 #endif /* HAVE_GNOME */
 
   g_assert (instance == NULL);
@@ -311,17 +403,12 @@
 
   g_free (conf_file);
 
-  /* Load the accel map, which libgnome does for us in the HAVE_GNOME case */
+#endif /* HAVE_GNOME */
+
 #ifndef HAVE_HILDON
-  accelmap_filename = g_strdup_printf ("%s.%s", game_name, ACCELMAP_EXT);
-  conf_file = g_build_filename (g_get_user_config_dir(), "gnome-games", accelmap_filename, NULL);
-  gtk_accel_map_load (conf_file);
-  g_free (accelmap_filename);
-  g_free (conf_file);
+  games_conf_load_accel_map (conf);
 #endif /* !HAVE_HILDON */
 
-#endif /* HAVE_GNOME */
-
   g_free (game_name);
 
   return object;
@@ -333,10 +420,12 @@
   GamesConf *conf = GAMES_CONF (object);
   GamesConfPrivate *priv = conf->priv;
 
-#ifdef HAVE_GNOME
+#ifndef HAVE_HILDON
   /* Save the accel map */
-  gnome_accelerators_sync ();
+  games_conf_save_accel_map (conf);
+#endif /* !HAVE_HILDON */
 
+#ifdef HAVE_GNOME
   gconf_client_remove_dir (priv->gconf_client, priv->base_path, NULL);
 
   g_free (priv->base_path);
@@ -348,9 +437,6 @@
   char *game_name, *conf_file, *conf_dir, *data = NULL;
   gsize len = 0;
   GError *error = NULL;
-#ifndef HAVE_HILDON
-  char *accelmap_filename;
-#endif /* !HAVE_HILDON */
 
   game_name = g_ascii_strdown (priv->game_name, -1);
   conf_file = g_build_filename (g_get_user_config_dir (), "gnome-games", game_name, NULL);
@@ -385,16 +471,6 @@
   g_free (data);
   g_free (conf_file);
   g_free (conf_dir);
-
-  /* Save the accel map */
-#ifndef HAVE_HILDON
-  accelmap_filename = g_strdup_printf ("%s.%s", game_name, ACCELMAP_EXT);
-  conf_file = g_build_filename (g_get_user_config_dir(), "gnome-games", accelmap_filename, NULL);
-  gtk_accel_map_save (conf_file);
-  g_free (accelmap_filename);
-  g_free (conf_file);
-#endif /* !HAVE_HILDON */
-
   g_free (game_name);
 
   g_free (priv->main_group);