devhelp r1212 - in trunk: . src

[rhult svn gnome org]

Author: rhult
Date: Sat Oct 11 06:43:54 2008
New Revision: 1212
URL: http://svn.gnome.org/viewvc/devhelp?rev=1212&view=rev

Log:
2008-10-11  Richard Hult  <richard imendio com>

	* src/ige-conf-gconf.c: (ige_conf_init), (ige_conf_add_defaults):
	* src/ige-conf-private.h:
	* src/ige-conf.c: (_ige_conf_defaults_free_list): Fix build with
	gconf implementation.


Modified:
   trunk/ChangeLog
   trunk/src/ige-conf-gconf.c
   trunk/src/ige-conf-private.h
   trunk/src/ige-conf.c

Modified: trunk/src/ige-conf-gconf.c
==============================================================================
--- trunk/src/ige-conf-gconf.c	(original)
+++ trunk/src/ige-conf-gconf.c	Sat Oct 11 06:43:54 2008
@@ -21,7 +21,7 @@
 #include "config.h"
 #include <string.h>
 #include <gconf/gconf-client.h>
-#include "ige-conf.h"
+#include "ige-conf-private.h"
 
 typedef struct {
         GConfClient *gconf_client;
@@ -74,8 +74,6 @@
 ige_conf_init (IgeConf *conf)
 {
         IgeConfPriv *priv;
-        GList       *defaults;
-        gchar       *root;
 
         priv = GET_PRIVATE (conf);
 
@@ -96,8 +94,9 @@
 ige_conf_add_defaults (IgeConf     *conf,
                        const gchar *path)
 {
-        GList *defaults;
-        gchar *root;
+        IgeConfPriv *priv = GET_PRIVATE (conf);
+        GList       *defaults;
+        gchar       *root;
 
         defaults = _ige_conf_defaults_read_file (path, NULL);
         root = _ige_conf_defaults_get_root (defaults);

Modified: trunk/src/ige-conf-private.h
==============================================================================
--- trunk/src/ige-conf-private.h	(original)
+++ trunk/src/ige-conf-private.h	Sat Oct 11 06:43:54 2008
@@ -41,8 +41,7 @@
 GList *_ige_conf_defaults_read_file (const gchar  *path,
                                      GError      **error);
 void   _ige_conf_defaults_free_list (GList        *defaults);
-
-const gchar *_ige_conf_defaults_get_root (GList *defaults);
+gchar *_ige_conf_defaults_get_root  (GList        *defaults);
 
 G_END_DECLS
 

Modified: trunk/src/ige-conf.c
==============================================================================
--- trunk/src/ige-conf.c	(original)
+++ trunk/src/ige-conf.c	Sat Oct 11 06:43:54 2008
@@ -215,14 +215,14 @@
         g_list_free (defaults);
 }
 
-const gchar *
+gchar *
 _ige_conf_defaults_get_root (GList *defaults)
 {
-        GList        *l;
-        const gchar  *root;
-        gchar       **strv_prev = NULL;
-        gint          i;
-        gint          last_common = G_MAXINT;
+        GList  *l;
+        gchar  *root;
+        gchar **strv_prev = NULL;
+        gint    i;
+        gint    last_common = G_MAXINT;
 
         for (l = defaults; l; l = l->next) {
                 IgeConfDefaultItem  *item = l->data;