[gnome-photos] Use ProviderName from the GoaObject whenever applicable

[Debarshi Ray <debarshir src gnome org>]

commit a6f0e109d5b5e6aadc5af3a3ae5b112cf369e5b4
Author: Debarshi Ray <debarshir gnome org>
Date:   Tue Jul 1 14:32:00 2014 +0200

    Use ProviderName from the GoaObject whenever applicable
    
    Fixes: https://bugzilla.gnome.org/731865

 po/POTFILES.in             |    2 --
 src/photos-facebook-item.c |   10 +++++++---
 src/photos-flickr-item.c   |   10 +++++++---
 src/photos-utils.c         |   17 ++++++++++++++++-
 src/photos-utils.h         |    5 +++++
 5 files changed, 35 insertions(+), 9 deletions(-)
---
diff --git a/po/POTFILES.in b/po/POTFILES.in
index eabc930..8d63ced 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -14,9 +14,7 @@ src/photos-base-item.c
 [type: gettext/glade]src/photos-dlna-renderers-dialog.ui
 src/photos-embed.c
 src/photos-empty-results-box.c
-src/photos-facebook-item.c
 src/photos-fetch-metas-job.c
-src/photos-flickr-item.c
 src/photos-indexing-notification.c
 src/photos-load-more-button.c
 src/photos-local-item.c
diff --git a/src/photos-facebook-item.c b/src/photos-facebook-item.c
index 937b9d1..ccf6995 100644
--- a/src/photos-facebook-item.c
+++ b/src/photos-facebook-item.c
@@ -30,7 +30,6 @@
 #include <gfbgraph/gfbgraph-goa-authorizer.h>
 #include <gio/gio.h>
 #include <glib.h>
-#include <glib/gi18n.h>
 #include <goa/goa.h>
 #include <libgnome-desktop/gnome-desktop-thumbnail.h>
 
@@ -194,9 +193,12 @@ photos_facebook_item_download (PhotosBaseItem *item, GCancellable *cancellable,
 static GtkWidget *
 photos_facebook_item_get_source_widget (PhotosBaseItem *item)
 {
+  PhotosFacebookItem *self = PHOTOS_FACEBOOK_ITEM (item);
   GtkWidget *source_widget;
+  const gchar *name;
 
-  source_widget = gtk_link_button_new_with_label ("https://www.facebook.com/";, _("Facebook"));
+  name = photos_utils_get_provider_name (self->priv->src_mngr, item);
+  source_widget = gtk_link_button_new_with_label ("https://www.facebook.com/";, name);
   gtk_widget_set_halign (source_widget, GTK_ALIGN_START);
 
   return source_widget;
@@ -226,10 +228,12 @@ static void
 photos_facebook_item_constructed (GObject *object)
 {
   PhotosFacebookItem *self = PHOTOS_FACEBOOK_ITEM (object);
+  const gchar *name;
 
   G_OBJECT_CLASS (photos_facebook_item_parent_class)->constructed (object);
 
-  photos_base_item_set_default_app_name (PHOTOS_BASE_ITEM (self), _("Facebook"));
+  name = photos_utils_get_provider_name (self->priv->src_mngr, PHOTOS_BASE_ITEM (self));
+  photos_base_item_set_default_app_name (PHOTOS_BASE_ITEM (self), name);
 }
 
 
diff --git a/src/photos-flickr-item.c b/src/photos-flickr-item.c
index 473fcd8..f53a1c6 100644
--- a/src/photos-flickr-item.c
+++ b/src/photos-flickr-item.c
@@ -29,7 +29,6 @@
 
 #include <gio/gio.h>
 #include <glib.h>
-#include <glib/gi18n.h>
 #include <goa/goa.h>
 #include <grilo.h>
 #include <libgnome-desktop/gnome-desktop-thumbnail.h>
@@ -279,9 +278,12 @@ photos_flickr_item_download (PhotosBaseItem *item, GCancellable *cancellable, GE
 static GtkWidget *
 photos_flickr_item_get_source_widget (PhotosBaseItem *item)
 {
+  PhotosFlickrItem *self = PHOTOS_FLICKR_ITEM (item);
   GtkWidget *source_widget;
+  const gchar *name;
 
-  source_widget = gtk_link_button_new_with_label ("https://www.flickr.com/";, _("Flickr"));
+  name = photos_utils_get_provider_name (self->priv->src_mngr, item);
+  source_widget = gtk_link_button_new_with_label ("https://www.flickr.com/";, name);
   gtk_widget_set_halign (source_widget, GTK_ALIGN_START);
 
   return source_widget;
@@ -328,10 +330,12 @@ static void
 photos_flickr_item_constructed (GObject *object)
 {
   PhotosFlickrItem *self = PHOTOS_FLICKR_ITEM (object);
+  const gchar *name;
 
   G_OBJECT_CLASS (photos_flickr_item_parent_class)->constructed (object);
 
-  photos_base_item_set_default_app_name (PHOTOS_BASE_ITEM (self), _("Flickr"));
+  name = photos_utils_get_provider_name (self->priv->src_mngr, PHOTOS_BASE_ITEM (self));
+  photos_base_item_set_default_app_name (PHOTOS_BASE_ITEM (self), name);
 }
 
 
diff --git a/src/photos-utils.c b/src/photos-utils.c
index 7ece6b0..657d02d 100644
--- a/src/photos-utils.c
+++ b/src/photos-utils.c
@@ -35,11 +35,11 @@
 #include <libgd/gd.h>
 
 #include "photos-application.h"
-#include "photos-base-item.h"
 #include "photos-facebook-item.h"
 #include "photos-flickr-item.h"
 #include "photos-local-item.h"
 #include "photos-query.h"
+#include "photos-source.h"
 #include "photos-tracker-queue.h"
 #include "photos-utils.h"
 
@@ -632,6 +632,21 @@ photos_utils_get_pixbuf_savable_formats (void)
   return write_list;
 }
 
+
+const gchar *
+photos_utils_get_provider_name (PhotosBaseManager *src_mngr, PhotosBaseItem *item)
+{
+  PhotosSource *source;
+  const gchar *name;
+  const gchar *resource_urn;
+
+  resource_urn = photos_base_item_get_resource_urn (item);
+  source = PHOTOS_SOURCE (photos_base_manager_get_object_by_id (src_mngr, resource_urn));
+  name = photos_source_get_name (source);
+  return name;
+}
+
+
 GtkBorder *
 photos_utils_get_thumbnail_frame_border (void)
 {
diff --git a/src/photos-utils.h b/src/photos-utils.h
index 42bbee8..1ebd0d1 100644
--- a/src/photos-utils.h
+++ b/src/photos-utils.h
@@ -33,6 +33,9 @@
 #include <gtk/gtk.h>
 #include <tracker-sparql.h>
 
+#include "photos-base-item.h"
+#include "photos-base-manager.h"
+
 G_BEGIN_DECLS
 
 #define PHOTOS_ERROR (photos_utils_error_quark ())
@@ -80,6 +83,8 @@ GdkPixbufFormat* photos_utils_get_pixbuf_format_by_suffix (const char *suffix);
 
 GSList*          photos_utils_get_pixbuf_savable_formats  (void);
 
+const gchar     *photos_utils_get_provider_name           (PhotosBaseManager *src_mngr, PhotosBaseItem 
*item);
+
 GtkBorder       *photos_utils_get_thumbnail_frame_border  (void);
 
 GList           *photos_utils_get_urns_from_paths         (GList *paths, GtkTreeModel *model);