Updated to git version!

5 files changed, 337 insertions, 90 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6e35ab96d5ed..492f9add595b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Thu May 25 11:55:57 UTC 2017
+# Mon Dec 25 17:03:13 UTC 2017
 pkgbase = pantheon-workarounds
 	pkgdesc = Workarounds for modular and minimal Pantheon Desktop Environments
-	pkgver = 5
-	pkgrel = 5
+	pkgver = 6
+	pkgrel = 1
 	url = https://launchpad.net/gala
 	install = gala.install
 	arch = i686
@@ -17,33 +17,42 @@ pkgbase = pantheon-workarounds
 	depends = gnome-settings-daemon-elementary
 	depends = gnome-settings-daemon-compat
 	depends = gnome-session
+	depends = gnome-user-share
 	depends = polkit-gnome
 	depends = xdg-user-dirs-gtk
-	optdepends = pantheon-default-settings-bzr: Pantheon configuration and themeing
+	optdepends = pantheon-default-settings-git: Pantheon configuration and themeing
 	optdepends = contractor-git: Service for sharing data between apps
 	optdepends = pantheon-print-git: Print settings dialog
 	optdepends = pantheon-agent-polkit-bzr: Polkit Authentication Agent
+	optdepends = pantheon-geoclue2-agent-git: Pantheon Geoclue2 Agent
+	optdepends = pantheon-dpms-helper-git: Script and settings for X DPMS
 	optdepends = xscreensaver-dbus-screenlock: xscreensaver locker for gnome-derivative desktops
-	provides = pantheon-session=
-	provides = pantheon-session-bzr=
-	provides = gala=
-	provides = gala-bzr=
-	provides = gala-git=
+	provides = pantheon-session=r106.81b95c3
+	provides = pantheon-session-bzr=r106.81b95c3
+	provides = pantheon-session-git=r106.81b95c3
+	provides = gala=r1061.439fdf6
+	provides = gala-bzr=r1061.439fdf6
+	provides = gala-git=r1061.439fdf6
 	conflicts = pantheon-session
 	conflicts = pantheon-session-bzr
+	conflicts = pantheon-session-git
 	conflicts = gala
 	conflicts = gala-bzr
 	conflicts = gala-git
-	source = pantheon-session::bzr+lp:~elementary-os/elementaryos/pantheon-xsession-settings
+	source = pantheon-session::git+https://github.com/elementary/session-settings#branch=meson
+	source = https://raw.githubusercontent.com/elementary/gala/master/data/org.pantheon.desktop.gala.gschema.xml.in
 	source = pantheon-session.sh
 	source = gnome-fallback-media-keys-helper-pantheon.desktop
 	source = gnome-fallback-background-helper-pantheon.desktop
 	source = gnome-fallback-mount-helper-pantheon.desktop
+	source = xsessions-typo.patch
 	sha512sums = SKIP
+	sha512sums = 30a488431a23ff5521a12e97fa69ed17b2033ba8f016bb922e07ad9bf2d671e14a90a38266de1567c4dcbf178b6919a8108fad3dd13e50573018dc2a8e9b070e
 	sha512sums = b2630c31724675c247b7017eea0862c76ec80a9f46691b65bc7f76702a9cacda46d9350d3bddc05ee21ded154f4d8ab277d536439152972dca0764f28e62cb38
 	sha512sums = b01a18bb7829eb7a48b72c90bdf5aa5913c24247426e0bfc509cba22f49d2d8c9eb301e1937b70f3f7f01a873c987e0bdea6dd5f24f8d900b952188fa5635d39
 	sha512sums = 0df6355d85d2329e245593408a74d09281c0dcea206ed594a7312b78db4d3cd57941a5ec29be780f965128fe512532edae85ffaf11a94b57374d5906875967fc
 	sha512sums = c06e3b8c59681ebe64fa0dd724eea1d40a579956372ce0851f30ededdda3ac41d329d40e5463bd779daba0d55853faec357203b042a4de3d601eafc8b09c350e
+	sha512sums = 09248891b1f5dc41add3ded2150e564b86dc11eee4a695fa8eea11b51e040ca1daaa28701f791d681c88d8869821b7304e2d11eb771d439d13b708e893702108
 
 pkgname = pantheon-workarounds
 
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index ef6d0ff0360b..000000000000
--- a/.gitignore
+++ /dev/null
@@ -1,55 +0,0 @@
-# Compiled source #
-###################
-*.com
-*.class
-*.dll
-*.exe
-*.o
-*.so
- 
-# Packages #
-############
-# it's better to unpack these files and commit the raw source
-# git has its own built in compression methods
-*.7z
-*.dmg
-*.gz
-*.iso
-*.jar
-*.rar
-*.tar
-*.zip
-*.xz
-
-# Archlinux Packaging #
-#######################
-*.tar
-*.tar.*
-*.zip
-*.tgz
-*.log
-*.log.*
-*.sig
-pkg/
-src/
- 
-# Logs and databases #
-######################
-*.log
-*.sql
-*.sqlite
- 
-# OS generated files #
-######################
-.DS_Store
-.DS_Store?
-._*
-.Spotlight-V100
-.Trashes
-ehthumbs.db
-Thumbs.db
-*~
-
-# Particulars #
-###############
-pantheon-session/
diff --git a/PKGBUILD b/PKGBUILD
index eec41c42b1f0..d157b0e0bdd1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,70 +3,75 @@
 # Contributor: Ner0 <darkelfdarkelf666@yahoo.co.uk>
 
 pkgname=pantheon-workarounds
-pkgver=5
-pkgrel=5
+pkgver=6
+pkgrel=1
 pkgdesc='Workarounds for modular and minimal Pantheon Desktop Environments'
 arch=('i686' 'x86_64')
 url='https://launchpad.net/gala'
 license=('GPL3')
 groups=('pantheon-qq')
-depends=('dconf' gnome-{keyring,settings-daemon-{elementary,compat},session}
+depends=('dconf' gnome-{keyring,settings-daemon-{elementary,compat},session,user-share}
          'polkit-gnome' 'xdg-user-dirs-gtk')
-optdepends=("pantheon-default-settings-bzr: Pantheon configuration and themeing"
+optdepends=("pantheon-default-settings-git: Pantheon configuration and themeing"
             "contractor-git: Service for sharing data between apps"
             "pantheon-print-git: Print settings dialog"
             "pantheon-agent-polkit-bzr: Polkit Authentication Agent"
+            "pantheon-geoclue2-agent-git: Pantheon Geoclue2 Agent"
+            "pantheon-dpms-helper-git: Script and settings for X DPMS"
             "xscreensaver-dbus-screenlock: xscreensaver locker for gnome-derivative desktops")
 makedepends=('bzr' 'intltool')
-conflicts=(pantheon-session{,-bzr} gala{,-bzr,-git})
+conflicts=(pantheon-session{,-bzr,-git} gala{,-bzr,-git})
 install='gala.install'
-source=("pantheon-session::bzr+lp:~elementary-os/elementaryos/pantheon-xsession-settings"
+source=("pantheon-session::git+https://github.com/elementary/session-settings#branch=meson"
+        "https://raw.githubusercontent.com/elementary/gala/master/data/org.pantheon.desktop.gala.gschema.xml.in"
         'pantheon-session.sh'
         'gnome-fallback-media-keys-helper-pantheon.desktop'
         'gnome-fallback-background-helper-pantheon.desktop'
-        'gnome-fallback-mount-helper-pantheon.desktop')
+        'gnome-fallback-mount-helper-pantheon.desktop'
+        'xsessions-typo.patch')
 sha512sums=('SKIP'
+            '30a488431a23ff5521a12e97fa69ed17b2033ba8f016bb922e07ad9bf2d671e14a90a38266de1567c4dcbf178b6919a8108fad3dd13e50573018dc2a8e9b070e'
             'b2630c31724675c247b7017eea0862c76ec80a9f46691b65bc7f76702a9cacda46d9350d3bddc05ee21ded154f4d8ab277d536439152972dca0764f28e62cb38'
             'b01a18bb7829eb7a48b72c90bdf5aa5913c24247426e0bfc509cba22f49d2d8c9eb301e1937b70f3f7f01a873c987e0bdea6dd5f24f8d900b952188fa5635d39'
             '0df6355d85d2329e245593408a74d09281c0dcea206ed594a7312b78db4d3cd57941a5ec29be780f965128fe512532edae85ffaf11a94b57374d5906875967fc'
-            'c06e3b8c59681ebe64fa0dd724eea1d40a579956372ce0851f30ededdda3ac41d329d40e5463bd779daba0d55853faec357203b042a4de3d601eafc8b09c350e')
+            'c06e3b8c59681ebe64fa0dd724eea1d40a579956372ce0851f30ededdda3ac41d329d40e5463bd779daba0d55853faec357203b042a4de3d601eafc8b09c350e'
+            '09248891b1f5dc41add3ded2150e564b86dc11eee4a695fa8eea11b51e040ca1daaa28701f791d681c88d8869821b7304e2d11eb771d439d13b708e893702108')
 
 prepare() {
-  #sed 's|policykit-1|polkit|' -i pantheon-session/autostart/polkit-gnome-authentication-agent-1-pantheon.desktop
-
-  bzr cat  lp:gala/data/org.pantheon.desktop.gala.gschema.xml.in > org.pantheon.desktop.gala.gschema.xml
+  cd "${srcdir}"
+  mv org.pantheon.desktop.gala.gschema.xml{.in,}
   sed -i 's|@GETTEXT_PACKAGE@|gala|g' org.pantheon.desktop.gala.gschema.xml
-  export pkgvergala="$(printf "r%s" "$(bzr version-info lp:gala | grep revno | tr -cd [:digit:])")"
 
-  cd "pantheon-session"
-  export pkgverpantheonsession="$(printf "r%s" "$(bzr revno)")"
+  git clone -n "https://github.com/elementary/gala.git"
+  cd "${srcdir}/gala"
+  export pkgvergala="r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
+
 
-  # TODO: sort and tweak pantheon-session's settings
+  cd "${srcdir}/pantheon-session"
+  export pkgverpantheonsession="$(printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)")"
 
-  # This space reserved for pantheon-default-settings(-bzr)
+  patch -Np2 < ../xsessions-typo.patch
+
+  # This space reserved for pantheon-default-settings(-git)
 }
 
-provides=(pantheon-session{,-bzr}="${pkgverpantheonsession}" gala{,-bzr,-git}="${pkgvergala}")
+provides=(pantheon-session{,-bzr,-git}="${pkgverpantheonsession}" gala{,-bzr,-git}="${pkgvergala}")
 
 package() {
   install -Dm644 {"${srcdir}","${pkgdir}"/usr/share/glib-2.0/schemas}/org.pantheon.desktop.gala.gschema.xml
 
   cd "${srcdir}"/pantheon-session
-  mkdir -p "${pkgdir}"/{etc/xdg,usr/share/pantheon}
-  cp -dr --no-preserve='ownership' autostart "${pkgdir}/etc/xdg/"
-  cp -dr --no-preserve='ownership' unity-greeter "${pkgdir}/usr/share/"
-  cp -dr --no-preserve='ownership' applications "${pkgdir}/usr/share/pantheon/"
+  meson --prefix=/usr --datadir=share builddir
+  DESTDIR=$pkgdir ninja -C builddir install
 
+  #These may no longer be needed
   install -Dm644 {"${srcdir}","${pkgdir}"/etc/xdg/autostart}/gnome-fallback-media-keys-helper-pantheon.desktop
   install -Dm644 {"${srcdir}","${pkgdir}"/etc/xdg/autostart}/gnome-fallback-background-helper-pantheon.desktop
   install -Dm644 {"${srcdir}","${pkgdir}"/etc/xdg/autostart}/gnome-fallback-mount-helper-pantheon.desktop
 
   # This space reserved for pantheon-default-settings-bzr
 
-  find "${pkgdir}" -type d -exec chmod 755 {} +
-  find "${pkgdir}" -type f -exec chmod 644 {} +
-
-# gnome-session workaround
+  # gnome-session workaround
   install -Dm755 "${srcdir}"/pantheon-session.sh "${pkgdir}"/usr/bin/pantheon-session
 }
 
diff --git a/org.pantheon.desktop.gala.gschema.xml.in b/org.pantheon.desktop.gala.gschema.xml.in
new file mode 100644
index 000000000000..438f87eaaa94
--- /dev/null
+++ b/org.pantheon.desktop.gala.gschema.xml.in
@@ -0,0 +1,280 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist>
+	<enum id="GalaActionType">
+		<value nick='none' value="0" />
+		<value nick="show-workspace-view" value="1" />
+		<value nick="maximize-current" value="2" />
+		<value nick="minimize-current" value="3" />
+		<value nick="open-launcher" value="4" />
+		<value nick="custom-command" value="5" />
+		<value nick="window-overview" value="6" />
+		<value nick="window-overview-all" value="7" />
+	</enum>
+	<enum id="GalaWindowOverviewType">
+		<value nick='grid' value='0'/>
+		<value nick='natural' value='1'/>
+	</enum>
+	
+	<schema path="/org/pantheon/desktop/gala/behavior/" id="org.pantheon.desktop.gala.behavior" gettext-domain="@GETTEXT_PACKAGE@">
+		<key enum="GalaActionType" name="hotcorner-topleft">
+			<default>'none'</default>
+			<summary>Action for the top left corner</summary>
+			<description></description>
+		</key>
+		<key enum="GalaWindowOverviewType" name="window-overview-type">
+			<default>'grid'</default>
+			<summary>Algorithm for window overview layout</summary>
+			<description>Choose the algorithm used for exposing the windows</description>
+		</key>
+		<key enum="GalaActionType" name="hotcorner-topright">
+			<default>'none'</default>
+			<summary>Action for the top right corner</summary>
+			<description></description>
+		</key>
+		<key enum="GalaActionType" name="hotcorner-bottomleft">
+			<default>'none'</default>
+			<summary>Action for the bottom left corner</summary>
+			<description></description>
+		</key>
+		<key enum="GalaActionType" name="hotcorner-bottomright">
+			<default>'none'</default>
+			<summary>Action for the bottom right corner</summary>
+			<description></description>
+		</key>
+		<key type="s" name="hotcorner-custom-command">
+			<default>''</default>
+			<summary>The command that will be executed for the hotcorner action 'custom-command' or multiple</summary>
+			<description>If you just put a single command, it will be used for every hotcorner assigned to 
+				'custom-command'. If you instead use the pattern
+				'hotcorner-topleft:command;;hotcorner-bottomright:command' the specific commands will be used
+				per hotcorner. Possible identifiers are 'hotcorner-[topleft; topright; bottomleft; bottomright]'
+				followed by a ':' and then the command. ';;' is used as delimiter between command defintions.
+			</description>
+		</key>
+		<key type="b" name="edge-tiling">
+			<default>true</default>
+			<summary>Enable edge tiling when dropping windows on screen edges</summary>
+			<description>If enabled, dropping windows on vertical screen edges maximizes them vertically and resizes them horizontally to cover half of the available area. Dropping windows on the top screen edge maximizes them completely.</description>
+		</key>
+		<key type="s" name="panel-main-menu-action">
+			<default>''</default>
+			<summary>Panel main menu action</summary>
+			<description>Sets the command to run when the panel-main-menu keybinding is pressed</description>
+		</key>
+		<key type="s" name="toggle-recording-action">
+			<default>''</default>
+			<summary></summary>
+			<description></description>
+		</key>
+		<key type="s" name="overlay-action">
+			<default>''</default>
+			<summary></summary>
+			<description></description>
+		</key>
+		<key type="b" name="dynamic-workspaces">
+			<default>true</default>
+			<summary>Enable dynamic workspace instead of static ones</summary>
+			<description>Use a dynamically increasing or decreasing number, as needed, of workspaces instead of a static, fixed number</description>
+		</key>
+		<key type="as" name="dock-names">
+			<default><![CDATA[['docky', 'Docky', 'plank']]]></default>
+			<summary>Names that are recognized as dock windows for the window switcher</summary>
+			<description>When launching the window-switcher, gala iterates over this list and attempts to find a window matching the names. If it does, it will hide this window and fade it back in, once the the switcher is closed.</description>
+		</key>
+	</schema>
+	
+	<schema path="/org/pantheon/desktop/gala/keybindings/" id="org.pantheon.desktop.gala.keybindings" gettext-domain="@GETTEXT_PACKAGE@">
+		<key type="as" name="switch-to-workspace-first">
+			<default><![CDATA[['<Super>Home']]]></default>
+			<summary>Shortcut to move to first workspace</summary>
+			<description></description>
+		</key>
+		<key type="as" name="switch-to-workspace-last">
+			<default><![CDATA[['<Super>End', '<Super>0']]]></default>
+			<summary>Shortcut to move to last workspace</summary>
+			<description></description>
+		</key>
+		<key type="as" name="move-to-workspace-first">
+			<default><![CDATA[['<Super><Shift>Home']]]></default>
+			<summary>Shortcut to move the current window to first workspace</summary>
+			<description></description>
+		</key>
+		<key type="as" name="move-to-workspace-last">
+			<default><![CDATA[['<Super><Shift>End', '<Super>0']]]></default>
+			<summary>Shortcut to move the current window to last workspace</summary>
+			<description></description>
+		</key>
+		<key type="as" name="zoom-in">
+			<default><![CDATA[['<Super>plus', '<Super>KP_Add']]]></default>
+			<summary>Zoom in</summary>
+			<description></description>
+		</key>
+		<key type="as" name="zoom-out">
+			<default><![CDATA[['<Super>minus', '<Super>KP_Subtract']]]></default>
+			<summary>Zoom out</summary>
+		</key>
+		<key type="as" name="expose-windows">
+			<default><![CDATA[['<Super>w']]]></default>
+			<summary>Shortcut to open the window overview</summary>
+			<description></description>
+		</key>
+		<key type="as" name="expose-all-windows">
+			<default><![CDATA[['<Super>a']]]></default>
+			<summary>Shortcut to open the window overview for all windows</summary>
+			<description></description>
+		</key>
+		<key type="as" name="cycle-workspaces-next">
+			<default><![CDATA[['<Super>Tab']]]></default>
+			<summary>Cycle to the next workspace to the right or to back to the first</summary>
+		</key>
+		<key type="as" name="cycle-workspaces-previous">
+			<default><![CDATA[['<Super><Shift>Tab']]]></default>
+			<summary>Cycle to the next workspace to the right or to back to the first</summary>
+		</key>
+		<key type="as" name="switch-input-source">
+			<default><![CDATA[['<Alt>space']]]></default>
+			<summary>Cycle to next keyboard layout</summary>
+			<description>DEPRECATED: This key is deprecated and ignored.</description>
+		</key>
+		<key type="as" name="switch-input-source-backward">
+			<default><![CDATA[['']]]></default>
+			<summary>Cycle to previous keyboard layout</summary>
+			<description>DEPRECATED: This key is deprecated and ignored.</description>
+		</key>
+		<key type="as" name="pip">
+			<default><![CDATA[['<Super>f']]]></default>
+			<summary>The shortcut to enable picture-in-picture window</summary>
+			<description>The shortcut to show the selection area to choose a window</description>
+		</key>
+	</schema>
+	
+	<schema path="/org/pantheon/desktop/gala/appearance/" id="org.pantheon.desktop.gala.appearance" gettext-domain="@GETTEXT_PACKAGE@">
+		<key type="b" name="attach-modal-dialogs">
+			<default>false</default>
+			<summary>Attach modal dialogs</summary>
+			<description>When true, instead of having independent titlebars, modal dialogs appear attached to the titlebar of the parent window and are moved together with the parent window.</description>
+		</key>
+		<key type="s" name="button-layout">
+			<default>'close:maximize'</default>
+			<summary>Arrangement of buttons on the titlebar</summary>
+			<description>Arrangement of buttons on the titlebar. The value should be a string, such as "menu:minimize,maximize,spacer,close"; the colon separates the left corner of the window from the right corner, and the button names are comma-separated. Duplicate buttons are not allowed. Unknown button names are silently ignored so that buttons can be added in future metacity versions without breaking older versions. A special spacer tag can be used to insert some space between two adjacent buttons.</description>
+		</key>
+		<key type="b" name="dim-parents">
+			<default>false</default>
+			<summary>Make parent windows that spawn a modal attached dialog being dimmed</summary>
+		</key>
+		<key type="d" name="alt-tab-window-opacity">
+			<range min="0.0" max="1.0"/>
+			<default>0.0</default>
+			<summary>The opacity of the windows located in the background in the alt-tab-switcher.</summary>
+			<description>DEPRECATED: This key is deprecated and ignored.</description>
+		</key>
+		<key type="s" name="workspace-switcher-background">
+			<default>''</default>
+			<summary>Background-image used in the workspace-switcher</summary>
+		</key>
+	</schema>
+	
+	<schema path="/org/pantheon/desktop/gala/animations/" id="org.pantheon.desktop.gala.animations" gettext-domain="@GETTEXT_PACKAGE@">
+		<key type="b" name="enable-animations">
+			<default>true</default>
+			<summary>Enable Animations</summary>
+			<description>Whether animations should be displayed. Note: This is a global key, it changes the behaviour of the window manager, the panel etc.</description>
+		</key>
+		<key type="i" name="open-duration">
+			<default>350</default>
+		</key>
+		<key type="i" name="snap-duration">
+			<default>250</default>
+			<summary>Duration of the snap animation as used by maximize/unmaximize</summary>
+		</key>
+		<key type="i" name="close-duration">
+			<default>300</default>
+			<summary>Duration of the close animation</summary>
+		</key>
+		<key type="i" name="minimize-duration">
+			<default>200</default>
+			<summary>Duration of the minimize animation</summary>
+		</key>
+		<key type="i" name="workspace-switch-duration">
+			<default>300</default>
+			<summary>Duration of the workspace switch animation</summary>
+		</key>
+		<key type="i" name="menu-duration">
+			<default>150</default>
+			<summary>Duration of the menu mapping animation</summary>
+		</key>
+	</schema>
+	
+	<schema path="/org/pantheon/desktop/gala/shadows/" id="org.pantheon.desktop.gala.shadows" gettext-domain="@GETTEXT_PACKAGE@">
+		<key type="as" name="normal-focused">
+			<default>['20', '-1', '0', '15', '220']</default>
+			<summary>Defines the shadow of normal focused windows</summary>
+			<description>The first value is the radius of the blur of the shadow, the second one the top fade (which is usually just -1), the third and fourth the x- and y-offset and the last the opacity. So [blur-radius, top-fade, x-offset, y-offset, opacity]</description>
+		</key>
+		<key type="as" name="normal-unfocused">
+			<default>['8', '-1', '0', '6', '150']</default>
+			<summary>Defines the shadow of a normal unfocused window</summary>
+			<description>See normal-focused</description>
+		</key>
+		<key type="as" name="menu">
+			<default>['7', '-1', '0', '5', '130']</default>
+			<summary>Defines the shadow of a menu</summary>
+			<description>See normal-focused</description>
+		</key>
+		<key type="as" name="dialog-focused">
+			<default>['12', '-1', '0', '7', '190']</default>
+			<summary>Defines the shadow of a focused dialog</summary>
+			<description>See normal-focused</description>
+		</key>
+		<key type="as" name="dialog-unfocused">
+			<default>['7', '-1', '0', '4', '130']</default>
+			<summary>Defines the shadow of an unfocused dialog</summary>
+			<description>See normal-focused</description>
+		</key>
+	</schema>
+	
+	<schema path="/org/pantheon/desktop/gala/notifications/" id="org.pantheon.desktop.gala.notifications" gettext-domain="@GETTEXT_PACKAGE@">
+		<key type="b" name="do-not-disturb">
+			<default>false</default>
+			<summary>Disable all notifications</summary>
+		</key>
+		<child name="applications" schema="org.pantheon.desktop.gala.notifications.application" />
+	</schema>
+
+	<schema id="org.pantheon.desktop.gala.notifications.application" gettext-domain="@GETTEXT_PACKAGE@">
+		<key type="b" name="bubbles">
+			<default>true</default>
+			<summary>Enable bubbles</summary>
+		</key>
+		<key type="b" name="sounds">
+			<default>true</default>
+			<summary>Enable sounds</summary>
+		</key>
+		<key type="b" name="remember">
+			<default>true</default>
+			<summary>Show missed notifications in notification center</summary>
+		</key>
+	</schema>
+	
+	<schema path="/org/pantheon/desktop/gala/mask-corners/" id="org.pantheon.desktop.gala.mask-corners" gettext-domain="@GETTEXT_PACKAGE@">
+		<key type="b" name="enable">
+			<default>true</default>
+			<summary>Enable rounded corner mask</summary>
+		</key>
+		<key type="i" name="corner-radius">
+			<default>4</default>
+			<range min="1" max="32"/>
+			<summary>Corner radius</summary>
+		</key>
+		<key type="b" name="disable-on-fullscreen">
+			<default>true</default>
+			<summary>Disable corner mask on fullscreen</summary>
+			<description>If enabled, when an application is fullscreen (fills the monitor), the corner masks will be disabled on that monitor.</description>
+		</key>
+		<key type="b" name="only-on-primary">
+			<default>false</default>
+			<summary>Only show corner masks on primary monitor</summary>
+		</key>
+	</schema>
+</schemalist>
diff --git a/xsessions-typo.patch b/xsessions-typo.patch
new file mode 100644
index 000000000000..5062e12a7fe4
--- /dev/null
+++ b/xsessions-typo.patch
@@ -0,0 +1,8 @@
+--- src/pantheon-session/xsessions/meson.build~	2017-12-26 01:18:00.411839705 +0900
++++ src/pantheon-session/xsessions/meson.build	2017-12-26 01:38:29.090538935 +0900
+@@ -1,4 +1,4 @@
+ install_data(
+     'pantheon.desktop',
+-    install_dir: join_paths(get_option('datadir'), 'xessions')
++    install_dir: join_paths(get_option('datadir'), 'xsessions')
+ )