[Xfce4-commits] [apps/xfce4-terminal] 01/01: Avoid passing null pointer to g_warning()

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

f   2   4   0   4       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository apps/xfce4-terminal.

commit 62a951cafacb1dd6afb76f6affaa5eb093123734
Author: Igor <f2404 at yandex.ru>
Date:   Mon Sep 16 10:15:15 2019 -0400

    Avoid passing null pointer to g_warning()
---
 terminal/terminal-preferences.c | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/terminal/terminal-preferences.c b/terminal/terminal-preferences.c
index d9228e3..3f941e7 100644
--- a/terminal/terminal-preferences.c
+++ b/terminal/terminal-preferences.c
@@ -1552,14 +1552,14 @@ terminal_preferences_store_value (const GValue *value,
 static gboolean
 terminal_preferences_store_idle (gpointer user_data)
 {
-  TerminalPreferences  *preferences = TERMINAL_PREFERENCES (user_data);
-  const gchar          *blurb;
-  GParamSpec           *pspec;
-  XfceRc               *rc = NULL;
-  GValue               *value;
-  GValue                src = { 0, };
-  guint                 n;
-  gchar                *filename;
+  TerminalPreferences *preferences = TERMINAL_PREFERENCES (user_data);
+  const gchar         *blurb;
+  GParamSpec          *pspec;
+  XfceRc              *rc = NULL;
+  GValue              *value;
+  GValue               src = { 0, };
+  guint                n;
+  gchar               *filename;
 
   /* try again later if we're loading */
   if (G_UNLIKELY (preferences->loading_in_progress))
@@ -1567,7 +1567,10 @@ terminal_preferences_store_idle (gpointer user_data)
 
   filename = xfce_resource_save_location (XFCE_RESOURCE_CONFIG, TERMINALRC, TRUE);
   if (G_UNLIKELY (filename == NULL))
-    goto error;
+    {
+      g_warning ("Unable to store terminal preferences.");
+      return FALSE;
+    }
 
   rc = xfce_rc_simple_open (filename, FALSE);
   if (G_UNLIKELY (rc == NULL))

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.