[gnome-photos] dlna-renderer: Do not expose the dLeyna DBus proxies

[Debarshi Ray <debarshir src gnome org>]

commit d10fcdf636fb52fe2c6e490fd96169b7314f6095
Author: Emanuele Aina <emanuele aina collabora com>
Date:   Sat Aug 3 16:50:11 2013 +0200

    dlna-renderer: Do not expose the dLeyna DBus proxies
    
    Instead of a getter for the full GDBusProxy-subclassing objects, provide
    a mean to obtain the UDN and drop the three getters.
    
    Actually, three prototypes and one implementation, since I forgot to
    commit the _get_push_host()/_get_player() implementations. Ouch.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=705436

 src/photos-dlna-renderer.c          |   22 ++++++++++++----------
 src/photos-dlna-renderer.h          |   11 ++---------
 src/photos-dlna-renderers-manager.c |   12 ++++--------
 3 files changed, 18 insertions(+), 27 deletions(-)
---
diff --git a/src/photos-dlna-renderer.c b/src/photos-dlna-renderer.c
index 00d9472..cfc7269 100644
--- a/src/photos-dlna-renderer.c
+++ b/src/photos-dlna-renderer.c
@@ -21,8 +21,10 @@
 
 #include "config.h"
 
+#include "photos-dleyna-renderer-device.h"
+#include "photos-dleyna-renderer-push-host.h"
 #include "photos-dlna-renderer.h"
-
+#include "photos-mpris-player.h"
 
 typedef enum
 {
@@ -446,15 +448,6 @@ photos_dlna_renderer_get_object_path (PhotosDlnaRenderer *self)
 }
 
 
-DleynaRendererDevice *
-photos_dlna_renderer_get_device (PhotosDlnaRenderer *self)
-{
-  PhotosDlnaRendererPrivate *priv = self->priv;
-
-  return priv->device;
-}
-
-
 static void
 photos_dlna_renderer_share_play_cb (GObject      *source_object,
                                     GAsyncResult *res,
@@ -802,6 +795,15 @@ photos_dlna_renderer_get_friendly_name (PhotosDlnaRenderer *self)
 }
 
 
+const gchar *
+photos_dlna_renderer_get_udn (PhotosDlnaRenderer *self)
+{
+  PhotosDlnaRendererPrivate *priv = self->priv;
+
+  return dleyna_renderer_device_get_udn (priv->device);
+}
+
+
 void
 photos_dlna_renderer_get_icon (PhotosDlnaRenderer  *self,
                                const gchar         *resolution,
diff --git a/src/photos-dlna-renderer.h b/src/photos-dlna-renderer.h
index 302f4ba..09c20e6 100644
--- a/src/photos-dlna-renderer.h
+++ b/src/photos-dlna-renderer.h
@@ -25,9 +25,6 @@
 #include <gio/gio.h>
 
 #include "photos-base-item.h"
-#include "photos-dleyna-renderer-device.h"
-#include "photos-dleyna-renderer-push-host.h"
-#include "photos-mpris-player.h"
 
 G_BEGIN_DECLS
 
@@ -83,12 +80,6 @@ PhotosDlnaRenderer   *photos_dlna_renderer_new_for_bus_finish (GAsyncResult
 
 const gchar          *photos_dlna_renderer_get_object_path    (PhotosDlnaRenderer  *renderer);
 
-DleynaRendererDevice *photos_dlna_renderer_get_device         (PhotosDlnaRenderer  *renderer);
-
-DleynaPushHost       *photos_dlna_renderer_get_push_host      (PhotosDlnaRenderer  *renderer);
-
-MprisPlayer          *photos_dlna_renderer_get_player         (PhotosDlnaRenderer  *renderer);
-
 void                  photos_dlna_renderer_share              (PhotosDlnaRenderer  *renderer,
                                                                PhotosBaseItem      *item,
                                                                GCancellable        *cancellable,
@@ -120,6 +111,8 @@ void                  photos_dlna_renderer_unshare_all_finish (PhotosDlnaRendere
 
 const gchar          *photos_dlna_renderer_get_friendly_name  (PhotosDlnaRenderer  *self);
 
+const gchar          *photos_dlna_renderer_get_udn            (PhotosDlnaRenderer  *self);
+
 void                  photos_dlna_renderer_get_icon           (PhotosDlnaRenderer  *self,
                                                                const gchar         *requested_mimetype,
                                                                const gchar         *resolution,
diff --git a/src/photos-dlna-renderers-manager.c b/src/photos-dlna-renderers-manager.c
index a722368..33d99ea 100644
--- a/src/photos-dlna-renderers-manager.c
+++ b/src/photos-dlna-renderers-manager.c
@@ -68,7 +68,6 @@ photos_dlna_renderers_manager_renderer_new_cb (GObject      *source_object,
   PhotosDlnaRenderersManager *self = PHOTOS_DLNA_RENDERERS_MANAGER (user_data);
   PhotosDlnaRenderersManagerPrivate *priv = self->priv;
   PhotosDlnaRenderer *renderer;
-  DleynaRendererDevice *device;
   const gchar *object_path;
   GError *error = NULL;
 
@@ -80,11 +79,10 @@ photos_dlna_renderers_manager_renderer_new_cb (GObject      *source_object,
       return;
     }
 
-  device = photos_dlna_renderer_get_device (renderer);
   object_path = photos_dlna_renderer_get_object_path (renderer);
   g_debug ("%s '%s' %s %s", __func__,
-           dleyna_renderer_device_get_friendly_name (device),
-           dleyna_renderer_device_get_udn (device),
+           photos_dlna_renderer_get_friendly_name (renderer),
+           photos_dlna_renderer_get_udn (renderer),
            object_path);
   g_hash_table_insert (priv->renderers, (gpointer) object_path, renderer);
   g_signal_emit (self, signals[RENDERER_FOUND], 0, renderer);
@@ -111,16 +109,14 @@ photos_dlna_renderers_manager_renderer_lost_cb (PhotosDlnaRenderersManager *self
 {
   PhotosDlnaRenderersManagerPrivate *priv = self->priv;
   PhotosDlnaRenderer *renderer;
-  DleynaRendererDevice *device;
 
   renderer = PHOTOS_DLNA_RENDERER (g_hash_table_lookup (priv->renderers, object_path));
   g_return_if_fail (renderer != NULL);
 
   g_hash_table_steal (priv->renderers, object_path);
-  device = photos_dlna_renderer_get_device (renderer);
   g_debug ("%s '%s' %s %s", __func__,
-           dleyna_renderer_device_get_friendly_name (device),
-           dleyna_renderer_device_get_udn (device),
+           photos_dlna_renderer_get_friendly_name (renderer),
+           photos_dlna_renderer_get_udn (renderer),
            object_path);
   g_signal_emit (self, signals[RENDERER_LOST], 0, renderer);
   g_object_unref (renderer);