summaryrefslogtreecommitdiff
path: root/libcaja-private/caja-progress-info.c
diff options
context:
space:
mode:
authorPablo Barciela <[email protected]>2019-03-25 23:03:56 +0100
committerZenWalker <[email protected]>2019-03-30 01:39:27 +0100
commit3641bd709a12f0e75cee6edaa90881420d54455b (patch)
treeaab286add01f83081c97adf097bcf85b0ae5bbf8 /libcaja-private/caja-progress-info.c
parent8f568265bf65f4c7bdc19738f91b4e98ed826394 (diff)
downloadcaja-3641bd709a12f0e75cee6edaa90881420d54455b.tar.bz2
caja-3641bd709a12f0e75cee6edaa90881420d54455b.tar.xz
caja-progress-info: make sure argument is initialized
Fixes Clang static analyzer warning: caja-progress-info.c:626:17: warning: 1st function call argument is an uninitialized value g_notification_set_body (notification, _("Process completed")); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Diffstat (limited to 'libcaja-private/caja-progress-info.c')
-rw-r--r--libcaja-private/caja-progress-info.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libcaja-private/caja-progress-info.c b/libcaja-private/caja-progress-info.c
index 39eb4b71..0023c65e 100644
--- a/libcaja-private/caja-progress-info.c
+++ b/libcaja-private/caja-progress-info.c
@@ -595,9 +595,10 @@ update_status_icon_and_window (void)
gboolean toshow;
GIcon *icon;
GNotification *notification;
+ gboolean show_notifications = g_settings_get_boolean (caja_preferences, CAJA_PREFERENCES_SHOW_NOTIFICATIONS);
static gboolean window_shown = FALSE;
- if (g_settings_get_boolean (caja_preferences, CAJA_PREFERENCES_SHOW_NOTIFICATIONS))
+ if (show_notifications)
{
notification = g_notification_new ("caja");
icon = g_themed_icon_new ("system-file-manager");
@@ -620,8 +621,7 @@ update_status_icon_and_window (void)
if (window_shown)
{
- if (g_settings_get_boolean (caja_preferences, CAJA_PREFERENCES_SHOW_NOTIFICATIONS) &&
- !gtk_window_is_active (GTK_WINDOW (get_progress_window ())))
+ if (show_notifications && !gtk_window_is_active (GTK_WINDOW (get_progress_window ())))
{
g_notification_set_body (notification, _("Process completed"));
g_application_send_notification (g_application_get_default (), "caja", notification);