[Xfce4-commits] <terminal:master> Don't show a warning when no config is found.

[Nick Schermer]

Updating branch refs/heads/master
         to df7505ae34568f78e3c89f42ab93dfc89360cd6a (commit)
       from 766f6c44a44a7de4430b844b1bac2b725ab25a4d (commit)

commit df7505ae34568f78e3c89f42ab93dfc89360cd6a
Author: Nick Schermer <nick at xfce.org>
Date:   Fri Nov 6 14:33:07 2009 +0100

    Don't show a warning when no config is found.

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

diff --git a/terminal/terminal-preferences.c b/terminal/terminal-preferences.c
index 9c50922..00a27f2 100644
--- a/terminal/terminal-preferences.c
+++ b/terminal/terminal-preferences.c
@@ -1460,13 +1460,12 @@ terminal_preferences_load (TerminalPreferences *preferences)
   guint         n;
 
   filename = xfce_resource_lookup (XFCE_RESOURCE_CONFIG, "Terminal/terminalrc");
+  if (G_UNLIKELY (filename == NULL))
+    return;
+
   rc = xfce_rc_simple_open (filename, TRUE);
   if (G_UNLIKELY (rc == NULL))
-    {
-      g_warning ("Unable to load terminal preferences.");
-      g_free (filename);
-      return;
-    }
+    goto connect_monitor;
 
   preferences->loading_in_progress = TRUE;
 
@@ -1525,6 +1524,7 @@ terminal_preferences_load (TerminalPreferences *preferences)
 
   g_object_thaw_notify (G_OBJECT (preferences));
 
+connect_monitor:
   /* startup file monitoring */
   terminal_preferences_monitor_connect (preferences, filename);