Update TODO

Remove profiling-switch from configure.ac.in
Update xfconf-query to use the new 'Reset' function in favour of the deprecated 'remove'.



(Old svn revision: 27979)

3 files changed, 12 insertions, 25 deletions

diff --git a/TODO b/TODO
index 0e80ae4..47fbb6d 100644
--- a/TODO
+++ b/TODO
@@ -7,10 +7,7 @@
   - tests for all the array and struct stuff
 * MCS settings migration code
   - special backend to read config entries
-  - script/c code for users who want to migrate all their settings to
-    xfconf and ditch MCS entirely
 * expire channels from memory if they aren't accessed for a while
-* add a GetAllChannels() method to enable a gconf-editor type app
 * PropertyChanged signal works, but...
   - optimise by checking previous value; don't fire signal if the value
     hasn't really changed.  will this slow down the daemon too much?
diff --git a/configure.ac.in b/configure.ac.in
index 9b4938f..b9a980f 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -152,16 +152,6 @@ if test "x$have_gnuc_visibility" = "xyes"; then
 fi
 AM_CONDITIONAL([HAVE_GNUC_VISIBILITY], [test "x$have_gnuc_visibility" = "xyes"])
 
-AC_ARG_ENABLE([profiling],
-              AC_HELP_STRING([--enable-profiling],
-                             [Enable gprof profiling support]),
-              [enable_profiling=yes])
-if test "x$enable_profiling" = "xyes"; then
-    AC_DEFINE([XFCONF_ENABLE_PROFILING], [1],
-              [Define if gprof profiling should be compiled in])
-fi
-AM_CONDITIONAL([ENABLE_PROFILING], [test "x$enable_profiling" = "xyes"])
-
 AC_OUTPUT([
 Makefile
 common/Makefile
diff --git a/xfconf-query/main.c b/xfconf-query/main.c
index c33b8d8..8b09395 100644
--- a/xfconf-query/main.c
+++ b/xfconf-query/main.c
@@ -60,7 +60,7 @@ static gboolean version = FALSE;
 static gboolean list = FALSE;
 static gboolean verbose = FALSE;
 static gboolean create = FALSE;
-static gboolean remove = FALSE;
+static gboolean reset = FALSE;
 static gchar *channel_name = NULL;
 static gchar *property_name = NULL;
 static gchar **set_value = NULL;
@@ -167,8 +167,8 @@ static GOptionEntry entries[] =
        N_("Specify the property value type"),
        NULL
     },
-    {    "remove", 'r', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &remove,
-        N_("Remove property"),
+    {    "reset", 'r', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &reset,
+        N_("Reset property"),
         NULL
     },
     {   "export", 'x', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_STRING, &export_file,
@@ -233,15 +233,15 @@ main(int argc, char **argv)
         return 1;
     }
 
-    if (create && remove)
+    if (create && reset)
     {
-        g_print("--create and --remove options can not be used together,\naborting...\n");
+        g_print("--create and --reset options can not be used together,\naborting...\n");
         return 1;
     }
 
-    if ((create || remove) && (list))
+    if ((create || reset) && (list))
     {
-        g_print("--create and --remove options can not be used together with\n --list\naborting...\n");
+        g_print("--create and --reset options can not be used together with\n --list\naborting...\n");
         return 1;
     }
 
@@ -251,9 +251,9 @@ main(int argc, char **argv)
         return 1;
     }
 
-    if ((import_file || export_file) && (list || property_name || create || remove))
+    if ((import_file || export_file) && (list || property_name || create || reset))
     {
-        g_print("--import and --export options can not be used together with\n --create, --remove, --property and --list,\naborting...\n");
+        g_print("--import and --export options can not be used together with\n --create, --reset, --property and --list,\naborting...\n");
         return 1;
     }
 
@@ -261,10 +261,10 @@ main(int argc, char **argv)
 
     if (property_name)
     {
-        /** Remove property */
-        if (remove)
+        /** Reset property */
+        if (reset)
         {
-            xfconf_channel_remove_property(channel, property_name);
+            xfconf_channel_reset_property(channel, property_name, FALSE);
         }
         /** Read value */
         else if(set_value == NULL || set_value[0] == NULL)