[Xfce4-commits] <postler:master> In Vala 0.10, GLib.RegexEvalCallback takes no user data

[Christian Dywan]

Updating branch refs/heads/master
         to 1269cfa760eb8f0831cafcba3e49c7337369d25f (commit)
       from d789ad143da83015a37093ef198ab03a0e3c8caa (commit)

commit 1269cfa760eb8f0831cafcba3e49c7337369d25f
Author: Christian Dywan <christian at twotoasts.de>
Date:   Wed Oct 20 18:46:48 2010 +0200

    In Vala 0.10, GLib.RegexEvalCallback takes no user data

 postler/postler-content.vala  |    2 +-
 postler/postler-messages.vala |    6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/postler/postler-content.vala b/postler/postler-content.vala
index cc7b8b8..d2b691d 100644
--- a/postler/postler-content.vala
+++ b/postler/postler-content.vala
@@ -744,7 +744,7 @@ public class Postler.Content : WebKit.WebView {
                     var escaped = GLib.Regex.escape_string (" " + emoticon.token);
                     var regex = new GLib.Regex (escaped);
                     body_chunk = regex.replace_eval (body_chunk, -1, 0, 0,
-                                                     evaluate_emoticon, &emoticon);
+                        (match_info, result) => { evaluate_emoticon (match_info, result, &emoticon); });
                 }
                 catch (GLib.RegexError error) { }
             }
diff --git a/postler/postler-messages.vala b/postler/postler-messages.vala
index 0500e64..571085e 100644
--- a/postler/postler-messages.vala
+++ b/postler/postler-messages.vala
@@ -220,8 +220,7 @@ public class Postler.Messages : Gtk.TreeView {
     }
 
     static bool evaluate_hex (GLib.MatchInfo     match_info,
-                              GLib.StringBuilder result,
-                              void*              user_data) {
+                              GLib.StringBuilder result) {
         string match = "0x" + match_info.fetch (2);
         result.append_printf ("%c", (int)match.to_ulong (null));
         return false;
@@ -231,8 +230,7 @@ public class Postler.Messages : Gtk.TreeView {
         string unquoted = quoted.replace (" =", " ").replace ("_", " ");
         try {
             var regex = new GLib.Regex ("([=]([0-9A-F][0-9A-F]))");
-            return regex.replace_eval (unquoted, -1, 0, 0,
-                                       evaluate_hex, null);
+            return regex.replace_eval (unquoted, -1, 0, 0, evaluate_hex);
         }
         catch (GLib.RegexError error) {
             GLib.critical (_("Failed to decode string \"%s\": %s"),