From 1e999e1ced77db6f6e3c06d8f6ca75bccc68a542 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Mon, 1 Dec 2014 20:10:27 +0100
Subject: [PATCH] debian: move system/X11 configuration to gui-agent-linux

---
 .../etc/X11/Xsession.d/25xdg-qubes-settings   | 18 ------------
 scripts_debian/qubes-files/etc/xdg/Xresources |  5 ----
 scripts_debian/qubes-files/etc/xdg/fonts.conf | 29 -------------------
 scripts_debian/qubes-files/etc/xdg/xsettingsd | 19 ------------
 4 files changed, 71 deletions(-)
 delete mode 100755 scripts_debian/qubes-files/etc/X11/Xsession.d/25xdg-qubes-settings
 delete mode 100644 scripts_debian/qubes-files/etc/xdg/Xresources
 delete mode 100644 scripts_debian/qubes-files/etc/xdg/fonts.conf
 delete mode 100644 scripts_debian/qubes-files/etc/xdg/xsettingsd

diff --git a/scripts_debian/qubes-files/etc/X11/Xsession.d/25xdg-qubes-settings b/scripts_debian/qubes-files/etc/X11/Xsession.d/25xdg-qubes-settings
deleted file mode 100755
index 3bab64b..0000000
--- a/scripts_debian/qubes-files/etc/X11/Xsession.d/25xdg-qubes-settings
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-installConfigurationFile() {
-    file="${1}"
-
-    if ! [ -f "${HOME}/.${file}" ]; then
-        if [ -f "/etc/xdg/${file}" ]; then
-            cp "/etc/xdg/${file}" "${HOME}/.${file}"
-        fi
-    fi
-}
-
-if [ -x /usr/bin/xsettingsd ]; then
-    installConfigurationFile "xsettingsd"
-    installConfigurationFile "fonts.conf"
-    installConfigurationFile "Xresources"
-    /usr/bin/xsettingsd &
-fi
diff --git a/scripts_debian/qubes-files/etc/xdg/Xresources b/scripts_debian/qubes-files/etc/xdg/Xresources
deleted file mode 100644
index 2bb5317..0000000
--- a/scripts_debian/qubes-files/etc/xdg/Xresources
+++ /dev/null
@@ -1,5 +0,0 @@
-Xft.antialias:          1
-Xft.hinting:            1
-Xft.rgba:               rgb
-Xft.hintstyle:          hintslight
-Xft.lcdfilter:          lcddefault
diff --git a/scripts_debian/qubes-files/etc/xdg/fonts.conf b/scripts_debian/qubes-files/etc/xdg/fonts.conf
deleted file mode 100644
index 17408f4..0000000
--- a/scripts_debian/qubes-files/etc/xdg/fonts.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-  <match target="font" >
-    <edit mode="assign" name="rgba">
-      <const>rgb</const>
-    </edit>
-  </match>
-  <match target="font" >
-    <edit mode="assign" name="hinting">
-      <bool>true</bool>
-    </edit>
-  </match>
-  <match target="font" >
-    <edit mode="assign" name="hintstyle">
-      <const>hintslight</const>
-    </edit>
-  </match>
-  <match target="font" >
-    <edit mode="assign" name="antialias">
-      <bool>true</bool>
-    </edit>
-  </match>
-  <match target="font" >
-    <edit mode="assign" name="lcdfilter">
-      <const>lcddefault</const>
-    </edit>
-  </match>
-</fontconfig>
diff --git a/scripts_debian/qubes-files/etc/xdg/xsettingsd b/scripts_debian/qubes-files/etc/xdg/xsettingsd
deleted file mode 100644
index 1cf2f71..0000000
--- a/scripts_debian/qubes-files/etc/xdg/xsettingsd
+++ /dev/null
@@ -1,19 +0,0 @@
-Gtk/ButtonImages 1
-Gtk/CursorThemeName "Vanilla-DMZ"
-Gtk/FontName "sans 10"
-Gtk/KeyThemeName "Adwaita"
-Gtk/MenuImages 1
-Gtk/ToolbarIconSize 2
-Gtk/ToolbarStyle "Icons"
-
-Net/EnableEventSounds 0
-Net/EnableInputFeedbackSounds 0
-Net/FallbackIconTheme "gnome"
-Net/IconThemeName "gnome"
-Net/ThemeName "Adwaita"
-
-Xft/Antialias 1
-Xft/Hinting 1
-Xft/HintStyle "hintslight"
-Xft/RGBA "rgb"
-Xft/lcdfilter "lcddefault"