From bfaf127ed7ab136d874fcd67f469a189c54b84c5 Mon Sep 17 00:00:00 2001
From: Arnaud Bienner <arnaud.bienner@gmail.com>
Date: Sun, 14 Sep 2014 21:43:13 +0200
Subject: [PATCH] Remove few Ubuntu One things remaining

---
 data/data.qrc                     |   1 -
 data/providers/ubuntuone.png      | Bin 1964 -> 0 bytes
 src/engines/gstenginepipeline.cpp |  13 +------------
 3 files changed, 1 insertion(+), 13 deletions(-)
 delete mode 100644 data/providers/ubuntuone.png

diff --git a/data/data.qrc b/data/data.qrc
index 25a861874..ba05aab3d 100644
--- a/data/data.qrc
+++ b/data/data.qrc
@@ -340,7 +340,6 @@
         <file>providers/soundcloud.png</file>
         <file>providers/subsonic-32.png</file>
         <file>providers/subsonic.png</file>
-        <file>providers/ubuntuone.png</file>
         <file>providers/wikipedia.png</file>
         <file>rainbowdash.png</file>
         <file>sample.mood</file>
diff --git a/data/providers/ubuntuone.png b/data/providers/ubuntuone.png
deleted file mode 100644
index 1a8d1f19532ec01e0901cd6a6c44b69797c359ff..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1964
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

diff --git a/src/engines/gstenginepipeline.cpp b/src/engines/gstenginepipeline.cpp
index 42b749657..0c3487a11 100644
--- a/src/engines/gstenginepipeline.cpp
+++ b/src/engines/gstenginepipeline.cpp
@@ -841,7 +841,7 @@ void GstEnginePipeline::SourceSetupCallback(GstURIDecodeBin* bin,
       instance->url().host().contains("grooveshark")) {
     // Grooveshark streaming servers will answer with a 400 error 'Bad request'
     // if we don't specify 'Range' field in HTTP header.
-    // Maybe it could be usefull in some other cases, but for now, I prefer to
+    // Maybe it could be useful in some other cases, but for now, I prefer to
     // keep this grooveshark specific.
     GstStructure* headers;
     headers = gst_structure_new("extra-headers", "Range", G_TYPE_STRING,
@@ -850,17 +850,6 @@ void GstEnginePipeline::SourceSetupCallback(GstURIDecodeBin* bin,
     gst_structure_free(headers);
   }
 
-  if (g_object_class_find_property(G_OBJECT_GET_CLASS(element),
-                                   "extra-headers") &&
-      instance->url().host().contains("files.one.ubuntu.com")) {
-    GstStructure* headers;
-    headers =
-        gst_structure_new("extra-headers", "Authorization", G_TYPE_STRING,
-                          instance->url().fragment().toAscii().data(), nullptr);
-    g_object_set(element, "extra-headers", headers, nullptr);
-    gst_structure_free(headers);
-  }
-
   if (g_object_class_find_property(G_OBJECT_GET_CLASS(element), "user-agent")) {
     QString user_agent =
         QString("%1 %2").arg(QCoreApplication::applicationName(),