X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtksocket.c;h=c497f5065eaf7936323909bccb456f485ad4f570;hb=d98b4fd0b433d56f7b2148f617baf212014a3b3e;hp=d20a567ecede9941b73a727e25a7fd553c1326d7;hpb=c7514e8f0d19a833257497caff413bb4dfae6eb4;p=~andy%2Fgtk

diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c
index d20a567ec..c497f5065 100644
--- a/gtk/gtksocket.c
+++ b/gtk/gtksocket.c
@@ -12,8 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.Free
  */
 
 /* By Owen Taylor <otaylor@gtk.org>              98/4/4 */
@@ -31,7 +30,6 @@
 
 #include <string.h>
 
-#include "gtkmainprivate.h"
 #include "gtkmarshalers.h"
 #include "gtksizerequest.h"
 #include "gtkplug.h"
@@ -39,6 +37,7 @@
 #include "gtkdnd.h"
 #include "gtkdebug.h"
 #include "gtkintl.h"
+#include "gtkmain.h"
 #include "gtkwidgetprivate.h"
 
 #include <gdk/gdkx.h>
@@ -381,7 +380,6 @@ static void
 gtk_socket_realize (GtkWidget *widget)
 {
   GtkAllocation allocation;
-  GtkSocket *socket = GTK_SOCKET (widget);
   GdkWindow *window;
   GdkWindowAttr attributes;
   XWindowAttributes xattrs;
@@ -405,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);
@@ -440,7 +438,6 @@ gtk_socket_realize (GtkWidget *widget)
 
 /**
  * gtk_socket_end_embedding:
- *
  * @socket: a #GtkSocket
  *
  * Called to end the embedding of a plug in the socket.
@@ -732,7 +729,6 @@ find_accel_key (GtkAccelKey *key,
 
 /**
  * gtk_socket_add_grabbed_key:
- *
  * @socket: a #GtkSocket
  * @keyval: a key
  * @modifiers: modifiers for the key
@@ -771,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
@@ -918,11 +913,13 @@ 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);
 }
 
 /**
  * gtk_socket_claim_focus:
- *
  * @socket: a #GtkSocket
  * @send_event: huh?
  *
@@ -1009,11 +1006,10 @@ gtk_socket_forall (GtkContainer *container,
 
 /**
  * gtk_socket_add_window:
- *
  * @socket: a #GtkSocket
  * @xid: the native identifier for a window
  * @need_reparent: whether the socket's plug's window needs to be
- *		   reparented to the socket
+ *                 reparented to the socket
  *
  * Adds a window to a GtkSocket.
  */
@@ -1146,7 +1142,6 @@ gtk_socket_add_window (GtkSocket       *socket,
 
 /**
  * gtk_socket_handle_map_request:
- *
  * @socket: a #GtkSocket
  *
  * Called from the GtkSocket backend when the plug has been mapped.
@@ -1166,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 ???
@@ -1184,7 +1178,6 @@ gtk_socket_unmap_notify (GtkSocket *socket)
 
 /**
  * gtk_socket_advance_toplevel_focus:
- *
  * @socket: a #GtkSocket
  * @direction: a direction
  *