Display an error when we come to the root.

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

diff --git a/gtk/gtksocket-x11.c b/gtk/gtksocket-x11.c
index 5dad07eeeb4d1c11df8230e401be5d49c3214b8d..9554d67ffcc0b50618f9688aa27354895e4171ed 100644 (file)
--- a/gtk/gtksocket-x11.c
+++ b/gtk/gtksocket-x11.c
@@ -101,13 +101,13 @@ _gtk_socket_windowing_size_request (GtkSocket *socket)
     {
       if (hints.flags & PMinSize)
        {
-         socket->request_width = hints.min_width;
-         socket->request_height = hints.min_height;
+         socket->request_width = MAX (hints.min_width, 1);
+         socket->request_height = MAX (hints.min_height, 1);
        }
       else if (hints.flags & PBaseSize)
        {
-         socket->request_width = hints.base_width;
-         socket->request_height = hints.base_height;
+         socket->request_width = MAX (hints.base_width, 1);
+         socket->request_height = MAX (hints.base_height, 1);
        }
     }
   socket->have_size = TRUE;
@@ -268,9 +268,9 @@ void
 _gtk_socket_windowing_embed_notify (GtkSocket *socket)
 {
 #ifdef HAVE_XFIXES
-  GdkDisplay *display = gtk_widget_get_display (GTK_WIDGET (socket);
+  GdkDisplay *display = gtk_widget_get_display (GTK_WIDGET (socket));
 
-  XFixesChangeSaveSet (GDK_DISPLAY_XDISPLAY (display)),
+  XFixesChangeSaveSet (GDK_DISPLAY_XDISPLAY (display),
                       GDK_WINDOW_XWINDOW (socket->plug_window),
                       SetModeInsert, SaveSetRoot, SaveSetUnmap);
 #endif