AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Fix prototype for activate_key. (#108927, Jason D. Hildebrand)

Browse Source 
Mon Apr 21 19:02:16 2003  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtksocket.c (activate_key): Fix prototype for
        activate_key. (#108927, Jason D. Hildebrand)
This commit is contained in:
Owen Taylor 2003-04-22 18:33:45 +00:00 committed by Owen Taylor
parent c40ab61ea9
commit e4b73d8a72
6 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Mon Apr 21 19:02:16 2003 Owen Taylor <otaylor@redhat.com>
* gtk/gtksocket.c (activate_key): Fix prototype for
activate_key. (#108927, Jason D. Hildebrand)
Mon Apr 21 18:42:51 2003 Owen Taylor <otaylor@redhat.com> Mon Apr 21 18:42:51 2003 Owen Taylor <otaylor@redhat.com>
* demos/gtk-demo/Makefile.am demos/gtk-demo/geninclude.pl: * demos/gtk-demo/Makefile.am demos/gtk-demo/geninclude.pl:

5
ChangeLog.pre-2-10
View File

@ -1,3 +1,8 @@
Mon Apr 21 19:02:16 2003 Owen Taylor <otaylor@redhat.com>
* gtk/gtksocket.c (activate_key): Fix prototype for
activate_key. (#108927, Jason D. Hildebrand)
Mon Apr 21 18:42:51 2003 Owen Taylor <otaylor@redhat.com> Mon Apr 21 18:42:51 2003 Owen Taylor <otaylor@redhat.com>
* demos/gtk-demo/Makefile.am demos/gtk-demo/geninclude.pl: * demos/gtk-demo/Makefile.am demos/gtk-demo/geninclude.pl:

5
ChangeLog.pre-2-4
View File

@ -1,3 +1,8 @@
Mon Apr 21 19:02:16 2003 Owen Taylor <otaylor@redhat.com>
* gtk/gtksocket.c (activate_key): Fix prototype for
activate_key. (#108927, Jason D. Hildebrand)
Mon Apr 21 18:42:51 2003 Owen Taylor <otaylor@redhat.com> Mon Apr 21 18:42:51 2003 Owen Taylor <otaylor@redhat.com>
* demos/gtk-demo/Makefile.am demos/gtk-demo/geninclude.pl: * demos/gtk-demo/Makefile.am demos/gtk-demo/geninclude.pl:

5
ChangeLog.pre-2-6
View File

@ -1,3 +1,8 @@
Mon Apr 21 19:02:16 2003 Owen Taylor <otaylor@redhat.com>
* gtk/gtksocket.c (activate_key): Fix prototype for
activate_key. (#108927, Jason D. Hildebrand)
Mon Apr 21 18:42:51 2003 Owen Taylor <otaylor@redhat.com> Mon Apr 21 18:42:51 2003 Owen Taylor <otaylor@redhat.com>
* demos/gtk-demo/Makefile.am demos/gtk-demo/geninclude.pl: * demos/gtk-demo/Makefile.am demos/gtk-demo/geninclude.pl:

5
ChangeLog.pre-2-8
View File

@ -1,3 +1,8 @@
Mon Apr 21 19:02:16 2003 Owen Taylor <otaylor@redhat.com>
* gtk/gtksocket.c (activate_key): Fix prototype for
activate_key. (#108927, Jason D. Hildebrand)
Mon Apr 21 18:42:51 2003 Owen Taylor <otaylor@redhat.com> Mon Apr 21 18:42:51 2003 Owen Taylor <otaylor@redhat.com>
* demos/gtk-demo/Makefile.am demos/gtk-demo/geninclude.pl: * demos/gtk-demo/Makefile.am demos/gtk-demo/geninclude.pl:

10
gtk/gtksocket.c
View File

@ -562,8 +562,11 @@ typedef struct
GdkModifierType accel_mods; GdkModifierType accel_mods;
} GrabbedKey; } GrabbedKey;
static void static gboolean
activate_key (GtkAccelGroup *accel_group, activate_key (GtkAccelGroup *accel_group,
GObject *acceleratable,
guint accel_key,
GdkModifierType accel_mods,
GrabbedKey *grabbed_key) GrabbedKey *grabbed_key)
{ {
XEvent xevent; XEvent xevent;
@ -571,6 +574,7 @@ activate_key (GtkAccelGroup *accel_group,
GtkSocket *socket = g_object_get_data (G_OBJECT (accel_group), "gtk-socket"); GtkSocket *socket = g_object_get_data (G_OBJECT (accel_group), "gtk-socket");
GdkScreen *screen = gdk_drawable_get_screen (socket->plug_window); GdkScreen *screen = gdk_drawable_get_screen (socket->plug_window);
gboolean retval = FALSE;
if (gdk_event && gdk_event->type == GDK_KEY_PRESS && socket->plug_window) if (gdk_event && gdk_event->type == GDK_KEY_PRESS && socket->plug_window)
{ {
@ -593,10 +597,14 @@ activate_key (GtkAccelGroup *accel_group,
False, KeyPressMask, &xevent); False, KeyPressMask, &xevent);
gdk_display_sync (gdk_screen_get_display (screen)); gdk_display_sync (gdk_screen_get_display (screen));
gdk_error_trap_pop (); gdk_error_trap_pop ();
retval = TRUE;
} }
if (gdk_event) if (gdk_event)
gdk_event_free (gdk_event); gdk_event_free (gdk_event);
return retval;
} }
static gboolean static gboolean