[goffice] Win32: attempt a fix for #590786.



commit 34728a5b9e1968d5a23585fe7f433d9269ca5eb2
Author: Morten Welinder <terra gnome org>
Date:   Tue Aug 25 19:54:00 2009 -0400

    Win32: attempt a fix for #590786.

 ChangeLog                   |    5 +++++
 goffice/app/go-conf-win32.c |    6 +++++-
 2 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 9064ef2..233d7fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-25  Morten Welinder  <terra gnome org>
+
+	* goffice/app/go-conf-win32.c (go_conf_win32_get_node): Guess what
+	should happen when key==NULL.  Hopefully addresses #590786.
+
 2009-08-25  Jean Brefort  <jean brefort normalesup org>
 
 	* configure.in: remove FooCanvas.
diff --git a/goffice/app/go-conf-win32.c b/goffice/app/go-conf-win32.c
index 7cdb333..739bace 100644
--- a/goffice/app/go-conf-win32.c
+++ b/goffice/app/go-conf-win32.c
@@ -29,7 +29,11 @@ go_conf_win32_get_node (GOConfNode *node, HKEY *phKey, gchar const *key, gboolea
 	LONG ret;
 	DWORD disposition;
 
-	path = g_strconcat (node ? "" : "Software\\", key, NULL);
+	if (key)
+		path = g_strconcat (node ? "" : "Software\\", key, NULL);
+	else
+		path = g_strdup (node ? "" : "Software");
+
 	for (c = path; *c; ++c) {
 		if (*c == '/')
 			*c = '\\';



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]