From 1e7242afa5acfefac65a54c9d5ac68fe6bee5b3d Mon Sep 17 00:00:00 2001
From: David Sansome <me@davidsansome.com>
Date: Wed, 16 Sep 2015 22:34:54 +1000
Subject: [PATCH] Remove Radio GFM since it's no longer running

---
 data/data.qrc                         |   1 -
 data/providers/radiogfm.png           | Bin 676 -> 0 bytes
 src/internet/core/internetmodel.cpp   |   1 -
 src/internet/somafm/somafmservice.cpp |   7 -------
 src/internet/somafm/somafmservice.h   |   5 -----
 5 files changed, 14 deletions(-)
 delete mode 100644 data/providers/radiogfm.png

diff --git a/data/data.qrc b/data/data.qrc
index 35e6cf8c1..d2907b238 100644
--- a/data/data.qrc
+++ b/data/data.qrc
@@ -331,7 +331,6 @@
         <file>providers/myspace.png</file>
         <file>providers/podcast16.png</file>
         <file>providers/podcast32.png</file>
-        <file>providers/radiogfm.png</file>
         <file>providers/rockradio.png</file>
         <file>providers/skydrive.png</file>
         <file>providers/somafm.png</file>
diff --git a/data/providers/radiogfm.png b/data/providers/radiogfm.png
deleted file mode 100644
index b7fd94e4fc452c0701aec2210e892bcca415da27..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 676
zcmV;V0$crwP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00001b5ch_0Itp)
z=>Px#32;bRa{vGf6951U69E94oEQKA00(qQO+^RY1Pufm9x<+kX#fBMHc3Q5R4C75
zU?dSRkg6W4fsKuog@qX`z<??b1u!Wl5QmkOW#!zK)L6f&qIfY;AqFJC&d$cg$pJJA
zs)>mm#Ng&)-?E|?$WT*}Z756T;pQ?n&|qc;DROr<ONjLHakqlm1J=pG!FKEPs_No|
zZ7X|aq{W&mQ-LVN&tZCR+5D;12~plal#?0`bOJBGD8vSi?W_8MjLj>$t;}?%_mqbC
zI%FmVE}hk2W~`YK>$`PTcWju4ucx)TstQO08yibbN-)H2Z8hl~bs1SnK>=R2Z8d2f
zb(tZ4PW9y}O_iyMF}|{L%24lXX=zQF+Mku3E-o%wUtc|A#-#kb3=K`Sit++hR#sJ2
zwf+0HD=W%EJ*}sw`~Uxss*1wC?nZMn;}7qiBqqkWxjJTLXa4{Hhl7Kwyu9N7|KIBB
z8VoGLAPtiy_wU)d9LPvZOLlj2`t<Snp50shd^|fl+pb?fH)&GuqQ&#ReSPcT;K0Dd
z3DQtsUv=a1DN#|8fB(M5MuptJeI62sOP0)!j*0yH_iIf}{mq+KLPLXCxx_#c0s{OS
zH?H2XW7C<_N1PpPw{BVm(J*u76l-fMUtcd#aoKh2R!2pJGqG?%J<Y<x!Uc>{c6KHv
zW_AvsC^I;I_*q$bfedC=L0%DAHg;}KUTFrTWC%(spy&q%1rr}IQkj`~m{|nC8hF?_
z#hI8`m{{1+G_Zo=A1DFz97rbzGn+6o3nvpR7Z<-GC$|I(8y5fqADuy-w!5?d0000<
KMNUMnLSTZrn<g&+

diff --git a/src/internet/core/internetmodel.cpp b/src/internet/core/internetmodel.cpp
index 707811d68..597d9046f 100644
--- a/src/internet/core/internetmodel.cpp
+++ b/src/internet/core/internetmodel.cpp
@@ -92,7 +92,6 @@ InternetModel::InternetModel(Application* app, QObject* parent)
   AddService(new JazzRadioService(app, this));
   AddService(new MagnatuneService(app, this));
   AddService(new PodcastService(app, this));
-  AddService(new RadioGFMService(app, this));
   AddService(new RockRadioService(app, this));
   AddService(new SavedRadio(app, this));
   AddService(new RadioTunesService(app, this));
diff --git a/src/internet/somafm/somafmservice.cpp b/src/internet/somafm/somafmservice.cpp
index 270ba5c72..b6496dea6 100644
--- a/src/internet/somafm/somafmservice.cpp
+++ b/src/internet/somafm/somafmservice.cpp
@@ -264,10 +264,3 @@ SomaFMService::SomaFMService(Application* app, InternetModel* parent)
     : SomaFMServiceBase(
           app, parent, "SomaFM", QUrl("http://somafm.com/channels.xml"),
           QUrl("http://somafm.com"), QUrl(), QIcon(":providers/somafm.png")) {}
-
-RadioGFMService::RadioGFMService(Application* app, InternetModel* parent)
-    : SomaFMServiceBase(app, parent, "Radio GFM",
-                        QUrl("http://streams.radio-gfm.net/channels.xml"),
-                        QUrl("http://www.radio-gfm.net"),
-                        QUrl("http://www.radio-gfm.net/spenden"),
-                        QIcon(":providers/radiogfm.png")) {}
diff --git a/src/internet/somafm/somafmservice.h b/src/internet/somafm/somafmservice.h
index 72523fb8e..1692af404 100644
--- a/src/internet/somafm/somafmservice.h
+++ b/src/internet/somafm/somafmservice.h
@@ -109,11 +109,6 @@ class SomaFMService : public SomaFMServiceBase {
   SomaFMService(Application* app, InternetModel* parent);
 };
 
-class RadioGFMService : public SomaFMServiceBase {
- public:
-  RadioGFMService(Application* app, InternetModel* parent);
-};
-
 QDataStream& operator<<(QDataStream& out, const SomaFMService::Stream& stream);
 QDataStream& operator>>(QDataStream& in, SomaFMService::Stream& stream);
 Q_DECLARE_METATYPE(SomaFMService::Stream)