Merge pull request #125 from a1346054/fixes

Simple maintenance improvements

9 files changed, 57 insertions, 58 deletions

diff --git a/COPYING b/COPYING
index 94a9ed0..f288702 100644
--- a/COPYING
+++ b/COPYING
@@ -1,7 +1,7 @@
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -645,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box".
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
+<https://www.gnu.org/licenses/>.
 
   The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
diff --git a/README.md b/README.md
index 968a4c3..8162817 100644
--- a/README.md
+++ b/README.md
@@ -46,13 +46,12 @@ Configuration is in keyfile format. For most installations you will want to chan
 
 ## Questions
 
-Questions about LightDM and LightDM GTK Greeter should be asked on the [mailing list](http://lists.freedesktop.org/mailman/listinfo/lightdm). All questions are welcome.
+Questions about LightDM and LightDM GTK Greeter should be asked on the [mailing list](https://lists.freedesktop.org/mailman/listinfo/lightdm). All questions are welcome.
 
-[Stack Overflow](http://stackoverflow.com/search?q=lightdm) and [Ask Ubuntu](http://askubuntu.com/search?q=lightdm) are good sites for frequently asked questions.
+[Stack Overflow](https://stackoverflow.com/search?q=lightdm) and [Ask Ubuntu](https://askubuntu.com/search?q=lightdm) are good sites for frequently asked questions.
 
 ## Links
  - [Homepage](https://github.com/xubuntu/lightdm-gtk-greeter)
  - [Releases](https://github.com/xubuntu/lightdm-gtk-greeter/releases)
  - [Bug Reports](https://github.com/xubuntu/lightdm-gtk-greeter/issues)
  - [Translations](https://www.transifex.com/xubuntu/lightdm-gtk-greeter)
- 
diff --git a/autogen.sh b/autogen.sh
index 973fb98..eeccce2 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -50,7 +50,7 @@ cd "$olddir"
 if [ "$NOCONFIGURE" = "" ]; then
         $srcdir/configure "$@" || exit 1
 
-        if [ "$1" = "--help" ]; then exit 0 else
+        if [ "$1" = "--help" ]; then exit 0; else
                 echo "Now type 'make' to compile $PKG_NAME" || exit 1
         fi
 else
diff --git a/data/sample-lightdm-gtk-greeter.css b/data/sample-lightdm-gtk-greeter.css
index 1ef1c38..2edf639 100644
--- a/data/sample-lightdm-gtk-greeter.css
+++ b/data/sample-lightdm-gtk-greeter.css
@@ -19,7 +19,7 @@ For more fine-grain control, you can also use the named widgets. Those are being
 /*************************
  * 2. Advanced theme *
  *************************/
- 
+
 /* the panel widget at the top */
 #panel_window {
     background-color: alpha (black, 0.5);
@@ -89,7 +89,7 @@ For more fine-grain control, you can also use the named widgets. Those are being
 #login_window GtkComboBox .button:active:hover:focus {
     padding: 0;
     background: none;
-    border-style: none;                                      
+    border-style: none;
     box-shadow: none;
 }
 
@@ -130,7 +130,7 @@ For more fine-grain control, you can also use the named widgets. Those are being
                                       );
 
     color: @lightdm_fg_color;
-                                      
+
     box-shadow: none;
     transition: all 150ms ease-out;
 }
@@ -282,4 +282,4 @@ For more fine-grain control, you can also use the named widgets. Those are being
 #greeter_infobar {
     border-bottom-width: 0;
     font: bold;
-}
\ No newline at end of file
+}
diff --git a/src/greeter_menu_bar.xml b/src/greeter_menu_bar.xml
index a009c1a..aa3d378 100644
--- a/src/greeter_menu_bar.xml
+++ b/src/greeter_menu_bar.xml
@@ -1,7 +1,7 @@
-<glade-catalog name="greeter_menu_bar" domain="glade-3" 
+<glade-catalog name="greeter_menu_bar" domain="glade-3"
                depends="gtk+" version="1.0">
   <glade-widget-classes>
-    <glade-widget-class title="Greeter MenuBar" name="GreeterMenuBar" 
+    <glade-widget-class title="Greeter MenuBar" name="GreeterMenuBar"
                         generic-name="GreeterMenuBar" parent="GtkMenuBar"
                         icon-name="widget-gtk-window"/>
   </glade-widget-classes>
diff --git a/src/greeterbackground.c b/src/greeterbackground.c
index 9a33b6b..a3da135 100644
--- a/src/greeterbackground.c
+++ b/src/greeterbackground.c
@@ -139,13 +139,13 @@ static const Monitor INVALID_MONITOR_STRUCT = {0};
 
 struct _GreeterBackground
 {
-	GObject parent_instance;
-	struct _GreeterBackgroundPrivate* priv;
+    GObject parent_instance;
+    struct _GreeterBackgroundPrivate* priv;
 };
 
 struct _GreeterBackgroundClass
 {
-	GObjectClass parent_class;
+    GObjectClass parent_class;
 };
 
 typedef struct _GreeterBackgroundPrivate GreeterBackgroundPrivate;
@@ -166,11 +166,11 @@ struct _GreeterBackgroundPrivate
     /* Default config for unlisted monitors */
     MonitorConfig* default_config;
 
-	/* Array of configured monitors for current screen */
+    /* Array of configured monitors for current screen */
     Monitor* monitors;
     gsize monitors_size;
 
-	/* Name => <Monitor*>, "Number" => <Monitor*> */
+    /* Name => <Monitor*>, "Number" => <Monitor*> */
     GHashTable* monitors_map;
 
     GList* active_monitors_config;
@@ -327,7 +327,7 @@ static const MonitorConfig DEFAULT_MONITOR_CONFIG =
 static void
 greeter_background_class_init(GreeterBackgroundClass* klass)
 {
-	GObjectClass* gobject_class = G_OBJECT_CLASS(klass);
+    GObjectClass* gobject_class = G_OBJECT_CLASS(klass);
 
     background_signals[BACKGROUND_SIGNAL_ACTIVE_MONITOR_CHANGED] =
                             g_signal_new("active-monitor-changed",
@@ -376,7 +376,7 @@ greeter_background_new(GtkWidget* child)
     background = GREETER_BACKGROUND(g_object_new(greeter_background_get_type(), NULL));
     background->priv->child = child;
     g_signal_connect(background->priv->child, "destroy", G_CALLBACK(greeter_background_child_destroyed_cb), background);
-	return background;
+    return background;
 }
 
 void
@@ -643,7 +643,7 @@ greeter_background_connect(GreeterBackground* background,
             monitor_set_background(monitor, bg);
             background_unref(&bg);
         }
-		else
+        else
             monitor_set_background(monitor, monitor->background_configured);
 
         if(monitor->name)
@@ -747,7 +747,7 @@ greeter_background_set_active_monitor(GreeterBackground* background,
     if (priv->active_monitor_change_in_progress)
         return;
 
-    /* Prevents infinite signal emmission between two monitors (LP: #1410406, #1509780)
+    /* Prevents infinite signal emission between two monitors (LP: #1410406, #1509780)
      * There are some rare scenarios when using multiple monitors that cause the greeter
      * to switch back and forth between the monitors indefinitely. By comparing the
      * timestamp at this precision (1/10th of a second), this should no longer be
diff --git a/src/greetermenubar.c b/src/greetermenubar.c
index 31e6041..6aa7136 100644
--- a/src/greetermenubar.c
+++ b/src/greetermenubar.c
@@ -19,8 +19,8 @@ G_DEFINE_TYPE(GreeterMenuBar, greeter_menu_bar, GTK_TYPE_MENU_BAR);
 static void
 greeter_menu_bar_class_init(GreeterMenuBarClass* klass)
 {
-	GtkWidgetClass* widget_class = GTK_WIDGET_CLASS(klass);
-	widget_class->size_allocate = greeter_menu_bar_size_allocate;
+    GtkWidgetClass* widget_class = GTK_WIDGET_CLASS(klass);
+    widget_class->size_allocate = greeter_menu_bar_size_allocate;
 }
 
 static void
@@ -32,7 +32,7 @@ greeter_menu_bar_init(GreeterMenuBar* square)
 GtkWidget*
 greeter_menu_bar_new(void)
 {
-	return GTK_WIDGET(g_object_new(greeter_menu_bar_get_type(), NULL));
+    return GTK_WIDGET(g_object_new(greeter_menu_bar_get_type(), NULL));
 }
 
 static gint
@@ -46,15 +46,15 @@ sort_minimal_size(gconstpointer a, gconstpointer b, GtkRequestedSize* sizes)
 static void
 greeter_menu_bar_size_allocate(GtkWidget* widget, GtkAllocation* allocation)
 {
-	GtkPackDirection  pack_direction;
-    GList 			 *item;
-    GList 			 *shell_children;
-    GList 			 *expand_nums = NULL;
-    guint 			  visible_count = 0;
-	guint 			  expand_count = 0;
+    GtkPackDirection   pack_direction;
+    GList             *item;
+    GList             *shell_children;
+    GList             *expand_nums = NULL;
+    guint              visible_count = 0;
+    guint              expand_count = 0;
 
-	g_return_if_fail(allocation != NULL);
-	g_return_if_fail(GREETER_IS_MENU_BAR(widget));
+    g_return_if_fail(allocation != NULL);
+    g_return_if_fail(GREETER_IS_MENU_BAR(widget));
 
     gtk_widget_set_allocation(widget, allocation);
 
@@ -89,9 +89,9 @@ greeter_menu_bar_size_allocate(GtkWidget* widget, GtkAllocation* allocation)
         GtkShadowType shadow_type = GTK_SHADOW_OUT;
         GtkBorder border;
         gint toggle_size;
-		GtkRequestedSize* request;
-		gboolean ltr;
-		int size;
+        GtkRequestedSize* request;
+        gboolean ltr;
+        int size;
 
         gtk_style_context_get_padding(context, flags, &border);
         gtk_widget_style_get(widget, "shadow-type", &shadow_type, NULL);
@@ -142,7 +142,7 @@ greeter_menu_bar_size_allocate(GtkWidget* widget, GtkAllocation* allocation)
         /* Distribution extra space for widgets with expand=True */
         if(size > 0 && expand_nums)
         {
-			GList *first_item = NULL;
+            GList *first_item = NULL;
             gint   needed_size = -1;
             gint   max_size = 0;
             gint   total_needed_size = 0;
@@ -177,7 +177,7 @@ greeter_menu_bar_size_allocate(GtkWidget* widget, GtkAllocation* allocation)
 
             for(item = first_item; item; item = g_list_next(item))
             {
-				gint dsize = 0;
+                gint dsize = 0;
 
                 request = &requested_sizes[GPOINTER_TO_INT(item->data)];
                 dsize = needed_size - request->natural_size;
diff --git a/src/greetermenubar.h b/src/greetermenubar.h
index 333aff9..feb48a2 100644
--- a/src/greetermenubar.h
+++ b/src/greetermenubar.h
@@ -27,12 +27,12 @@ typedef struct _GreeterMenuBarClass  GreeterMenuBarClass;
 
 struct _GreeterMenuBar
 {
-	GtkMenuBar parent_instance;
+    GtkMenuBar parent_instance;
 };
 
 struct _GreeterMenuBarClass
 {
-	GtkMenuBarClass parent_class;
+    GtkMenuBarClass parent_class;
 };
 
 GType greeter_menu_bar_get_type(void) G_GNUC_CONST;
diff --git a/src/lightdm-gtk-greeter.c b/src/lightdm-gtk-greeter.c
index 88cc44b..ad6e73e 100644
--- a/src/lightdm-gtk-greeter.c
+++ b/src/lightdm-gtk-greeter.c
@@ -198,7 +198,7 @@ static gchar* get_session (void);
 static void set_session (const gchar *session);
 void session_selected_cb (GtkMenuItem *menuitem, gpointer user_data);
 
-/* Sesion language */
+/* Session language */
 static gchar *current_language;
 static gchar* get_language (void);
 static void set_language (const gchar *language);
@@ -1062,7 +1062,7 @@ set_session (const gchar *session)
             menu_iter = menu_items;
 
         if (menu_iter)
-	        gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_iter->data), TRUE);
+            gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_iter->data), TRUE);
     }
 
     g_free (current_session);
@@ -1962,7 +1962,7 @@ xkl_xevent_filter (GdkXEvent *xev, GdkEvent *event, gpointer  data)
 }
 #endif
 
-/* a11y indciator */
+/* a11y indicator */
 
 void
 a11y_font_cb (GtkCheckMenuItem *item)
@@ -2152,19 +2152,19 @@ start_authentication (const gchar *username)
         lightdm_greeter_authenticate (greeter, NULL);
 #endif
 
-		if (lightdm_greeter_get_lock_hint (greeter))
-		{
-			GList * items = lightdm_user_list_get_users (lightdm_user_list_get_instance ());
-			for (GList * item = items; item; item = item->next)
-			{
-				LightDMUser *user = item->data;
-				if( lightdm_user_get_logged_in (user))
-				{
-					gtk_entry_set_text (username_entry,lightdm_user_get_name(user));
-					break;
-				}
-			}
-		}
+        if (lightdm_greeter_get_lock_hint (greeter))
+        {
+            GList * items = lightdm_user_list_get_users (lightdm_user_list_get_instance ());
+            for (GList * item = items; item; item = item->next)
+            {
+                LightDMUser *user = item->data;
+                if( lightdm_user_get_logged_in (user))
+                {
+                    gtk_entry_set_text (username_entry,lightdm_user_get_name(user));
+                    break;
+                }
+            }
+        }
     }
     else if (g_strcmp0 (username, "*guest") == 0)
     {
@@ -2900,7 +2900,7 @@ main (int argc, char **argv)
         out to relieve memory pressure."
 
         With systemd version 239 the ulimit for RLIMIT_MEMLOCK was set to 16 MiB
-        and therefore the mlockall call would fail. This is lucky becasue the subsequent mmap would not fail.
+        and therefore the mlockall call would fail. This is lucky because the subsequent mmap would not fail.
 
         With systemd version 240 the RLIMIT_MEMLOCK is now set to 64 MiB
         and now the mlockall no longer fails. However, it not possible to mmap in all