Merge lp:~midori/midori/domainkeysfixes into lp:midori

[Paweł Forysiuk]

Fix building ctrl+enter extension with older versions of vala

[Cris Dywan (kalikiana)]

Looks good, and seems to work as before. Tested with different Vala versions.

review: Approve

=== modified file 'extensions/domain-keys.vala'
--- extensions/domain-keys.vala	2014-03-02 18:25:40 +0000
+++ extensions/domain-keys.vala	2014-03-03 22:53:12 +0000
@@ -13,7 +13,7 @@
     class Manager : Midori.Extension {
         internal Manager () {
             GLib.Object (name: _("Domain Hotkeys"),
-                         description: _("Add www. and .com/.country_domain and proceed with Ctrl+Enter/Ctrl+Shift"),
+                         description: _("Add www. and .com/.country_domain and proceed with Ctrl+Enter/Shift+Enter"),
                          version: "0.1" + Midori.VERSION_SUFFIX,
                          authors: "James Axl <[e-mail]>");
             activate.connect (this.activated);
@@ -21,7 +21,7 @@
         }
 
         bool key_press_event (Midori.LocationAction action, Gdk.EventKey event_key) {
-            if (event_key.keyval == Gdk.Key.Return) {
+            if (event_key.keyval == Gdk.keyval_from_name ("Return")) {
                 if ((bool)(event_key.state & Gdk.ModifierType.CONTROL_MASK)) {
                     submit_uri(action);
                     return true;