Patch from Frederic Crozat, test code from Jean-Philippe Chancelier. Fixes

[~andy/gtk] / tests / testsocket.c

diff --git a/tests/testsocket.c b/tests/testsocket.c
index 7168d1d434662ebd08a02f0790afe88d327c8305..85a7192d747b4597be228c773ab6f135f7e6faa7 100644 (file)
--- a/tests/testsocket.c
+++ b/tests/testsocket.c
@@ -11,7 +11,7 @@ int n_children = 0;
 GSList *sockets = NULL;
 
 GtkWidget *window;
-GtkWidget *vbox;
+GtkWidget *box;
 
 typedef struct 
 {
@@ -129,7 +129,7 @@ steal (GtkWidget *window, GtkEntry *entry)
     }
 
   socket = create_socket ();
-  gtk_box_pack_start (GTK_BOX (vbox), socket->box, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (box), socket->box, TRUE, TRUE, 0);
   gtk_widget_show (socket->box);
 
   gtk_socket_steal (GTK_SOCKET (socket->socket), xid);
@@ -167,7 +167,7 @@ child_read_watch (GIOChannel *channel, GIOCondition cond, gpointer data)
       else
        {
          Socket *socket = create_socket ();
-         gtk_box_pack_start (GTK_BOX (vbox), socket->box, TRUE, TRUE, 0);
+         gtk_box_pack_start (GTK_BOX (box), socket->box, TRUE, TRUE, 0);
          gtk_widget_show (socket->box);
          
          gtk_socket_add_id (GTK_SOCKET (socket->socket), xid);
@@ -204,7 +204,7 @@ add_child (GtkWidget *window,
   if (active)
     {
       socket = create_socket ();
-      gtk_box_pack_start (GTK_BOX (vbox), socket->box, TRUE, TRUE, 0);
+      gtk_box_pack_start (GTK_BOX (box), socket->box, TRUE, TRUE, 0);
       gtk_widget_show (socket->box);
       sprintf(buffer, "%#lx", (gulong) gtk_socket_get_id (GTK_SOCKET (socket->socket)));
       argv[1] = buffer;
@@ -248,7 +248,7 @@ add_local_active_child (GtkWidget *window)
   Socket *socket;
 
   socket = create_socket ();
-  gtk_box_pack_start (GTK_BOX (vbox), socket->box, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (box), socket->box, TRUE, TRUE, 0);
   gtk_widget_show (socket->box);
 
   create_child_plug (gtk_socket_get_id (GTK_SOCKET (socket->socket)), TRUE);
@@ -261,7 +261,7 @@ add_local_passive_child (GtkWidget *window)
   GdkNativeWindow xid;
 
   socket = create_socket ();
-  gtk_box_pack_start (GTK_BOX (vbox), socket->box, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (box), socket->box, TRUE, TRUE, 0);
   gtk_widget_show (socket->box);
 
   xid = create_child_plug (0, TRUE);
@@ -273,6 +273,7 @@ main (int argc, char *argv[])
 {
   GtkWidget *button;
   GtkWidget *hbox;
+  GtkWidget *vbox;
   GtkWidget *entry;
   GtkAccelGroup *accel_group;
   GtkItemFactory *item_factory;
@@ -345,6 +346,11 @@ main (int argc, char *argv[])
                    G_CALLBACK (steal),
                    entry);
 
+  hbox = gtk_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+
+  box = hbox;
+  
   gtk_widget_show_all (window);
 
   gtk_main ();