Intercept events of type GDK_SETTING before we check to see if there was

Thu Dec 12 18:02:34 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkmain.c (gtk_main_do_event): Intercept events
        of type GDK_SETTING before we check to see if there
        was an event widget or not. (#97451, Simon Wong,
        Bastien Nocera)

diff --git a/ChangeLog b/ChangeLog
index 44c6cfe1c2d6a793c587ca90e6f8fff6ab51658e..229c986bedd394dddbd6d2dc1a418514f540b017 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Dec 12 18:02:34 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmain.c (gtk_main_do_event): Intercept events
+       of type GDK_SETTING before we check to see if there
+       was an event widget or not. (#97451, Simon Wong,
+       Bastien Nocera)
+
 Thu Dec 12 17:58:41 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkrc.key.emacs: Add C-u/C-h/C-w. (#72245)

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 44c6cfe1c2d6a793c587ca90e6f8fff6ab51658e..229c986bedd394dddbd6d2dc1a418514f540b017 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Thu Dec 12 18:02:34 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmain.c (gtk_main_do_event): Intercept events
+       of type GDK_SETTING before we check to see if there
+       was an event widget or not. (#97451, Simon Wong,
+       Bastien Nocera)
+
 Thu Dec 12 17:58:41 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkrc.key.emacs: Add C-u/C-h/C-w. (#72245)

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 44c6cfe1c2d6a793c587ca90e6f8fff6ab51658e..229c986bedd394dddbd6d2dc1a418514f540b017 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+Thu Dec 12 18:02:34 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmain.c (gtk_main_do_event): Intercept events
+       of type GDK_SETTING before we check to see if there
+       was an event widget or not. (#97451, Simon Wong,
+       Bastien Nocera)
+
 Thu Dec 12 17:58:41 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkrc.key.emacs: Add C-u/C-h/C-w. (#72245)

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 44c6cfe1c2d6a793c587ca90e6f8fff6ab51658e..229c986bedd394dddbd6d2dc1a418514f540b017 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Thu Dec 12 18:02:34 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmain.c (gtk_main_do_event): Intercept events
+       of type GDK_SETTING before we check to see if there
+       was an event widget or not. (#97451, Simon Wong,
+       Bastien Nocera)
+
 Thu Dec 12 17:58:41 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkrc.key.emacs: Add C-u/C-h/C-w. (#72245)

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 44c6cfe1c2d6a793c587ca90e6f8fff6ab51658e..229c986bedd394dddbd6d2dc1a418514f540b017 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Thu Dec 12 18:02:34 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmain.c (gtk_main_do_event): Intercept events
+       of type GDK_SETTING before we check to see if there
+       was an event widget or not. (#97451, Simon Wong,
+       Bastien Nocera)
+
 Thu Dec 12 17:58:41 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkrc.key.emacs: Add C-u/C-h/C-w. (#72245)

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 44c6cfe1c2d6a793c587ca90e6f8fff6ab51658e..229c986bedd394dddbd6d2dc1a418514f540b017 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Thu Dec 12 18:02:34 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmain.c (gtk_main_do_event): Intercept events
+       of type GDK_SETTING before we check to see if there
+       was an event widget or not. (#97451, Simon Wong,
+       Bastien Nocera)
+
 Thu Dec 12 17:58:41 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkrc.key.emacs: Add C-u/C-h/C-w. (#72245)

diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 20e0e6e181b667f24b1753392eace837c5da76f5..10b5f276cbbdeb73eb2e02ed8b61b75e8359810e 100644 (file)
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -1351,6 +1351,12 @@ gtk_main_do_event (GdkEvent *event)
   if (next_event)
     gdk_event_free (next_event);
 
+  if (event->type == GDK_SETTING)
+    {
+      _gtk_settings_handle_event (&event->setting);
+      return;
+    }
+
   /* Find the widget which got the event. We store the widget
    *  in the user_data field of GdkWindow's.
    *  Ignore the event if we don't have a widget for it, except
@@ -1370,8 +1376,6 @@ gtk_main_do_event (GdkEvent *event)
       if (event->type == GDK_PROPERTY_NOTIFY)
        _gtk_selection_incr_event (event->any.window,
                                   &event->property);
-      else if (event->type == GDK_SETTING)
-       _gtk_settings_handle_event (&event->setting);
 
       return;
     }