From 9b593480006f72e634029c8356f3f51ae28f04fb Mon Sep 17 00:00:00 2001
From: Michal Hruby <michal.mhr@gmail.com>
Date: Tue, 11 Oct 2011 12:18:06 +0200
Subject: Don't overuse Variants if we can just use a struct

---
 src/remote.vala           | 10 ++++++++--
 src/zeitgeist-daemon.vala | 18 +++++++++---------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/remote.vala b/src/remote.vala
index ae6b0e70..70713f74 100644
--- a/src/remote.vala
+++ b/src/remote.vala
@@ -21,6 +21,12 @@
 
 namespace Zeitgeist
 {
+    public struct VersionStruct
+    {
+        int major;
+        int minor;
+        int micro;
+    }
 
     [DBus (name = "org.gnome.zeitgeist.Log")]
     public interface RemoteLog : Object
@@ -86,8 +92,8 @@ namespace Zeitgeist
         [DBus (name = "extensions")]
         public abstract string[] extensions { owned get; }
 
-        [DBus (signature = "iii", name = "version")]
-        public abstract Variant version { owned get; }
+        [DBus (name = "version")]
+        public abstract VersionStruct version { owned get; }
 
     }
 
diff --git a/src/zeitgeist-daemon.vala b/src/zeitgeist-daemon.vala
index 1b85d9f6..fb95e99c 100644
--- a/src/zeitgeist-daemon.vala
+++ b/src/zeitgeist-daemon.vala
@@ -88,26 +88,26 @@ namespace Zeitgeist
             }
         }
 
-        public Variant version
+        public VersionStruct version
         {
             owned get
             {
-                var vb = new VariantBuilder (new VariantType ("(iii)"));
+                var s = VersionStruct ();
                 string[] ver = Config.VERSION.split (".");
                 if (ver.length >= 3)
                 {
-                    vb.add ("i", int.parse (ver[0]));
-                    vb.add ("i", int.parse (ver[1]));
-                    vb.add ("i", int.parse (ver[2]));
+                    s.major = int.parse (ver[0]);
+                    s.minor = int.parse (ver[1]);
+                    s.micro = int.parse (ver[2]);
                 }
                 else
                 {
                     warning ("Unable to parse version info!");
-                    vb.add ("i", 0);
-                    vb.add ("i", 8);
-                    vb.add ("i", 99);
+                    s.major = 0;
+                    s.minor = 8;
+                    s.micro = 99;
                 }
-                return vb.end ();
+                return s;
             }
         }
 
-- 
cgit v1.2.3