White-space cleanup. Removing superfluous EOL white-spaces.

13 files changed, 188 insertions, 188 deletions

diff --git a/NEWS.Canonical b/NEWS.Canonical
index 5da5fb3..4c20638 100644
--- a/NEWS.Canonical
+++ b/NEWS.Canonical
@@ -7,7 +7,7 @@ Overview of changes in arctica-greeter 14.04.9
 
     - Correctly handle SIGTERM and quit cleanly. We were previously not stopping
       the signal and so not cleaning up on exit. This left an upstart process
-      for each greeter remaining.      
+      for each greeter remaining.
     - If a user has an invalid session, then use the system default session
     - Correctly handle sessions not starting
 
@@ -15,7 +15,7 @@ Overview of changes in arctica-greeter 14.04.8
 
     - Allow unity-settings-daemon to blank the screen by implementing the
       gnome-screensaver and gnome-session d-bus interfaces.
-  
+
 Overview of changes in arctica-greeter 14.04.7
 
     - Own the com.canonical.UnityGreeter D-Bus name
diff --git a/data/arctica-greeter-blue.xcf b/data/arctica-greeter-blue.xcf
index 93c2251..80de962 100644
--- a/data/arctica-greeter-blue.xcf
+++ b/data/arctica-greeter-blue.xcf
diff --git a/data/arctica-greeter-yellow.xcf b/data/arctica-greeter-yellow.xcf
index a462ce8..3a54f3b 100644
--- a/data/arctica-greeter-yellow.xcf
+++ b/data/arctica-greeter-yellow.xcf
diff --git a/data/sounds/COPYING.system-ready b/data/sounds/COPYING.system-ready
index f54f251..3943996 100644
--- a/data/sounds/COPYING.system-ready
+++ b/data/sounds/COPYING.system-ready
@@ -5,219 +5,219 @@ Sounds composed and recorded by Nathaniel McCallum <npmccallum@canonical.com>
 
 This work is licensed under the Creative Commons Attribution-ShareAlike License.
 
-THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE 
-COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY 
-COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS 
+THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
+COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
+COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
 AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
 
-BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE 
-TO BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS YOU THE 
-RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS 
+BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
+TO BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS YOU THE
+RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS
 AND CONDITIONS.
 
 1. Definitions
 
-   a. "Collective Work" means a work, such as a periodical issue, 
-      anthology or encyclopedia, in which the Work in its entirety in 
-      unmodified form, along with a number of other contributions, 
-      constituting separate and independent works in themselves, are assembled 
-      into a collective whole. A work that constitutes a Collective Work will 
-      not be considered a Derivative Work (as defined below) for the purposes 
+   a. "Collective Work" means a work, such as a periodical issue,
+      anthology or encyclopedia, in which the Work in its entirety in
+      unmodified form, along with a number of other contributions,
+      constituting separate and independent works in themselves, are assembled
+      into a collective whole. A work that constitutes a Collective Work will
+      not be considered a Derivative Work (as defined below) for the purposes
       of this License.
-   b. "Derivative Work" means a work based upon the Work or upon the 
-      Work and other pre-existing works, such as a translation, musical 
-      arrangement, dramatization, fictionalization, motion picture version, 
-      sound recording, art reproduction, abridgment, condensation, or any 
-      other form in which the Work may be recast, transformed, or adapted, 
-      except that a work that constitutes a Collective Work will not be 
-      considered a Derivative Work for the purpose of this License. For the 
-      avoidance of doubt, where the Work is a musical composition or sound 
-      recording, the synchronization of the Work in timed-relation with a 
-      moving image ("synching") will be considered a Derivative Work for the 
+   b. "Derivative Work" means a work based upon the Work or upon the
+      Work and other pre-existing works, such as a translation, musical
+      arrangement, dramatization, fictionalization, motion picture version,
+      sound recording, art reproduction, abridgment, condensation, or any
+      other form in which the Work may be recast, transformed, or adapted,
+      except that a work that constitutes a Collective Work will not be
+      considered a Derivative Work for the purpose of this License. For the
+      avoidance of doubt, where the Work is a musical composition or sound
+      recording, the synchronization of the Work in timed-relation with a
+      moving image ("synching") will be considered a Derivative Work for the
       purpose of this License.
-   c. "Licensor" means the individual or entity that offers the Work 
+   c. "Licensor" means the individual or entity that offers the Work
       under the terms of this License.
-   d. "Original Author" means the individual or entity who created the 
+   d. "Original Author" means the individual or entity who created the
       Work.
-   e. "Work" means the copyrightable work of authorship offered under 
+   e. "Work" means the copyrightable work of authorship offered under
       the terms of this License.
-   f. "You" means an individual or entity exercising rights under this 
-      License who has not previously violated the terms of this License with 
-      respect to the Work, or who has received express permission from the 
-      Licensor to exercise rights under this License despite a previous 
+   f. "You" means an individual or entity exercising rights under this
+      License who has not previously violated the terms of this License with
+      respect to the Work, or who has received express permission from the
+      Licensor to exercise rights under this License despite a previous
       violation.
-   g. "License Elements" means the following high-level license 
-      attributes as selected by Licensor and indicated in the title of this 
+   g. "License Elements" means the following high-level license
+      attributes as selected by Licensor and indicated in the title of this
       License: Attribution, ShareAlike.
 
-2. Fair Use Rights. Nothing in this license is intended to reduce, 
-   limit, or restrict any rights arising from fair use, first sale or other 
-   limitations on the exclusive rights of the copyright owner under 
+2. Fair Use Rights. Nothing in this license is intended to reduce,
+   limit, or restrict any rights arising from fair use, first sale or other
+   limitations on the exclusive rights of the copyright owner under
    copyright law or other applicable laws.
 
-3. License Grant. Subject to the terms and conditions of this License, 
-   Licensor hereby grants You a worldwide, royalty-free, non-exclusive, 
-   perpetual (for the duration of the applicable copyright) license to 
+3. License Grant. Subject to the terms and conditions of this License,
+   Licensor hereby grants You a worldwide, royalty-free, non-exclusive,
+   perpetual (for the duration of the applicable copyright) license to
    exercise the rights in the Work as stated below:
 
-   a. to reproduce the Work, to incorporate the Work into one or more 
-      Collective Works, and to reproduce the Work as incorporated in the 
+   a. to reproduce the Work, to incorporate the Work into one or more
+      Collective Works, and to reproduce the Work as incorporated in the
       Collective Works;
    b. to create and reproduce Derivative Works;
-   c. to distribute copies or phonorecords of, display publicly, perform 
-      publicly, and perform publicly by means of a digital audio transmission 
+   c. to distribute copies or phonorecords of, display publicly, perform
+      publicly, and perform publicly by means of a digital audio transmission
       the Work including as incorporated in Collective Works;
-   d. to distribute copies or phonorecords of, display publicly, perform 
-      publicly, and perform publicly by means of a digital audio transmission 
+   d. to distribute copies or phonorecords of, display publicly, perform
+      publicly, and perform publicly by means of a digital audio transmission
       Derivative Works.
-   e. For the avoidance of doubt, where the work is a musical 
+   e. For the avoidance of doubt, where the work is a musical
       composition:
-         i. Performance Royalties Under Blanket Licenses. Licensor 
-            waives the exclusive right to collect, whether individually or via a 
-            performance rights society (e.g. ASCAP, BMI, SESAC), royalties for 
-            the public performance or public digital performance (e.g. webcast) 
+         i. Performance Royalties Under Blanket Licenses. Licensor
+            waives the exclusive right to collect, whether individually or via a
+            performance rights society (e.g. ASCAP, BMI, SESAC), royalties for
+            the public performance or public digital performance (e.g. webcast)
             of the Work.
-         ii. Mechanical Rights and Statutory Royalties. Licensor waives 
-            the exclusive right to collect, whether individually or via a music 
-            rights society or designated agent (e.g. Harry Fox Agency), 
-            royalties for any phonorecord You create from the Work ("cover 
-            version") and distribute, subject to the compulsory license created 
-            by 17 USC Section 115 of the US Copyright Act (or the equivalent in 
+         ii. Mechanical Rights and Statutory Royalties. Licensor waives
+            the exclusive right to collect, whether individually or via a music
+            rights society or designated agent (e.g. Harry Fox Agency),
+            royalties for any phonorecord You create from the Work ("cover
+            version") and distribute, subject to the compulsory license created
+            by 17 USC Section 115 of the US Copyright Act (or the equivalent in
             other jurisdictions).
-   f. Webcasting Rights and Statutory Royalties. For the avoidance of 
-      doubt, where the Work is a sound recording, Licensor waives the 
-      exclusive right to collect, whether individually or via a 
-      performance-rights society (e.g. SoundExchange), royalties for the 
-      public digital performance (e.g. webcast) of the Work, subject to the 
-      compulsory license created by 17 USC Section 114 of the US Copyright Act 
+   f. Webcasting Rights and Statutory Royalties. For the avoidance of
+      doubt, where the Work is a sound recording, Licensor waives the
+      exclusive right to collect, whether individually or via a
+      performance-rights society (e.g. SoundExchange), royalties for the
+      public digital performance (e.g. webcast) of the Work, subject to the
+      compulsory license created by 17 USC Section 114 of the US Copyright Act
       (or the equivalent in other jurisdictions).
 
-The above rights may be exercised in all media and formats whether now 
-known or hereafter devised. The above rights include the right to make 
-such modifications as are technically necessary to exercise the rights 
-in other media and formats. All rights not expressly granted by Licensor 
+The above rights may be exercised in all media and formats whether now
+known or hereafter devised. The above rights include the right to make
+such modifications as are technically necessary to exercise the rights
+in other media and formats. All rights not expressly granted by Licensor
 are hereby reserved.
 
-4. Restrictions.The license granted in Section 3 above is expressly made 
+4. Restrictions.The license granted in Section 3 above is expressly made
    subject to and limited by the following restrictions:
 
-   a. You may distribute, publicly display, publicly perform, or 
-      publicly digitally perform the Work only under the terms of this 
-      License, and You must include a copy of, or the Uniform Resource 
-      Identifier for, this License with every copy or phonorecord of the Work 
-      You distribute, publicly display, publicly perform, or publicly 
-      digitally perform. You may not offer or impose any terms on the Work 
-      that alter or restrict the terms of this License or the recipients' 
-      exercise of the rights granted hereunder. You may not sublicense the 
-      Work. You must keep intact all notices that refer to this License and to 
-      the disclaimer of warranties. You may not distribute, publicly display, 
-      publicly perform, or publicly digitally perform the Work with any 
-      technological measures that control access or use of the Work in a 
-      manner inconsistent with the terms of this License Agreement. The above 
-      applies to the Work as incorporated in a Collective Work, but this does 
-      not require the Collective Work apart from the Work itself to be made 
-      subject to the terms of this License. If You create a Collective Work, 
-      upon notice from any Licensor You must, to the extent practicable, 
-      remove from the Collective Work any reference to such Licensor or the 
-      Original Author, as requested. If You create a Derivative Work, upon 
-      notice from any Licensor You must, to the extent practicable, remove 
-      from the Derivative Work any reference to such Licensor or the Original 
+   a. You may distribute, publicly display, publicly perform, or
+      publicly digitally perform the Work only under the terms of this
+      License, and You must include a copy of, or the Uniform Resource
+      Identifier for, this License with every copy or phonorecord of the Work
+      You distribute, publicly display, publicly perform, or publicly
+      digitally perform. You may not offer or impose any terms on the Work
+      that alter or restrict the terms of this License or the recipients'
+      exercise of the rights granted hereunder. You may not sublicense the
+      Work. You must keep intact all notices that refer to this License and to
+      the disclaimer of warranties. You may not distribute, publicly display,
+      publicly perform, or publicly digitally perform the Work with any
+      technological measures that control access or use of the Work in a
+      manner inconsistent with the terms of this License Agreement. The above
+      applies to the Work as incorporated in a Collective Work, but this does
+      not require the Collective Work apart from the Work itself to be made
+      subject to the terms of this License. If You create a Collective Work,
+      upon notice from any Licensor You must, to the extent practicable,
+      remove from the Collective Work any reference to such Licensor or the
+      Original Author, as requested. If You create a Derivative Work, upon
+      notice from any Licensor You must, to the extent practicable, remove
+      from the Derivative Work any reference to such Licensor or the Original
       Author, as requested.
-   b. You may distribute, publicly display, publicly perform, or 
-      publicly digitally perform a Derivative Work only under the terms of 
-      this License, a later version of this License with the same License 
-      Elements as this License, or a Creative Commons iCommons license that 
-      contains the same License Elements as this License (e.g. 
-      Attribution-ShareAlike 2.0 Japan). You must include a copy of, or the 
-      Uniform Resource Identifier for, this License or other license specified 
-      in the previous sentence with every copy or phonorecord of each 
-      Derivative Work You distribute, publicly display, publicly perform, or 
-      publicly digitally perform. You may not offer or impose any terms on the 
-      Derivative Works that alter or restrict the terms of this License or the 
-      recipients' exercise of the rights granted hereunder, and You must keep 
-      intact all notices that refer to this License and to the disclaimer of 
-      warranties. You may not distribute, publicly display, publicly perform, 
-      or publicly digitally perform the Derivative Work with any technological 
-      measures that control access or use of the Work in a manner inconsistent 
-      with the terms of this License Agreement. The above applies to the 
-      Derivative Work as incorporated in a Collective Work, but this does not 
-      require the Collective Work apart from the Derivative Work itself to be 
+   b. You may distribute, publicly display, publicly perform, or
+      publicly digitally perform a Derivative Work only under the terms of
+      this License, a later version of this License with the same License
+      Elements as this License, or a Creative Commons iCommons license that
+      contains the same License Elements as this License (e.g.
+      Attribution-ShareAlike 2.0 Japan). You must include a copy of, or the
+      Uniform Resource Identifier for, this License or other license specified
+      in the previous sentence with every copy or phonorecord of each
+      Derivative Work You distribute, publicly display, publicly perform, or
+      publicly digitally perform. You may not offer or impose any terms on the
+      Derivative Works that alter or restrict the terms of this License or the
+      recipients' exercise of the rights granted hereunder, and You must keep
+      intact all notices that refer to this License and to the disclaimer of
+      warranties. You may not distribute, publicly display, publicly perform,
+      or publicly digitally perform the Derivative Work with any technological
+      measures that control access or use of the Work in a manner inconsistent
+      with the terms of this License Agreement. The above applies to the
+      Derivative Work as incorporated in a Collective Work, but this does not
+      require the Collective Work apart from the Derivative Work itself to be
       made subject to the terms of this License.
-   c. If you distribute, publicly display, publicly perform, or publicly 
-      digitally perform the Work or any Derivative Works or Collective Works, 
-      You must keep intact all copyright notices for the Work and give the 
-      Original Author credit reasonable to the medium or means You are 
-      utilizing by conveying the name (or pseudonym if applicable) of the 
-      Original Author if supplied; the title of the Work if supplied; to the 
-      extent reasonably practicable, the Uniform Resource Identifier, if any, 
-      that Licensor specifies to be associated with the Work, unless such URI 
-      does not refer to the copyright notice or licensing information for the 
-      Work; and in the case of a Derivative Work, a credit identifying the use 
-      of the Work in the Derivative Work (e.g., "French translation of the 
-      Work by Original Author," or "Screenplay based on original Work by 
-      Original Author"). Such credit may be implemented in any reasonable 
-      manner; provided, however, that in the case of a Derivative Work or 
-      Collective Work, at a minimum such credit will appear where any other 
-      comparable authorship credit appears and in a manner at least as 
+   c. If you distribute, publicly display, publicly perform, or publicly
+      digitally perform the Work or any Derivative Works or Collective Works,
+      You must keep intact all copyright notices for the Work and give the
+      Original Author credit reasonable to the medium or means You are
+      utilizing by conveying the name (or pseudonym if applicable) of the
+      Original Author if supplied; the title of the Work if supplied; to the
+      extent reasonably practicable, the Uniform Resource Identifier, if any,
+      that Licensor specifies to be associated with the Work, unless such URI
+      does not refer to the copyright notice or licensing information for the
+      Work; and in the case of a Derivative Work, a credit identifying the use
+      of the Work in the Derivative Work (e.g., "French translation of the
+      Work by Original Author," or "Screenplay based on original Work by
+      Original Author"). Such credit may be implemented in any reasonable
+      manner; provided, however, that in the case of a Derivative Work or
+      Collective Work, at a minimum such credit will appear where any other
+      comparable authorship credit appears and in a manner at least as
       prominent as such other comparable authorship credit.
 
 5. Representations, Warranties and Disclaimer
-UNLESS OTHERWISE AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS 
-THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND 
-CONCERNING THE MATERIALS, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, 
-INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, 
-FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF 
-LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, 
-WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE 
+UNLESS OTHERWISE AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS
+THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND
+CONCERNING THE MATERIALS, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE,
+INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY,
+FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF
+LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS,
+WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE
 EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
 
-6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE 
-LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR 
-ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES 
-ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS 
+6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE
+LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR
+ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES
+ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS
 BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 
 7. Termination
 
-   a. This License and the rights granted hereunder will terminate 
-      automatically upon any breach by You of the terms of this License. 
-      Individuals or entities who have received Derivative Works or Collective 
-      Works from You under this License, however, will not have their licenses 
-      terminated provided such individuals or entities remain in full 
-      compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will 
+   a. This License and the rights granted hereunder will terminate
+      automatically upon any breach by You of the terms of this License.
+      Individuals or entities who have received Derivative Works or Collective
+      Works from You under this License, however, will not have their licenses
+      terminated provided such individuals or entities remain in full
+      compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will
       survive any termination of this License.
-   b. Subject to the above terms and conditions, the license granted 
-      here is perpetual (for the duration of the applicable copyright in the 
-      Work). Notwithstanding the above, Licensor reserves the right to release 
-      the Work under different license terms or to stop distributing the Work 
-      at any time; provided, however that any such election will not serve to 
-      withdraw this License (or any other license that has been, or is 
-      required to be, granted under the terms of this License), and this 
-      License will continue in full force and effect unless terminated as 
+   b. Subject to the above terms and conditions, the license granted
+      here is perpetual (for the duration of the applicable copyright in the
+      Work). Notwithstanding the above, Licensor reserves the right to release
+      the Work under different license terms or to stop distributing the Work
+      at any time; provided, however that any such election will not serve to
+      withdraw this License (or any other license that has been, or is
+      required to be, granted under the terms of this License), and this
+      License will continue in full force and effect unless terminated as
       stated above.
 
 8. Miscellaneous
 
-   a. Each time You distribute or publicly digitally perform the Work or 
-      a Collective Work, the Licensor offers to the recipient a license to the 
-      Work on the same terms and conditions as the license granted to You 
+   a. Each time You distribute or publicly digitally perform the Work or
+      a Collective Work, the Licensor offers to the recipient a license to the
+      Work on the same terms and conditions as the license granted to You
       under this License.
-   b. Each time You distribute or publicly digitally perform a 
-      Derivative Work, Licensor offers to the recipient a license to the 
-      original Work on the same terms and conditions as the license granted to 
+   b. Each time You distribute or publicly digitally perform a
+      Derivative Work, Licensor offers to the recipient a license to the
+      original Work on the same terms and conditions as the license granted to
       You under this License.
-   c. If any provision of this License is invalid or unenforceable under 
-      applicable law, it shall not affect the validity or enforceability of 
-      the remainder of the terms of this License, and without further action 
-      by the parties to this agreement, such provision shall be reformed to 
-      the minimum extent necessary to make such provision valid and 
+   c. If any provision of this License is invalid or unenforceable under
+      applicable law, it shall not affect the validity or enforceability of
+      the remainder of the terms of this License, and without further action
+      by the parties to this agreement, such provision shall be reformed to
+      the minimum extent necessary to make such provision valid and
       enforceable.
-   d. No term or provision of this License shall be deemed waived and no 
-      breach consented to unless such waiver or consent shall be in writing 
+   d. No term or provision of this License shall be deemed waived and no
+      breach consented to unless such waiver or consent shall be in writing
       and signed by the party to be charged with such waiver or consent.
-   e. This License constitutes the entire agreement between the parties 
-      with respect to the Work licensed here. There are no understandings, 
-      agreements or representations with respect to the Work not specified 
-      here. Licensor shall not be bound by any additional provisions that may 
-      appear in any communication from You. This License may not be modified 
+   e. This License constitutes the entire agreement between the parties
+      with respect to the Work licensed here. There are no understandings,
+      agreements or representations with respect to the Work not specified
+      here. Licensor shall not be bound by any additional provisions that may
+      appear in any communication from You. This License may not be modified
       without the mutual written agreement of the Licensor and You.
diff --git a/debian/control b/debian/control
index f427fde..f2bc6e6 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: arctica-greeter
 Section: x11
 Priority: optional
-Maintainer: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> 
+Maintainer: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
 Standards-Version: 4.1.1
 Build-Depends: at-spi2-core,
                dbus-x11,
diff --git a/debian/copyright.in b/debian/copyright.in
index 23d2388..31462aa 100644
--- a/debian/copyright.in
+++ b/debian/copyright.in
@@ -256,7 +256,7 @@ Files: data/arctica-greeter-blue.xcf
  data/badges/lxde_badge.xcf
  data/badges/xfce_badge.xcf
  data/badges/xmonad_badge.xcf
-Copyright: 
+Copyright:
 License: UNKNOWN
  FIXME
 
diff --git a/debian/rules b/debian/rules
index 9801911..d39cf60 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f 
+#!/usr/bin/make -f
 
 LDFLAGS+=-Wl,--as-needed
 
diff --git a/src/arctica-greeter.vala b/src/arctica-greeter.vala
index 2def301..76b2279 100644
--- a/src/arctica-greeter.vala
+++ b/src/arctica-greeter.vala
@@ -92,7 +92,7 @@ public class ArcticaGreeter
 
         var state_dir = Path.build_filename (Environment.get_user_cache_dir (), "arctica-greeter");
         DirUtils.create_with_parents (state_dir, 0775);
-        
+
         var xdg_seat = GLib.Environment.get_variable("XDG_SEAT");
         var state_file_name = xdg_seat != null && xdg_seat != "seat0" ? xdg_seat + "-state" : "state";
 
diff --git a/src/idle-monitor.vala b/src/idle-monitor.vala
index ee841b3..374e924 100644
--- a/src/idle-monitor.vala
+++ b/src/idle-monitor.vala
@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2014 Canonical Ltd
  * Copyright (C) 2017 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
diff --git a/src/logo-generator.vala b/src/logo-generator.vala
index 0556466..1cea95f 100644
--- a/src/logo-generator.vala
+++ b/src/logo-generator.vala
@@ -6,7 +6,7 @@ public class Main : Object
     private static string? result = null;
     private static int width = 245;
     private static int height = 44;
-    private const OptionEntry[] options = { 
+    private const OptionEntry[] options = {
 	{"logo", 0, 0, OptionArg.FILENAME, ref file, "Path to logo", "LOGO"},
 	{"text", 0, 0, OptionArg.STRING, ref text, "Sublogo text", "TEXT"},
 	{"width", 0, 0, OptionArg.INT, ref width, "Logo width", "WIDTH"},
@@ -21,7 +21,7 @@ public class Main : Object
 	    opt_context.set_help_enabled (true);
 	    opt_context.add_main_entries (options, null);
 	    opt_context.parse (ref args);
-	} catch (OptionError e) {    
+	} catch (OptionError e) {
 	    stdout.printf ("error: %s\n", e.message);
 	    stdout.printf ("Run '%s --help' to see a full list of available command line options.\n", args[0]);
 	    return 0;
diff --git a/src/settings-daemon.vala b/src/settings-daemon.vala
index 5230b0a..e0371ec 100644
--- a/src/settings-daemon.vala
+++ b/src/settings-daemon.vala
@@ -97,7 +97,7 @@ public class SettingsDaemon : Object
                            {
                                debug ("Acquired org.gnome.ScreenSaver");
                                start_settings_daemon ();
-                           },                          
+                           },
                            () => debug ("Failed to acquire name org.gnome.ScreenSaver"));
 
         /* The media-keys plugin inhibits the power key, but we don't want
@@ -207,7 +207,7 @@ public class ScreenSaverInterface : Object
     public ScreenSaverInterface ()
     {
         idle_monitor = new IdleMonitor ();
-        _set_active (false);       
+        _set_active (false);
     }
 
     private void _set_active (bool value)
@@ -244,7 +244,7 @@ public class ScreenSaverInterface : Object
     {
         return _active;
     }
-    
+
     public uint32 get_active_time () { return 0; }
     public void lock () {}
     public void show_message (string summary, string body, string icon) {}
diff --git a/src/user-list.vala b/src/user-list.vala
index 65feaa2..48957c3 100644
--- a/src/user-list.vala
+++ b/src/user-list.vala
@@ -237,7 +237,7 @@ public class UserList : GreeterList
     {
         return remote_server_list_name.split ("*")[2];
     }
-    
+
     private string username_from_remote_loding_server_list_name (string remote_server_list_name)
     {
         return remote_server_list_name.split ("*")[3];
@@ -474,7 +474,7 @@ public class UserList : GreeterList
                     else if (password_field.text == "duplicate")
                     {
                         test_fill_remote_login_servers_duplicate_entries (out server_list);
-                        login_success = true;                        
+                        login_success = true;
                     }
                 }
                 else
@@ -668,7 +668,7 @@ public class UserList : GreeterList
         current_remote_fields = new HashTable<string, Gtk.Widget> (str_hash, str_equal);
         var url = url_from_remote_loding_server_list_name (selected_entry.id);
         var username = username_from_remote_loding_server_list_name (selected_entry.id);
-        
+
         foreach (var remote_server in server_list)
         {
             var remote_username = username_from_remote_server_fields (remote_server);
@@ -1233,10 +1233,10 @@ public class UserList : GreeterList
                 RemoteServerField field2 = RemoteServerField ();
                 field2.type = "password";
                 remote_server.fields = {field1, field2};
-                
+
                 test_server_list += remote_server;
                 set_remote_directory_servers (test_server_list);
-                
+
                 return false;
             });
 
@@ -1422,7 +1422,7 @@ public class UserList : GreeterList
         server_list[0] = remote_server2;
         server_list[1] = remote_server5;
     }
-    
+
     private bool test_key_press_cb (Gdk.EventKey event)
     {
         if ((event.state & Gdk.ModifierType.CONTROL_MASK) == 0)
diff --git a/tests/test.vala b/tests/test.vala
index 50a6530..e90b29e 100644
--- a/tests/test.vala
+++ b/tests/test.vala
@@ -555,20 +555,20 @@ public class Test
         email.text = "a@canonical.com";
         pwd.text = "duplicate";
         list.selected_entry.respond ({});
-        GLib.assert (!list.selected_entry.has_errors);        
-        GLib.assert (list.selected_entry.id == "*remote_login*http://rdpdefaultusername.com*alowl2");        
-        
+        GLib.assert (!list.selected_entry.has_errors);
+        GLib.assert (list.selected_entry.id == "*remote_login*http://rdpdefaultusername.com*alowl2");
+
         var username = remote_login_entry_username_field(list);
         var domain = remote_login_entry_domain_field(list);
-        var password = remote_login_entry_password_field(list);		
+        var password = remote_login_entry_password_field(list);
         GLib.assert (username.text == "alowl2" && domain.text == "PRINTERS" && password.text == "duplicate2");
-                        
+
         do_scroll (list, GreeterList.ScrollTarget.DOWN);
         GLib.assert (list.selected_entry.id == "*remote_login*http://rdpdefaultusername.com*alowl1");
         username = remote_login_entry_username_field(list);
         domain = remote_login_entry_domain_field(list);
         password = remote_login_entry_password_field(list);
-        GLib.assert (username.text == "alowl1" && domain.text == "SCANNERS" && password.text == "duplicate1");	
+        GLib.assert (username.text == "alowl1" && domain.text == "SCANNERS" && password.text == "duplicate1");
         wait_for_scrolling_end (list);
         mw.hide ();
     }