Handle backgrounds defined in ~/.cinnamon/backgrounds.xml

linuxmint · Sep 1, 2012 · 287a728 · 287a728
1 parent 66d347e
commit 287a728
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/files/usr/lib/cinnamon-settings/cinnamon-settings.py b/files/usr/lib/cinnamon-settings/cinnamon-settings.py
@@ -293,7 +293,7 @@ def parse_xml_backgrounds_list(self, filename):
             if rootNode.tag == "wallpapers":
                 for wallpaperNode in rootNode:
                     if wallpaperNode.tag == "wallpaper" and wallpaperNode.get("deleted") != "true":
-                        wallpaperData = {}
+                        wallpaperData = {"metadataFile": filename}
                         for prop in wallpaperNode:
                             if type(prop.tag) == str:
                                 wallpaperData[prop.tag] = prop.text
@@ -308,6 +308,8 @@ def update_icon_view(self):
         for i in os.listdir("/usr/share/gnome-background-properties"):
             if i.endswith(".xml"):
                 pictures_list += self.parse_xml_backgrounds_list(os.path.join("/usr/share/gnome-background-properties", i))
+        if os.path.exists(os.path.join(os.getenv("HOME"), ".cinnamon", "backgrounds.xml")):
+            pictures_list += self.parse_xml_backgrounds_list(os.path.join(os.getenv("HOME"), ".cinnamon", "backgrounds.xml"))
         self.icon_view.set_pictures_list(pictures_list)
 
 class BackgroundSidePage (SidePage):