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

[Robert Ancell <rancell src gnome org>]

commit aec417d3f05daab1aee80e705cd312f5c337ddd5
Author: Robert Ancell <robert ancell canonical com>
Date:   Tue Jan 3 16:56:15 2012 +1100

    libgames-support: Remove games-conf.c

 gnect/src/main.c                  |    1 -
 gnect/src/prefs.c                 |    2 +-
 gnibbles/src/preferences.c        |    2 +-
 gnobots2/src/properties.c         |    2 +-
 libgames-support/Makefile.am      |    2 -
 libgames-support/games-conf.c     | 1276 -------------------------------------
 libgames-support/games-conf.h     |  114 ----
 libgames-support/games-controls.c |   72 +--
 libgames-support/games-controls.h |    3 +-
 quadrapassel/src/scoreframe.cpp   |    1 -
 quadrapassel/src/tetris.cpp       |    2 +-
 11 files changed, 12 insertions(+), 1465 deletions(-)
---
diff --git a/gnect/src/main.c b/gnect/src/main.c
index e597178..8a91452 100644
--- a/gnect/src/main.c
+++ b/gnect/src/main.c
@@ -29,7 +29,6 @@
 #include <gtk/gtk.h>
 #include <canberra-gtk.h>
 
-#include <libgames-support/games-conf.h>
 #include <libgames-support/games-gridframe.h>
 #include <libgames-support/games-stock.h>
 #include <libgames-support/games-fullscreen-action.h>
diff --git a/gnect/src/prefs.c b/gnect/src/prefs.c
index e77d254..04f669c 100644
--- a/gnect/src/prefs.c
+++ b/gnect/src/prefs.c
@@ -327,7 +327,7 @@ prefsbox_open (void)
 
   label = gtk_label_new_with_mnemonic (_("Keyboard Controls"));
 
-  controls_list = games_controls_list_new_settings (settings);
+  controls_list = games_controls_list_new (settings);
   games_controls_list_add_controls (GAMES_CONTROLS_LIST (controls_list),
 				    "key-left", _("Move left"), DEFAULT_KEY_LEFT,
                                     "key-right", _("Move right"), DEFAULT_KEY_RIGHT,
diff --git a/gnibbles/src/preferences.c b/gnibbles/src/preferences.c
index c55a177..ab09e37 100644
--- a/gnibbles/src/preferences.c
+++ b/gnibbles/src/preferences.c
@@ -415,7 +415,7 @@ gnibbles_preferences_cb (GtkWidget * widget, gpointer data)
 
     frame = games_frame_new (_("Keyboard Controls"));
 
-    controls = games_controls_list_new_settings (worm_settings[i]);
+    controls = games_controls_list_new (worm_settings[i]);
 
     games_controls_list_add_controls (GAMES_CONTROLS_LIST (controls),
                                       "key-left", _("Move left"), GDK_KEY_Left,
diff --git a/gnobots2/src/properties.c b/gnobots2/src/properties.c
index 12d72dd..e8898a3 100644
--- a/gnobots2/src/properties.c
+++ b/gnobots2/src/properties.c
@@ -545,7 +545,7 @@ show_properties_dialog (void)
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_container_add (GTK_CONTAINER (frame), vbox);
 
-  controls_list = games_controls_list_new_settings (settings);
+  controls_list = games_controls_list_new (settings);
   games_controls_list_add_controls (GAMES_CONTROLS_LIST (controls_list),
 				    "key00", _("Key to move NW"), default_keys[0],
 				    "key01", _("Key to move N"), default_keys[1],
diff --git a/libgames-support/Makefile.am b/libgames-support/Makefile.am
index 9a14787..6d3a399 100644
--- a/libgames-support/Makefile.am
+++ b/libgames-support/Makefile.am
@@ -11,8 +11,6 @@ BUILT_SOURCES = \
 	games-marshal.h
 
 libgames_support_la_SOURCES =		\
-	games-conf.c			\
-	games-conf.h			\
 	games-stock.c			\
 	games-stock.h
 
diff --git a/libgames-support/games-controls.c b/libgames-support/games-controls.c
index 31edb63..f9136bc 100644
--- a/libgames-support/games-controls.c
+++ b/libgames-support/games-controls.c
@@ -25,7 +25,6 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include "games-conf.h"
 #include "games-controls.h"
 
 enum {
@@ -48,7 +47,6 @@ struct GamesControlsListPrivate {
   GtkWidget *view;
 
   GSettings *settings;
-  char *conf_group;
   gulong notify_handler_id;
 };
 
@@ -82,10 +80,7 @@ accel_edited_cb (GtkCellRendererAccel *cell,
 
   /* Note: the model is updated in the conf notification callback */
   /* FIXME: what to do with the modifiers? */
-  if (list->priv->settings)
-    g_settings_set_int (list->priv->settings, conf_key, keyval);
-  else
-    games_conf_set_keyval (list->priv->conf_group, conf_key, keyval);
+  g_settings_set_int (list->priv->settings, conf_key, keyval);
   g_free (conf_key);
 }
 
@@ -118,15 +113,12 @@ accel_cleared_cb (GtkCellRendererAccel *cell,
 
   /* Note: the model is updated in the conf notification callback */
   /* FIXME: what to do with the modifiers? */
-  if (list->priv->settings)
-    g_settings_set_int (list->priv->settings, conf_key, default_keyval);
-  else
-    games_conf_set_keyval (list->priv->conf_group, conf_key, default_keyval);
+  g_settings_set_int (list->priv->settings, conf_key, default_keyval);
   g_free (conf_key);
 }
 
 static void
-value_changed (GamesControlsList *list, const gchar *key)
+settings_changed_cb (GSettings *settings, const gchar *key, GamesControlsList *list)
 {
   GtkTreeIter iter;
   gboolean valid;
@@ -147,10 +139,7 @@ value_changed (GamesControlsList *list, const gchar *key)
                           DEFAULT_KEYCODE_COLUMN, &default_keyval,
                           -1);
 
-      if (list->priv->settings)
-        keyval = g_settings_get_int (list->priv->settings, key);
-      else
-        keyval = games_conf_get_keyval_with_default (list->priv->conf_group, key, default_keyval);
+      keyval = g_settings_get_int (list->priv->settings, key);
 
       gtk_list_store_set (list->priv->store, &iter,
                           KEYCODE_COLUMN, keyval,
@@ -167,26 +156,6 @@ value_changed (GamesControlsList *list, const gchar *key)
 }
 
 static void
-conf_value_changed_cb (GamesConf *conf,
-                       const char *group,
-                       const char *key,
-                       GamesControlsList *list)
-{
-  if ((group == NULL && list->priv->conf_group != NULL) ||
-      (group != NULL && (list->priv->conf_group == NULL ||
-                         strcmp (group, list->priv->conf_group) != 0)))
-    return;
-
-  value_changed (list, key);
-}
-
-static void
-settings_changed_cb (GSettings *settings, const gchar *key, GamesControlsList *list)
-{
-  value_changed (list, key);
-}
-
-static void
 games_controls_list_init (GamesControlsList *list)
 {
   list->priv = G_TYPE_INSTANCE_GET_PRIVATE (list, GAMES_TYPE_CONTROLS_LIST, GamesControlsListPrivate);
@@ -262,12 +231,8 @@ games_controls_list_finalize (GObject *object)
 {
   GamesControlsList *list = GAMES_CONTROLS_LIST (object);
 
-  if (list->priv->settings)
-    g_signal_handler_disconnect (list->priv->settings, list->priv->notify_handler_id);
-  else
-    g_signal_handler_disconnect (games_conf_get_default (), list->priv->notify_handler_id);
+  g_signal_handler_disconnect (list->priv->settings, list->priv->notify_handler_id);
 
-  g_free (list->priv->conf_group);
   if (list->priv->settings)
       g_object_unref (list->priv->settings);
 
@@ -288,27 +253,7 @@ games_controls_list_class_init (GamesControlsListClass *klass)
 /* Public API */
 
 GtkWidget *
-games_controls_list_new (const char *conf_group)
-{
-  GamesControlsList *list;
-
-  list = g_object_new (GAMES_TYPE_CONTROLS_LIST,
-                       "hscrollbar-policy", GTK_POLICY_NEVER,
-                       "vscrollbar-policy", GTK_POLICY_AUTOMATIC,
-                       "shadow-type", GTK_SHADOW_IN,
-                       NULL);
-
-  list->priv->conf_group = g_strdup (conf_group);
-  list->priv->notify_handler_id = g_signal_connect (games_conf_get_default (),
-                                                    "value-changed",
-                                                    G_CALLBACK (conf_value_changed_cb),
-                                                    list);
-
-  return GTK_WIDGET (list);
-}
-
-GtkWidget *
-games_controls_list_new_settings (GSettings *settings)
+games_controls_list_new (GSettings *settings)
 {
   GamesControlsList *list;
 
@@ -342,10 +287,7 @@ games_controls_list_add_control (GamesControlsList *list,
   if (!label)
     label = _("Unknown Command");
 
-  if (list->priv->settings)
-    keyval = g_settings_get_int (list->priv->settings, conf_key);
-  else
-    keyval = games_conf_get_keyval_with_default (list->priv->conf_group, conf_key, default_keyval);
+  keyval = g_settings_get_int (list->priv->settings, conf_key);
 
   gtk_list_store_insert_with_values (list->priv->store, &iter, -1,
                                      CONFKEY_COLUMN, conf_key,
diff --git a/libgames-support/games-controls.h b/libgames-support/games-controls.h
index 3fd4644..d192dfc 100644
--- a/libgames-support/games-controls.h
+++ b/libgames-support/games-controls.h
@@ -32,8 +32,7 @@ typedef struct {
 } GamesControlsListClass;
 
 GType      games_controls_list_get_type     (void);
-GtkWidget *games_controls_list_new          (const char *conf_group);
-GtkWidget *games_controls_list_new_settings (GSettings *settings);
+GtkWidget *games_controls_list_new          (GSettings *settings);
 void       games_controls_list_add_control  (GamesControlsList *list,
                                              const char *conf_key,
                                              const char *label,
diff --git a/quadrapassel/src/scoreframe.cpp b/quadrapassel/src/scoreframe.cpp
index d570fd7..266835a 100644
--- a/quadrapassel/src/scoreframe.cpp
+++ b/quadrapassel/src/scoreframe.cpp
@@ -21,7 +21,6 @@
 
 #include <config.h>
 
-#include <libgames-support/games-conf.h>
 #include <libgames-support/games-frame.h>
 
 #include "scoreframe.h"
diff --git a/quadrapassel/src/tetris.cpp b/quadrapassel/src/tetris.cpp
index 63bce52..76fbe3d 100644
--- a/quadrapassel/src/tetris.cpp
+++ b/quadrapassel/src/tetris.cpp
@@ -711,7 +711,7 @@ Tetris::gameProperties(GtkAction *action, void *d)
 	fvbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 	gtk_container_add (GTK_CONTAINER (frame), fvbox);
 
-	controls_list = games_controls_list_new_settings (t->settings);
+	controls_list = games_controls_list_new (t->settings);
 	games_controls_list_add_controls (GAMES_CONTROLS_LIST (controls_list),
 					  "key-left", _("Move left"), GDK_KEY_Left,
 					  "key-right", _("Move right"), GDK_KEY_Right,