Fixes in support of regolith-linux/regolith-desktop#88.

regolith-linux · Aug 16, 2019 · 4c5d822 · 4c5d822
1 parent a136e4b
commit 4c5d822
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/Xresources/gnome b/Xresources/gnome
@@ -1,4 +1,3 @@
 gnome.gtk.theme:        gtk_theme
 gnome.wm.theme:         gtk_theme
-gnome.icon.theme:       icon_theme
-gnome.wallpaper.uri:    wallpaper_uri
+gnome.icon.theme:       icon_theme
diff --git a/Xresources/theme-nordic b/Xresources/theme-nordic
@@ -1,3 +1,2 @@
 #define gtk_theme       Nordic
 #define icon_theme      Arc
-#define wallpaper_uri   "file:///usr/share/backgrounds/ESP_020528_1750_desktop.jpg"
diff --git a/Xresources/theme-regolith b/Xresources/theme-regolith
@@ -1,3 +1,2 @@
 #define gtk_theme       SolArc-Dark
-#define icon_theme      Arc
-#define wallpaper_uri   "file:///usr/share/backgrounds/ESP_020528_1750_desktop.jpg"
+#define icon_theme      Arc
diff --git a/Xresources/theme-ubuntu-dark b/Xresources/theme-ubuntu-dark
@@ -1,3 +1,2 @@
 #define gtk_theme       Adwaita-dark
-#define icon_theme      Adwaita
-#define wallpaper_uri   "file:///usr/share/backgrounds/Dingo_Wallpaper_Grey_4096x2304.png"
+#define icon_theme      Adwaita
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,10 @@
+regolith-styles (1.2.24-1ubuntu1ppa1) disco; urgency=medium
+
+  * Remove desktop wallpaper from Xresources.
+    Conflicts with user settings. 
+
+ -- Ken Gilmer <kgilmer@gmail.com>  Thu, 15 Aug 2019 20:49:08 -0700
+
 regolith-styles (1.2.23-1ubuntu1ppa1) disco; urgency=medium
 
   * Fix name of nordic theme.