[gthumb] Revert "Build with gtk > 2.19.3 (GTK_WIDGET_TOPLEVEL -> gtk_widget_is_toplevel)"
- From: Paolo Bacchilega <paobac src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gthumb] Revert "Build with gtk > 2.19.3 (GTK_WIDGET_TOPLEVEL -> gtk_widget_is_toplevel)"
- Date: Sun, 24 Jan 2010 08:40:12 +0000 (UTC)
commit ccf9ce891ad638e9817dadd8f8088b4962f04ffe
Author: Paolo Bacchilega <paobac src gnome org>
Date: Sun Jan 24 09:35:12 2010 +0100
Revert "Build with gtk > 2.19.3 (GTK_WIDGET_TOPLEVEL -> gtk_widget_is_toplevel)"
This reverts commit a4b16a8bebc644f95179c9b1a391768b7709cd96.
1) no one can commit without asking to the maintainer.
2) the patch is not necessary thanks to the previous commit that
allows to use deprecated API by default.
gthumb/eggfileformatchooser.c | 5 -----
gthumb/gth-file-tool.c | 4 ----
gthumb/gth-tags-entry.c | 6 +-----
3 files changed, 1 insertions(+), 14 deletions(-)
---
diff --git a/gthumb/eggfileformatchooser.c b/gthumb/eggfileformatchooser.c
index cd6506b..09f0872 100644
--- a/gthumb/eggfileformatchooser.c
+++ b/gthumb/eggfileformatchooser.c
@@ -632,12 +632,7 @@ get_toplevel (GtkWidget *widget)
GtkWidget *toplevel;
toplevel = gtk_widget_get_toplevel (widget);
-
-#if GTK_CHECK_VERSION (2, 19, 3)
- if (!gtk_widget_is_toplevel (toplevel))
-#else
if (!GTK_WIDGET_TOPLEVEL (toplevel))
-#endif
return NULL;
else
return GTK_WINDOW (toplevel);
diff --git a/gthumb/gth-file-tool.c b/gthumb/gth-file-tool.c
index 60f6ed6..45b42c5 100644
--- a/gthumb/gth-file-tool.c
+++ b/gthumb/gth-file-tool.c
@@ -194,11 +194,7 @@ gth_file_tool_get_window (GthFileTool *self)
{
if (self->priv->window == NULL) {
self->priv->window = gtk_widget_get_toplevel (GTK_WIDGET (self));
-#if GTK_CHECK_VERSION (2, 19, 3)
- if (! gtk_widget_is_toplevel (self->priv->window))
-#else
if (! GTK_WIDGET_TOPLEVEL (self->priv->window))
-#endif
self->priv->window = NULL;
}
return self->priv->window;
diff --git a/gthumb/gth-tags-entry.c b/gthumb/gth-tags-entry.c
index d77b255..a5cc024 100644
--- a/gthumb/gth-tags-entry.c
+++ b/gthumb/gth-tags-entry.c
@@ -614,11 +614,7 @@ tag_list_unmap_cb (GtkWidget *widget,
GdkGeometry geometry;
toplevel = gtk_widget_get_toplevel (widget);
-#if GTK_CHECK_VERSION (2, 19, 3)
- if (! gtk_widget_is_toplevel (toplevel))
-#else
- if (! GTK_WIDGET_TOPLEVEL (toplevel))
-#endif
+ if (! GTK_WIDGET_TOPLEVEL (toplevel))
return;
geometry.max_height = -1;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]