Merge lp:~larsu/evince/lp1312179 into lp:~ubuntu-desktop/evince/ubuntu

[Lars Karlitski]

menu patch: allow detailed action names in the set_accels_for_action case

[Sebastien Bacher (seb128)]

thanks

review: Approve

=== modified file 'debian/patches/0002-Don-t-use-gtk_application_set_accels_for_action.patch'
--- debian/patches/0002-Don-t-use-gtk_application_set_accels_for_action.patch	2014-02-10 17:43:04 +0000
+++ debian/patches/0002-Don-t-use-gtk_application_set_accels_for_action.patch	2014-04-29 14:20:41 +0000
@@ -14,23 +14,33 @@
  shell/menus.ui         | 22 ++++++++++++++++++++++
  2 files changed, 23 insertions(+), 1 deletion(-)
 
-diff --git a/shell/ev-application.c b/shell/ev-application.c
-index e2d87af..2c4b7b3 100644
---- a/shell/ev-application.c
-+++ b/shell/ev-application.c
-@@ -1176,7 +1176,7 @@ ev_application_startup (GApplication *gapplication)
+Index: evince-3.10.3/shell/ev-application.c
+===================================================================
+--- evince-3.10.3.orig/shell/ev-application.c	2014-04-29 16:09:07.319931409 +0200
++++ evince-3.10.3/shell/ev-application.c	2014-04-29 16:09:33.031931585 +0200
+@@ -1193,7 +1193,17 @@
          it = action_accels;
          while (it[0])
            {
 -            gtk_application_set_accels_for_action (GTK_APPLICATION (application), it[0], &it[1]);
-+            gtk_application_add_accelerator (GTK_APPLICATION (application), it[1], it[0], NULL);
++            gchar *action;
++            GVariant *target;
++
++            if (g_action_parse_detailed_name (it[0], &action, &target, NULL))
++              {
++                gtk_application_add_accelerator (GTK_APPLICATION (application), it[1], action, target);
++
++                g_free (action);
++                if (target)
++                  g_variant_unref (target);
++              }
              it += g_strv_length ((gchar **) it) + 1;
            }
  }
-diff --git a/shell/menus.ui b/shell/menus.ui
-index c3006f8..1d9a32e 100644
---- a/shell/menus.ui
-+++ b/shell/menus.ui
+Index: evince-3.10.3/shell/menus.ui
+===================================================================
+--- evince-3.10.3.orig/shell/menus.ui	2014-04-29 16:09:07.319931409 +0200
++++ evince-3.10.3/shell/menus.ui	2014-04-29 16:09:07.311931409 +0200
 @@ -23,6 +23,7 @@
        <item>
          <attribute name="label" translatable="yes">_Open</attribute>
@@ -181,6 +191,3 @@
        </item>
      </section>
      <section>
--- 
-1.9.rc1
-