[goffice] Fix configuration loading when using .gnumericrc. [#600654]

[Jean Bréfort <jbrefort src gnome org>]

commit 0482067fb122173707eb5394683454541ddea335
Author: Jean Brefort <jean brefort normalesup org>
Date:   Wed Nov 4 13:12:38 2009 +0100

    Fix configuration loading when using .gnumericrc. [#600654]

 ChangeLog                     |    5 +++++
 NEWS                          |    1 +
 goffice/app/go-conf-keyfile.c |    2 +-
 3 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 48c0979..2c6c44e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-04  Jean Brefort  <jean brefort normalesup org>
+
+	* goffice/app/go-conf-keyfile.c (go_conf_get_real_key): do not add a '/'
+	when subkey is NULL. [#600654]
+
 2009-11-03  Jean Brefort  <jean brefort normalesup org>
 
 	* goffice/graph/gog-child-button.c (ensure_menu): add parent name to
diff --git a/NEWS b/NEWS
index c2a82b0..bed17a8 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@ goffice 0.7.16:
 
 Jean:
 	* Add parent name for new objects in the graph guru "Add" menu.
+	* Fix configuratioin loading when using .gnumericrc. [#600654]
 
 --------------------------------------------------------------------------
 goffice 0.7.15:
diff --git a/goffice/app/go-conf-keyfile.c b/goffice/app/go-conf-keyfile.c
index 26bd7cd..f837a81 100644
--- a/goffice/app/go-conf-keyfile.c
+++ b/goffice/app/go-conf-keyfile.c
@@ -54,7 +54,7 @@ static void dump_key_data_to_file_cb (char const *rcfile, GKeyFile *key_file)
 static gchar *
 go_conf_get_real_key (GOConfNode const *key, gchar const *subkey)
 {
-	return key ? g_strconcat ((key)->path, "/", subkey, NULL) :
+	return key ? g_strconcat ((key)->path, subkey? "/": NULL , subkey, NULL) :
 		     g_strdup (subkey);
 }