[totem] Update eggfileformatchooser from bug 609763



commit e6b0a67f88ecccd13edf349379f30ac36812e04c
Author: Bastien Nocera <hadess hadess net>
Date:   Mon Feb 15 12:27:00 2010 +0000

    Update eggfileformatchooser from bug 609763
    
    Fix compilation with GSEAL
    
    https://bugzilla.gnome.org/show_bug.cgi?id=609763

 src/eggfileformatchooser.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/src/eggfileformatchooser.c b/src/eggfileformatchooser.c
index e1eb2d5..4c691c9 100644
--- a/src/eggfileformatchooser.c
+++ b/src/eggfileformatchooser.c
@@ -572,6 +572,7 @@ error_message_with_parent (GtkWindow  *parent,
 {
   gboolean first_call = TRUE;
   GtkWidget *dialog;
+  GtkWindowGroup *window_group;
 
   if (first_call)
     {
@@ -588,8 +589,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);
@@ -602,7 +604,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);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]