[gtk+] gtk/gtklabel.c: Use accessor functions to access GtkWindow

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

commit 991eaa7580812d1b26e62382f6201dcdfd0b16d7
Author: Javier Jardón <jjardon gnome org>
Date:   Tue Aug 17 15:13:33 2010 +0200

    gtk/gtklabel.c: Use accessor functions to access GtkWindow

 gtk/gtklabel.c |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 4ac3420..94ac98a 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -6398,17 +6398,22 @@ gtk_label_activate_current_link (GtkLabel *label)
     {
       GtkWidget *toplevel;
       GtkWindow *window;
+      GtkWidget *default_widget, *focus_widget;
 
       toplevel = gtk_widget_get_toplevel (widget);
       if (GTK_IS_WINDOW (toplevel))
         {
           window = GTK_WINDOW (toplevel);
 
-          if (window &&
-              window->default_widget != widget &&
-              !(widget == window->focus_widget &&
-                (!window->default_widget || !gtk_widget_is_sensitive (window->default_widget))))
-            gtk_window_activate_default (window);
+          if (window)
+            {
+              default_widget = gtk_window_get_default_widget (window);
+              focus_widget = gtk_window_get_focus (window);
+
+              if (default_widget != widget &&
+                  !(widget == focus_widget && (!default_widget || !gtk_widget_is_sensitive (default_widget))))
+                gtk_window_activate_default (window);
+            }
         }
     }
 }