[Xfce4-commits] <terminal:master> Use new save and load location.

[Nick Schermer]

Updating branch refs/heads/master
         to d7de42b139b3359fcb4770f79125b306d5250e13 (commit)
       from 089943d54979326d0ef740433564dbe3ce44e5ca (commit)

commit d7de42b139b3359fcb4770f79125b306d5250e13
Author: Nick Schermer <nick at xfce.org>
Date:   Fri Dec 21 17:44:03 2012 +0100

    Use new save and load location.

 terminal/terminal-preferences.c |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/terminal/terminal-preferences.c b/terminal/terminal-preferences.c
index e54cb33..7809c81 100644
--- a/terminal/terminal-preferences.c
+++ b/terminal/terminal-preferences.c
@@ -37,6 +37,8 @@
 #include <terminal/terminal-preferences.h>
 #include <terminal/terminal-private.h>
 
+#define TERMINALRC     "xfce4/terminal/terminalrc"
+#define TERMINALRC_OLD "Terminal/terminalrc"
 
 
 enum
@@ -1390,9 +1392,14 @@ terminal_preferences_load (TerminalPreferences *preferences)
   GValue       *value;
   guint         n;
 
-  filename = xfce_resource_lookup (XFCE_RESOURCE_CONFIG, "Terminal/terminalrc");
+  filename = xfce_resource_lookup (XFCE_RESOURCE_CONFIG, TERMINALRC);
   if (G_UNLIKELY (filename == NULL))
-    return;
+    {
+      /* old location of the Terminal days */
+      filename = xfce_resource_lookup (XFCE_RESOURCE_CONFIG, TERMINALRC_OLD);
+      if (G_UNLIKELY (filename == NULL))
+        return;
+    }
 
   rc = xfce_rc_simple_open (filename, TRUE);
   if (G_UNLIKELY (rc == NULL))
@@ -1530,7 +1537,7 @@ terminal_preferences_store_idle (gpointer user_data)
   if (G_UNLIKELY (preferences->loading_in_progress))
     return TRUE;
 
-  filename = xfce_resource_save_location (XFCE_RESOURCE_CONFIG, "Terminal/terminalrc", TRUE);
+  filename = xfce_resource_save_location (XFCE_RESOURCE_CONFIG, TERMINALRC, TRUE);
   if (G_UNLIKELY (filename == NULL))
     goto error;