diff options
38 files changed, 102 insertions, 45 deletions
@@ -1,3 +1,45 @@ +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. + 2008-06-04 Kjartan Maraas <kmaraas@gnome.org> * configure.in: Bump version after tagging. diff --git a/backends/evoldap-backend.c b/backends/evoldap-backend.c index 67da2867..53d0ce9d 100644 --- a/backends/evoldap-backend.c +++ b/backends/evoldap-backend.c @@ -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 { diff --git a/backends/gconf-merge-tree.c b/backends/gconf-merge-tree.c index 95334051..f1b6102d 100644 --- a/backends/gconf-merge-tree.c +++ b/backends/gconf-merge-tree.c @@ -20,7 +20,7 @@ * Mark McLoughlin <mark@skynet.ie> */ -#include <config.h> +#include "config.h" #include <locale.h> #include "markup-tree.c" diff --git a/backends/markup-backend.c b/backends/markup-backend.c index 86ceb13f..d81809c8 100644 --- a/backends/markup-backend.c +++ b/backends/markup-backend.c @@ -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> diff --git a/backends/markup-tree.c b/backends/markup-tree.c index 61ead91b..72ed1a4c 100644 --- a/backends/markup-tree.c +++ b/backends/markup-tree.c @@ -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> diff --git a/backends/markup-tree.h b/backends/markup-tree.h index 0d5d9d42..6f1d0ad8 100644 --- a/backends/markup-tree.h +++ b/backends/markup-tree.h @@ -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; diff --git a/backends/xml-backend.c b/backends/xml-backend.c index 30ff0019..140e3173 100644 --- a/backends/xml-backend.c +++ b/backends/xml-backend.c @@ -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" diff --git a/backends/xml-cache.c b/backends/xml-cache.c index 4186628d..261ad55c 100644 --- a/backends/xml-cache.c +++ b/backends/xml-cache.c @@ -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> diff --git a/backends/xml-cache.h b/backends/xml-cache.h index aa69e59c..ce49d43a 100644 --- a/backends/xml-cache.h +++ b/backends/xml-cache.h @@ -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" diff --git a/backends/xml-dir.c b/backends/xml-dir.c index 9c32d8e9..5b1d5b30 100644 --- a/backends/xml-dir.c +++ b/backends/xml-dir.c @@ -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 diff --git a/backends/xml-dir.h b/backends/xml-dir.h index ebc27eeb..688e3fc1 100644 --- a/backends/xml-dir.h +++ b/backends/xml-dir.h @@ -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 */ diff --git a/backends/xml-entry.c b/backends/xml-entry.c index ececb383..9d2ccaed 100644 --- a/backends/xml-entry.c +++ b/backends/xml-entry.c @@ -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> diff --git a/backends/xml-entry.h b/backends/xml-entry.h index 6724fd8d..622b4858 100644 --- a/backends/xml-entry.h +++ b/backends/xml-entry.h @@ -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 */ diff --git a/backends/xml-test.c b/backends/xml-test.c index b964a419..05973beb 100644 --- a/backends/xml-test.c +++ b/backends/xml-test.c @@ -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> diff --git a/gconf/Makefile.am b/gconf/Makefile.am index 51357f30..74d456bc 100644 --- a/gconf/Makefile.am +++ b/gconf/Makefile.am @@ -43,7 +43,7 @@ BUILT_SOURCES = \ $(libgconf_2_la_OBJECTS) $(gconftool_2_OBJECTS) $(gconfd_2_OBJECTS): $(built_sourcecode) -CLEANFILES = $(BUILT_SOURCES) +CLEANFILES = $(BUILT_SOURCES) $(service_DATA) DISTCLEANFILES = default.path diff --git a/gconf/gconf-backend.c b/gconf/gconf-backend.c index ca6b1929..734ac1d2 100644 --- a/gconf/gconf-backend.c +++ b/gconf/gconf-backend.c @@ -18,7 +18,7 @@ * Boston, MA 02111-1307, USA. */ - +#include "config.h" #include "gconf-backend.h" #include "gconf-internals.h" #include <stdio.h> diff --git a/gconf/gconf-backend.h b/gconf/gconf-backend.h index a8a3c24f..70107111 100644 --- a/gconf/gconf-backend.h +++ b/gconf/gconf-backend.h @@ -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 diff --git a/gconf/gconf-changeset.c b/gconf/gconf-changeset.c index ecd0c8e0..cc2dd52e 100644 --- a/gconf/gconf-changeset.c +++ b/gconf/gconf-changeset.c @@ -17,6 +17,7 @@ * Boston, MA 02111-1307, USA. */ +#include "config.h" #include "gconf-changeset.h" #include "gconf-internals.h" diff --git a/gconf/gconf-changeset.h b/gconf/gconf-changeset.h index bebec014..1b8fc4f6 100644 --- a/gconf/gconf-changeset.h +++ b/gconf/gconf-changeset.h @@ -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 diff --git a/gconf/gconf-client.c b/gconf/gconf-client.c index c79dfae0..fa0e022a 100644 --- a/gconf/gconf-client.c +++ b/gconf/gconf-client.c @@ -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" diff --git a/gconf/gconf-client.h b/gconf/gconf-client.h index d24af511..29eec237 100644 --- a/gconf/gconf-client.h +++ b/gconf/gconf-client.h @@ -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 diff --git a/gconf/gconf-database.c b/gconf/gconf-database.c index d7da2312..50e09f75 100644 --- a/gconf/gconf-database.c +++ b/gconf/gconf-database.c @@ -17,6 +17,7 @@ * Boston, MA 02111-1307, USA. */ +#include "config.h" #include "gconf-database.h" #include "gconf-listeners.h" #include "gconf-sources.h" diff --git a/gconf/gconf-engine.h b/gconf/gconf-engine.h index 009a49dd..7ee72266 100644 --- a/gconf/gconf-engine.h +++ b/gconf/gconf-engine.h @@ -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 diff --git a/gconf/gconf-error.c b/gconf/gconf-error.c index 053d7146..2c2bfdb3 100644 --- a/gconf/gconf-error.c +++ b/gconf/gconf-error.c @@ -17,6 +17,7 @@ * Boston, MA 02111-1307, USA. */ +#include "config.h" #include "gconf-error.h" #include "gconf-internals.h" #include <stdarg.h> diff --git a/gconf/gconf-glib.c b/gconf/gconf-glib.c index 266f7b9c..002248de 100644 --- a/gconf/gconf-glib.c +++ b/gconf/gconf-glib.c @@ -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> diff --git a/gconf/gconf-internals.c b/gconf/gconf-internals.c index d9797be2..783d984d 100644 --- a/gconf/gconf-internals.c +++ b/gconf/gconf-internals.c @@ -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 @@ gconf_get_daemon_dir (void) { char *s; char *subdir; - char *tmpdir; + const char *tmpdir; subdir = g_strconcat ("gconfd-", g_get_user_name (), NULL); @@ -2841,7 +2841,6 @@ gconf_activate_server (gboolean start_if_not_found, GError **error) { ConfigServer server = CORBA_OBJECT_NIL; - GError *tmp_err; GString *failure_log; CORBA_Environment ev; @@ -2875,7 +2874,6 @@ gconf_activate_server (gboolean start_if_not_found, return server; } - out: if (server == CORBA_OBJECT_NIL && error && *error == NULL) diff --git a/gconf/gconf-internals.h b/gconf/gconf-internals.h index 1852af5f..dc8d35ef 100644 --- a/gconf/gconf-internals.h +++ b/gconf/gconf-internals.h @@ -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" diff --git a/gconf/gconf-listeners.c b/gconf/gconf-listeners.c index a170ba2d..b1193918 100644 --- a/gconf/gconf-listeners.c +++ b/gconf/gconf-listeners.c @@ -17,6 +17,7 @@ * Boston, MA 02111-1307, USA. */ +#include "config.h" #include "gconf-listeners.h" #include "gconf.h" diff --git a/gconf/gconf-locale.c b/gconf/gconf-locale.c index 39b97ddb..c885f921 100644 --- a/gconf/gconf-locale.c +++ b/gconf/gconf-locale.c @@ -17,6 +17,7 @@ * Boston, MA 02111-1307, USA. */ +#include "config.h" #include "gconf-locale.h" #include "gconf-internals.h" #include <sys/time.h> diff --git a/gconf/gconf-sanity-check.c b/gconf/gconf-sanity-check.c index a88c9a04..e466960f 100644 --- a/gconf/gconf-sanity-check.c +++ b/gconf/gconf-sanity-check.c @@ -17,6 +17,7 @@ * Boston, MA 02111-1307, USA. */ +#include "config.h" #include "gconf.h" #include "gconf-internals.h" #include "gconf-sources.h" diff --git a/gconf/gconf-schema.c b/gconf/gconf-schema.c index 395ee9d2..6c8c0a26 100644 --- a/gconf/gconf-schema.c +++ b/gconf/gconf-schema.c @@ -17,6 +17,7 @@ * Boston, MA 02111-1307, USA. */ +#include "config.h" #include "gconf-schema.h" #include "gconf-internals.h" diff --git a/gconf/gconf-schema.h b/gconf/gconf-schema.h index 1f512f30..59217357 100644 --- a/gconf/gconf-schema.h +++ b/gconf/gconf-schema.h @@ -23,7 +23,7 @@ #include <glib.h> -#include <gconf/gconf-value.h> +#include "gconf/gconf-value.h" G_BEGIN_DECLS diff --git a/gconf/gconf-sources.c b/gconf/gconf-sources.c index 2187fb8c..d66ab736 100644 --- a/gconf/gconf-sources.c +++ b/gconf/gconf-sources.c @@ -18,6 +18,7 @@ * Boston, MA 02111-1307, USA. */ +#include "config.h" #include "gconf-backend.h" #include "gconf-sources.h" #include "gconf-internals.h" diff --git a/gconf/gconf-value.c b/gconf/gconf-value.c index bd02cfaa..f03e241c 100644 --- a/gconf/gconf-value.c +++ b/gconf/gconf-value.c @@ -17,6 +17,7 @@ * Boston, MA 02111-1307, USA. */ +#include "config.h" #include "gconf-value.h" #include "gconf-error.h" #include "gconf-schema.h" diff --git a/gconf/gconf.h b/gconf/gconf.h index a5390f02..1b128abf 100644 --- a/gconf/gconf.h +++ b/gconf/gconf.h @@ -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, diff --git a/gconf/gconftool.c b/gconf/gconftool.c index 2c1a55c5..c7569c27 100644 --- a/gconf/gconftool.c +++ b/gconf/gconftool.c @@ -17,6 +17,7 @@ * Boston, MA 02111-1307, USA. */ +#include "config.h" #include "gconf.h" #include "gconf-internals.h" #include <stdio.h> diff --git a/gconf/testclient.c b/gconf/testclient.c index fc879eac..adfae6da 100644 --- a/gconf/testclient.c +++ b/gconf/testclient.c @@ -18,6 +18,7 @@ * Boston, MA 02111-1307, USA. */ +#include "config.h" #include "gconf.h" #include "gconf-orbit.h" #include <stdio.h> diff --git a/gconf/testgconfclient.c b/gconf/testgconfclient.c index f6f25d47..5b0f15b8 100644 --- a/gconf/testgconfclient.c +++ b/gconf/testgconfclient.c @@ -18,6 +18,7 @@ * Boston, MA 02111-1307, USA. */ +#include "config.h" #include "gconf-client.h" #include <gtk/gtk.h> |