[rygel/wip/g-i: 43/48] wip: Remove Freedesktop interfaces from core

[Jens Georg <jensgeorg src gnome org>]

commit 88c106c59797e2caaba81b0e06a3437cfe59e7bd
Author: Jens Georg <jensg openismus com>
Date:   Sat May 25 15:35:23 2013 +0900

    wip: Remove Freedesktop interfaces from core

 src/librygel-core/filelist.am                      |    1 -
 src/librygel-server/filelist.am                    |    1 +
 .../rygel-free-desktop-interfaces.vala             |   19 ++++---------------
 src/plugins/external/Makefile.am                   |    3 ++-
 .../external}/rygel-free-desktop-interfaces.vala   |   16 ++++++++--------
 src/plugins/mpris/Makefile.am                      |    3 ++-
 .../mpris}/rygel-free-desktop-interfaces.vala      |   18 ++++++------------
 7 files changed, 23 insertions(+), 38 deletions(-)
---
diff --git a/src/librygel-core/filelist.am b/src/librygel-core/filelist.am
index bea3b1e..231110e 100644
--- a/src/librygel-core/filelist.am
+++ b/src/librygel-core/filelist.am
@@ -13,7 +13,6 @@ LIBRYGEL_CORE_VAPI_SOURCE_FILES = \
        rygel-media-device.vala \
        rygel-configuration.vala \
        rygel-base-configuration.vala \
-       rygel-free-desktop-interfaces.vala \
        rygel-state-machine.vala \
        rygel-v1-hacks.vala
 
diff --git a/src/librygel-server/filelist.am b/src/librygel-server/filelist.am
index fcc0bbc..c513de1 100644
--- a/src/librygel-server/filelist.am
+++ b/src/librygel-server/filelist.am
@@ -38,6 +38,7 @@ LIBRYGEL_SERVER_NONVAPI_SOURCE_FILES = \
        rygel-content-directory.vala \
        rygel-dbus-thumbnailer.vala \
        rygel-engine-loader.vala \
+       rygel-free-desktop-interfaces.vala \
        rygel-http-byte-seek.vala \
        rygel-http-get-handler.vala \
        rygel-http-get.vala \
diff --git a/src/librygel-core/rygel-free-desktop-interfaces.vala 
b/src/librygel-server/rygel-free-desktop-interfaces.vala
similarity index 55%
copy from src/librygel-core/rygel-free-desktop-interfaces.vala
copy to src/librygel-server/rygel-free-desktop-interfaces.vala
index e4713ef..511e75c 100644
--- a/src/librygel-core/rygel-free-desktop-interfaces.vala
+++ b/src/librygel-server/rygel-free-desktop-interfaces.vala
@@ -22,22 +22,11 @@
  */
 
 namespace FreeDesktop {
-    public const string DBUS_SERVICE = "org.freedesktop.DBus";
-    public const string DBUS_OBJECT_PATH = "/org/freedesktop/DBus";
+    internal const string DBUS_SERVICE = "org.freedesktop.DBus";
+    internal const string DBUS_OBJECT_PATH = "/org/freedesktop/DBus";
 }
 
 [DBus (name = "org.freedesktop.DBus")]
-public interface FreeDesktop.DBusObject: Object {
-    public abstract signal void name_owner_changed (string name,
-                                                    string old_owner,
-                                                    string new_owner);
-
-    public abstract async string[] list_names () throws DBusError;
-    public abstract async string[] list_activatable_names () throws DBusError;
-}
-
-[DBus (name = "org.freedesktop.DBus.Properties")]
-public interface FreeDesktop.Properties: Object {
-    public abstract async HashTable<string,Variant> get_all (string iface)
-                                                             throws DBusError;
+internal interface FreeDesktop.DBusObject: Object {
+    internal abstract async string[] list_activatable_names () throws DBusError;
 }
diff --git a/src/plugins/external/Makefile.am b/src/plugins/external/Makefile.am
index 3d28073..fa28188 100644
--- a/src/plugins/external/Makefile.am
+++ b/src/plugins/external/Makefile.am
@@ -13,7 +13,8 @@ librygel_external_la_SOURCES = \
        rygel-external-interfaces.vala \
        rygel-external-plugin-factory.vala \
        rygel-external-icon-factory.vala \
-       rygel-external-variant-util.vala
+       rygel-external-variant-util.vala \
+       rygel-free-desktop-interfaces.vala
 
 librygel_external_la_VALAFLAGS = \
        $(RYGEL_COMMON_LIBRYGEL_SERVER_VALAFLAGS) \
diff --git a/src/librygel-core/rygel-free-desktop-interfaces.vala 
b/src/plugins/external/rygel-free-desktop-interfaces.vala
similarity index 70%
copy from src/librygel-core/rygel-free-desktop-interfaces.vala
copy to src/plugins/external/rygel-free-desktop-interfaces.vala
index e4713ef..7bd20a6 100644
--- a/src/librygel-core/rygel-free-desktop-interfaces.vala
+++ b/src/plugins/external/rygel-free-desktop-interfaces.vala
@@ -22,22 +22,22 @@
  */
 
 namespace FreeDesktop {
-    public const string DBUS_SERVICE = "org.freedesktop.DBus";
-    public const string DBUS_OBJECT_PATH = "/org/freedesktop/DBus";
+    internal const string DBUS_SERVICE = "org.freedesktop.DBus";
+    internal const string DBUS_OBJECT_PATH = "/org/freedesktop/DBus";
 }
 
 [DBus (name = "org.freedesktop.DBus")]
-public interface FreeDesktop.DBusObject: Object {
-    public abstract signal void name_owner_changed (string name,
+internal interface FreeDesktop.DBusObject: Object {
+    internal abstract signal void name_owner_changed (string name,
                                                     string old_owner,
                                                     string new_owner);
 
-    public abstract async string[] list_names () throws DBusError;
-    public abstract async string[] list_activatable_names () throws DBusError;
+    internal abstract async string[] list_names () throws DBusError;
+    internal abstract async string[] list_activatable_names () throws DBusError;
 }
 
 [DBus (name = "org.freedesktop.DBus.Properties")]
-public interface FreeDesktop.Properties: Object {
-    public abstract async HashTable<string,Variant> get_all (string iface)
+internal interface FreeDesktop.Properties: Object {
+    internal abstract async HashTable<string,Variant> get_all (string iface)
                                                              throws DBusError;
 }
diff --git a/src/plugins/mpris/Makefile.am b/src/plugins/mpris/Makefile.am
index c672e2b..45211f5 100644
--- a/src/plugins/mpris/Makefile.am
+++ b/src/plugins/mpris/Makefile.am
@@ -7,7 +7,8 @@ librygel_mpris_la_SOURCES = \
        rygel-mpris-player.vala \
        rygel-mpris-plugin.vala \
        rygel-mpris-plugin-factory.vala \
-       rygel-mpris-interfaces.vala
+       rygel-mpris-interfaces.vala \
+       rygel-free-desktop-interfaces.vala
 
 librygel_mpris_la_VALAFLAGS = \
        $(RYGEL_COMMON_LIBRYGEL_RENDERER_VALAFLAGS) \
diff --git a/src/librygel-core/rygel-free-desktop-interfaces.vala 
b/src/plugins/mpris/rygel-free-desktop-interfaces.vala
similarity index 63%
rename from src/librygel-core/rygel-free-desktop-interfaces.vala
rename to src/plugins/mpris/rygel-free-desktop-interfaces.vala
index e4713ef..d39e53d 100644
--- a/src/librygel-core/rygel-free-desktop-interfaces.vala
+++ b/src/plugins/mpris/rygel-free-desktop-interfaces.vala
@@ -22,22 +22,16 @@
  */
 
 namespace FreeDesktop {
-    public const string DBUS_SERVICE = "org.freedesktop.DBus";
-    public const string DBUS_OBJECT_PATH = "/org/freedesktop/DBus";
+    internal const string DBUS_SERVICE = "org.freedesktop.DBus";
+    internal const string DBUS_OBJECT_PATH = "/org/freedesktop/DBus";
 }
 
 [DBus (name = "org.freedesktop.DBus")]
-public interface FreeDesktop.DBusObject: Object {
-    public abstract signal void name_owner_changed (string name,
+internal interface FreeDesktop.DBusObject: Object {
+    internal abstract signal void name_owner_changed (string name,
                                                     string old_owner,
                                                     string new_owner);
 
-    public abstract async string[] list_names () throws DBusError;
-    public abstract async string[] list_activatable_names () throws DBusError;
-}
-
-[DBus (name = "org.freedesktop.DBus.Properties")]
-public interface FreeDesktop.Properties: Object {
-    public abstract async HashTable<string,Variant> get_all (string iface)
-                                                             throws DBusError;
+    internal abstract async string[] list_names () throws DBusError;
+    internal abstract async string[] list_activatable_names () throws DBusError;
 }