[gnome-online-accounts/wip/jfelder/owncloud-music: 14/14] owncloud: Handle Uri and AcceptSslErrors for music
- From: Jean Felder <jfelder src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-online-accounts/wip/jfelder/owncloud-music: 14/14] owncloud: Handle Uri and AcceptSslErrors for music
- Date: Thu, 21 May 2020 20:15:23 +0000 (UTC)
commit 5be6daaffa2214de8315c893013578106e690d53
Author: Gaurav Narula <gnarula94 gmail com>
Date: Fri Dec 13 18:41:22 2019 +0100
owncloud: Handle Uri and AcceptSslErrors for music
https://bugzilla.gnome.org/show_bug.cgi?id=753415
src/goabackend/goalastfmprovider.c | 2 +-
src/goabackend/goaobjectskeletonutils.c | 2 ++
src/goabackend/goaobjectskeletonutils.h | 1 +
src/goabackend/goaowncloudprovider.c | 5 ++++-
4 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/src/goabackend/goalastfmprovider.c b/src/goabackend/goalastfmprovider.c
index bd5f71f2..25e16cda 100644
--- a/src/goabackend/goalastfmprovider.c
+++ b/src/goabackend/goalastfmprovider.c
@@ -121,7 +121,7 @@ build_object (GoaProvider *provider,
/* Music */
music_enabled = g_key_file_get_boolean (key_file, group, "MusicEnabled", NULL);
accept_ssl_errors = g_key_file_get_boolean (key_file, group, "AcceptSslErrors", NULL);
- goa_object_skeleton_attach_music (object, music_enabled, accept_ssl_errors);
+ goa_object_skeleton_attach_music (object, NULL, music_enabled, accept_ssl_errors);
if (just_added)
{
diff --git a/src/goabackend/goaobjectskeletonutils.c b/src/goabackend/goaobjectskeletonutils.c
index 13e398f1..b9cdcf2f 100644
--- a/src/goabackend/goaobjectskeletonutils.c
+++ b/src/goabackend/goaobjectskeletonutils.c
@@ -134,6 +134,7 @@ goa_object_skeleton_attach_documents (GoaObjectSkeleton *object,
void
goa_object_skeleton_attach_music (GoaObjectSkeleton *object,
+ const gchar *uri,
gboolean music_enabled,
gboolean accept_ssl_errors)
{
@@ -147,6 +148,7 @@ goa_object_skeleton_attach_music (GoaObjectSkeleton *object,
music = goa_music_skeleton_new ();
g_object_set (G_OBJECT (music),
"accept-ssl-errors", accept_ssl_errors,
+ "uri", uri,
NULL);
goa_object_skeleton_set_music (object, music);
}
diff --git a/src/goabackend/goaobjectskeletonutils.h b/src/goabackend/goaobjectskeletonutils.h
index 9d715910..6bf3566e 100644
--- a/src/goabackend/goaobjectskeletonutils.h
+++ b/src/goabackend/goaobjectskeletonutils.h
@@ -50,6 +50,7 @@ void goa_object_skeleton_attach_maps (GoaObjectSkeleton *o
gboolean maps_enabled);
void goa_object_skeleton_attach_music (GoaObjectSkeleton *object,
+ const gchar *uri,
gboolean music_enabled,
gboolean accept_ssl_errors);
diff --git a/src/goabackend/goaowncloudprovider.c b/src/goabackend/goaowncloudprovider.c
index 4b24de1e..6ef02761 100644
--- a/src/goabackend/goaowncloudprovider.c
+++ b/src/goabackend/goaowncloudprovider.c
@@ -153,6 +153,7 @@ build_object (GoaProvider *provider,
gchar *uri_caldav;
gchar *uri_carddav;
gchar *uri_webdav;
+ gchar *uri_music_ampache;
GoaPasswordBased *password_based = NULL;
SoupURI *uri = NULL;
gboolean accept_ssl_errors;
@@ -222,7 +223,9 @@ build_object (GoaProvider *provider,
/* Music */
music_enabled = g_key_file_get_boolean (key_file, group, "MusicEnabled", NULL);
- goa_object_skeleton_attach_music (object, music_enabled);
+ uri_music_ampache = g_strconcat (uri_string, MUSIC_AMPACHE_ENDPOINT, NULL);
+ goa_object_skeleton_attach_music (object, uri_music_ampache, music_enabled, accept_ssl_errors);
+ g_free (uri_music_ampache);
if (just_added)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]