gcalctool r2294 - in trunk: . gcalctool

[rancell svn gnome org]

Author: rancell
Date: Thu Nov  6 10:34:49 2008
New Revision: 2294
URL: http://svn.gnome.org/viewvc/gcalctool?rev=2294&view=rev

Log:
Read configuration from /apps/gcalctool not /apps/(appname) as the application name is different when symlinked (Matt Keenan, Bug #559260).


Modified:
   trunk/ChangeLog
   trunk/gcalctool/get.c

Modified: trunk/gcalctool/get.c
==============================================================================
--- trunk/gcalctool/get.c	(original)
+++ trunk/gcalctool/get.c	Thu Nov  6 10:34:49 2008
@@ -52,7 +52,7 @@
 get_resource(char *key)
 {
     char key_name[MAXLINE];
-    SNPRINTF(key_name, MAXLINE, "/apps/%s/%s", v->appname, key);
+    SNPRINTF(key_name, MAXLINE, "/apps/gcalctool/%s", key);
     return(gconf_client_get_string(client, key_name, NULL));
 }
 
@@ -61,7 +61,7 @@
 set_resource(char *key, char *value)
 {
     char key_name[MAXLINE];
-    SNPRINTF(key_name, MAXLINE, "/apps/%s/%s", v->appname, key);    
+    SNPRINTF(key_name, MAXLINE, "/apps/gcalctool/%s", key);    
     gconf_client_set_string(client, key_name, value, NULL);
 }
 
@@ -333,10 +333,7 @@
 void
 resources_init()        /* Load gconf configuration database for gcalctool. */
 { 
-    char str[MAXLINE];
-
     assert(client == NULL);
-    SNPRINTF(str, MAXLINE, "/apps/%s", v->appname);
     client = gconf_client_get_default();
-    gconf_client_add_dir(client, str, GCONF_CLIENT_PRELOAD_NONE, NULL);
+    gconf_client_add_dir(client, "/apps/gcalctool", GCONF_CLIENT_PRELOAD_NONE, NULL);
 }