From 01821a62d4f79cd398d81f554e12f3bb19278331 Mon Sep 17 00:00:00 2001
From: Victor Kareh <vkareh@redhat.com>
Date: Tue, 19 Aug 2025 11:13:21 -0400
Subject: options: Re-introduce the icon option

Since profiles do not provide a way of setting the window icon, we
re-introduce the --icon option to allow the window instance to report an
icon programmatically.

Fixes https://github.com/mate-desktop/mate-terminal/issues/246
---
 src/terminal-options.c | 45 +++++++++++++++++++++++++++++++++++++--------
 1 file changed, 37 insertions(+), 8 deletions(-)

(limited to 'src/terminal-options.c')

diff --git a/src/terminal-options.c b/src/terminal-options.c
index 352466f..ab24d4a 100644
--- a/src/terminal-options.c
+++ b/src/terminal-options.c
@@ -85,6 +85,7 @@ initial_window_free (InitialWindow *iw)
 	g_list_free (iw->tabs);
 	g_free (iw->geometry);
 	g_free (iw->role);
+	g_free (iw->icon);
 	g_slice_free (InitialWindow, iw);
 }
 
@@ -101,6 +102,9 @@ apply_defaults (TerminalOptions *options,
 	if (iw->geometry == NULL)
 		iw->geometry = g_strdup (options->default_geometry);
 
+	if (iw->icon == NULL)
+		iw->icon = g_strdup (options->default_icon);
+
 	if (options->default_window_menubar_forced)
 	{
 		iw->force_menubar_state = TRUE;
@@ -477,6 +481,27 @@ option_geometry_callback (const gchar *option_name,
 	return TRUE;
 }
 
+static gboolean
+option_icon_callback (const gchar *option_name,
+                      const gchar *value,
+                      gpointer     data,
+                      GError     **error)
+{
+	TerminalOptions *options = data;
+
+	if (options->initial_windows)
+	{
+		InitialWindow *iw;
+
+		iw = g_list_last (options->initial_windows)->data;
+		iw->icon = g_strdup (value);
+	}
+	else
+		options->default_icon = g_strdup (value);
+
+	return TRUE;
+}
+
 static gboolean
 option_disable_factory_callback (const gchar *option_name,
                                  const gchar *value,
@@ -719,6 +744,7 @@ terminal_options_parse (const char *working_directory,
 	options->initial_windows = NULL;
 	options->default_role = NULL;
 	options->default_geometry = NULL;
+	options->default_icon = NULL;
 	options->default_title = NULL;
 	options->zoom = 1.0;
 
@@ -846,6 +872,7 @@ terminal_options_merge_config (TerminalOptions *options,
 
 		iw->role = g_key_file_get_string (key_file, window_group, TERMINAL_CONFIG_WINDOW_PROP_ROLE, NULL);
 		iw->geometry = g_key_file_get_string (key_file, window_group, TERMINAL_CONFIG_WINDOW_PROP_GEOMETRY, NULL);
+		iw->icon = g_key_file_get_string (key_file, window_group, TERMINAL_CONFIG_WINDOW_PROP_ICON, NULL);
 		iw->start_fullscreen = g_key_file_get_boolean (key_file, window_group, TERMINAL_CONFIG_WINDOW_PROP_FULLSCREEN, NULL);
 		iw->start_maximized = g_key_file_get_boolean (key_file, window_group, TERMINAL_CONFIG_WINDOW_PROP_MAXIMIZED, NULL);
 		if (g_key_file_has_key (key_file, window_group, TERMINAL_CONFIG_WINDOW_PROP_MENUBAR_VISIBLE, NULL))
@@ -926,6 +953,7 @@ terminal_options_free (TerminalOptions *options)
 	g_strfreev (options->env);
 	g_free (options->default_role);
 	g_free (options->default_geometry);
+	g_free (options->default_icon);
 	g_free (options->default_working_dir);
 	g_free (options->default_title);
 	g_free (options->default_profile);
@@ -1053,6 +1081,15 @@ get_goption_context (TerminalOptions *options)
 			N_("Set the window role"),
 			N_("ROLE")
 		},
+		{
+			"icon",
+			0,
+			0,
+			G_OPTION_ARG_CALLBACK,
+			option_icon_callback,
+			N_("Set the window icon"),
+			N_("ICON")
+		},
 		{
 			"active",
 			0,
@@ -1329,14 +1366,6 @@ get_goption_context (TerminalOptions *options)
 			unsupported_option_callback,
 			NULL, NULL
 		},
-		{
-			"icon",
-			0,
-			G_OPTION_FLAG_HIDDEN | G_OPTION_FLAG_NO_ARG,
-			G_OPTION_ARG_CALLBACK,
-			unsupported_option_callback,
-			NULL, NULL
-		},
 		{
 			"termname",
 			0,
-- 
cgit v1.2.1