Meh... Fix Vala alreadylibzeitgeist2

2 files changed, 20 insertions, 29 deletions

diff --git a/extensions/storage-monitor.vala b/extensions/storage-monitor.vala
index d5c581aa..f1c1eeed 100644
--- a/extensions/storage-monitor.vala
+++ b/extensions/storage-monitor.vala
@@ -541,35 +541,6 @@ namespace Zeitgeist
         }
     }
 
-    [DBus (name = "org.freedesktop.NetworkManager")]
-    internal interface NetworkManagerDBus : Object
-    {
-        [DBus (name = "state")]
-        public abstract uint32 state () throws IOError;
-        public signal void state_changed (uint32 state);
-    }
-
-    [DBus (name = "net.connman.Manager")]
-    internal interface ConnmanManagerDBus : Object
-    {
-        public abstract string get_state () throws IOError;
-        public signal void state_changed (string state);
-    }
-
-    // vala doesn't include proper headers, this fixes it
-    private static void vala_bug_workaround_2 ()
-    {
-        try
-        {
-            Bus.get_sync (BusType.SESSION, null);
-        }
-        catch (Error err)
-        {
-            // kill "unused method" warning
-            vala_bug_workaround_2 ();
-        }
-    }
-
     [ModuleInit]
 #if BUILTIN_EXTENSIONS
     public static Type storage_monitor_init (TypeModule module)
diff --git a/libzeitgeist/remote.vala b/libzeitgeist/remote.vala
index 33eb48b9..2b74c4e5 100644
--- a/libzeitgeist/remote.vala
+++ b/libzeitgeist/remote.vala
@@ -134,6 +134,26 @@ namespace Zeitgeist
             out double[] relevancies, out uint matches,
             Cancellable? cancellable=null) throws Error;
     }
+
+    /* FIXME: Remove this! Only here because of a bug
+              in Vala (Vala Bug #661361) */
+    [DBus (name = "org.freedesktop.NetworkManager")]
+    public interface NetworkManagerDBus : Object
+    {
+        [DBus (name = "state")]
+        public abstract uint32 state () throws IOError;
+        public signal void state_changed (uint32 state);
+    }
+
+    /* FIXME: Remove this! Only here because of a bug
+              in Vala (Vala Bug #661361) */
+    [DBus (name = "net.connman.Manager")]
+    public interface ConnmanManagerDBus : Object
+    {
+        public abstract string get_state () throws IOError;
+        public signal void state_changed (string state);
+    }
+
 }
 
 // vim:expandtab:ts=4:sw=4