GtkLabelAccessible: Sanity check _get_text() input values

[~andy/gtk] / gtk / gtksocket.c

diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c
index 6a0202c9d7c0603905220b50d6c2e99b229b0751..c497f5065eaf7936323909bccb456f485ad4f570 100644 (file)
--- a/gtk/gtksocket.c
+++ b/gtk/gtksocket.c
@@ -380,7 +380,6 @@ static void
 gtk_socket_realize (GtkWidget *widget)
 {
   GtkAllocation allocation;
-  GtkSocket *socket = GTK_SOCKET (widget);
   GdkWindow *window;
   GdkWindowAttr attributes;
   XWindowAttributes xattrs;
@@ -404,7 +403,7 @@ gtk_socket_realize (GtkWidget *widget)
   window = gdk_window_new (gtk_widget_get_parent_window (widget),
                            &attributes, attributes_mask);
   gtk_widget_set_window (widget, window);
-  gdk_window_set_user_data (window, socket);
+  gtk_widget_register_window (widget, window);
 
   gtk_style_context_set_background (gtk_widget_get_style_context (widget),
                                     window);
@@ -768,7 +767,6 @@ gtk_socket_add_grabbed_key (GtkSocket       *socket,
 
 /**
  * gtk_socket_remove_grabbed_key:
- *
  * @socket: a #GtkSocket
  * @keyval: a key
  * @modifiers: modifiers for the key
@@ -915,6 +913,9 @@ gtk_socket_notify (GObject    *object,
 {
   if (strcmp (pspec->name, "is-focus") == 0)
     socket_update_focus_in (GTK_SOCKET (object));
+
+  if (G_OBJECT_CLASS (gtk_socket_parent_class)->notify)
+    G_OBJECT_CLASS (gtk_socket_parent_class)->notify (object, pspec);
 }
 
 /**
@@ -1160,7 +1161,6 @@ gtk_socket_handle_map_request (GtkSocket *socket)
 
 /**
  * gtk_socket_unmap_notify:
- *
  * @socket: a #GtkSocket
  *
  * Called from the GtkSocket backend when the plug has been unmapped ???