[gthumb] Resync with eggfileformatchooser upstream code

[Javier Jardón <jjardon src gnome org>]

commit dc7ee16ba2d8f37667c8acd3d1e2cd07f638a79d
Author: Javier Jardón <jjardon gnome org>
Date:   Mon Mar 15 12:39:45 2010 +0100

    Resync with eggfileformatchooser upstream code

 gthumb/eggfileformatchooser.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/gthumb/eggfileformatchooser.c b/gthumb/eggfileformatchooser.c
index 09f0872..8f3bc05 100644
--- a/gthumb/eggfileformatchooser.c
+++ b/gthumb/eggfileformatchooser.c
@@ -602,6 +602,7 @@ error_message_with_parent (GtkWindow  *parent,
 {
   gboolean first_call = TRUE;
   GtkWidget *dialog;
+  GtkWindowGroup *window_group;
 
   if (first_call)
     {
@@ -618,8 +619,9 @@ error_message_with_parent (GtkWindow  *parent,
   gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
 					    "%s", detail);
 
-  if (parent->group)
-    gtk_window_group_add_window (parent->group, GTK_WINDOW (dialog));
+  window_group = gtk_window_get_group (parent);
+  if (window_group)
+    gtk_window_group_add_window (window_group, GTK_WINDOW (dialog));
 
   gtk_dialog_run (GTK_DIALOG (dialog));
   gtk_widget_destroy (dialog);
@@ -632,7 +634,11 @@ get_toplevel (GtkWidget *widget)
   GtkWidget *toplevel;
 
   toplevel = gtk_widget_get_toplevel (widget);
+#if GTK_CHECK_VERSION (2,18,0)
+  if (!gtk_widget_is_toplevel (toplevel))
+#else
   if (!GTK_WIDGET_TOPLEVEL (toplevel))
+#endif
     return NULL;
   else
     return GTK_WINDOW (toplevel);