[gnome-terminal] Defer updating the icon title until the window is realised
- From: Christian Persch <chpe src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gnome-terminal] Defer updating the icon title until the window is realised
- Date: Tue, 1 Sep 2009 17:03:12 +0000 (UTC)
commit 50ad901a1cf7acce32cc7538720688211369e696
Author: Christian Persch <chpe gnome org>
Date: Tue Sep 1 19:00:45 2009 +0200
Defer updating the icon title until the window is realised
Since this requires accessing the window's GdkWindow directly, we have
to defer this until the window is realised.
src/terminal-window.c | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
---
diff --git a/src/terminal-window.c b/src/terminal-window.c
index 853f2f8..824e3e8 100644
--- a/src/terminal-window.c
+++ b/src/terminal-window.c
@@ -197,6 +197,10 @@ static void
profile_set_callback (TerminalScreen *screen,
TerminalProfile *old_profile,
TerminalWindow *window);
+static void
+sync_screen_icon_title (TerminalScreen *screen,
+ GParamSpec *psepc,
+ TerminalWindow *window);
G_DEFINE_TYPE (TerminalWindow, terminal_window, GTK_TYPE_WINDOW)
@@ -1433,9 +1437,9 @@ terminal_window_size_allocate_cb (GtkWidget *widget,
static void
terminal_window_realize (GtkWidget *widget)
{
-#ifdef GDK_WINDOWING_X11
TerminalWindow *window = TERMINAL_WINDOW (widget);
TerminalWindowPrivate *priv = window->priv;
+#ifdef GDK_WINDOWING_X11
GdkScreen *screen;
GdkColormap *colormap;
@@ -1461,6 +1465,10 @@ terminal_window_realize (GtkWidget *widget)
widget->allocation.x, widget->allocation.y);
GTK_WIDGET_CLASS (terminal_window_parent_class)->realize (widget);
+
+ /* Need to do this now since this requires the window to be realized */
+ if (priv->active_screen != NULL)
+ sync_screen_icon_title (priv->active_screen, NULL, window);
}
static gboolean
@@ -2179,6 +2187,9 @@ sync_screen_icon_title (TerminalScreen *screen,
{
TerminalWindowPrivate *priv = window->priv;
+ if (!GTK_WIDGET_REALIZED (window))
+ return;
+
if (screen != priv->active_screen)
return;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]