* hildon-widgets/hildon-app.c (hildon_app_key_snooper): Add code to control if there...

NB#26383 (bis)

diff --git a/ChangeLog b/ChangeLog
index de70075..c9f8abb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2006-06-02  Luc Pionchon  <luc.pionchon@nokia.com>
 
+       * hildon-widgets/hildon-app.c (hildon_app_key_snooper): Add code
+       to control if there is a combobox activated when the menu key is
+       pressed and stop the menu drawing, this is a new case that happens
+       when the application is avoiding the focus can go to the combobox.
+
+       NB#26383 (bis)
+
+
+2006-06-02  Luc Pionchon  <luc.pionchon@nokia.com>
+
        * hildon-widgets/hildon-time-editor.c
        (hildon_time_editor_validate): removed the assinment of the
        error_widget, now just the highlight_callback can do it when it

diff --git a/hildon-widgets/hildon-app.c b/hildon-widgets/hildon-app.c
index d504d69..d16968f 100644 (file)
--- a/hildon-widgets/hildon-app.c
+++ b/hildon-widgets/hildon-app.c
@@ -1525,6 +1525,18 @@ hildon_app_key_snooper (GtkWidget *widget, GdkEventKey *keyevent, HildonApp *app
             }
         }
 
+      /* Don't act when a GtkWindow of a combobox is selected, this
+         can happen in some applications that change the properties of
+         the widget focus attribute, WARNING: we are using the name of
+         the hildon combobox widget to identify the window
+         (gtkcombobox.c, HILDON_COMBO_BOX_POPUP), if it changes we
+         must change this name */
+      if (GTK_IS_WINDOW (widget) && 
+          !g_ascii_strcasecmp("hildon-combobox-window", gtk_widget_get_name (widget)))
+        {
+          return TRUE;
+        }
+
       if (GTK_IS_DIALOG (toplevel)
           && gtk_window_get_modal (GTK_WINDOW (toplevel)))
         {