From 8641465b9d2e406cdc56d0a3955be231aba34a5e Mon Sep 17 00:00:00 2001 From: rbuj Date: Tue, 23 Nov 2021 15:13:16 +0100 Subject: terminal-window: gtk+ 2.17.1 fixed gtk bug 535557 --- src/terminal-window.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'src') diff --git a/src/terminal-window.c b/src/terminal-window.c index 3482680..c690dd2 100644 --- a/src/terminal-window.c +++ b/src/terminal-window.c @@ -106,8 +106,6 @@ struct _TerminalWindowPrivate guint disposed : 1; guint present_on_insert : 1; - /* Workaround until gtk+ bug #535557 is fixed */ - guint icon_title_set : 1; time_t focus_time; /* should we copy selection to clibpoard */ @@ -2535,8 +2533,6 @@ sync_screen_icon_title (TerminalScreen *screen, return; gdk_window_set_icon_name (gtk_widget_get_window (GTK_WIDGET (window)), terminal_screen_get_icon_title (screen)); - - priv->icon_title_set = TRUE; } static void @@ -2549,10 +2545,6 @@ sync_screen_icon_title_set (TerminalScreen *screen, if (!gtk_widget_get_realized (GTK_WIDGET (window))) return; - /* No need to restore the title if we never set an icon title */ - if (!priv->icon_title_set) - return; - if (screen != priv->active_screen) return; @@ -2560,12 +2552,7 @@ sync_screen_icon_title_set (TerminalScreen *screen, return; /* Need to reset the icon name */ - /* FIXME: Once gtk+ bug 535557 is fixed, use that to unset the icon title. */ - - g_object_set_qdata (G_OBJECT (gtk_widget_get_window (GTK_WIDGET (window))), - g_quark_from_static_string ("gdk-icon-name-set"), - GUINT_TO_POINTER (FALSE)); - priv->icon_title_set = FALSE; + gdk_window_set_icon_name (gtk_widget_get_window (GTK_WIDGET (window)), NULL); /* Re-setting the right title will be done by the notify::title handler which comes after this one */ } -- cgit v1.2.1