[gnome-terminal] Use gtk_widget_is_toplevel() instead of GTK_WIDGET_TOPLEVEL
- From: Christian Persch <chpe src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gnome-terminal] Use gtk_widget_is_toplevel() instead of GTK_WIDGET_TOPLEVEL
- Date: Wed, 13 Jan 2010 17:50:45 +0000 (UTC)
commit 22784ee64a0bd3eef12f20873bead0133e9377aa
Author: Christian Persch <chpe gnome org>
Date: Wed Jan 13 18:49:36 2010 +0100
Use gtk_widget_is_toplevel() instead of GTK_WIDGET_TOPLEVEL
Bug #606298.
src/terminal-screen.c | 11 ++++++++++-
src/terminal-window.c | 13 ++++++++++++-
2 files changed, 22 insertions(+), 2 deletions(-)
---
diff --git a/src/terminal-screen.c b/src/terminal-screen.c
index 56856d1..99e9754 100644
--- a/src/terminal-screen.c
+++ b/src/terminal-screen.c
@@ -263,7 +263,11 @@ parent_parent_set_cb (GtkWidget *widget,
g_return_if_fail (GTK_IS_NOTEBOOK (widget->parent));
toplevel = gtk_widget_get_toplevel (widget);
+#if GTK_CHECK_VERSION (2, 19, 3)
+ g_return_if_fail (gtk_widget_is_toplevel (toplevel));
+#else
g_return_if_fail (GTK_WIDGET_TOPLEVEL (toplevel));
+#endif
priv->window = TERMINAL_WINDOW (toplevel);
}
@@ -1627,7 +1631,12 @@ get_child_environment (TerminalScreen *screen,
guint i;
window = gtk_widget_get_toplevel (term);
- g_assert (window != NULL && GTK_WIDGET_TOPLEVEL (window));
+ g_assert (window != NULL);
+#if GTK_CHECK_VERSION (2, 19, 3)
+ g_assert (gtk_widget_is_toplevel (window));
+#else
+ g_assert (GTK_WIDGET_TOPLEVEL (window));
+#endif
env_table = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
diff --git a/src/terminal-window.c b/src/terminal-window.c
index 8cf5b55..e2326d3 100644
--- a/src/terminal-window.c
+++ b/src/terminal-window.c
@@ -2246,7 +2246,14 @@ close_button_clicked_cb (GtkWidget *tab_label,
TerminalScreen *screen;
toplevel = gtk_widget_get_toplevel (screen_container);
- if (!GTK_WIDGET_TOPLEVEL (toplevel) || !TERMINAL_IS_WINDOW (toplevel))
+#if GTK_CHECK_VERSION (2, 19, 3)
+ if (!gtk_widget_is_toplevel (toplevel))
+#else
+ if (!GTK_WIDGET_TOPLEVEL (toplevel))
+#endif
+ return;
+
+ if (!TERMINAL_IS_WINDOW (toplevel))
return;
window = TERMINAL_WINDOW (toplevel);
@@ -2269,7 +2276,11 @@ terminal_window_add_screen (TerminalWindow *window,
GtkWidget *screen_container, *tab_label;
old_window = gtk_widget_get_toplevel (GTK_WIDGET (screen));
+#if GTK_CHECK_VERSION (2, 19, 3)
+ if (gtk_widget_is_toplevel (old_window) &&
+#else
if (GTK_WIDGET_TOPLEVEL (old_window) &&
+#endif
TERMINAL_IS_WINDOW (old_window) &&
TERMINAL_WINDOW (old_window)== window)
return;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]