GNOME.org
 

[rygel/rygel-0-22] server,plugins: Fix type name clash

commit c80df3d1395e636ec38316eab4df927e507d3d7b
Author: Jens Georg <mail jensge org>
Date:   Thu May 29 08:31:59 2014 +0200

    server,plugins: Fix type name clash
    
    Caused DBus plugins not to work properly
    
    Signed-off-by: Jens Georg <mail jensge org>
    
    https://bugzilla.gnome.org/show_bug.cgi?id=730913

 src/librygel-server/rygel-dbus-thumbnailer.vala    |    2 +-
 .../rygel-free-desktop-interfaces.vala             |    4 ++--
 .../external/rygel-external-album-art-factory.vala |    2 +-
 src/plugins/external/rygel-external-container.vala |    2 +-
 .../external/rygel-external-icon-factory.vala      |    2 +-
 .../external/rygel-external-item-factory.vala      |    1 -
 .../external/rygel-external-plugin-factory.vala    |    2 +-
 src/plugins/external/rygel-external-plugin.vala    |    2 +-
 .../external/rygel-external-thumbnail-factory.vala |    2 +-
 .../external/rygel-free-desktop-interfaces.vala    |    6 +++---
 .../mpris/rygel-free-desktop-interfaces.vala       |    4 ++--
 src/plugins/mpris/rygel-mpris-plugin-factory.vala  |    2 +-
 12 files changed, 15 insertions(+), 16 deletions(-)
---
diff --git a/src/librygel-server/rygel-dbus-thumbnailer.vala b/src/librygel-server/rygel-dbus-thumbnailer.vala
index db783a0..c2a1e6e 100644
--- a/src/librygel-server/rygel-dbus-thumbnailer.vala
+++ b/src/librygel-server/rygel-dbus-thumbnailer.vala
@@ -21,7 +21,7 @@
 using Gee;
 
 [DBus (name = "org.freedesktop.thumbnails.Thumbnailer1")]
-interface Tumbler : GLib.Object {
+private interface Rygel.Tumbler : GLib.Object {
         public abstract async uint Queue (string[] uris,
                                           string[] mime_types,
                                           string flavor,
diff --git a/src/librygel-server/rygel-free-desktop-interfaces.vala 
b/src/librygel-server/rygel-free-desktop-interfaces.vala
index 511e75c..66e1759 100644
--- a/src/librygel-server/rygel-free-desktop-interfaces.vala
+++ b/src/librygel-server/rygel-free-desktop-interfaces.vala
@@ -21,12 +21,12 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-namespace FreeDesktop {
+namespace Rygel.FreeDesktop {
     internal const string DBUS_SERVICE = "org.freedesktop.DBus";
     internal const string DBUS_OBJECT_PATH = "/org/freedesktop/DBus";
 }
 
 [DBus (name = "org.freedesktop.DBus")]
-internal interface FreeDesktop.DBusObject: Object {
+internal interface Rygel.FreeDesktop.DBusObject: Object {
     internal abstract async string[] list_activatable_names () throws DBusError;
 }
diff --git a/src/plugins/external/rygel-external-album-art-factory.vala 
b/src/plugins/external/rygel-external-album-art-factory.vala
index e523c54..e9f9d7b 100644
--- a/src/plugins/external/rygel-external-album-art-factory.vala
+++ b/src/plugins/external/rygel-external-album-art-factory.vala
@@ -22,7 +22,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-using FreeDesktop;
+using Rygel.External.FreeDesktop;
 
 /**
  * Factory for thumbnail from external plugins.
diff --git a/src/plugins/external/rygel-external-container.vala 
b/src/plugins/external/rygel-external-container.vala
index 89bf94d..449ad43 100644
--- a/src/plugins/external/rygel-external-container.vala
+++ b/src/plugins/external/rygel-external-container.vala
@@ -24,7 +24,7 @@
 
 using GUPnP;
 using Gee;
-using FreeDesktop;
+using Rygel.External.FreeDesktop;
 
 /**
  * Represents an external container.
diff --git a/src/plugins/external/rygel-external-icon-factory.vala 
b/src/plugins/external/rygel-external-icon-factory.vala
index ff8124f..1645284 100644
--- a/src/plugins/external/rygel-external-icon-factory.vala
+++ b/src/plugins/external/rygel-external-icon-factory.vala
@@ -22,7 +22,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-using FreeDesktop;
+using Rygel.External.FreeDesktop;
 
 public class Rygel.External.IconFactory {
     private static string ITEM_IFACE = "org.gnome.UPnP.MediaItem2";
diff --git a/src/plugins/external/rygel-external-item-factory.vala 
b/src/plugins/external/rygel-external-item-factory.vala
index a4ed8b2..46711c7 100644
--- a/src/plugins/external/rygel-external-item-factory.vala
+++ b/src/plugins/external/rygel-external-item-factory.vala
@@ -23,7 +23,6 @@
  */
 
 using GUPnP;
-using FreeDesktop;
 
 /**
  * Creates item for external plugins.
diff --git a/src/plugins/external/rygel-external-plugin-factory.vala 
b/src/plugins/external/rygel-external-plugin-factory.vala
index 273a684..771ab4f 100644
--- a/src/plugins/external/rygel-external-plugin-factory.vala
+++ b/src/plugins/external/rygel-external-plugin-factory.vala
@@ -24,7 +24,7 @@
 
 using Rygel;
 using Gee;
-using FreeDesktop;
+using Rygel.External.FreeDesktop;
 
 private External.PluginFactory plugin_factory;
 
diff --git a/src/plugins/external/rygel-external-plugin.vala b/src/plugins/external/rygel-external-plugin.vala
index 89a318c..f9fc34f 100644
--- a/src/plugins/external/rygel-external-plugin.vala
+++ b/src/plugins/external/rygel-external-plugin.vala
@@ -22,7 +22,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-using FreeDesktop;
+using Rygel.External.FreeDesktop;
 
 public class Rygel.External.Plugin : Rygel.MediaServerPlugin {
     public const string MODULE_NAME = "External";
diff --git a/src/plugins/external/rygel-external-thumbnail-factory.vala 
b/src/plugins/external/rygel-external-thumbnail-factory.vala
index 9576da7..dc933ba 100644
--- a/src/plugins/external/rygel-external-thumbnail-factory.vala
+++ b/src/plugins/external/rygel-external-thumbnail-factory.vala
@@ -22,7 +22,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-using FreeDesktop;
+using Rygel.External.FreeDesktop;
 
 /**
  * Factory for thumbnail from external plugins.
diff --git a/src/plugins/external/rygel-free-desktop-interfaces.vala 
b/src/plugins/external/rygel-free-desktop-interfaces.vala
index 7bd20a6..da7abbd 100644
--- a/src/plugins/external/rygel-free-desktop-interfaces.vala
+++ b/src/plugins/external/rygel-free-desktop-interfaces.vala
@@ -21,13 +21,13 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-namespace FreeDesktop {
+namespace Rygel.External.FreeDesktop {
     internal const string DBUS_SERVICE = "org.freedesktop.DBus";
     internal const string DBUS_OBJECT_PATH = "/org/freedesktop/DBus";
 }
 
 [DBus (name = "org.freedesktop.DBus")]
-internal interface FreeDesktop.DBusObject: Object {
+internal interface Rygel.External.FreeDesktop.DBusObject: Object {
     internal abstract signal void name_owner_changed (string name,
                                                     string old_owner,
                                                     string new_owner);
@@ -37,7 +37,7 @@ internal interface FreeDesktop.DBusObject: Object {
 }
 
 [DBus (name = "org.freedesktop.DBus.Properties")]
-internal interface FreeDesktop.Properties: Object {
+internal interface Rygel.External.FreeDesktop.Properties: Object {
     internal abstract async HashTable<string,Variant> get_all (string iface)
                                                              throws DBusError;
 }
diff --git a/src/plugins/mpris/rygel-free-desktop-interfaces.vala 
b/src/plugins/mpris/rygel-free-desktop-interfaces.vala
index d39e53d..c05c7a5 100644
--- a/src/plugins/mpris/rygel-free-desktop-interfaces.vala
+++ b/src/plugins/mpris/rygel-free-desktop-interfaces.vala
@@ -21,13 +21,13 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-namespace FreeDesktop {
+namespace Rygel.MPRIS.FreeDesktop {
     internal const string DBUS_SERVICE = "org.freedesktop.DBus";
     internal const string DBUS_OBJECT_PATH = "/org/freedesktop/DBus";
 }
 
 [DBus (name = "org.freedesktop.DBus")]
-internal interface FreeDesktop.DBusObject: Object {
+internal interface Rygel.MPRIS.FreeDesktop.DBusObject: Object {
     internal abstract signal void name_owner_changed (string name,
                                                     string old_owner,
                                                     string new_owner);
diff --git a/src/plugins/mpris/rygel-mpris-plugin-factory.vala 
b/src/plugins/mpris/rygel-mpris-plugin-factory.vala
index cb5d098..fd9336d 100644
--- a/src/plugins/mpris/rygel-mpris-plugin-factory.vala
+++ b/src/plugins/mpris/rygel-mpris-plugin-factory.vala
@@ -24,7 +24,7 @@
 
 using Rygel;
 using Gee;
-using FreeDesktop;
+using Rygel.MPRIS.FreeDesktop;
 
 private MPRIS.PluginFactory plugin_factory;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]