about summary refs log tree commit diff stats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/command/command.c8
-rw-r--r--src/command/commands.c7
-rw-r--r--src/command/commands.h2
-rw-r--r--src/config/preferences.c11
-rw-r--r--src/config/preferences.h2
-rw-r--r--src/ui/console.c10
-rw-r--r--src/ui/ui.h2
-rw-r--r--tests/unittests/ui/stub_ui.c1
8 files changed, 14 insertions, 29 deletions
diff --git a/src/command/command.c b/src/command/command.c
index e94d3406..984812f5 100644
--- a/src/command/command.c
+++ b/src/command/command.c
@@ -1253,7 +1253,6 @@ static struct cmd_t command_defs[] =
         CMD_NOEXAMPLES
     },
 
-#ifdef HAVE_GTK
     { "/tray",
         cmd_tray, parse_args, 1, 1, &cons_tray_setting,
         CMD_TAGS(
@@ -1266,7 +1265,6 @@ static struct cmd_t command_defs[] =
             { "on|off", "Enable or disable tray icon." })
         CMD_NOEXAMPLES
     },
-#endif
 
     { "/intype",
         cmd_intype, parse_args, 1, 1, &cons_intype_setting,
@@ -3076,9 +3074,9 @@ _cmd_complete_parameters(ProfWin *window, const char *const input)
     jabber_conn_status_t conn_status = jabber_get_connection_status();
 
     // autocomplete boolean settings
-    gchar *boolean_choices[] = { "/beep", "/intype", "/states", "/outtype",
-        "/flash", "/splash", "/chlog", "/grlog", "/history", "/vercheck",
-        "/privileges", "/presence", "/wrap", "/winstidy", "/carbons", "/encwarn", "/lastactivity" };
+    gchar *boolean_choices[] = { "/beep", "/intype", "/states", "/outtype", "/flash", "/splash", "/chlog", "/grlog",
+        "/history", "/vercheck", "/privileges", "/presence", "/wrap", "/winstidy", "/carbons", "/encwarn",
+        "/lastactivity", "/tray" };
 
     for (i = 0; i < ARRAY_SIZE(boolean_choices); i++) {
         result = autocomplete_param_with_func(input, boolean_choices[i], prefs_autocomplete_boolean_choice);
diff --git a/src/command/commands.c b/src/command/commands.c
index b2795a43..c60a3a3e 100644
--- a/src/command/commands.c
+++ b/src/command/commands.c
@@ -5528,10 +5528,10 @@ cmd_flash(ProfWin *window, const char *const command, gchar **args)
     return _cmd_set_boolean_preference(args[0], command, "Screen flash", PREF_FLASH);
 }
 
-#ifdef HAVE_GTK
 gboolean
 cmd_tray(ProfWin *window, const char *const command, gchar **args)
 {
+#ifdef HAVE_GTK
     gboolean old = prefs_get_boolean(PREF_TRAY);
     gboolean ret = _cmd_set_boolean_preference(args[0], command, "Tray icon", PREF_TRAY);
     gboolean new = prefs_get_boolean(PREF_TRAY);
@@ -5543,8 +5543,11 @@ cmd_tray(ProfWin *window, const char *const command, gchar **args)
         }
     }
     return ret;
-}
+#else
+    cons_show("This version of Profanity has not been built with GTK Tray Icon support enabled");
+    return TRUE;
 #endif
+}
 
 gboolean
 cmd_intype(ProfWin *window, const char *const command, gchar **args)
diff --git a/src/command/commands.h b/src/command/commands.h
index 34c9cc49..cfa9d966 100644
--- a/src/command/commands.h
+++ b/src/command/commands.h
@@ -89,9 +89,7 @@ gboolean cmd_lastactivity(ProfWin *window, const char *const command, gchar **ar
 gboolean cmd_disconnect(ProfWin *window, const char *const command, gchar **args);
 gboolean cmd_dnd(ProfWin *window, const char *const command, gchar **args);
 gboolean cmd_flash(ProfWin *window, const char *const command, gchar **args);
-#ifdef HAVE_GTK
 gboolean cmd_tray(ProfWin *window, const char *const command, gchar **args);
-#endif
 gboolean cmd_gone(ProfWin *window, const char *const command, gchar **args);
 gboolean cmd_grlog(ProfWin *window, const char *const command, gchar **args);
 gboolean cmd_group(ProfWin *window, const char *const command, gchar **args);
diff --git a/src/config/preferences.c b/src/config/preferences.c
index 4f403888..25a6ff87 100644
--- a/src/config/preferences.c
+++ b/src/config/preferences.c
@@ -47,10 +47,6 @@
 #include "tools/autocomplete.h"
 #include "config/conflists.h"
 
-#ifdef HAVE_GTK
-#include "tray.h"
-#endif
-
 // preference groups refer to the sections in .profrc, for example [ui]
 #define PREF_GROUP_LOGGING "logging"
 #define PREF_GROUP_CHATSTATES "chatstates"
@@ -1175,9 +1171,6 @@ _get_group(preference_t pref)
         case PREF_TITLEBAR_SHOW:
         case PREF_TITLEBAR_GOODBYE:
         case PREF_FLASH:
-#ifdef HAVE_GTK
-        case PREF_TRAY:
-#endif
         case PREF_INTYPE:
         case PREF_HISTORY:
         case PREF_OCCUPANTS:
@@ -1246,6 +1239,7 @@ _get_group(preference_t pref)
         case PREF_NOTIFY_SUB:
         case PREF_NOTIFY_MENTION_CASE_SENSITIVE:
         case PREF_NOTIFY_MENTION_WHOLE_WORD:
+        case PREF_TRAY:
             return PREF_GROUP_NOTIFICATIONS;
         case PREF_CHLOG:
         case PREF_GRLOG:
@@ -1296,10 +1290,8 @@ _get_key(preference_t pref)
             return "titlebar.goodbye";
         case PREF_FLASH:
             return "flash";
-#ifdef HAVE_GTK
         case PREF_TRAY:
             return "tray";
-#endif
         case PREF_INTYPE:
             return "intype";
         case PREF_HISTORY:
@@ -1513,6 +1505,7 @@ _get_default_boolean(preference_t pref)
         case PREF_TLS_SHOW:
         case PREF_LASTACTIVITY:
         case PREF_NOTIFY_MENTION_WHOLE_WORD:
+        case PREF_TRAY:
             return TRUE;
         default:
             return FALSE;
diff --git a/src/config/preferences.h b/src/config/preferences.h
index eb749b16..e4968521 100644
--- a/src/config/preferences.h
+++ b/src/config/preferences.h
@@ -52,9 +52,7 @@ typedef enum {
     PREF_TITLEBAR_SHOW,
     PREF_TITLEBAR_GOODBYE,
     PREF_FLASH,
-#ifdef HAVE_GTK
     PREF_TRAY,
-#endif
     PREF_INTYPE,
     PREF_HISTORY,
     PREF_CARBONS,
diff --git a/src/ui/console.c b/src/ui/console.c
index 73cfbfd1..43cad63d 100644
--- a/src/ui/console.c
+++ b/src/ui/console.c
@@ -1182,16 +1182,14 @@ cons_flash_setting(void)
         cons_show("Terminal flash (/flash)             : OFF");
 }
 
-#ifdef HAVE_GTK
 void
 cons_tray_setting(void)
 {
     if (prefs_get_boolean(PREF_TRAY))
-        cons_show("Tray icon (/tray)             : ON");
+        cons_show("Tray icon (/tray)                   : ON");
     else
-        cons_show("Tray icon (/tray)             : OFF");
+        cons_show("Tray icon (/tray)                   : OFF");
 }
-#endif
 
 void
 cons_splash_setting(void)
@@ -1508,9 +1506,6 @@ cons_show_ui_prefs(void)
     cons_theme_setting();
     cons_beep_setting();
     cons_flash_setting();
-#ifdef HAVE_GTK
-    cons_tray_setting();
-#endif
     cons_splash_setting();
     cons_wrap_setting();
     cons_winstidy_setting();
@@ -1625,6 +1620,7 @@ cons_show_desktop_prefs(void)
     cons_show("Desktop notification preferences:");
     cons_show("");
     cons_notify_setting();
+    cons_tray_setting();
 
     cons_alert();
 }
diff --git a/src/ui/ui.h b/src/ui/ui.h
index 09215595..01ae3953 100644
--- a/src/ui/ui.h
+++ b/src/ui/ui.h
@@ -284,9 +284,7 @@ void cons_privileges_setting(void);
 void cons_beep_setting(void);
 void cons_console_setting(void);
 void cons_flash_setting(void);
-#ifdef HAVE_GTK
 void cons_tray_setting(void);
-#endif
 void cons_splash_setting(void);
 void cons_encwarn_setting(void);
 void cons_tlsshow_setting(void);
diff --git a/tests/unittests/ui/stub_ui.c b/tests/unittests/ui/stub_ui.c
index f9de0859..5e86799a 100644
--- a/tests/unittests/ui/stub_ui.c
+++ b/tests/unittests/ui/stub_ui.c
@@ -444,6 +444,7 @@ void cons_reconnect_setting(void) {}
 void cons_autoping_setting(void) {}
 void cons_autoconnect_setting(void) {}
 void cons_inpblock_setting(void) {}
+void cons_tray_setting(void) {}
 
 void cons_show_contact_online(PContact contact, Resource *resource, GDateTime *last_activity)
 {
generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2024-10-23 03:17:59 +0000