summaryrefslogtreecommitdiff
path: root/tests/testsocket_child.c
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2001-04-18 18:28:19 +0000
committerOwen Taylor <otaylor@src.gnome.org>2001-04-18 18:28:19 +0000
commit6cff7051b16d99178c5320592e96c757597835e4 (patch)
tree6aabc47ef5228d44c3a95b3a55cee06281200ac7 /tests/testsocket_child.c
parent60b6a010e931aaaf97d723c893068381a421f0a0 (diff)
downloadgtk+-6cff7051b16d99178c5320592e96c757597835e4.tar.gz
Try changing mode on shm segments to 0600. We'll see who complains.
Wed Apr 18 14:23:14 2001 Owen Taylor <otaylor@redhat.com> * gdk/x11/gdkimage-x11.c (gdk_image_new): Try changing mode on shm segments to 0600. We'll see who complains. * gdk/gdkwindow.c (_gdk_window_destroy_hierarchy): Call _gdk_windowing_window_destroy() AFTER recursing through children. * tests/Makefile.am (noinst_PROGRAMS): Build testsocket, testsocket_child on X. * tests/testsocket[_child].c: Fix uses of gtk_window_get_default_accel_group(). [ Merge patch from Ramiro Estrugo <ramiro@eazel.com> from gtk-1-2 ] * gdk/gdkimage.c: (gdk_image_get): Deal with the possibility that XGetImage() might return NULL. Allocate the GdkImagePrivate structure only after XGetImage() succeeds in order not to dereference a NULL ximage pointer. This prevents a core dump when XGetImage() fails - which is unlikely, but can happen due to race conditions accessing the geometries of drawables. An x error will still be triggered, but the gdk image wrapper at least wont seg fault.
Diffstat (limited to 'tests/testsocket_child.c')
-rw-r--r--tests/testsocket_child.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/tests/testsocket_child.c b/tests/testsocket_child.c
index 873067bbf0..8848cf96ea 100644
--- a/tests/testsocket_child.c
+++ b/tests/testsocket_child.c
@@ -16,9 +16,8 @@ add_buttons (GtkWidget *widget, GtkWidget *box)
GtkWidget *add_button;
GtkWidget *remove_button;
GtkWidget *toplevel = gtk_widget_get_toplevel (box);
- GtkAccelGroup *accel_group = gtk_window_get_default_accel_group (GTK_WINDOW (toplevel));
- add_button = gtk_button_new_accel ("_Add", accel_group);
+ add_button = gtk_button_new_with_mnemonic ("_Add");
gtk_box_pack_start (GTK_BOX (box), add_button, TRUE, TRUE, 0);
gtk_widget_show (add_button);
@@ -26,7 +25,7 @@ add_buttons (GtkWidget *widget, GtkWidget *box)
GTK_SIGNAL_FUNC (add_buttons),
box);
- remove_button = gtk_button_new_accel ("_Remove", accel_group);
+ remove_button = gtk_button_new_with_mnemonic ("_Remove");
gtk_box_pack_start (GTK_BOX (box), remove_button, TRUE, TRUE, 0);
gtk_widget_show (remove_button);
@@ -44,7 +43,6 @@ main (int argc, char *argv[])
GtkWidget *hbox;
GtkWidget *entry;
GtkWidget *button;
- GtkAccelGroup *accel_group;
gtk_init (&argc, &argv);
if (argc < 2)
@@ -73,9 +71,7 @@ main (int argc, char *argv[])
gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
gtk_widget_show (entry);
- accel_group = gtk_window_get_default_accel_group (GTK_WINDOW (window));
-
- button = gtk_button_new_accel ("_Close", accel_group);
+ button = gtk_button_new_with_mnemonic ("_Close");
gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
gtk_widget_show (button);