Merge lp:~kalikiana/midori/ctxmenufixes into lp:midori

[Cris Dywan]

Update Delete action sensitivity and swap Undo/ Redo

As suggested in the related bug:
The 'Open in New Window' icon is fine here, I see nothing to be improved.
GTK+ upstream has decided to get rid of the input method and unicode menu items, so it seems pointless to me to re-introduce them now.

[gue5t gue5t (gue5t)]

From what I hear, GTK 3.9.8 removes the menu items, but previous GTK3 versions and all GTK2 versions keep it, so if possible I think we should still place the menuitems if possible in those environments. That can be done separately from this change.

[gue5t gue5t (gue5t)]

This pull request should be split into two: one for Midori.URI work and one for the context-menu fixes.

It looks like the activation checks for undo/redo items are reversed: undo checks can_redo and vice-versa.

review: Needs Fixing

[lp:~kalikiana/midori/ctxmenufixes]

6328. By Launchpad Translations on behalf of midori on 2013-08-09

Launchpad automatic translations update.

6329. By Cris Dywan on 2013-08-09

Always use Inspect Element and not Inspect Page in the context menu

6330. By Cris Dywan on 2013-08-09

Swap Undo/ Redo in context menu to match menubar

6331. By Cris Dywan on 2013-08-09

Update Delete action sensitivity in context menu

[Cris Dywan (kalikiana)]

Sorry for the mess, I re-created the commits.

[gue5t gue5t (gue5t)]

Much better.

review: Approve

=== modified file 'midori/midori-view.c'
--- midori/midori-view.c	2013-08-09 21:00:42 +0000
+++ midori/midori-view.c	2013-08-09 21:48:14 +0000
@@ -2312,9 +2312,9 @@
     {
         /* Enforce update of actions - there's no "selection-changed" signal */
         #ifndef HAVE_WEBKIT2
+        gtk_action_set_sensitive (gtk_action_group_get_action (actions, "Undo"),
+            webkit_web_view_can_undo (WEBKIT_WEB_VIEW (view->web_view)));
         gtk_action_set_sensitive (gtk_action_group_get_action (actions, "Redo"),
-            webkit_web_view_can_undo (WEBKIT_WEB_VIEW (view->web_view)));
-        gtk_action_set_sensitive (gtk_action_group_get_action (actions, "Undo"),
             webkit_web_view_can_redo (WEBKIT_WEB_VIEW (view->web_view)));
         gtk_action_set_sensitive (gtk_action_group_get_action (actions, "Cut"),
             webkit_web_view_can_cut_clipboard (WEBKIT_WEB_VIEW (view->web_view)));
@@ -2322,10 +2322,12 @@
             webkit_web_view_can_copy_clipboard (WEBKIT_WEB_VIEW (view->web_view)));
         gtk_action_set_sensitive (gtk_action_group_get_action (actions, "Paste"),
             webkit_web_view_can_paste_clipboard (WEBKIT_WEB_VIEW (view->web_view)));
+        gtk_action_set_sensitive (gtk_action_group_get_action (actions, "Delete"),
+            webkit_web_view_can_cut_clipboard (WEBKIT_WEB_VIEW (view->web_view)));
         gtk_action_set_sensitive (gtk_action_group_get_action (actions, "SelectAll"), TRUE);
         #endif
+        midori_context_action_add_by_name (menu, "Undo");
         midori_context_action_add_by_name (menu, "Redo");
-        midori_context_action_add_by_name (menu, "Undo");
         midori_context_action_add (menu, NULL);
         midori_context_action_add_by_name (menu, "Cut");
         midori_context_action_add_by_name (menu, "Copy");