Merge lp:~gue5t/midori/search-clear-menu into lp:midori

[gue5t gue5t]

Don't open search engines menu when clearing search action

At present, clicking (with any mouse button) the clear icon after entering text in the search entry opens the drop-down menu listing search engines. This is incorrect and unintended behavior, and requires an additional click to dismiss the menu when just trying to clear the entry.

This branch restores the intended behavior of the clear icon.

[Paweł Forysiuk (tuxator)]

review: Approve

=== modified file 'midori/midori-searchaction.c'
--- midori/midori-searchaction.c	2014-07-16 02:14:19 +0000
+++ midori/midori-searchaction.c	2015-03-16 15:41:38 +0000
@@ -466,6 +466,10 @@
                                        gint                 button,
                                        GtkAction*           action)
 {
+    /* Only display the search engines when the engine icon, not clear button, is clicked */
+    if (icon_pos != GTK_ENTRY_ICON_PRIMARY)
+        return;
+
     GtkMenu* menu = midori_search_action_get_menu (entry,
                                                    MIDORI_SEARCH_ACTION (action),
                                                    midori_search_action_engine_activate_cb);