Merge lp:~bratsche/ido/focus-changes into lp:ido/0.3

[Cody Russell]

[Conor Curran (cjcurran)]

review: Approve

[David Barth (dbarth)]

That solves the focus issue on the entry

[lp:~bratsche/ido/focus-changes]

66. By Cody Russell on 2010-09-16

Remove notify.

[David Barth (dbarth)]

The code was merged in ido/meerkat

=== modified file 'configure.ac'
--- configure.ac	2010-09-14 00:31:26 +0000
+++ configure.ac	2010-09-16 15:01:07 +0000
@@ -2,8 +2,13 @@
 # shamelessly stolen from clutter-gtk
 #
 m4_define([ido_major_version], [0])
+<<<<<<< TREE
 m4_define([ido_minor_version], [2])
 m4_define([ido_micro_version], [0])
+=======
+m4_define([ido_minor_version], [1])
+m4_define([ido_micro_version], [13])
+>>>>>>> MERGE-SOURCE
 
 m4_define([ido_api_version],
           [ido_major_version.ido_minor_version])
 
=== modified file 'src/idoentrymenuitem.c'
--- src/idoentrymenuitem.c	2010-09-10 21:26:16 +0000
+++ src/idoentrymenuitem.c	2010-09-16 15:01:07 +0000
@@ -161,6 +161,10 @@
 {
   GdkEvent *event = gdk_event_new (GDK_FOCUS_CHANGE);
 
+  gdk_keyboard_ungrab (GDK_CURRENT_TIME);
+
+  gdk_keyboard_grab (widget->window, TRUE, GDK_CURRENT_TIME);
+
   g_object_ref (widget);
 
   event->focus_change.type = GDK_FOCUS_CHANGE;
@@ -169,8 +173,6 @@
 
   gtk_widget_event (widget, event);
 
-  g_object_notify (G_OBJECT (widget), "has-focus");
-
   g_object_unref (widget);
   gdk_event_free (event);
 }
@@ -181,13 +183,10 @@
 {
   GtkWidget *entry = IDO_ENTRY_MENU_ITEM (widget)->priv->entry;
 
+  ido_entry_menu_item_send_focus_change (widget, TRUE);
+
   if (event->button == 1)
     {
-      if (entry->window != NULL)
-        {
-          gdk_window_raise (entry->window);
-        }
-
       if (!gtk_widget_has_focus (entry))
         {
           gtk_widget_grab_focus (entry);