about summary refs log tree commit diff stats
path: root/src/profanity.c
diff options
context:
space:
mode:
authorJames Booth <boothj5@gmail.com>2016-04-17 23:17:43 +0100
committerJames Booth <boothj5@gmail.com>2016-04-17 23:17:43 +0100
commit2daa02cb60fc27e4dddadc32e487088c38b97b02 (patch)
tree54f6f1ff3cc2013647478e860280d635036bbc3e /src/profanity.c
parent6cc04bc3ba85415e6ec532ddf60738961a3a9560 (diff)
parent4cb1d73a8358f660056156b5632e8c41659eb6e0 (diff)
downloadprofani-tty-2daa02cb60fc27e4dddadc32e487088c38b97b02.tar.gz
Merge remote-tracking branch 'asdil12/tray_config'
Diffstat (limited to 'src/profanity.c')
-rw-r--r--src/profanity.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/profanity.c b/src/profanity.c
index 2595f5f7..4ca649cd 100644
--- a/src/profanity.c
+++ b/src/profanity.c
@@ -373,7 +373,7 @@ _init(char *log_level)
     atexit(_shutdown);
     plugins_init();
 #ifdef HAVE_GTK
-    if (gtk_ready) {
+    if (gtk_ready && prefs_get_boolean(PREF_TRAY)) {
         log_debug("Building GTK icon");
         create_tray();
     }
@@ -397,7 +397,7 @@ _shutdown(void)
         cl_ev_disconnect();
     }
 #ifdef HAVE_GTK
-    if (gtk_ready) {
+    if (gtk_ready && prefs_get_boolean(PREF_TRAY)) {
         destroy_tray();
     }
 #endif