[geary/bug/728002-webkit2: 130/140] Fix some compilation issues on older vala/gcc/GTK+ setups.



commit d41e74ffe373da4a4199f9d6a288b3296f4fbee5
Author: Michael James Gratton <mike vee net>
Date:   Mon Jan 30 14:50:18 2017 +1100

    Fix some compilation issues on older vala/gcc/GTK+ setups.
    
    * src/client/composer/composer-link-popover.vala (ComposerLinkPopover):
      Replace calls to GTK 3.22-specific ::popdown() with ::hide().
    
    * src/engine/util/util-js.vala (Geary.JS): Replace '\v' literal,
      unsupported on at least valac 0.30.1 and gcc 5.4, with ordinal equiv.

 src/client/composer/composer-link-popover.vala |    6 ++++--
 src/engine/util/util-js.vala                   |    2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/src/client/composer/composer-link-popover.vala b/src/client/composer/composer-link-popover.vala
index 3a763df..538801a 100644
--- a/src/client/composer/composer-link-popover.vala
+++ b/src/client/composer/composer-link-popover.vala
@@ -173,13 +173,15 @@ public class ComposerLinkPopover : Gtk.Popover {
     [GtkCallback]
     private void on_activate_popover() {
         link_activate();
-        this.popdown();
+        // GTK+ 3.22/4: Change change this to popdown()
+        hide();
     }
 
     [GtkCallback]
     private void on_delete_clicked() {
         link_delete();
-        this.popdown();
+        // GTK+ 3.22/4: Change change this to popdown()
+        hide();
     }
 
     [GtkCallback]
diff --git a/src/engine/util/util-js.vala b/src/engine/util/util-js.vala
index e6f61f0..4f65c14 100644
--- a/src/engine/util/util-js.vala
+++ b/src/engine/util/util-js.vala
@@ -163,7 +163,7 @@ namespace Geary.JS {
      */
     public string escape_string(string value) {
         const unichar[] RESERVED = {
-            '\x00', '\'', '"', '\\', '\n', '\r', '\v', '\t', '\b', '\f'
+            '\x00', '\'', '"', '\\', '\n', '\r', '\x0b', '\t', '\b', '\f'
         };
         StringBuilder builder = new StringBuilder.sized(value.length);
         for (int i = 0; i < value.length; i++) {


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]