gconf r2621 - in trunk: . backends gconf

From: kmaraas svn gnome org
To: svn-commits-list gnome org
Subject: gconf r2621 - in trunk: . backends gconf
Date: Sat, 28 Jun 2008 10:06:40 +0000 (UTC)
Author: kmaraas
Date: Sat Jun 28 10:06:40 2008
New Revision: 2621
URL: http://svn.gnome.org/viewvc/gconf?rev=2621&view=rev

Log:
2008-06-28  Kjartan Maraas  <kmaraas gnome org>

	* backends/evoldap-backend.c:
	* backends/gconf-merge-tree.c:
	* backends/markup-backend.c:
	* backends/markup-tree.c:
	* backends/markup-tree.h:
	* backends/xml-backend.c:
	* backends/xml-cache.c:
	* backends/xml-cache.h:
	* backends/xml-dir.c:
	* backends/xml-dir.h:
	* backends/xml-entry.c:
	* backends/xml-entry.h:
	* backends/xml-test.c:
	* gconf/Makefile.am:
	* gconf/gconf-backend.c:
	* gconf/gconf-backend.h:
	* gconf/gconf-changeset.c:
	* gconf/gconf-changeset.h:
	* gconf/gconf-client.c:
	* gconf/gconf-client.h:
	* gconf/gconf-database.c:
	* gconf/gconf-engine.h:
	* gconf/gconf-error.c:
	* gconf/gconf-glib.c:
	* gconf/gconf-internals.c: (gconf_get_daemon_dir),
	(gconf_activate_server):
	* gconf/gconf-internals.h:
	* gconf/gconf-listeners.c:
	* gconf/gconf-locale.c:
	* gconf/gconf-sanity-check.c:
	* gconf/gconf-schema.c:
	* gconf/gconf-schema.h:
	* gconf/gconf-sources.c:
	* gconf/gconf-value.c:
	* gconf/gconf.h:
	* gconf/gconftool.c:
	* gconf/testclient.c:
	* gconf/testgconfclient.c:
	Clean up includes and fix a couple compiler warnings.

Modified:
   trunk/ChangeLog
   trunk/backends/evoldap-backend.c
   trunk/backends/gconf-merge-tree.c
   trunk/backends/markup-backend.c
   trunk/backends/markup-tree.c
   trunk/backends/markup-tree.h
   trunk/backends/xml-backend.c
   trunk/backends/xml-cache.c
   trunk/backends/xml-cache.h
   trunk/backends/xml-dir.c
   trunk/backends/xml-dir.h
   trunk/backends/xml-entry.c
   trunk/backends/xml-entry.h
   trunk/backends/xml-test.c
   trunk/gconf/Makefile.am
   trunk/gconf/gconf-backend.c
   trunk/gconf/gconf-backend.h
   trunk/gconf/gconf-changeset.c
   trunk/gconf/gconf-changeset.h
   trunk/gconf/gconf-client.c
   trunk/gconf/gconf-client.h
   trunk/gconf/gconf-database.c
   trunk/gconf/gconf-engine.h
   trunk/gconf/gconf-error.c
   trunk/gconf/gconf-glib.c
   trunk/gconf/gconf-internals.c
   trunk/gconf/gconf-internals.h
   trunk/gconf/gconf-listeners.c
   trunk/gconf/gconf-locale.c
   trunk/gconf/gconf-sanity-check.c
   trunk/gconf/gconf-schema.c
   trunk/gconf/gconf-schema.h
   trunk/gconf/gconf-sources.c
   trunk/gconf/gconf-value.c
   trunk/gconf/gconf.h
   trunk/gconf/gconftool.c
   trunk/gconf/testclient.c
   trunk/gconf/testgconfclient.c

Modified: trunk/backends/evoldap-backend.c
==============================================================================
--- trunk/backends/evoldap-backend.c	(original)
+++ trunk/backends/evoldap-backend.c	Sat Jun 28 10:06:40 2008
@@ -30,9 +30,9 @@
 #include <libxml/xpath.h>
 #include <glib.h>
 
-#include <gconf/gconf.h>
-#include <gconf/gconf-backend.h>
-#include <gconf/gconf-internals.h>
+#include "gconf/gconf.h"
+#include "gconf/gconf-backend.h"
+#include "gconf/gconf-internals.h"
 
 typedef struct
 {

Modified: trunk/backends/gconf-merge-tree.c
==============================================================================
--- trunk/backends/gconf-merge-tree.c	(original)
+++ trunk/backends/gconf-merge-tree.c	Sat Jun 28 10:06:40 2008
@@ -20,7 +20,7 @@
  *     Mark McLoughlin <mark skynet ie>
  */
 
-#include <config.h>
+#include "config.h"
 #include <locale.h>
 
 #include "markup-tree.c"

Modified: trunk/backends/markup-backend.c
==============================================================================
--- trunk/backends/markup-backend.c	(original)
+++ trunk/backends/markup-backend.c	Sat Jun 28 10:06:40 2008
@@ -17,10 +17,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
-
-#include <gconf/gconf-backend.h>
-#include <gconf/gconf-internals.h>
-#include <gconf/gconf.h>
+#include "config.h"
+#include "gconf/gconf-backend.h"
+#include "gconf/gconf-internals.h"
+#include "gconf/gconf.h"
 
 #include <stdio.h>
 #include <time.h>

Modified: trunk/backends/markup-tree.c
==============================================================================
--- trunk/backends/markup-tree.c	(original)
+++ trunk/backends/markup-tree.c	Sat Jun 28 10:06:40 2008
@@ -18,9 +18,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include "config.h"
 #include <glib.h>
-#include <gconf/gconf-internals.h>
-#include <gconf/gconf-schema.h>
+#include "gconf/gconf-internals.h"
+#include "gconf/gconf-schema.h"
 #include "markup-tree.h"
 #include <sys/types.h>
 #include <sys/stat.h>

Modified: trunk/backends/markup-tree.h
==============================================================================
--- trunk/backends/markup-tree.h	(original)
+++ trunk/backends/markup-tree.h	Sat Jun 28 10:06:40 2008
@@ -21,7 +21,7 @@
 #define MARKUP_TREE_H
 
 #include <glib.h>
-#include <gconf/gconf-value.h>
+#include "gconf/gconf-value.h"
 
 typedef struct _MarkupTree  MarkupTree;
 typedef struct _MarkupDir   MarkupDir;

Modified: trunk/backends/xml-backend.c
==============================================================================
--- trunk/backends/xml-backend.c	(original)
+++ trunk/backends/xml-backend.c	Sat Jun 28 10:06:40 2008
@@ -18,10 +18,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
-
-#include <gconf/gconf-backend.h>
-#include <gconf/gconf-internals.h>
-#include <gconf/gconf.h>
+#include "config.h"
+#include "gconf/gconf-backend.h"
+#include "gconf/gconf-internals.h"
+#include "gconf/gconf.h"
 
 #include "xml-cache.h"
 

Modified: trunk/backends/xml-cache.c
==============================================================================
--- trunk/backends/xml-cache.c	(original)
+++ trunk/backends/xml-cache.c	Sat Jun 28 10:06:40 2008
@@ -17,8 +17,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include "config.h"
 #include "xml-cache.h"
-#include <gconf/gconf-internals.h>
+#include "gconf/gconf-internals.h"
 
 #include <string.h>
 #include <time.h>

Modified: trunk/backends/xml-cache.h
==============================================================================
--- trunk/backends/xml-cache.h	(original)
+++ trunk/backends/xml-cache.h	Sat Jun 28 10:06:40 2008
@@ -20,7 +20,7 @@
 #ifndef GCONF_XML_CACHE_H
 #define GCONF_XML_CACHE_H
 
-#include <gconf/gconf.h>
+#include "gconf/gconf.h"
 #include <libxml/tree.h>
 #include "xml-dir.h"
 

Modified: trunk/backends/xml-dir.c
==============================================================================
--- trunk/backends/xml-dir.c	(original)
+++ trunk/backends/xml-dir.c	Sat Jun 28 10:06:40 2008
@@ -17,6 +17,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include "config.h"
 #include "xml-dir.h"
 #include "xml-entry.h"
 
@@ -33,7 +34,7 @@
 #include <errno.h>
 #include <limits.h>
 
-#include <gconf/gconf-internals.h>
+#include "gconf/gconf-internals.h"
 
 /* This makes hash table safer when debugging */
 #ifndef GCONF_ENABLE_DEBUG

Modified: trunk/backends/xml-dir.h
==============================================================================
--- trunk/backends/xml-dir.h	(original)
+++ trunk/backends/xml-dir.h	Sat Jun 28 10:06:40 2008
@@ -20,7 +20,7 @@
 #ifndef GCONF_XML_DIR_H
 #define GCONF_XML_DIR_H
 
-#include <gconf/gconf.h>
+#include "gconf/gconf.h"
 #include <libxml/tree.h>
 
 /* Dir stores the information about a given directory */

Modified: trunk/backends/xml-entry.c
==============================================================================
--- trunk/backends/xml-entry.c	(original)
+++ trunk/backends/xml-entry.c	Sat Jun 28 10:06:40 2008
@@ -17,8 +17,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include "config.h"
 #include "xml-entry.h"
-#include <gconf/gconf-internals.h>
+#include "gconf/gconf-internals.h"
 #include <stdlib.h>
 #include <string.h>
 #include <libxml/entities.h>

Modified: trunk/backends/xml-entry.h
==============================================================================
--- trunk/backends/xml-entry.h	(original)
+++ trunk/backends/xml-entry.h	Sat Jun 28 10:06:40 2008
@@ -20,7 +20,7 @@
 #ifndef GCONF_XML_ENTRY_H
 #define GCONF_XML_ENTRY_H
 
-#include <gconf/gconf.h>
+#include "gconf/gconf.h"
 #include <libxml/tree.h>
 
 /* Entry stores all the information about a given key */

Modified: trunk/backends/xml-test.c
==============================================================================
--- trunk/backends/xml-test.c	(original)
+++ trunk/backends/xml-test.c	Sat Jun 28 10:06:40 2008
@@ -17,11 +17,12 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include "config.h"
 #include "xml-entry.h"
 #include "xml-dir.h"
 #include "xml-cache.h"
-#include <gconf/gconf-internals.h>
-#include <gconf/gconf-backend.h>
+#include "gconf/gconf-internals.h"
+#include "gconf/gconf-backend.h"
 #include <stdlib.h>
 #include <string.h>
 #include <libxml/entities.h>

Modified: trunk/gconf/Makefile.am
==============================================================================
--- trunk/gconf/Makefile.am	(original)
+++ trunk/gconf/Makefile.am	Sat Jun 28 10:06:40 2008
@@ -43,7 +43,7 @@
 
 $(libgconf_2_la_OBJECTS) $(gconftool_2_OBJECTS) $(gconfd_2_OBJECTS): $(built_sourcecode)
 
-CLEANFILES = $(BUILT_SOURCES)
+CLEANFILES = $(BUILT_SOURCES) $(service_DATA)
 
 DISTCLEANFILES = default.path
 

Modified: trunk/gconf/gconf-backend.c
==============================================================================
--- trunk/gconf/gconf-backend.c	(original)
+++ trunk/gconf/gconf-backend.c	Sat Jun 28 10:06:40 2008
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-
+#include "config.h"
 #include "gconf-backend.h"
 #include "gconf-internals.h"
 #include <stdio.h>

Modified: trunk/gconf/gconf-backend.h
==============================================================================
--- trunk/gconf/gconf-backend.h	(original)
+++ trunk/gconf/gconf-backend.h	Sat Jun 28 10:06:40 2008
@@ -21,9 +21,9 @@
 #ifndef GCONF_GCONFBACKEND_H
 #define GCONF_GCONFBACKEND_H
 
-#include <gconf/gconf-internals.h>
+#include "gconf/gconf-internals.h"
 #include <gmodule.h>
-#include <gconf/gconf-sources.h>
+#include "gconf/gconf-sources.h"
 
 /*
  * This vtable is more complicated than strictly necessary, hoping

Modified: trunk/gconf/gconf-changeset.c
==============================================================================
--- trunk/gconf/gconf-changeset.c	(original)
+++ trunk/gconf/gconf-changeset.c	Sat Jun 28 10:06:40 2008
@@ -17,6 +17,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include "config.h"
 #include "gconf-changeset.h"
 #include "gconf-internals.h"
 

Modified: trunk/gconf/gconf-changeset.h
==============================================================================
--- trunk/gconf/gconf-changeset.h	(original)
+++ trunk/gconf/gconf-changeset.h	Sat Jun 28 10:06:40 2008
@@ -20,7 +20,7 @@
 #ifndef GCONF_GCONF_CHANGESET_H
 #define GCONF_GCONF_CHANGESET_H
 
-#include <gconf/gconf.h>
+#include "gconf/gconf.h"
 
 G_BEGIN_DECLS
 

Modified: trunk/gconf/gconf-client.c
==============================================================================
--- trunk/gconf/gconf-client.c	(original)
+++ trunk/gconf/gconf-client.c	Sat Jun 28 10:06:40 2008
@@ -18,11 +18,12 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
 
 #include "gconf-client.h"
-#include <gconf/gconf-internals.h>
+#include "gconf/gconf-internals.h"
 
 #include "gconfmarshal.h"
 #include "gconfmarshal.c"

Modified: trunk/gconf/gconf-client.h
==============================================================================
--- trunk/gconf/gconf-client.h	(original)
+++ trunk/gconf/gconf-client.h	Sat Jun 28 10:06:40 2008
@@ -22,9 +22,9 @@
 #define GCONF_GCONF_CLIENT_H
 
 #include <glib-object.h>
-#include <gconf/gconf.h>
-#include <gconf/gconf-listeners.h>
-#include <gconf/gconf-changeset.h>
+#include "gconf/gconf.h"
+#include "gconf/gconf-listeners.h"
+#include "gconf/gconf-changeset.h"
 
 G_BEGIN_DECLS
 

Modified: trunk/gconf/gconf-database.c
==============================================================================
--- trunk/gconf/gconf-database.c	(original)
+++ trunk/gconf/gconf-database.c	Sat Jun 28 10:06:40 2008
@@ -17,6 +17,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include "config.h"
 #include "gconf-database.h"
 #include "gconf-listeners.h"
 #include "gconf-sources.h"

Modified: trunk/gconf/gconf-engine.h
==============================================================================
--- trunk/gconf/gconf-engine.h	(original)
+++ trunk/gconf/gconf-engine.h	Sat Jun 28 10:06:40 2008
@@ -21,7 +21,7 @@
 #define GCONF_GCONF_ENGINE_H
 
 #include <glib.h>
-#include <gconf/gconf-error.h>
+#include "gconf/gconf-error.h"
 
 G_BEGIN_DECLS
 

Modified: trunk/gconf/gconf-error.c
==============================================================================
--- trunk/gconf/gconf-error.c	(original)
+++ trunk/gconf/gconf-error.c	Sat Jun 28 10:06:40 2008
@@ -17,6 +17,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include "config.h"
 #include "gconf-error.h"
 #include "gconf-internals.h"
 #include <stdarg.h>

Modified: trunk/gconf/gconf-glib.c
==============================================================================
--- trunk/gconf/gconf-glib.c	(original)
+++ trunk/gconf/gconf-glib.c	Sat Jun 28 10:06:40 2008
@@ -17,6 +17,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include "config.h"
 #include "gconf-glib-public.h"
 #include "gconf-glib-private.h"
 #include <string.h>

Modified: trunk/gconf/gconf-internals.c
==============================================================================
--- trunk/gconf/gconf-internals.c	(original)
+++ trunk/gconf/gconf-internals.c	Sat Jun 28 10:06:40 2008
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 #include "gconf-internals.h"
 #include "gconf-backend.h"
 #include "gconf-schema.h"
@@ -2796,7 +2796,7 @@
     {
       char *s;
       char *subdir;
-      char *tmpdir;
+      const char *tmpdir;
 
       subdir = g_strconcat ("gconfd-", g_get_user_name (), NULL);
       
@@ -2841,7 +2841,6 @@
                        GError  **error)
 {
   ConfigServer server = CORBA_OBJECT_NIL;
-  GError *tmp_err;
   GString *failure_log;
   CORBA_Environment ev;
 
@@ -2875,7 +2874,6 @@
       return server;
     }
 
- out:
   if (server == CORBA_OBJECT_NIL &&
       error &&
       *error == NULL)

Modified: trunk/gconf/gconf-internals.h
==============================================================================
--- trunk/gconf/gconf-internals.h	(original)
+++ trunk/gconf/gconf-internals.h	Sat Jun 28 10:06:40 2008
@@ -29,11 +29,9 @@
 #include <config.h>
 #include <libintl.h>
 
-#define _(String) dgettext (GETTEXT_PACKAGE, String)
-#define N_(String) (String)
-
 #include <glib.h>
 #include <glib/gstdio.h>
+#include <glib/gi18n-lib.h>
 #include "gconf-error.h"
 #include "gconf-value.h"
 #include "gconf-engine.h"

Modified: trunk/gconf/gconf-listeners.c
==============================================================================
--- trunk/gconf/gconf-listeners.c	(original)
+++ trunk/gconf/gconf-listeners.c	Sat Jun 28 10:06:40 2008
@@ -17,6 +17,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include "config.h"
 #include "gconf-listeners.h"
 #include "gconf.h"
 

Modified: trunk/gconf/gconf-locale.c
==============================================================================
--- trunk/gconf/gconf-locale.c	(original)
+++ trunk/gconf/gconf-locale.c	Sat Jun 28 10:06:40 2008
@@ -17,6 +17,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include "config.h"
 #include "gconf-locale.h"
 #include "gconf-internals.h"
 #include <sys/time.h>

Modified: trunk/gconf/gconf-sanity-check.c
==============================================================================
--- trunk/gconf/gconf-sanity-check.c	(original)
+++ trunk/gconf/gconf-sanity-check.c	Sat Jun 28 10:06:40 2008
@@ -17,6 +17,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include "config.h"
 #include "gconf.h"
 #include "gconf-internals.h"
 #include "gconf-sources.h"

Modified: trunk/gconf/gconf-schema.c
==============================================================================
--- trunk/gconf/gconf-schema.c	(original)
+++ trunk/gconf/gconf-schema.c	Sat Jun 28 10:06:40 2008
@@ -17,6 +17,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include "config.h"
 #include "gconf-schema.h"
 #include "gconf-internals.h"
 

Modified: trunk/gconf/gconf-schema.h
==============================================================================
--- trunk/gconf/gconf-schema.h	(original)
+++ trunk/gconf/gconf-schema.h	Sat Jun 28 10:06:40 2008
@@ -23,7 +23,7 @@
 
 #include <glib.h>
 
-#include <gconf/gconf-value.h>
+#include "gconf/gconf-value.h"
 
 G_BEGIN_DECLS
 

Modified: trunk/gconf/gconf-sources.c
==============================================================================
--- trunk/gconf/gconf-sources.c	(original)
+++ trunk/gconf/gconf-sources.c	Sat Jun 28 10:06:40 2008
@@ -18,6 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include "config.h"
 #include "gconf-backend.h"
 #include "gconf-sources.h"
 #include "gconf-internals.h"

Modified: trunk/gconf/gconf-value.c
==============================================================================
--- trunk/gconf/gconf-value.c	(original)
+++ trunk/gconf/gconf-value.c	Sat Jun 28 10:06:40 2008
@@ -17,6 +17,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include "config.h"
 #include "gconf-value.h"
 #include "gconf-error.h"
 #include "gconf-schema.h"

Modified: trunk/gconf/gconf.h
==============================================================================
--- trunk/gconf/gconf.h	(original)
+++ trunk/gconf/gconf.h	Sat Jun 28 10:06:40 2008
@@ -24,10 +24,10 @@
 
 G_BEGIN_DECLS
 
-#include <gconf/gconf-schema.h>
-#include <gconf/gconf-engine.h>
-#include <gconf/gconf-error.h>
-#include <gconf/gconf-enum-types.h>
+#include "gconf/gconf-schema.h"
+#include "gconf/gconf-engine.h"
+#include "gconf/gconf-error.h"
+#include "gconf/gconf-enum-types.h"
 
 typedef void (*GConfNotifyFunc) (GConfEngine* conf,
                                  guint cnxn_id,

Modified: trunk/gconf/gconftool.c
==============================================================================
--- trunk/gconf/gconftool.c	(original)
+++ trunk/gconf/gconftool.c	Sat Jun 28 10:06:40 2008
@@ -17,6 +17,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include "config.h"
 #include "gconf.h"
 #include "gconf-internals.h"
 #include <stdio.h>

Modified: trunk/gconf/testclient.c
==============================================================================
--- trunk/gconf/testclient.c	(original)
+++ trunk/gconf/testclient.c	Sat Jun 28 10:06:40 2008
@@ -18,6 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include "config.h"
 #include "gconf.h"
 #include "gconf-orbit.h"
 #include <stdio.h>

Modified: trunk/gconf/testgconfclient.c
==============================================================================
--- trunk/gconf/testgconfclient.c	(original)
+++ trunk/gconf/testgconfclient.c	Sat Jun 28 10:06:40 2008
@@ -18,6 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include "config.h"
 #include "gconf-client.h"
 
 #include <gtk/gtk.h>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]