gconf r2502 - in trunk: . gconf

[kmaraas svn gnome org]

Author: kmaraas
Date: Tue Jan  8 14:16:57 2008
New Revision: 2502
URL: http://svn.gnome.org/viewvc/gconf?rev=2502&view=rev

Log:
2008-01-08  Kjartan Maraas  <kmaraas gnome org>

	* gconf/gconf-backend.c: (gconf_backend_verify_vtable):
	* gconf/gconf-database.c: (gconf_database_add_listener):
	* gconf/gconfd.c: (logfile_save), (restore_client):
	* gconf/gconftool.c: (hash_install_foreach):
	String review by Clytie Siddall. Closes bug #315212

	configure.in: Bump version to 2.21.1 because of the string changes
	above.

Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/gconf/gconf-backend.c
   trunk/gconf/gconf-database.c
   trunk/gconf/gconfd.c
   trunk/gconf/gconftool.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Jan  8 14:16:57 2008
@@ -1,4 +1,4 @@
-AC_INIT([GConf],[2.20.2],[http://bugzilla.gnome.org/enter_bug.cgi?product=GConf],[GConf])
+AC_INIT([GConf],[2.21.1],[http://bugzilla.gnome.org/enter_bug.cgi?product=GConf],[GConf])
 
 AC_DEFUN([AC_FYI], [echo "FYI: " $1])
 
@@ -78,7 +78,7 @@
 
 dnl increment any time the source changes; set to 
 dnl  0 if you increment CURRENT
-GCONF_REVISION=2
+GCONF_REVISION=3
 
 dnl increment if any interfaces have been added; set to 0
 dnl  if any interfaces have been removed. removal has 

Modified: trunk/gconf/gconf-backend.c
==============================================================================
--- trunk/gconf/gconf-backend.c	(original)
+++ trunk/gconf/gconf-backend.c	Tue Jan  8 14:16:57 2008
@@ -258,7 +258,7 @@
   if (!vtable)
     {
       gconf_set_error(err,
-		      GCONF_ERROR_FAILED, _("Backend `%s' failed return a vtable\n"),
+		      GCONF_ERROR_FAILED, _("Backend `%s' failed to return a vtable\n"),
 		      backend_name);
       return FALSE;
     }

Modified: trunk/gconf/gconf-database.c
==============================================================================
--- trunk/gconf/gconf-database.c	(original)
+++ trunk/gconf/gconf-database.c	Tue Jan  8 14:16:57 2008
@@ -1116,7 +1116,7 @@
        * app to simply continue.
        */
       gconf_log (GCL_WARNING,
-		 _("Failed to log addition of listener %s (%s);"
+		 _("Failed to log addition of listener %s (%s); "
 		   "will not be able to restore this listener on "
 		   "gconfd restart, resulting in unreliable "
 		   "notification of configuration changes."),

Modified: trunk/gconf/gconfd.c
==============================================================================
--- trunk/gconf/gconfd.c	(original)
+++ trunk/gconf/gconfd.c	Tue Jan  8 14:16:57 2008
@@ -1577,7 +1577,7 @@
   if (g_rename (tmpfile, logfile) < 0)
     {
       gconf_log (GCL_WARNING,
-                 _("Failed to move new save state file into place: %s"),
+                 _("Failed to move new saved state file into place: %s"),
                  g_strerror (errno));
 
       /* Try to restore old file */
@@ -1928,7 +1928,7 @@
   
   if (ev._major != CORBA_NO_EXCEPTION)
     {
-      gconf_log (GCL_DEBUG, "Failed to update client in saved state file, probably the client no longer exists");
+      gconf_log (GCL_DEBUG, "Failed to update client in saved state file, the client probably no longer exists");
 
       goto finished;
     }

Modified: trunk/gconf/gconftool.c
==============================================================================
--- trunk/gconf/gconftool.c	(original)
+++ trunk/gconf/gconftool.c	Tue Jan  8 14:16:57 2008
@@ -3681,7 +3681,7 @@
 	{
 	  g_assert(error != NULL);
 
-	  g_printerr (_("WARNING: failed to install schema `%s' locale `%s': %s\n"),
+	  g_printerr (_("WARNING: failed to install schema `%s', locale `%s': %s\n"),
 		      info->key, gconf_schema_get_locale(schema), error->message);
 	  g_error_free(error);
 	  error = NULL;
@@ -3699,7 +3699,7 @@
 	{
 	  g_assert(error != NULL);
 
-	  g_printerr (_("WARNING: failed to uninstall schema `%s' locale `%s': %s\n"),
+	  g_printerr (_("WARNING: failed to uninstall schema `%s', locale `%s': %s\n"),
 		      info->key, gconf_schema_get_locale(schema), error->message);
 	  g_error_free(error);
 	  error = NULL;