Merge lp:~gue5t/midori/restore-middle-btn-up into lp:midori

[gue5t gue5t]

Remove explicit mouse button handling from KatzeArrayAction

This seems to fix the bug, but I'm wary of removing code without understanding why it was there in the first place. I did test it (trash, the tabs menu, etc.) and noticed no regressions. Why do we have explicit mouse handling in ArrayAction?

[Cris Dywan (kalikiana)]

Did you test with global menubars?

review: Needs Information

[gue5t gue5t (gue5t)]

The global menubars only emit the "activate" event, but I have not. I'll trek on over to the nearest Ubuntu box and see if I can test.

[Cris Dywan (kalikiana)]

Testing I get this while using menus

gtk_widget_get_preferred_height_for_width: assertion 'width >= 0' failed

review: Needs Fixing

[gue5t gue5t (gue5t)]

Does the gtk_widget_get_preferred_height_for_width fail with the Ubuntu global menubar, or with a certain GTK3 theme? I can't seem to reproduce it locally. The assertion sounds like maybe a widget hasn't been realized yet at some point, but it's difficult to figure out realization ordering issues just by looking at code.

[Cris Dywan (kalikiana)]

Hrm something more fundamental must have broken I can't get the menubar to appear in the global panel at all even if I override UBUNTU_MENUPROXY. Though no errors either. But the only change due to Midori assuming there is a global bar I can see is the menu item [x] Menubar disappearing from the menus.

[Cris Dywan (kalikiana)]

review: Approve

[RabbitBot (rabbitbot-a)]

Attempt to merge into lp:midori failed due to conflicts:

text conflict in katze/katze-arrayaction.c

Unmerged revisions

6474. By gue5t <email address hidden> on 2013-11-15

Remove explicit mouse button handling from KatzeArrayAction

=== modified file 'katze/katze-arrayaction.c'
--- katze/katze-arrayaction.c	2012-12-16 18:40:00 +0000
+++ katze/katze-arrayaction.c	2013-11-15 02:55:41 +0000
@@ -305,23 +305,6 @@
     katze_array_action_activate_item (array_action, item, 1);
 }
 
-static gboolean
-katze_array_action_menu_button_press_cb (GtkWidget*        proxy,
-                                         GdkEventButton*   event,
-                                         KatzeArrayAction* array_action)
-{
-    KatzeItem* item = g_object_get_data (G_OBJECT (proxy), "KatzeItem");
-
-    katze_array_action_activate_item (array_action, item, event->button);
-
-    /* we need to block the 'activate' handler which would be called
-     * otherwise as well */
-    g_signal_handlers_block_by_func (proxy,
-        katze_array_action_menu_activate_cb, array_action);
-
-    return TRUE;
-}
-
 static void
 katze_array_action_menu_item_select_cb (GtkWidget*        proxy,
                                         KatzeArrayAction* array_action);
@@ -414,8 +397,6 @@
             g_signal_connect (menuitem, "activate",
                 G_CALLBACK (katze_array_action_menu_activate_cb), array_action);
         }
-        g_signal_connect (menuitem, "button-press-event",
-            G_CALLBACK (katze_array_action_menu_button_press_cb), array_action);
         gtk_widget_show (menuitem);
     }
 }
@@ -625,9 +606,6 @@
     }
     else
     {
-        g_signal_connect (menuitem, "button-press-event",
-            G_CALLBACK (katze_array_action_menu_button_press_cb), array_action);
-        /* we need the 'activate' signal as well for keyboard events */
         g_signal_connect (menuitem, "activate",
             G_CALLBACK (katze_array_action_menu_activate_cb), array_action);
     }