[gnome-video-arcade] Remove all mention of GConf.



commit 76999b3ffe0b511797187eb8010684ea08c12619
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sun Apr 24 15:21:22 2011 -0400

    Remove all mention of GConf.

 README                |    9 ---------
 src/gva-columns.c     |   28 +++++++++++++---------------
 src/gva-main.c        |   18 ++++++++----------
 src/gva-preferences.c |   12 ++++--------
 src/gva-tree-view.c   |    7 +++----
 5 files changed, 28 insertions(+), 46 deletions(-)
---
diff --git a/README b/README
index d573e8b..d3f6193 100644
--- a/README
+++ b/README
@@ -49,15 +49,6 @@ installed prior to compiling the source code:
        varies by distribution, but it should be something similar to
        gtk2-devel (Fedora) or libgtk2.0-dev (Debian/Ubuntu).
 
-   - Header files for GConf version 2.0 (or higher).
-
-       GNOME Video Arcade uses GConf to remember preferences, favorites
-       and other miscellaneous user data.  The GConf header files should
-       be available from your GNU/Linux distribution as a "development"
-       package.  The exact package name varies by distribution, but it
-       should be something similar to GConf2-devel (Fedora) or
-       libgconf2-dev (Debian/Ubuntu).
-
    - Header files for SQLite version 3.x.
 
        GNOME Video Arcade uses SQLite to store detailed information
diff --git a/src/gva-columns.c b/src/gva-columns.c
index 7c629bd..f3a1552 100644
--- a/src/gva-columns.c
+++ b/src/gva-columns.c
@@ -1109,7 +1109,7 @@ gva_columns_new_from_id (GvaGameStoreColumn column_id)
  * @column_name: the name of the column to create
  *
  * Creates a new #GtkTreeViewColumn from the given @column_name (as stored
- * in GConf), configured for use in the main tree view.
+ * in GSettings), configured for use in the main tree view.
  *
  * Returns: a new #GtkTreeViewColumn
  **/
@@ -1210,15 +1210,14 @@ columns_load_remove_name (GList **p_list, const gchar *name)
  * gva_columns_load:
  * @view: a #GtkTreeView
  *
- * Loads @view with columns in the order stored in the GConf key
- * <filename>/apps/gnome-video-arcade/all-columns</filename>, but only
- * makes visible those columns listed in
- * <filename>/apps/gnome-video-arcade/columns</filename>.  Newly supported
- * columns are appended to @view but remain invisible until explicitly
- * selected in the Preferences window.
+ * Loads @view with columns in the order stored in the GSettings key
+ * <filename>all-columns</filename>, but only makes visible those columns
+ * listed in <filename>columns</filename>.  Newly supported columns are
+ * appended to @view but remain invisible until explicitly selected in
+ * the Preferences window.
  *
- * Each column is loaded by reading the column name from GConf and passing
- * it to gva_columns_new_from_name() to create the #GtkTreeViewColumn.
+ * Each column is loaded by reading the column name from GSettings and
+ * passing it to gva_columns_new_from_name() to create the #GtkTreeViewColumn.
  **/
 void
 gva_columns_load (GtkTreeView *view)
@@ -1235,8 +1234,8 @@ gva_columns_load (GtkTreeView *view)
 
         /* Adding columns to the tree view will cause it to emit
          * "columns-changed" signals, for which gva_columns_save() is a
-         * handler.  Prevent the handler from modifying GConf keys while
-         * we're loading. */
+         * handler.  Prevent the handler from modifying GSettings keys
+         * while we're loading. */
         g_signal_handlers_block_by_func (view, gva_columns_save, NULL);
 
         settings = gva_get_settings ();
@@ -1349,10 +1348,9 @@ gva_columns_load (GtkTreeView *view)
  * gva_columns_save:
  * @view: a #GtkTreeView
  *
- * Writes the column order and visible columns of @view to the GConf
- * keys <filename>/apps/gnome-video-arcade/all-columns</filename> and
- * <filename>/apps/gnome-video-arcade/columns</filename> respectively,
- * using gva_columns_get_names() to extract the column names.
+ * Writes the column order and visible columns of @view to the GSettings
+ * keys <filename>all-columns</filename> and <filename>columns</filename>
+ * respectively, using gva_columns_get_names() to extract the column names.
  **/
 void
 gva_columns_save (GtkTreeView *view)
diff --git a/src/gva-main.c b/src/gva-main.c
index 6f7fe7e..e7c0847 100644
--- a/src/gva-main.c
+++ b/src/gva-main.c
@@ -678,9 +678,9 @@ gva_main_clear_search (void)
  *
  * Executes a game database search and configures the main window to
  * display the results.  More precisely, the function saves the search
- * entry contents to GConf, switches to the Search Results view, forces
- * an update, ensures a row in the resulting game list is selected, and
- * gives focus to the main tree view.
+ * entry contents to GSettings, switches to the Search Results view,
+ * forces an update, ensures a row in the resulting game list is selected,
+ * and gives focus to the main tree view.
  *
  * The SQL expression used in the database search is retrieved from
  * gva_main_get_search_expression().  It is applied while updating the
@@ -758,8 +758,7 @@ gva_main_get_last_search_text (void)
  * gva_main_set_last_search_text:
  * @text: the search entry text
  *
- * Writes @text to GConf key
- * <filename>/apps/gnome-video-arcade/search</filename>.
+ * Writes @text to GSettings key <filename>search</filename>.
  *
  * This is used to remember the search entry text from the previous session
  * of <emphasis>GNOME Video Arcade</emphasis> so that the same text can be
@@ -787,8 +786,8 @@ gva_main_set_last_search_text (const gchar *text)
  * most recent search, @column_name and @search_text are set to %NULL
  * and the function returns %FALSE.
  *
- * Returns: %TRUE if match values were successfully retrieved from GConf,
- *          %FALSE otherwise
+ * Returns: %TRUE if match values were successfully retrieved from
+ *          GSettings, %FALSE otherwise
  **/
 gboolean
 gva_main_get_last_selected_match (gchar **column_name,
@@ -834,9 +833,8 @@ fail:
  * @column_name: the column name of the completion match
  * @search_text: the search text of the completion match
  *
- * Writes @column_name and @search_text to GConf key
- * <filename>/apps/gnome-video-arcade/sql-expression</filename> as a
- * string pair.
+ * Writes @column_name and @search_text to GSettings key
+ * <filename>sql-expression</filename> as a string tuple.
  *
  * This is used to remember whether the search results from the previous
  * session of <emphasis>GNOME Video Arcade</emphasis> were the result of
diff --git a/src/gva-preferences.c b/src/gva-preferences.c
index a90f5da..a0d134e 100644
--- a/src/gva-preferences.c
+++ b/src/gva-preferences.c
@@ -110,8 +110,7 @@ gva_preferences_get_auto_play (void)
  * the Properties window or when the user selects a different
  * game while the Properties window is visible.
  *
- * The preference is stored in GConf key
- * <filename>/apps/gnome-video-arcade/auto-play</filename>.
+ * The preference is stored in GSettings key <filename>auto-play</filename>.
  **/
 void
 gva_preferences_set_auto_play (gboolean auto_play)
@@ -148,8 +147,7 @@ gva_preferences_get_auto_save (void)
  * Accepts the user's preference for whether to restore the emulated
  * machine's previous state when starting a game.
  *
- * The preference is stored in GConf key
- * <filename>/apps/gnome-video-arcade/auto-save</filename>.
+ * The preference is stored in GSettings key <filename>auto-save</filename>.
  **/
 void
 gva_preferences_set_auto_save (gboolean auto_save)
@@ -186,8 +184,7 @@ gva_preferences_get_full_screen (void)
  * Accepts the user's preference for whether to start games in full
  * screen mode.
  *
- * The preference is stored in GConf key
- * <filename>/apps/gnome-video-arcade/full-screen</filename>.
+ * The preference is stored in GSettings key <filename>full-screen</filename>.
  **/
 void
 gva_preferences_set_full_screen (gboolean full_screen)
@@ -224,8 +221,7 @@ gva_preferences_get_show_clones (void)
  * Accepts the user's preference for whether to show cloned games in
  * the main window.
  *
- * The preference is stored in GConf key
- * <filename>/apps/gnome-video-arcade/show-clones</filename>.
+ * The preference is stored in GSettings key <filename>show-clones</filename>.
  **/
 void
 gva_preferences_set_show_clones (gboolean show_clones)
diff --git a/src/gva-tree-view.c b/src/gva-tree-view.c
index 3986662..9b4ea22 100644
--- a/src/gva-tree-view.c
+++ b/src/gva-tree-view.c
@@ -608,8 +608,7 @@ gva_tree_view_get_last_selected_game (void)
  * gva_tree_view_set_last_selected_game:
  * @game: the name of a game
  *
- * Writes @game to GConf key
- * <filename>/apps/gnome-video-arcade/selected-game</filename>.
+ * Writes @game to GSettings key <filename>selected-game</filename>.
  *
  * This is used to remember which game was selected in the previous
  * session of <emphasis>GNOME Video Arcade</emphasis> so that the same
@@ -666,8 +665,8 @@ gva_tree_view_get_last_sort_column_id (GvaGameStoreColumn *column_id,
  * @column_id: sort column ID
  * @order: sort order
  *
- * Writes @column_id and @order to GConf key
- * <filename>/apps/gnome-video-arcade/sort-column</filename>.
+ * Writes @column_id and @order to GSettings key
+ * <filename>sort-column</filename>.
  *
  * This is used to remember which how the game list view was sorted in
  * the previous session of <emphasis>GNOME Video Arcade</emphasis> so that



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