Fork from Ubuntu's indicator-keyboard.

32 files changed, 120 insertions, 174 deletions

diff --git a/.bzrignore b/.bzrignore
deleted file mode 100644
index 434bf43c..00000000
--- a/.bzrignore
+++ /dev/null
@@ -1,47 +0,0 @@
-*.c
-*.log
-*.pyc
-*.stamp
-*.stamp-t
-*.substvars
-*.valid
-.deps
-.libs
-.timestamp
-Makefile
-Makefile.in
-aclocal.m4
-autom4te.cache
-build-aux
-config.log
-config.status
-configure
-data/org.ayatana.indicator.keyboard
-data/gschemas.compiled
-data/indicator-keyboard-icon-generator
-data/indicator-keyboard.conf
-data/indicator-keyboard.desktop
-data/indicator-keyboard.service
-data/upstart/indicator-keyboard.desktop
-debian/autoreconf.after
-debian/autoreconf.before
-debian/files
-debian/indicator-keyboard
-debian/tmp
-lib/indicator-keyboard-service
-libtool
-m4/intltool.m4
-m4/libtool.m4
-m4/ltoptions.m4
-m4/ltsugar.m4
-m4/ltversion.m4
-m4/lt~obsolete.m4
-po/POTFILES
-po/stamp-it
-tests/config.vala
-tests/dconf-service
-tests/gvfs
-tests/indicator-keyboard-test
-tests/indicator-keyboard-test.trs
-tests/indicator-keyboard-tests
-tests/services/indicator-keyboard.service
diff --git a/AUTHORS b/AUTHORS
index b3718204..62ba656d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1 +1,2 @@
+Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
 William Hua <william.hua@canonical.com>
diff --git a/AUTHORS.Canonical b/AUTHORS.Canonical
new file mode 100644
index 00000000..b3718204
--- /dev/null
+++ b/AUTHORS.Canonical
@@ -0,0 +1 @@
+William Hua <william.hua@canonical.com>
diff --git a/MERGE-REVIEW b/MERGE-REVIEW
deleted file mode 100644
index d77c0f10..00000000
--- a/MERGE-REVIEW
+++ /dev/null
@@ -1,17 +0,0 @@
-
-This documents the expections that the project has on what both submitters
-and reviewers should ensure that they've done for a merge into the project.
-
-== Submitter Responsibilities ==
-
- * Ensure the project compiles and the test suite executes without error
- * Ensure that non-obvious code has comments explaining it
- * If the change works on specific profiles, please include those in the merge description.
-
-== Reviewer Responsibilities ==
-
- * Did the Jenkins build compile?  Pass?  Run unit tests successfully?
- * Are there appropriate tests to cover any new functionality?
- * If the description says this effects the desktop profile:
-   * Run tests indicator-keyboard/unity7*
-
diff --git a/Makefile.am b/Makefile.am
index 94cd26da..bc9f0c5b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = po lib data tests
+SUBDIRS = po src data tests
 
 include $(top_srcdir)/Makefile.am.coverage
diff --git a/README b/README
index 2928a41c..bb33d3c6 100644
--- a/README
+++ b/README
@@ -1,11 +1,11 @@
-indicator-keyboard-icon-generator
-=================================
+ayatana-indicator-keyboard-icon-generator
+==========================================
 
 To refresh the keyboard layout icons, I usually enter the data directory and
 run:
 
-./indicator-keyboard-icon-generator -i icon.svg.in -I icon-1.svg.in -o dark  -c '#dfdbd2'
-./indicator-keyboard-icon-generator -i icon.svg.in -I icon-1.svg.in -o light -c '#3c3c3c'
+./ayatana-indicator-keyboard-icon-generator -i icon.svg.in -I icon-1.svg.in -o dark  -c '#dfdbd2'
+./ayatana-indicator-keyboard-icon-generator -i icon.svg.in -I icon-1.svg.in -o light -c '#3c3c3c'
 ('#dfdbd2' and '#3c3c3c' are the colours for the dark and light themes.)
 
 Then I just copy the files in the dark and light directories to
@@ -14,4 +14,4 @@ source package.
 
 data/icon.svg.in and data/icon-1.svg.in are template files for the
 un-subscripted and subscripted icons. Parameters can be tweaked on the command
-line for the generator: './indicator-keyboard-icon-generator -?' for details.
+line for the generator: './ayatana-indicator-keyboard-icon-generator -h' for details.
diff --git a/autogen.sh b/autogen.sh
index 1d70f697..4498c240 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,4 +3,5 @@
 mkdir -p m4
 autoreconf -i
 intltoolize -c -f
+
 test -n "$NOCONFIGURE" || ./configure "$@"
diff --git a/configure.ac b/configure.ac
index 058c84dd..0b9ccfb7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ([2.69])
 
-AC_INIT([ayatana-indicator-keyboard], [0.1.0])
+AC_INIT([ayatana-indicator-keyboard], [0.1.1])
 AC_REVISION([0.1.0])
 
 AC_CONFIG_SRCDIR([configure.ac])
@@ -39,7 +39,6 @@ PKG_CHECK_MODULES([GIO], [gio-2.0])
 PKG_CHECK_MODULES([GTK], [gtk+-3.0])
 PKG_CHECK_MODULES([PANGOFT2], [pangoft2])
 PKG_CHECK_MODULES([PANGOCAIRO], [pangocairo])
-PKG_CHECK_MODULES([GNOME_DESKTOP], [gnome-desktop-3.0])
 PKG_CHECK_MODULES([LIBXKLAVIER], [libxklavier])
 PKG_CHECK_MODULES([LIBGNOMEKBD], [libgnomekbdui])
 PKG_CHECK_MODULES([IBUS], [ibus-1.0])
@@ -59,7 +58,7 @@ AC_SUBST(COVERAGE_LDFLAGS)
 AC_CONFIG_FILES([Makefile
                  data/Makefile
                  data/upstart/Makefile
-                 lib/Makefile
+                 src/Makefile
                  po/Makefile.in
                  tests/Makefile
                  tests/autopilot/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index bb9a1f82..6f33aeaf 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -13,7 +13,7 @@ AM_VALAFLAGS = --enable-experimental-non-null   \
                --metadatadir $(top_srcdir)/deps \
                --vapidir $(top_srcdir)/deps
 
-ayatana_indicator_keyboard_icon_generator_SOURCES = main.vala                     \
+ayatana_indicator_keyboard_icon_generator_SOURCES = icon-generator.vala                     \
                                                     $(top_srcdir)/lib/common.vala
 ayatana_indicator_keyboard_icon_generator_VALAFLAGS = $(AM_VALAFLAGS)         \
                                                       --pkg gee-1.0           \
@@ -68,7 +68,7 @@ indicatordir = $(INDICATOR_DIR)
 
 org.ayatana.indicator.keyboard:
 	$(AM_V_GEN) (echo '[Indicator Service]';                                              \
-	             echo 'Name=indicator-keyboard';                                          \
+	             echo 'Name=ayatana-indicator-keyboard';                                          \
 	             echo 'ObjectPath=/org/ayatana/indicator/keyboard';                     \
 	             echo 'Position=80';                                                      \
 	             echo '';                                                                 \
@@ -101,6 +101,6 @@ gschemas.compiled: $(gsettings_SCHEMAS)
 EXTRA_DIST = $(dist_service_DATA)   \
 	     $(dist_indicator_DATA) \
 	     $(gsettings_SCHEMAS) \
-	     indicator-keyboard.conf.in \
-	     indicator-keyboard.desktop.in
+	     ayatana-indicator-keyboard.conf.in \
+	     ayatana-indicator-keyboard.desktop.in
 
diff --git a/data/ayatana-indicator-keyboard.conf.in b/data/ayatana-indicator-keyboard.conf.in
new file mode 100644
index 00000000..5083a485
--- /dev/null
+++ b/data/ayatana-indicator-keyboard.conf.in
@@ -0,0 +1,9 @@
+description "Ayatana Indicator Keyboard Backend"
+
+start on ayatana-indicator-services-start
+stop on desktop-end or ayatana-indicator-services-end
+
+respawn
+respawn limit 2 10
+
+exec @pkglibexecdir@/ayatana-indicator-keyboard-service --use-gtk
diff --git a/data/ayatana-indicator-keyboard.desktop.in b/data/ayatana-indicator-keyboard.desktop.in
new file mode 100644
index 00000000..b31bec51
--- /dev/null
+++ b/data/ayatana-indicator-keyboard.desktop.in
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Ayatana Indicator Keyboard
+Exec=@pkglibexecdir@/ayatana-indicator-keyboard-service
+OnlyShowIn=MATE;
+NoDisplay=true
+StartupNotify=false
+Terminal=false
diff --git a/data/main.vala b/data/icon-generator.vala
index 8077f093..8077f093 100644
--- a/data/main.vala
+++ b/data/icon-generator.vala
diff --git a/data/indicator-keyboard.conf.in b/data/indicator-keyboard.conf.in
deleted file mode 100644
index 737a4830..00000000
--- a/data/indicator-keyboard.conf.in
+++ /dev/null
@@ -1,9 +0,0 @@
-description "Indicator Keyboard Backend"
-
-start on indicator-services-start
-stop on desktop-end or indicator-services-end
-
-respawn
-respawn limit 2 10
-
-exec @pkglibexecdir@/indicator-keyboard-service --use-gtk
diff --git a/data/indicator-keyboard.desktop.in b/data/indicator-keyboard.desktop.in
deleted file mode 100644
index 3fca71fb..00000000
--- a/data/indicator-keyboard.desktop.in
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Indicator Keyboard
-Exec=@pkglibexecdir@/indicator-keyboard-service
-OnlyShowIn=Unity;GNOME;
-NoDisplay=true
-StartupNotify=false
-Terminal=false
-AutostartCondition=GNOME3 unless-session gnome
diff --git a/data/upstart/Makefile.am b/data/upstart/Makefile.am
index c0b6a2eb..c762a603 100644
--- a/data/upstart/Makefile.am
+++ b/data/upstart/Makefile.am
@@ -3,10 +3,10 @@
 ###########################
 
 xdg_autostartdir = $(datadir)/upstart/xdg/autostart
-xdg_autostart_DATA = indicator-keyboard.desktop
+xdg_autostart_DATA = ayatana-indicator-keyboard.desktop
 
 %.desktop: %.desktop.in
 	$(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
 
-EXTRA_DIST = indicator-keyboard.desktop.in
+EXTRA_DIST = ayatana-indicator-keyboard.desktop.in
 
diff --git a/data/upstart/indicator-keyboard.desktop.in b/data/upstart/ayatana-indicator-keyboard.desktop.in
index ec7e565c..f20783be 100644
--- a/data/upstart/indicator-keyboard.desktop.in
+++ b/data/upstart/ayatana-indicator-keyboard.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
-Name=Indicator Keyboard
-Exec=@pkglibexecdir@/indicator-keyboard-service
+Name=Ayatana Indicator Keyboard
+Exec=@pkglibexecdir@/ayatana-indicator-keyboard-service
 OnlyShowIn=Unity;
 NoDisplay=true
 StartupNotify=false
diff --git a/debian/changelog b/debian/changelog
index 111842a9..348789e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,10 @@
-ayatana-indicator-keyboard (0.1.0-0) UNRELEASED; urgency=medium
+ayatana-indicator-keyboard (0.1.1-0) UNRELEASED; urgency=medium
 
   * Fork from Ubuntu's indicator-keyboard.
 
+  * Upstream-provided Debian package for ayatana-indicator-keyboard.
+    See upstream ChangeLog for recent changes.
+
  -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Thu, 12 Nov 2015 13:32:10 +0100
 
 indicator-keyboard (0.0.0+15.10.20151006-0ubuntu1) wily; urgency=medium
diff --git a/debian/control b/debian/control
index 3bf1be69..d5bf8862 100644
--- a/debian/control
+++ b/debian/control
@@ -1,27 +1,27 @@
-Source: indicator-keyboard
-Section: gnome
+Source: ayatana-indicator-keyboard
+Section: x11
 Priority: optional
 Maintainer: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-Build-Depends: debhelper (>= 9.0.0),
-               dh-autoreconf,
+Build-Depends: debhelper (>= 9),
                dbus,
+               dpkg-dev (>= 1.16.1.1),
                fcitx-libs-dev (>= 1:4.2.8.3),
                gir1.2-fcitx-1.0,
                libaccountsservice-dev,
-               libgee-dev,
+               libgee-0.8-dev | libgee-dev,
                libgirepository1.0-dev,
                libgnome-desktop-3-dev,
                libgnomekbd-dev,
                libgtk-3-dev,
                libibus-1.0-dev (>= 1.5.0),
-               liblightdm-gobject-1-dev,
+               lightdm-vala | liblightdm-gobject-1-dev,
                valac,
                xauth,
                xvfb,
-Standards-Version: 3.9.4
-Homepage: https://github.com/ArcticaProject/ayatana-indicator-keyboard
-Vcs-Git: git://cgit.arctica-project.org/ayatana/ayatana-indicator-keyboard.git
-Vcs-Browser: https://cgit.arctica-project.org/ayatana/ayatana-indicator-keyboard.git/
+Standards-Version: 4.1.1
+Homepage: https://github.com/AyatanaIndicators/ayatana-indicator-keyboard
+Vcs-Git: https://github.com/AyatanaIndicators/ayatana-indicator-keyboard
+Vcs-Browser: https://github.com/AyatanaIndicators/ayatana-indicator-keyboard
 
 Package: ayatana-indicator-keyboard
 Architecture: any
@@ -30,7 +30,7 @@ Depends: ${misc:Depends},
 Breaks: ibus (<< 1.5.5-1ubuntu3),
 Description: Ayatana Keyboard indicator
  This package contains the keyboard indicator, which should show as an
- icon in the top panel of indicator aware destkop environments.
+ icon in the top panel of indicator aware desktop environments.
  .
- It can be used to switch key layouts or languages, and helps the user
- identifying which layouts are currently in use.
+ It can be used to switch keyboard layouts or languages, and helps the
+ user identifying which layouts are currently in use.
diff --git a/debian/copyright b/debian/copyright
index 6354e29b..8ad93a5c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,16 +1,18 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: indicator-keyboard
+Upstream-Name: ayatana-indicator-keyboard
+Upstream-Contact: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
 Source: https://code.launchpad.net/indicator-keyboard
 
 Files: *
 Copyright: 2013 Canonical Ltd.
-License: GPL-3.0
+License: GPL-3
 
 Files: debian/*
 Copyright: 2013 Canonical Ltd.
-License: GPL-3.0
+  2017, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+License: GPL-3
 
-License: GPL-3.0
+License: GPL-3
  This package is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public License as
  published by the Free Software Foundation; version 3 of the
diff --git a/debian/rules b/debian/rules
index e290d9e1..5da073ca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,13 +4,17 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
+
 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
 
 %:
-	dh $@ --with autoreconf
+	dh $@
 
 override_dh_autoreconf:
-	NOCONFIGURE=1 dh_autoreconf ./autogen.sh
+	NOCONFIGURE=1 ./autogen.sh
 
 override_dh_install:
 	find debian/ayatana-indicator-keyboard/usr/lib -name *.la -delete
diff --git a/lib/Makefile.am b/lib/Makefile.am
deleted file mode 100644
index e458475c..00000000
--- a/lib/Makefile.am
+++ /dev/null
@@ -1,55 +0,0 @@
-pkglibexec_PROGRAMS = ayatana-indicator-keyboard-service
-
-AM_CFLAGS = -w -DGNOME_DESKTOP_USE_UNSTABLE_API
-AM_LDFLAGS = -lm
-AM_VALAFLAGS = --enable-experimental-non-null   \
-               --metadatadir $(top_srcdir)/deps \
-               --vapidir $(top_srcdir)/deps
-
-indicator_keyboard_service_SOURCES = main.vala            \
-                                     source.vala          \
-                                     common.vala          \
-                                     ibus-menu.vala       \
-                                     ibus-panel.vala      \
-                                     indicator-menu.vala  \
-                                     keyboard-plugin.vala \
-                                     window-stack.vala    \
-                                     unity-session.vala   \
-                                     unity-greeter.vala
-indicator_keyboard_service_VALAFLAGS = $(AM_VALAFLAGS)            \
-                                       --pkg gee-1.0              \
-                                       --pkg posix                \
-                                       --pkg pangocairo           \
-                                       --pkg gtk+-3.0             \
-                                       --pkg GDesktopEnums-3.0    \
-                                       --pkg GnomeDesktop-3.0     \
-                                       --pkg Xkl-1.0              \
-                                       --pkg Gkbd-3.0             \
-                                       --pkg ibus-1.0             \
-                                       --pkg Fcitx-1.0            \
-                                       --pkg AccountsService-1.0  \
-                                       --pkg liblightdm-gobject-1
-indicator_keyboard_service_CFLAGS = $(AM_CFLAGS)              \
-                                    $(GEE_CFLAGS)             \
-                                    $(PANGOCAIRO_CFLAGS)      \
-                                    $(GTK_CFLAGS)             \
-                                    $(GNOME_DESKTOP_CFLAGS)   \
-                                    $(LIBXKLAVIER_CFLAGS)     \
-                                    $(LIBGNOMEKBD_CFLAGS)     \
-                                    $(IBUS_CFLAGS)            \
-                                    $(FCITX_GCLIENT_CFLAGS)   \
-                                    $(ACCOUNTSSERVICE_CFLAGS) \
-                                    $(LIGHTDM_CFLAGS)         \
-                                    $(COVERAGE_CFLAGS)
-indicator_keyboard_service_LDFLAGS = $(AM_LDFLAGS)           \
-                                     $(GEE_LIBS)             \
-                                     $(PANGOCAIRO_LIBS)      \
-                                     $(GTK_LIBS)             \
-                                     $(GNOME_DESKTOP_LIBS)   \
-                                     $(LIBXKLAVIER_LIBS)     \
-                                     $(LIBGNOMEKBD_LIBS)     \
-                                     $(IBUS_LIBS)            \
-                                     $(FCITX_GCLIENT_LIBS)   \
-                                     $(ACCOUNTSSERVICE_LIBS) \
-                                     $(LIGHTDM_LIBS)         \
-                                     $(COVERAGE_LDFLAGS)
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 00000000..a0fc4bb5
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,55 @@
+pkglibexec_PROGRAMS = ayatana-indicator-keyboard-service
+
+AM_CFLAGS = -w -DGNOME_DESKTOP_USE_UNSTABLE_API
+AM_LDFLAGS = -lm
+AM_VALAFLAGS = --enable-experimental-non-null   \
+               --metadatadir $(top_srcdir)/deps \
+               --vapidir $(top_srcdir)/deps
+
+ayatana_indicator_keyboard_service_SOURCES = main.vala            \
+                                             source.vala          \
+                                             common.vala          \
+                                             ibus-menu.vala       \
+                                             ibus-panel.vala      \
+                                             indicator-menu.vala  \
+                                             keyboard-plugin.vala \
+                                             window-stack.vala    \
+                                             unity-session.vala   \
+                                             unity-greeter.vala
+ayatana_indicator_keyboard_service_VALAFLAGS = $(AM_VALAFLAGS)            \
+                                               --pkg gee-1.0              \
+                                               --pkg posix                \
+                                               --pkg pangocairo           \
+                                               --pkg gtk+-3.0             \
+                                               --pkg GDesktopEnums-3.0    \
+                                               --pkg GnomeDesktop-3.0     \
+                                               --pkg Xkl-1.0              \
+                                               --pkg Gkbd-3.0             \
+                                               --pkg ibus-1.0             \
+                                               --pkg Fcitx-1.0            \
+                                               --pkg AccountsService-1.0  \
+                                               --pkg liblightdm-gobject-1
+ayatana_indicator_keyboard_service_CFLAGS = $(AM_CFLAGS)              \
+                                            $(GEE_CFLAGS)             \
+                                            $(PANGOCAIRO_CFLAGS)      \
+                                            $(GTK_CFLAGS)             \
+                                            $(GNOME_DESKTOP_CFLAGS)   \
+                                            $(LIBXKLAVIER_CFLAGS)     \
+                                            $(LIBGNOMEKBD_CFLAGS)     \
+                                            $(IBUS_CFLAGS)            \
+                                            $(FCITX_GCLIENT_CFLAGS)   \
+                                            $(ACCOUNTSSERVICE_CFLAGS) \
+                                            $(LIGHTDM_CFLAGS)         \
+                                            $(COVERAGE_CFLAGS)
+ayatana_indicator_keyboard_service_LDFLAGS = $(AM_LDFLAGS)           \
+                                             $(GEE_LIBS)             \
+                                             $(PANGOCAIRO_LIBS)      \
+                                             $(GTK_LIBS)             \
+                                             $(GNOME_DESKTOP_LIBS)   \
+                                             $(LIBXKLAVIER_LIBS)     \
+                                             $(LIBGNOMEKBD_LIBS)     \
+                                             $(IBUS_LIBS)            \
+                                             $(FCITX_GCLIENT_LIBS)   \
+                                             $(ACCOUNTSSERVICE_LIBS) \
+                                             $(LIGHTDM_LIBS)         \
+                                             $(COVERAGE_LDFLAGS)
diff --git a/lib/common.vala b/src/common.vala
index 9824bc26..9824bc26 100644
--- a/lib/common.vala
+++ b/src/common.vala
diff --git a/lib/ibus-menu.vala b/src/ibus-menu.vala
index a240f00b..a240f00b 100644
--- a/lib/ibus-menu.vala
+++ b/src/ibus-menu.vala
diff --git a/lib/ibus-panel.vala b/src/ibus-panel.vala
index 2a380efd..2a380efd 100644
--- a/lib/ibus-panel.vala
+++ b/src/ibus-panel.vala
diff --git a/lib/indicator-menu.vala b/src/indicator-menu.vala
index 2cfa52c6..2cfa52c6 100644
--- a/lib/indicator-menu.vala
+++ b/src/indicator-menu.vala
diff --git a/lib/keyboard-plugin.vala b/src/keyboard-plugin.vala
index af1628f6..af1628f6 100644
--- a/lib/keyboard-plugin.vala
+++ b/src/keyboard-plugin.vala
diff --git a/lib/main.vala b/src/main.vala
index 9bb3eb1f..9bb3eb1f 100644
--- a/lib/main.vala
+++ b/src/main.vala
diff --git a/lib/source.vala b/src/source.vala
index b7d7a971..b7d7a971 100644
--- a/lib/source.vala
+++ b/src/source.vala
diff --git a/lib/unity-greeter.vala b/src/unity-greeter.vala
index 5ca398ec..5ca398ec 100644
--- a/lib/unity-greeter.vala
+++ b/src/unity-greeter.vala
diff --git a/lib/unity-session.vala b/src/unity-session.vala
index 15337c36..15337c36 100644
--- a/lib/unity-session.vala
+++ b/src/unity-session.vala
diff --git a/lib/window-stack.vala b/src/window-stack.vala
index a943da6a..a943da6a 100644
--- a/lib/window-stack.vala
+++ b/src/window-stack.vala