Author: Balló György <ballogyor@gmail.com>
Subject: Disable Panoramio sources, which no longer work
 .
 This patch was imported from Arch Linux (link below) and modified by James Lu <bitflip3@gmail.com>
 to migrate away from old Panoramio sources as well.

From: vendor, https://git.archlinux.org/svntogit/community.git/tree/repos/community-any/fix-popup-menu.patch?h=packages/variety
Forwarded: no
Last-Update: 2017-03-24

Index: variety/variety/PreferencesVarietyDialog.py
===================================================================
--- variety.orig/variety/PreferencesVarietyDialog.py	2017-03-24 11:55:52.916033568 -0700
+++ variety/variety/PreferencesVarietyDialog.py	2017-03-24 11:55:52.912033650 -0700
@@ -32,7 +32,6 @@
 from variety.AddFlickrDialog import AddFlickrDialog
 from variety.AddMediaRssDialog import AddMediaRssDialog
 from variety.AddRedditDialog import AddRedditDialog
-from variety.AddPanoramioDialog import AddPanoramioDialog
 from variety.EditFavoriteOperationsDialog import EditFavoriteOperationsDialog
 from variety.SmartFeaturesConfirmationDialog import SmartFeaturesConfirmationDialog
 from variety.LoginOrRegisterDialog import LoginOrRegisterDialog
@@ -64,7 +63,6 @@
 EDITABLE_TYPES = [
     Options.SourceType.FLICKR,
     Options.SourceType.MEDIA_RSS,
-    Options.SourceType.PANORAMIO,
     Options.SourceType.WALLHAVEN,
     Options.SourceType.REDDIT,
 ]
@@ -381,7 +379,6 @@
             '-',
             (_("Flickr"), self.on_add_flickr_clicked),
             (_("Wallhaven.cc"), self.on_add_wallhaven_clicked),
-            (_("Panoramio"), self.on_add_panoramio_clicked),
             (_("Reddit"), self.on_add_reddit_clicked),
             (_("Media RSS"), self.on_add_mediarss_clicked),
         ]
@@ -672,8 +669,6 @@
                 self.dialog = AddRedditDialog()
             elif type == Options.SourceType.MEDIA_RSS:
                 self.dialog = AddMediaRssDialog()
-            elif type == Options.SourceType.PANORAMIO:
-                self.dialog = AddPanoramioDialog()
 
             self.dialog.set_edited_row(edited_row)
             self.show_dialog(self.dialog)
@@ -786,9 +781,6 @@
     def on_add_wallhaven_clicked(self, widget=None):
         self.show_dialog(AddWallhavenDialog())
 
-    def on_add_panoramio_clicked(self, widget=None):
-        self.show_dialog(AddPanoramioDialog())
-
     def show_dialog(self, dialog):
         self.dialog = dialog
         self.dialog.parent = self
Index: variety/variety/VarietyWindow.py
===================================================================
--- variety.orig/variety/VarietyWindow.py	2017-03-24 11:55:52.916033568 -0700
+++ variety/variety/VarietyWindow.py	2017-03-24 11:55:52.912033650 -0700
@@ -541,8 +541,6 @@
             return UnsplashDownloader(self)
         elif type == Options.SourceType.MEDIA_RSS:
             return MediaRssDownloader(self, location)
-        elif type == Options.SourceType.PANORAMIO:
-            return PanoramioDownloader(self, location)
         elif type == Options.SourceType.RECOMMENDED:
             if self.smart.user:
                 return MediaRssDownloader(self, '%s/user/%s/recommended/rss' % (Smart.SITE_URL, self.smart.user["id"]))
Index: variety/variety/Options.py
===================================================================
--- variety.orig/variety/Options.py	2017-03-24 11:55:52.916033568 -0700
+++ variety/variety/Options.py	2017-03-24 11:56:06.539756948 -0700
@@ -42,7 +42,6 @@
         APOD = 8
         MEDIA_RSS = 10
         EARTH = 11
-        PANORAMIO = 12
         WALLHAVEN = 13
         REDDIT = 14
         BING = 15
@@ -60,7 +59,6 @@
             APOD: "apod",
             MEDIA_RSS: "mediarss",
             EARTH: "earth",
-            PANORAMIO: "panoramio",
             WALLHAVEN: "wallhaven",
             REDDIT: "reddit",
             BING: "bing",
@@ -72,7 +70,7 @@
         str_to_type = dict((v,k) for k, v in type_to_str.items())

         dl_types = [DESKTOPPR, FLICKR, APOD, MEDIA_RSS, EARTH,
-                    PANORAMIO, WALLHAVEN, REDDIT, BING, UNSPLASH, RECOMMENDED, LATEST]
+                    WALLHAVEN, REDDIT, BING, UNSPLASH, RECOMMENDED, LATEST]

     class LightnessMode:
         DARK = 0