Merge lp:~bennabiy/ltsp/ldm-cleanup into lp:~ltsp-upstream/ltsp/ldm-trunk

[ben-Nabiy Derush]

Ran indent -kr -i4 -nut -c50 -psl on all .c files in branch.

Pure code cleanup.

[lp:~bennabiy/ltsp/ldm-cleanup]

1551. By ben-Nabiy Derush on 2014-07-28

Revised README-DEVELOPMENT-POLICY to clarify whitespace changes in existing
code needing a separate merge request.

[Jakob Unterwurzacher (jakobunt)]

Looks like this has already been merged for the most part. Still I'd like to add: Please don't do that (again). It breaks everybody's patches against ldm and breaks bzr blame.

review: Disapprove

[Vagrant Cascadian (vagrantc)]

On 2014-09-22 16:36:13 -0500, Jakob Unterwurzacher wrote:
> Looks like this has already been merged for the most part. Still I'd
> like to add: Please don't do that (again). It breaks everybody's
> patches against ldm and breaks bzr blame.

I have to disagree.

As upstream, patches that bring code consistant with our own style
guidelines are appreciated and welcomed.

We should be more strict about accepting and submitting patches that
don't follow them, which was the real problem, and I take my share of
the blame for that.

live well,
  vagrant

=== modified file 'README-DEVELOPMENT-POLICY'
--- README-DEVELOPMENT-POLICY	2008-07-25 22:40:00 +0000
+++ README-DEVELOPMENT-POLICY	2014-07-28 15:29:30 +0000
@@ -21,5 +21,8 @@
      - 4 character tab width, and spaces instead of tabs
      - Align inline comments on column 50
      - A newline after function definitions
+ - If you change whitespace or formatting of existing code, please do this in a
+   separate merge proposal. This includes running the above indent command on 
+   existing code.
  - All if() else blocks will have {}'s, even if only 1 line long, or Ollie will break your thumbs.
  - Comments will be /* */ or Scott will break the rest of your fingers.

=== modified file 'gtkgreet/greeter.c'
--- gtkgreet/greeter.c	2012-08-21 14:33:07 +0000
+++ gtkgreet/greeter.c	2014-07-28 15:29:30 +0000
@@ -79,67 +79,67 @@
 
 GList *host_list = NULL;
 GIOChannel *g_stdout;           /* stdout io channel */
-gchar * ldm_theme_dir;
+gchar *ldm_theme_dir;
 
 int allowguest;
 gint login_timeout;
 gint timeout_left;
 
 gchar *
-ldm_theme_file(char * file)
+ldm_theme_file(char *file)
 {
-    gchar * filename;
-    gchar * filename_default;
+    gchar *filename;
+    gchar *filename_default;
     filename = g_strconcat("/", ldm_theme_dir, "/", file, NULL);
-    filename_default = g_strconcat("/", LDM_THEME_DIR, "ltsp", "/", file, NULL);
-    if (access(g_strconcat(filename, ".png", NULL), F_OK ) != -1)
-    {
+    filename_default =
+        g_strconcat("/", LDM_THEME_DIR, "ltsp", "/", file, NULL);
+    if (access(g_strconcat(filename, ".png", NULL), F_OK) != -1) {
         filename = g_strconcat(filename, ".png", NULL);
-    }
-    else if (access(g_strconcat(filename, ".jpg", NULL), F_OK ) != -1)
-    {
+    } else if (access(g_strconcat(filename, ".jpg", NULL), F_OK) != -1) {
         filename = g_strconcat(filename, ".jpg", NULL);
-    }
-    else if (access(g_strconcat(filename_default, ".png", NULL), F_OK ) != -1)
-    {
+    } else if (access(g_strconcat(filename_default, ".png", NULL), F_OK) !=
+               -1) {
         filename = g_strconcat(filename_default, ".png", NULL);
-    }
-    else if (access(g_strconcat(filename_default, ".jpg", NULL), F_OK ) != -1)
-    {
+    } else if (access(g_strconcat(filename_default, ".jpg", NULL), F_OK) !=
+               -1) {
         filename = g_strconcat(filename_default, ".jpg", NULL);
     }
     return filename;
 }
-GdkPixmap* root_bg = 0;
-void load_root_background(const gchar* filename, gboolean scale, gboolean reload) {
-    if (root_bg != 0){
+
+GdkPixmap *root_bg = 0;
+void
+load_root_background(const gchar * filename, gboolean scale,
+                     gboolean reload)
+{
+    if (root_bg != 0) {
         if (reload) {
-            g_object_unref(G_OBJECT (root_bg));
+            g_object_unref(G_OBJECT(root_bg));
             root_bg = 0;
         } else {
             return;
         }
     }
 
-    GtkWidget* image = gtk_image_new_from_file(filename);
-    g_object_ref(G_OBJECT (image));
-    GdkPixbuf* pixbuf = gtk_image_get_pixbuf(GTK_IMAGE (image));
-    double img_width = (double)gdk_pixbuf_get_width(pixbuf);
-    double img_height = (double)gdk_pixbuf_get_height(pixbuf);
+    GtkWidget *image = gtk_image_new_from_file(filename);
+    g_object_ref(G_OBJECT(image));
+    GdkPixbuf *pixbuf = gtk_image_get_pixbuf(GTK_IMAGE(image));
+    double img_width = (double) gdk_pixbuf_get_width(pixbuf);
+    double img_height = (double) gdk_pixbuf_get_height(pixbuf);
 
-    GdkWindow* root = gdk_get_default_root_window();
+    GdkWindow *root = gdk_get_default_root_window();
     gint width, height;
-    gdk_drawable_get_size(GDK_DRAWABLE (root), &width, &height);
+    gdk_drawable_get_size(GDK_DRAWABLE(root), &width, &height);
 
     // create pixmap
-    gdk_drawable_get_size(GDK_DRAWABLE (root), &width, &height);
-    root_bg = gdk_pixmap_new(GDK_DRAWABLE (root), width, height, -1);
-    g_object_ref(G_OBJECT (root_bg));
+    gdk_drawable_get_size(GDK_DRAWABLE(root), &width, &height);
+    root_bg = gdk_pixmap_new(GDK_DRAWABLE(root), width, height, -1);
+    g_object_ref(G_OBJECT(root_bg));
 
     // paint pixmap onto bg
-    cairo_t* ctx = gdk_cairo_create(GDK_DRAWABLE (root_bg));
+    cairo_t *ctx = gdk_cairo_create(GDK_DRAWABLE(root_bg));
     if (scale) {
-        cairo_scale(ctx, width/img_width, height/img_height);
+        cairo_scale(ctx, width / img_width, height / img_height);
     }
     gdk_cairo_set_source_pixbuf(ctx, pixbuf, 0, 0);
     cairo_paint(ctx);
@@ -147,46 +147,42 @@
 
     //g_object_unref(G_OBJECT (bg));
 
-    g_object_unref(G_OBJECT (image));
+    g_object_unref(G_OBJECT(image));
 }
 
 void
-set_root_background() {
-    GdkWindow* root = gdk_get_default_root_window();
+set_root_background()
+{
+    GdkWindow *root = gdk_get_default_root_window();
 
 
     // bg needs to be set and painted, so it refreshes now and in the future
-    gdk_window_set_back_pixmap(GDK_WINDOW (root), GDK_PIXMAP (root_bg), 0);
-    gdk_draw_drawable(GDK_DRAWABLE (root),
-                      gdk_gc_new(GDK_DRAWABLE (root)),
-                      GDK_DRAWABLE (root_bg),
-                      0, 0,
-                      0, 0,
-                      -1, -1);
+    gdk_window_set_back_pixmap(GDK_WINDOW(root), GDK_PIXMAP(root_bg), 0);
+    gdk_draw_drawable(GDK_DRAWABLE(root),
+                      gdk_gc_new(GDK_DRAWABLE(root)),
+                      GDK_DRAWABLE(root_bg), 0, 0, 0, 0, -1, -1);
 }
 
 void
-draw_background(GtkWidget* widget, gpointer data) {
-    GdkWindow* window;
+draw_background(GtkWidget * widget, gpointer data)
+{
+    GdkWindow *window;
     gint width, height, x, y;
 
     window = gtk_widget_get_window(widget);
     if (window == NULL) {
         return;
     }
-    gdk_drawable_get_size(GDK_DRAWABLE (window), &width, &height);
-    gdk_window_get_origin(GDK_WINDOW (window), &x, &y);
-    GdkPixmap* new_bg = gdk_pixmap_new(root_bg, width, height, -1);
-    g_object_ref(G_OBJECT (new_bg));
-    gdk_draw_drawable(GDK_DRAWABLE (new_bg),
-                    gdk_gc_new(GDK_DRAWABLE (new_bg)),
-                    GDK_DRAWABLE (root_bg),
-                    x, y,
-                    0, 0,
-                    width, height);
-    gdk_window_set_back_pixmap(GDK_WINDOW (window), new_bg, 0);
+    gdk_drawable_get_size(GDK_DRAWABLE(window), &width, &height);
+    gdk_window_get_origin(GDK_WINDOW(window), &x, &y);
+    GdkPixmap *new_bg = gdk_pixmap_new(root_bg, width, height, -1);
+    g_object_ref(G_OBJECT(new_bg));
+    gdk_draw_drawable(GDK_DRAWABLE(new_bg),
+                      gdk_gc_new(GDK_DRAWABLE(new_bg)),
+                      GDK_DRAWABLE(root_bg), x, y, 0, 0, width, height);
+    gdk_window_set_back_pixmap(GDK_WINDOW(window), new_bg, 0);
 
-    gtk_widget_queue_draw(GTK_WIDGET (widget));
+    gtk_widget_queue_draw(GTK_WIDGET(widget));
 }
 
 static void
@@ -196,7 +192,7 @@
 }
 
 static void
-spawn_command(GtkWidget * widget, const gchar *command)
+spawn_command(GtkWidget * widget, const gchar * command)
 {
     GError **error = NULL;
     g_spawn_command_line_async(command, error);
@@ -215,12 +211,12 @@
     // use 12 hour clock format if LDM_12HOURCLOCK is set to true
     if (ldm_getenv_bool("LDM_12HOURCLOCK")) {
         timestring = g_strdup_printf("<b>%.2d:%.2d</b>",
-                                   (timePtr->tm_hour % 12) ? (timePtr->tm_hour % 12) : 12,
-                                   timePtr->tm_min);
-    }
-    else {
+                                     (timePtr->tm_hour %
+                                      12) ? (timePtr->tm_hour % 12) : 12,
+                                     timePtr->tm_min);
+    } else {
         timestring = g_strdup_printf("<b>%.2d:%.2d</b>",
-                                   timePtr->tm_hour, timePtr->tm_min);
+                                     timePtr->tm_hour, timePtr->tm_min);
     }
 
     gtk_label_set_markup((GtkLabel *) label, timestring);
@@ -235,19 +231,22 @@
 {
     gchar *string;
     int entry_length;
-    entry_length = strlen(gtk_entry_get_text((GtkEntry *)entry));
-    if(entry_length == 0 && timeout_enabled) {
-        if (timeout_left > 1){
+    entry_length = strlen(gtk_entry_get_text((GtkEntry *) entry));
+    if (entry_length == 0 && timeout_enabled) {
+        if (timeout_left > 1) {
             timeout_left--;
         } else if (timeout_left == 1) {
-            g_io_channel_write_chars(g_stdout, "@GUEST@\n", -1, NULL, NULL);
+            g_io_channel_write_chars(g_stdout, "@GUEST@\n", -1, NULL,
+                                     NULL);
             g_io_channel_flush(g_stdout, NULL);
             timeout_left = 0;
             timeout_enabled = FALSE;
-        } else if (timeout_left == 0){
+        } else if (timeout_left == 0) {
             timeout_left = login_timeout;
         }
-        string = g_strdup_printf(_("Automatic login in %d seconds"), timeout_left);
+        string =
+            g_strdup_printf(_("Automatic login in %d seconds"),
+                            timeout_left);
         gtk_label_set_markup((GtkLabel *) label, string);
         g_free(string);
         gtk_widget_show(timeoutbox);
@@ -274,17 +273,14 @@
     guchar **data = NULL;
     gboolean result;
 
-    result=gdk_property_get(
-        gdk_get_default_root_window(),
-        gdk_atom_intern(property,TRUE),
-        GDK_NONE,
-        0,
-        512,
-        FALSE,
-        actual_property_type,
-        actual_format,
-        actual_length,
-        data);
+    result = gdk_property_get(gdk_get_default_root_window(),
+                              gdk_atom_intern(property, TRUE),
+                              GDK_NONE,
+                              0,
+                              512,
+                              FALSE,
+                              actual_property_type,
+                              actual_format, actual_length, data);
     return result;
 }
 
@@ -298,7 +294,7 @@
     g_io_channel_read_line_string(io_input, buf, NULL, NULL);
     g_strstrip(buf->str);
 
-    log_entry("gtkgreet",7,"Got command: %s",buf->str);
+    log_entry("gtkgreet", 7, "Got command: %s", buf->str);
 
     if (!g_ascii_strncasecmp(buf->str, "msg", 3)) {
         gchar **split_buf;
@@ -319,7 +315,7 @@
         g_strfreev(split_buf);
     } else if (!g_ascii_strncasecmp(buf->str, "userid", 6)) {
         timeout_enabled = login_timeout > 0;
-        if(timeout_enabled) {
+        if (timeout_enabled) {
             gtk_widget_show(timeoutbox);
         }
         gtk_widget_show(entry);
@@ -368,12 +364,12 @@
         buf->str[buf->len] = '\0';
 
         // choice;choice 1|choice 2|choice 3
-        gchar** choices = g_strsplit(buf->str+7, "|", -1);
+        gchar **choices = g_strsplit(buf->str + 7, "|", -1);
 
         // drop combo box to drop model
         gtk_list_store_clear(choiceList);
 
-        for (i=0; i<g_strv_length(choices); ++i) {
+        for (i = 0; i < g_strv_length(choices); ++i) {
             gtk_list_store_append(GTK_LIST_STORE(choiceList), &iter);
             gtk_list_store_set(GTK_LIST_STORE(choiceList), &iter, 0,
                                choices[i], -1);
@@ -391,8 +387,8 @@
         buf->str[buf->len] = '\0';
 
         // pref choice;key;title;menu;icon;choice 1|choice 2|choice 3
-        gchar** args = g_strsplit(buf->str, ";", 6);
-        gchar** choices = g_strsplit(args[5], "|", -1);
+        gchar **args = g_strsplit(buf->str, ";", 6);
+        gchar **choices = g_strsplit(args[5], "|", -1);
 
         GreeterPref *pref = greeter_pref_new(g_strdup(args[1]));
         pref->type = PREF_CHOICE;
@@ -400,8 +396,9 @@
         pref->menu = g_strdup(args[3]);
         pref->icon = g_strdup(args[4]);
 
-        for (i=0; i<g_strv_length(choices); ++i) {
-            pref->choices = g_list_append(pref->choices, g_strdup(choices[i]));
+        for (i = 0; i < g_strv_length(choices); ++i) {
+            pref->choices =
+                g_list_append(pref->choices, g_strdup(choices[i]));
         }
 
         g_strfreev(choices);
@@ -414,12 +411,13 @@
         buf->len--;
         buf->str[buf->len] = '\0';
 
-        valstr = g_strdup_printf("%s\n", greeter_pref_get_value(name).str_val);
+        valstr =
+            g_strdup_printf("%s\n", greeter_pref_get_value(name).str_val);
         g_io_channel_write_chars(g_stdout, valstr, -1, NULL, NULL);
         g_io_channel_flush(g_stdout, NULL);
         g_free(valstr);
     } else if (!g_ascii_strncasecmp(buf->str, "allowguest", 10)) {
-        gchar* valstr = buf->str + 11;
+        gchar *valstr = buf->str + 11;
         allowguest = g_ascii_strncasecmp(valstr, "false", 2);
         if (!allowguest)
             gtk_widget_hide(GTK_WIDGET(GuestButton));
@@ -454,8 +452,8 @@
 static void
 handle_choice(GtkComboBox * combo, GdkWindow * window)
 {
-    gchar* selection;
-    gchar* entrystr;
+    gchar *selection;
+    gchar *entrystr;
 
     selection = gtk_combo_box_get_active_text(GTK_COMBO_BOX(choiceCombo));
     entrystr = g_strdup_printf("%s\n", selection);
@@ -473,19 +471,19 @@
     g_io_channel_write_chars(g_stdout, entrystr, -1, NULL, NULL);
     g_io_channel_flush(g_stdout, NULL);
     g_free(entrystr);
-    if(gtk_entry_get_visibility(GTK_ENTRY(entry)))
+    if (gtk_entry_get_visibility(GTK_ENTRY(entry)))
         gtk_entry_set_text(entry, "");
 }
 
 static gboolean
-menu_append_pref(gpointer akey, gpointer avalue, gpointer adata) {
-    char* key = (char*)akey;
-    GreeterPref* pref = (GreeterPref*)avalue;
-    GtkWidget* menu = (GtkWidget*)adata;
+menu_append_pref(gpointer akey, gpointer avalue, gpointer adata)
+{
+    char *key = (char *) akey;
+    GreeterPref *pref = (GreeterPref *) avalue;
+    GtkWidget *menu = (GtkWidget *) adata;
     GtkWidget *pref_item, *prefico;
 
-    pref_item =
-        gtk_image_menu_item_new_with_mnemonic(_(pref->menu));
+    pref_item = gtk_image_menu_item_new_with_mnemonic(_(pref->menu));
     prefico = gtk_image_new_from_file(ldm_theme_file(pref->icon));
     gtk_image_menu_item_set_image((GtkImageMenuItem *) pref_item, prefico);
 
@@ -510,9 +508,11 @@
 
     if (getenv("LDM_FORCE_LANGUAGE") == NULL) {
         lang_item =
-            gtk_image_menu_item_new_with_mnemonic(_("Select _Language ..."));
+            gtk_image_menu_item_new_with_mnemonic(_
+                                                  ("Select _Language ..."));
         langico = gtk_image_new_from_file(ldm_theme_file("language"));
-        gtk_image_menu_item_set_image((GtkImageMenuItem *) lang_item, langico);
+        gtk_image_menu_item_set_image((GtkImageMenuItem *) lang_item,
+                                      langico);
         g_signal_connect_swapped(G_OBJECT(lang_item), "activate",
                                  G_CALLBACK(langwin), window);
         gtk_menu_shell_append(GTK_MENU_SHELL(menu), lang_item);
@@ -520,9 +520,11 @@
 
     if (getenv("LDM_FORCE_SESSION") == NULL) {
         sess_item =
-            gtk_image_menu_item_new_with_mnemonic(_("Select _Session ..."));
+            gtk_image_menu_item_new_with_mnemonic(_
+                                                  ("Select _Session ..."));
         sessico = gtk_image_new_from_file(ldm_theme_file("session"));
-        gtk_image_menu_item_set_image((GtkImageMenuItem *) sess_item, sessico);
+        gtk_image_menu_item_set_image((GtkImageMenuItem *) sess_item,
+                                      sessico);
         g_signal_connect_swapped(G_OBJECT(sess_item), "activate",
                                  G_CALLBACK(sesswin), window);
         gtk_menu_shell_append(GTK_MENU_SHELL(menu), sess_item);
@@ -532,30 +534,32 @@
         host_item =
             gtk_image_menu_item_new_with_mnemonic(_("Select _Host ..."));
         hostico = gtk_image_new_from_file(ldm_theme_file("host"));
-        gtk_image_menu_item_set_image((GtkImageMenuItem *) host_item, hostico);
+        gtk_image_menu_item_set_image((GtkImageMenuItem *) host_item,
+                                      hostico);
         g_signal_connect_swapped(G_OBJECT(host_item), "activate",
                                  G_CALLBACK(hostwin), window);
         gtk_menu_shell_append(GTK_MENU_SHELL(menu), host_item);
     }
 
-    for (i=0; i<=9; i++) {
+    for (i = 0; i <= 9; i++) {
         g_sprintf(custom_env_var, "LDM_MENU_ITEM_%d", i);
-        custom_mnemonic=getenv(custom_env_var);
+        custom_mnemonic = getenv(custom_env_var);
         if (custom_mnemonic == NULL)
             continue;
         custom_item =
             gtk_image_menu_item_new_with_mnemonic(custom_mnemonic);
         g_sprintf(custom_env_var, "LDM_MENU_COMMAND_%d", i);
-        custom_command=getenv(custom_env_var);
+        custom_command = getenv(custom_env_var);
         if (custom_command == NULL) {
             gtk_widget_destroy(custom_item);
             continue;
         }
         customico = gtk_image_new_from_file(ldm_theme_file("backend"));
         gtk_image_menu_item_set_image((GtkImageMenuItem *) custom_item,
-            customico);
+                                      customico);
         g_signal_connect(G_OBJECT(custom_item), "activate",
-                         G_CALLBACK(spawn_command), g_strdup(custom_command));
+                         G_CALLBACK(spawn_command),
+                         g_strdup(custom_command));
         gtk_menu_shell_append(GTK_MENU_SHELL(menu), custom_item);
     }
     greeter_pref_foreach(menu_append_pref, menu);
@@ -602,7 +606,7 @@
         *dest = '\0';
     else {
         strncpy(dest, source, MAXSTRSZ - 1);
-        *(dest + MAXSTRSZ - 1) = '\0';     /* ensure null termination */
+        *(dest + MAXSTRSZ - 1) = '\0';           /* ensure null termination */
     }
 
     return dest;
@@ -613,13 +617,15 @@
  * Inspired by gdm/gui/gdmlogin.c
  */
 static gboolean
-key_press_event(GtkWidget *widget, GdkEventKey *event, gpointer window)
+key_press_event(GtkWidget * widget, GdkEventKey * event, gpointer window)
 {
     if ((event->keyval == GDK_Tab ||
          event->keyval == GDK_KP_Tab) &&
-        (event->state & (GDK_CONTROL_MASK|GDK_MOD1_MASK|GDK_SHIFT_MASK)) == 0) {
-            handle_entry(GTK_ENTRY(entry), window);
-            return TRUE;
+        (event->
+         state & (GDK_CONTROL_MASK | GDK_MOD1_MASK | GDK_SHIFT_MASK)) ==
+        0) {
+        handle_entry(GTK_ENTRY(entry), window);
+        return TRUE;
     }
 
     return FALSE;
@@ -642,30 +648,28 @@
     GdkPixbuf *pix;
     gint width, height;
     GIOChannel *g_stdin;
-    char * ldm_theme;
+    char *ldm_theme;
 
 #ifdef ENABLE_NLS
-    setlocale (LC_ALL, "");
-    bindtextdomain (GETTEXT_PACKAGE, LOCALE_DIR);
-    bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-    textdomain (GETTEXT_PACKAGE);
+    setlocale(LC_ALL, "");
+    bindtextdomain(GETTEXT_PACKAGE, LOCALE_DIR);
+    bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
+    textdomain(GETTEXT_PACKAGE);
 #endif
 
     /* Init log settings */
-    log_init(ldm_getenv_bool("LDM_SYSLOG"),ldm_getenv_int("LDM_LOGLEVEL",-1));
+    log_init(ldm_getenv_bool("LDM_SYSLOG"),
+             ldm_getenv_int("LDM_LOGLEVEL", -1));
 
     gtk_init(&argc, &argv);
     ldm_theme = getenv("LDM_THEME");
 
-    if (ldm_theme)
-    {
-        if(*ldm_theme == '/')
+    if (ldm_theme) {
+        if (*ldm_theme == '/')
             ldm_theme_dir = g_strdup(ldm_theme);
         else
             ldm_theme_dir = g_strconcat(LDM_THEME_DIR, ldm_theme, NULL);
-    }
-    else
-    {
+    } else {
         ldm_theme_dir = g_strconcat(LDM_THEME_DIR, "default", NULL);
     }
 
@@ -697,10 +701,12 @@
         timelabel = gtk_label_new("");
 #ifdef K12LINUX
         hoststring =
-            g_strdup_printf("<b>%s</b> (%s)", get_sysname(), getenv("LDMINFO_IPADDR"));
+            g_strdup_printf("<b>%s</b> (%s)", get_sysname(),
+                            getenv("LDMINFO_IPADDR"));
 #else
         hoststring =
-            g_strdup_printf("<b>%s</b> (%s) //", get_sysname(), getenv("LDMINFO_IPADDR"));
+            g_strdup_printf("<b>%s</b> (%s) //", get_sysname(),
+                            getenv("LDMINFO_IPADDR"));
 #endif
         gtk_label_set_markup((GtkLabel *) syslabel, hoststring);
         update_time(timelabel);
@@ -727,29 +733,31 @@
     }
 
     /**** Create the login window ****/
-    gtk_window_set_position(GTK_WINDOW(loginWindow), GTK_WIN_POS_CENTER_ALWAYS);
+    gtk_window_set_position(GTK_WINDOW(loginWindow),
+                            GTK_WIN_POS_CENTER_ALWAYS);
     {
-        GtkWidget *guestbox, *guestspacer1, *guestspacer2, *vbox, *vbox2, *hbox;
+        GtkWidget *guestbox, *guestspacer1, *guestspacer2, *vbox, *vbox2,
+            *hbox;
         GtkCellRenderer *renderer;
 
-        g_signal_connect(G_OBJECT(loginWindow), "destroy", G_CALLBACK(destroy),
-                         NULL);
+        g_signal_connect(G_OBJECT(loginWindow), "destroy",
+                         G_CALLBACK(destroy), NULL);
 
         gtk_widget_set_app_paintable(loginWindow, TRUE);
         g_signal_connect(loginWindow, "configure-event",
-                        G_CALLBACK(draw_background), NULL);
+                         G_CALLBACK(draw_background), NULL);
         //gtk_widget_set_size_request(loginWindow, width/2, height/2);
         //gtk_widget_realize(loginWindow);
-        gtk_window_set_decorated(GTK_WINDOW (loginWindow), FALSE);
+        gtk_window_set_decorated(GTK_WINDOW(loginWindow), FALSE);
 
         logo = gtk_image_new_from_file(ldm_theme_file("logo"));
 #ifdef K12LINUX
-        if(access(ldm_theme_file("bottom_right"), R_OK) == 0) {
-            bottom_right = gtk_image_new_from_file(ldm_theme_file("bottom_right"));
-            has_bottom_right_image=TRUE;
-        }
-        else
-            has_bottom_right_image=FALSE;
+        if (access(ldm_theme_file("bottom_right"), R_OK) == 0) {
+            bottom_right =
+                gtk_image_new_from_file(ldm_theme_file("bottom_right"));
+            has_bottom_right_image = TRUE;
+        } else
+            has_bottom_right_image = FALSE;
 #endif
 
         pix = gtk_image_get_pixbuf((GtkImage *) logo);
@@ -779,18 +787,18 @@
                          G_CALLBACK(key_press_event), loginWindow);
 
         choiceList = gtk_list_store_new(1, G_TYPE_STRING);
-        choiceCombo = gtk_combo_box_new_with_model(GTK_TREE_MODEL(choiceList));
+        choiceCombo =
+            gtk_combo_box_new_with_model(GTK_TREE_MODEL(choiceList));
         renderer = gtk_cell_renderer_text_new();
         gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(choiceCombo),
-                                                   GTK_CELL_RENDERER(renderer),
-                                                   TRUE);
+                                   GTK_CELL_RENDERER(renderer), TRUE);
         gtk_cell_layout_add_attribute(GTK_CELL_LAYOUT(choiceCombo),
                                       GTK_CELL_RENDERER(renderer),
                                       "text", 0);
         g_signal_connect(G_OBJECT(choiceCombo), "changed",
                          G_CALLBACK(handle_choice), root);
 
-        if (getenv("LDM_LOGIN_TIMEOUT") != NULL ) {
+        if (getenv("LDM_LOGIN_TIMEOUT") != NULL) {
             login_timeout = atoi(getenv("LDM_LOGIN_TIMEOUT"));
         } else {
             login_timeout = 0;
@@ -802,33 +810,43 @@
         timeoutlabel = gtk_label_new("");
         timeoutbox = gtk_hbox_new(FALSE, 0);
         gtk_box_pack_start(GTK_BOX(vbox), timeoutbox, FALSE, FALSE, 0);
-        gtk_box_pack_start(GTK_BOX(timeoutbox), timeoutspacer1, TRUE, FALSE, 0);
-        gtk_box_pack_start(GTK_BOX(timeoutbox), timeoutlabel, FALSE, FALSE, 0);
-        gtk_box_pack_start(GTK_BOX(timeoutbox), timeoutspacer2, TRUE, FALSE, 0);
+        gtk_box_pack_start(GTK_BOX(timeoutbox), timeoutspacer1, TRUE,
+                           FALSE, 0);
+        gtk_box_pack_start(GTK_BOX(timeoutbox), timeoutlabel, FALSE, FALSE,
+                           0);
+        gtk_box_pack_start(GTK_BOX(timeoutbox), timeoutspacer2, TRUE,
+                           FALSE, 0);
         g_timeout_add(1000, (GSourceFunc) update_timeout, timeoutlabel);
 
         guestspacer1 = gtk_label_new("");
         guestspacer2 = gtk_label_new("");
-        GuestButton = gtk_button_new_with_label (_("Login as Guest"));
+        GuestButton = gtk_button_new_with_label(_("Login as Guest"));
         g_signal_connect(G_OBJECT(GuestButton), "clicked",
-            G_CALLBACK(handle_guestbutton), root);
-        gtk_button_set_focus_on_click((GtkButton *)GuestButton, FALSE);
+                         G_CALLBACK(handle_guestbutton), root);
+        gtk_button_set_focus_on_click((GtkButton *) GuestButton, FALSE);
         guestbox = gtk_hbox_new(FALSE, 0);
-        gtk_box_pack_start(GTK_BOX(guestbox), guestspacer1, TRUE, FALSE, 0);
-        gtk_box_pack_start(GTK_BOX(guestbox), GuestButton, FALSE, FALSE, 0);
-        gtk_box_pack_start(GTK_BOX(guestbox), guestspacer2, TRUE, FALSE, 0);
+        gtk_box_pack_start(GTK_BOX(guestbox), guestspacer1, TRUE, FALSE,
+                           0);
+        gtk_box_pack_start(GTK_BOX(guestbox), GuestButton, FALSE, FALSE,
+                           0);
+        gtk_box_pack_start(GTK_BOX(guestbox), guestspacer2, TRUE, FALSE,
+                           0);
 
         entryspacer1 = gtk_label_new("");
         entryspacer2 = gtk_label_new("");
-        gtk_box_pack_start(GTK_BOX(EntryBox), entryspacer1, TRUE, FALSE, 0);
+        gtk_box_pack_start(GTK_BOX(EntryBox), entryspacer1, TRUE, FALSE,
+                           0);
         gtk_box_pack_start(GTK_BOX(EntryBox), UserPrompt, FALSE, FALSE, 0);
         gtk_box_pack_start(GTK_BOX(EntryBox), entry, FALSE, FALSE, 0);
-        gtk_box_pack_start(GTK_BOX(EntryBox), choiceCombo, FALSE, FALSE, 0);
-        gtk_box_pack_start(GTK_BOX(EntryBox), entryspacer2, TRUE, FALSE, 0);
+        gtk_box_pack_start(GTK_BOX(EntryBox), choiceCombo, FALSE, FALSE,
+                           0);
+        gtk_box_pack_start(GTK_BOX(EntryBox), entryspacer2, TRUE, FALSE,
+                           0);
 
         gtk_box_pack_start(GTK_BOX(vbox), logo, FALSE, FALSE, 5);
         gtk_box_pack_start(GTK_BOX(vbox), EntryBox, TRUE, FALSE, 0);
-        if(allowguest) gtk_box_pack_start(GTK_BOX(vbox), guestbox, FALSE, FALSE, 0);
+        if (allowguest)
+            gtk_box_pack_start(GTK_BOX(vbox), guestbox, FALSE, FALSE, 0);
         gtk_box_pack_start(GTK_BOX(vbox), timeoutbox, FALSE, FALSE, 0);
         gtk_box_pack_start(GTK_BOX(vbox), StatusMessages, TRUE, FALSE, 0);
         gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, FALSE, 0);
@@ -842,10 +860,10 @@
     {
         GtkWidget *BottomBarBox;
 
-        gtk_widget_set_app_paintable(GTK_WIDGET (prefBar), TRUE);
+        gtk_widget_set_app_paintable(GTK_WIDGET(prefBar), TRUE);
         g_signal_connect(prefBar, "configure-event",
-                        G_CALLBACK(draw_background), NULL);
-        gtk_window_set_decorated(GTK_WINDOW (prefBar), FALSE);
+                         G_CALLBACK(draw_background), NULL);
+        gtk_window_set_decorated(GTK_WINDOW(prefBar), FALSE);
         gtk_widget_set_size_request(prefBar, width, BOTTOM_BAR_HEIGHT);
 
         BottomBarBox = gtk_hbox_new(FALSE, 0);
@@ -861,21 +879,28 @@
 #else
         optionbutton_box = gtk_vbox_new(FALSE, 0);
         optionbutton_spacer = gtk_label_new("");
-        gtk_box_pack_start(GTK_BOX(optionbutton_box), GTK_WIDGET(optionbutton_spacer), TRUE, FALSE, 0);
-        gtk_box_pack_end(GTK_BOX(optionbutton_box), GTK_WIDGET(optionbutton), FALSE, FALSE, 5);
+        gtk_box_pack_start(GTK_BOX(optionbutton_box),
+                           GTK_WIDGET(optionbutton_spacer), TRUE, FALSE,
+                           0);
+        gtk_box_pack_end(GTK_BOX(optionbutton_box),
+                         GTK_WIDGET(optionbutton), FALSE, FALSE, 5);
         gtk_box_pack_start(GTK_BOX(BottomBarBox),
                            GTK_WIDGET(optionbutton_box), FALSE, FALSE, 5);
 
-        if(has_bottom_right_image == TRUE) {
+        if (has_bottom_right_image == TRUE) {
             bottom_right_box = gtk_vbox_new(FALSE, 0);
             bottom_right_spacer = gtk_label_new("");
-            gtk_box_pack_start(GTK_BOX(bottom_right_box), GTK_WIDGET(bottom_right_spacer), TRUE, FALSE, 0);
-            gtk_box_pack_end(GTK_BOX(bottom_right_box), GTK_WIDGET(bottom_right), FALSE, FALSE, 0);
+            gtk_box_pack_start(GTK_BOX(bottom_right_box),
+                               GTK_WIDGET(bottom_right_spacer), TRUE,
+                               FALSE, 0);
+            gtk_box_pack_end(GTK_BOX(bottom_right_box),
+                             GTK_WIDGET(bottom_right), FALSE, FALSE, 0);
             gtk_box_pack_end(GTK_BOX(BottomBarBox),
-                             GTK_WIDGET(bottom_right_box), FALSE, FALSE, 0);
+                             GTK_WIDGET(bottom_right_box), FALSE, FALSE,
+                             0);
         }
 #endif
-        gtk_container_add(GTK_CONTAINER (prefBar), BottomBarBox);
+        gtk_container_add(GTK_CONTAINER(prefBar), BottomBarBox);
     }
 
 #ifdef K12LINUX
@@ -884,12 +909,12 @@
     {
         GtkWidget *TopBarBox;
 
-        gtk_window_set_decorated(GTK_WINDOW (topBar), FALSE);
+        gtk_window_set_decorated(GTK_WINDOW(topBar), FALSE);
         gtk_widget_set_size_request(topBar, width, TOP_BAR_HEIGHT);
 
         TopBarBox = gtk_hbox_new(FALSE, 5);
         gtk_box_pack_start(GTK_BOX(TopBarBox),
-                         GTK_WIDGET(syslabel), FALSE, FALSE, 5);
+                           GTK_WIDGET(syslabel), FALSE, FALSE, 5);
         gtk_box_pack_end(GTK_BOX(TopBarBox),
                          GTK_WIDGET(timelabel), FALSE, FALSE, 5);
     }
@@ -898,10 +923,10 @@
 
     gtk_widget_show_all(loginWindow);
     gtk_widget_show_all(prefBar);
-    gtk_window_move(GTK_WINDOW (prefBar), 0, height - BOTTOM_BAR_HEIGHT);
+    gtk_window_move(GTK_WINDOW(prefBar), 0, height - BOTTOM_BAR_HEIGHT);
 #ifdef K12LINUX
     gtk_widget_show_all(topBar);
-    gtk_window_move(GTK_WINDOW (topBar), 0, 0);
+    gtk_window_move(GTK_WINDOW(topBar), 0, 0);
 #endif
 
     gdk_window_set_cursor(root, normcursor);

=== modified file 'gtkgreet/langwin.c'
--- gtkgreet/langwin.c	2010-10-11 03:32:02 +0000
+++ gtkgreet/langwin.c	2014-07-28 15:29:30 +0000
@@ -69,8 +69,7 @@
         GList *l = NULL;
 
         curr_host =
-            ldminfo_lookup(g_list_nth_data(host_list,
-                  selected_host_id));
+            ldminfo_lookup(g_list_nth_data(host_list, selected_host_id));
         l = curr_host->languages;
         g_strlcpy(language, g_list_nth_data(l, lang_selected - 1),
                   MAXSTRSZ);
@@ -98,7 +97,8 @@
      * Populate lang with default host hash
      */
 
-    curr_host = ldminfo_lookup(g_list_nth_data(host_list, selected_host_id));
+    curr_host =
+        ldminfo_lookup(g_list_nth_data(host_list, selected_host_id));
 
     gtk_combo_box_append_text(GTK_COMBO_BOX(lang_select),
                               g_strdup(_("Default")));
@@ -135,7 +135,8 @@
 
     label = gtk_label_new("");
     gtk_label_set_markup((GtkLabel *) label,
-                         _("Select the language for your session to use:"));
+                         _
+                         ("Select the language for your session to use:"));
 
     gtk_box_pack_start((GtkBox *) vbox, (GtkWidget *) label, FALSE, FALSE,
                        0);

=== modified file 'gtkgreet/prefs.c'
--- gtkgreet/prefs.c	2012-08-21 13:10:36 +0000
+++ gtkgreet/prefs.c	2014-07-28 15:29:30 +0000
@@ -25,13 +25,17 @@
 #include <unistd.h>
 #include <sys/socket.h>
 
-static GTree* greeter_prefs = NULL;
+static GTree *greeter_prefs = NULL;
 
-static int g_strcmp(gconstpointer a, gconstpointer b) {
-    return strcmp((char*)a, (char*)b);
+static int
+g_strcmp(gconstpointer a, gconstpointer b)
+{
+    return strcmp((char *) a, (char *) b);
 }
 
-void greeter_pref_init() {
+void
+greeter_pref_init()
+{
     if (greeter_prefs) {
         g_tree_destroy(greeter_prefs);
         greeter_prefs = NULL;
@@ -39,23 +43,27 @@
     greeter_prefs = g_tree_new(g_strcmp);
 }
 
-GreeterPref* greeter_pref_new(const gchar* name) {
-    GreeterPref* pref = g_malloc0(sizeof(GreeterPref));
+GreeterPref *
+greeter_pref_new(const gchar * name)
+{
+    GreeterPref *pref = g_malloc0(sizeof(GreeterPref));
     g_tree_replace(greeter_prefs, g_strdup(name), pref);
     pref->choices = g_list_alloc();
 
     return pref;
 }
 
-void greeter_pref_destroy(const gchar* name) {
+void
+greeter_pref_destroy(const gchar * name)
+{
     gpointer key;
     gpointer valptr;
-    GreeterPref* value;
+    GreeterPref *value;
 
     g_tree_lookup_extended(greeter_prefs, name, &key, &valptr);
-    value = (GreeterPref*)valptr;
+    value = (GreeterPref *) valptr;
     if (value->choices) {
-        g_list_foreach(value->choices, (GFunc)g_free, NULL);
+        g_list_foreach(value->choices, (GFunc) g_free, NULL);
         g_list_free(value->choices);
     }
     if (value->title) {
@@ -73,26 +81,35 @@
     g_free(key);
 }
 
-void greeter_pref_prompt(const gchar* name) {
-}
-
-GreeterPref* greeter_pref_get_pref(const gchar* name) {
-    return (GreeterPref*)g_tree_lookup(greeter_prefs, name);
-}
-
-PrefValue greeter_pref_get_value(const gchar* name) {
-    GreeterPref* value = (GreeterPref*) g_tree_lookup(greeter_prefs, name);
+void
+greeter_pref_prompt(const gchar * name)
+{
+}
+
+GreeterPref *
+greeter_pref_get_pref(const gchar * name)
+{
+    return (GreeterPref *) g_tree_lookup(greeter_prefs, name);
+}
+
+PrefValue
+greeter_pref_get_value(const gchar * name)
+{
+    GreeterPref *value =
+        (GreeterPref *) g_tree_lookup(greeter_prefs, name);
     if (!value) {
-        return (PrefValue)"None";
-    } if (value->value.int_val == 0) {
-        return (PrefValue)"None";
+        return (PrefValue) "None";
+    }
+    if (value->value.int_val == 0) {
+        return (PrefValue) "None";
     }
 
-    return (PrefValue)(char*)g_list_nth_data(value->choices,
-                                             value->value.int_val);
+    return (PrefValue) (char *) g_list_nth_data(value->choices,
+                                                value->value.int_val);
 }
 
-void greeter_pref_foreach(GTraverseFunc func, gpointer user_data) {
+void
+greeter_pref_foreach(GTraverseFunc func, gpointer user_data)
+{
     g_tree_foreach(greeter_prefs, func, user_data);
 }
-

=== modified file 'gtkgreet/prefwin.c'
--- gtkgreet/prefwin.c	2012-08-21 14:33:07 +0000
+++ gtkgreet/prefwin.c	2014-07-28 15:29:30 +0000
@@ -27,14 +27,14 @@
 #include "../src/ldminfo.h"
 #include "greeter.h"
 
-static GtkWidget* pref_combo = NULL;
+static GtkWidget *pref_combo = NULL;
 static gint choice_total = 0;
 
 extern GIOChannel *g_stdout;
 
 typedef struct {
-    GtkWidget* prefwin;
-    const gchar* prefname;
+    GtkWidget *prefwin;
+    const gchar *prefname;
 } PrefData;
 
 /*
@@ -42,12 +42,13 @@
  */
 
 static void
-prefwin_accept(GtkWidget * widget, PrefData* data)
+prefwin_accept(GtkWidget * widget, PrefData * data)
 {
-    GreeterPref* pref = greeter_pref_get_pref(data->prefname);
-    gchar* notif;
+    GreeterPref *pref = greeter_pref_get_pref(data->prefname);
+    gchar *notif;
 
-    pref->value.int_val = gtk_combo_box_get_active(GTK_COMBO_BOX(pref_combo));
+    pref->value.int_val =
+        gtk_combo_box_get_active(GTK_COMBO_BOX(pref_combo));
     gtk_widget_destroy(data->prefwin);
 
     notif = g_strconcat("@", data->prefname, "@\n", NULL);
@@ -74,7 +75,7 @@
 prefwin(GtkWidget * widget, gpointer pref_name)
 {
 
-    GreeterPref* pref;
+    GreeterPref *pref;
     GtkWidget *prefwin, *label, *vbox, *buttonbox;
     GtkWidget *cancel, *accept, *frame;
 
@@ -90,7 +91,8 @@
     g_list_foreach(pref->choices,
                    (GFunc) populate_pref_combo_box, pref_combo);
 
-    gtk_combo_box_set_active(GTK_COMBO_BOX(pref_combo), pref->value.int_val);
+    gtk_combo_box_set_active(GTK_COMBO_BOX(pref_combo),
+                             pref->value.int_val);
 
     /*
      * Build window
@@ -110,7 +112,7 @@
                      G_CALLBACK(destroy_popup), prefwin);
 
     accept = gtk_button_new_from_stock("gtk-ok");
-    PrefData* data = g_malloc0(sizeof(PrefData));
+    PrefData *data = g_malloc0(sizeof(PrefData));
     data->prefwin = prefwin;
     data->prefname = pref_name;
     g_signal_connect(G_OBJECT(accept), "clicked",
@@ -122,8 +124,7 @@
                      FALSE, 0);
 
     label = gtk_label_new("");
-    gtk_label_set_markup((GtkLabel *) label,
-                         _(pref->title));
+    gtk_label_set_markup((GtkLabel *) label, _(pref->title));
 
     gtk_box_pack_start((GtkBox *) vbox, (GtkWidget *) label, FALSE, FALSE,
                        0);
@@ -143,4 +144,3 @@
 
     return;
 }
-

=== modified file 'gtkgreet/sesswin.c'
--- gtkgreet/sesswin.c	2010-10-11 03:32:02 +0000
+++ gtkgreet/sesswin.c	2014-07-28 15:29:30 +0000
@@ -67,7 +67,8 @@
         ldminfo *curr_host = NULL;
         GList *s = NULL;
 
-        curr_host = ldminfo_lookup(g_list_nth_data(host_list, selected_host_id));
+        curr_host =
+            ldminfo_lookup(g_list_nth_data(host_list, selected_host_id));
         s = curr_host->sessions;
         g_strlcpy(session, g_list_nth_data(s, sess_selected - 2),
                   MAXSTRSZ);
@@ -99,7 +100,8 @@
      * Populate sess with default host hash
      */
 
-    curr_host = ldminfo_lookup(g_list_nth_data(host_list, current_host_id));
+    curr_host =
+        ldminfo_lookup(g_list_nth_data(host_list, current_host_id));
 
     gtk_combo_box_append_text(GTK_COMBO_BOX(sess_select),
                               g_strdup(_("Default")));

=== modified file 'misc/ldm-dialog.c'
--- misc/ldm-dialog.c	2009-11-20 22:13:05 +0000
+++ misc/ldm-dialog.c	2014-07-28 15:29:30 +0000
@@ -45,42 +45,48 @@
 GIOChannel *g_stdin;
 int auto_close;
 
-void yes_clicked(GtkWidget * widget, GtkWidget * mywin)
+void
+yes_clicked(GtkWidget * widget, GtkWidget * mywin)
 {
     gtk_main_quit();
     exit(0);
 }
 
-void no_clicked(GtkWidget * widget, GtkWidget * mywin)
+void
+no_clicked(GtkWidget * widget, GtkWidget * mywin)
 {
     gtk_main_quit();
     exit(1);
 }
 
-void link_clicked(GtkWidget * widget, GtkLabel * mywin)
+void
+link_clicked(GtkWidget * widget, GtkLabel * mywin)
 {
-    printf("url: %s\n",gtk_label_get_current_uri(GTK_LABEL(widget)));
+    printf("url: %s\n", gtk_label_get_current_uri(GTK_LABEL(widget)));
     gtk_main_quit();
     exit(0);
 }
 
-void update_progressbar()
+void
+update_progressbar()
 {
-    gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(progress), current_number/100.0);
-    if(current_number < 100.0) {
-        if(yes)
+    gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(progress),
+                                  current_number / 100.0);
+    if (current_number < 100.0) {
+        if (yes)
             gtk_widget_set_sensitive(yes, FALSE);
     } else {
-        if(auto_close == TRUE)
+        if (auto_close == TRUE)
             yes_clicked(NULL, NULL);
-        if(yes) {
+        if (yes) {
             gtk_widget_set_sensitive(yes, TRUE);
             gtk_widget_grab_focus(yes);
         }
     }
 }
 
-void update_progressbar_from_channel(GIOChannel * channel)
+void
+update_progressbar_from_channel(GIOChannel * channel)
 {
     GString *buf;
     buf = g_string_new("");
@@ -91,29 +97,36 @@
     g_io_channel_flush(g_stdin, NULL);
 }
 
-void usage(char * progname) {
-    printf("Usage: %s --message|--question|--progress [mode specific options] \"message\"\n", progname);
+void
+usage(char *progname)
+{
+    printf
+        ("Usage: %s --message|--question|--progress [mode specific options] \"message\"\n",
+         progname);
     printf("Progress mode options: --auto-close\n");
     exit(1);
 }
 
 #define USAGE() usage(argv[0])
 
-int main(int argc, char ** argv){
-    GtkWidget *mywin, *vbox, *hbox, *label, *spacer, *big_hbox, *ospacer, *o2spacer;
+int
+main(int argc, char **argv)
+{
+    GtkWidget *mywin, *vbox, *hbox, *label, *spacer, *big_hbox, *ospacer,
+        *o2spacer;
     int mode;
     int retval;
-    char * message;
+    char *message;
     int has_no_button, has_yes_button;
     mode = NOTHING;
     has_no_button = TRUE;
     has_yes_button = TRUE;
     auto_close = FALSE;
 
-    setlocale (LC_ALL, "");
-    bindtextdomain (GETTEXT_PACKAGE, LOCALE_DIR);
-    bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-    textdomain (GETTEXT_PACKAGE);
+    setlocale(LC_ALL, "");
+    bindtextdomain(GETTEXT_PACKAGE, LOCALE_DIR);
+    bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
+    textdomain(GETTEXT_PACKAGE);
 
     // Option processing
     struct option longopts[] = {
@@ -121,17 +134,17 @@
         {"question", 0, 0, QUESTION},
         {"progress", 0, 0, PROGRESS},
         {"auto-close", 0, 0, AUTO_CLOSE_OPTION},
-        {0,0,0,0}
+        {0, 0, 0, 0}
     };
-    while(1) {
+    while (1) {
         retval = getopt_long(argc, argv, "", longopts, NULL);
-        if(retval == -1)
+        if (retval == -1)
             break;
-        switch(retval) {
+        switch (retval) {
         case MESSAGE:
         case QUESTION:
         case PROGRESS:
-            if(mode != NOTHING)
+            if (mode != NOTHING)
                 USAGE();
             mode = retval;
             break;
@@ -143,21 +156,21 @@
             break;
         }
     }
-    if(mode == NOTHING)
-        USAGE();
-    if((argc - optind) != 1)
-        USAGE();
-    if(auto_close == TRUE && mode != PROGRESS)
+    if (mode == NOTHING)
+        USAGE();
+    if ((argc - optind) != 1)
+        USAGE();
+    if (auto_close == TRUE && mode != PROGRESS)
         USAGE();
     message = argv[optind];
-    switch(mode) {
+    switch (mode) {
     case MESSAGE:
         has_no_button = FALSE;
         break;
     case QUESTION:
         break;
     case PROGRESS:
-        if(auto_close == TRUE)
+        if (auto_close == TRUE)
             has_yes_button = FALSE;
         break;
     }
@@ -166,27 +179,31 @@
     gtk_init(&argc, &argv);
 
     // Theme
-    char * ldm_theme;
-    gchar * ldm_gtkrc;
+    char *ldm_theme;
+    gchar *ldm_gtkrc;
     ldm_theme = getenv("LDM_THEME");
-    if (ldm_theme)
-    {
-        if(*ldm_theme == '/')
+    if (ldm_theme) {
+        if (*ldm_theme == '/')
             ldm_gtkrc = g_strconcat(ldm_theme, "/greeter-gtkrc", NULL);
         else
-            ldm_gtkrc = g_strconcat(LDM_THEME_DIR, ldm_theme, "/greeter-gtkrc", NULL);
+            ldm_gtkrc =
+                g_strconcat(LDM_THEME_DIR, ldm_theme, "/greeter-gtkrc",
+                            NULL);
     } else
-        ldm_gtkrc = g_strconcat(LDM_THEME_DIR, "default", "/greeter-gtkrc", NULL);
+        ldm_gtkrc =
+            g_strconcat(LDM_THEME_DIR, "default", "/greeter-gtkrc", NULL);
     gtk_rc_add_default_file(ldm_gtkrc);
     g_free(ldm_gtkrc);
     // Finish setting up the basic stuff
     mywin = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-    gdk_window_set_cursor(gdk_get_default_root_window(), gdk_cursor_new(GDK_LEFT_PTR));
-    gtk_window_set_title(GTK_WINDOW(mywin),"");
-    gtk_window_set_skip_taskbar_hint(GTK_WINDOW(mywin),TRUE);
-    gtk_window_set_resizable (GTK_WINDOW(mywin),0);
+    gdk_window_set_cursor(gdk_get_default_root_window(),
+                          gdk_cursor_new(GDK_LEFT_PTR));
+    gtk_window_set_title(GTK_WINDOW(mywin), "");
+    gtk_window_set_skip_taskbar_hint(GTK_WINDOW(mywin), TRUE);
+    gtk_window_set_resizable(GTK_WINDOW(mywin), 0);
     gtk_window_set_position(GTK_WINDOW(mywin), GTK_WIN_POS_CENTER_ALWAYS);
-    g_signal_connect(GTK_WINDOW(mywin), "destroy", G_CALLBACK(no_clicked), mywin);
+    g_signal_connect(GTK_WINDOW(mywin), "destroy", G_CALLBACK(no_clicked),
+                     mywin);
     hbox = gtk_hbox_new(FALSE, 3);
     spacer = gtk_label_new("");
     ospacer = gtk_label_new("");
@@ -196,33 +213,34 @@
     gtk_box_pack_start(GTK_BOX(hbox), spacer, TRUE, FALSE, 0);
 
     // Make the yes button
-    if(has_yes_button == TRUE) {
+    if (has_yes_button == TRUE) {
         yes = gtk_button_new_from_stock("gtk-ok");
-        g_signal_connect(G_OBJECT(yes), "clicked", G_CALLBACK(yes_clicked), mywin);
+        g_signal_connect(G_OBJECT(yes), "clicked", G_CALLBACK(yes_clicked),
+                         mywin);
         gtk_box_pack_start(GTK_BOX(hbox), yes, FALSE, FALSE, 0);
     }
-
     // Make the no button
-    if(has_no_button == TRUE) {
+    if (has_no_button == TRUE) {
         no = gtk_button_new_from_stock("gtk-cancel");
-        g_signal_connect(G_OBJECT(no), "clicked", G_CALLBACK(no_clicked), mywin);
+        g_signal_connect(G_OBJECT(no), "clicked", G_CALLBACK(no_clicked),
+                         mywin);
         gtk_box_pack_start(GTK_BOX(hbox), no, FALSE, FALSE, 0);
     }
-
     // Create the label
     label = gtk_label_new(message);
     gtk_label_set_markup(GTK_LABEL(label), message);
     gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
     gtk_window_set_default_size(GTK_WINDOW(mywin), 300, -1);
-    g_signal_connect(GTK_LABEL(label), "activate-link", G_CALLBACK(link_clicked), label);
+    g_signal_connect(GTK_LABEL(label), "activate-link",
+                     G_CALLBACK(link_clicked), label);
 
     vbox = gtk_vbox_new(FALSE, 0);
-    GtkWidget * blah;
+    GtkWidget *blah;
     blah = gtk_alignment_new(0, 0.5, 0, 0);
     gtk_container_add(GTK_CONTAINER(blah), label);
     gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(blah), FALSE, FALSE, 10);
 
-    if(mode == PROGRESS) {
+    if (mode == PROGRESS) {
         // Make the progress bar
         progress = gtk_progress_bar_new();
         gtk_box_pack_start(GTK_BOX(vbox), progress, FALSE, FALSE, 0);
@@ -234,9 +252,9 @@
 
         // Set up the hook that listens for input
         g_stdin = g_io_channel_unix_new(0);
-        g_io_add_watch(g_stdin, G_IO_IN, (GIOFunc) update_progressbar_from_channel, g_stdin);
+        g_io_add_watch(g_stdin, G_IO_IN,
+                       (GIOFunc) update_progressbar_from_channel, g_stdin);
     }
-
     // More basic GTK stuff
     gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
     gtk_box_pack_start(GTK_BOX(vbox), ospacer, FALSE, FALSE, 0);

=== modified file 'src/ldm.c'
--- src/ldm.c	2013-02-27 08:55:18 +0000
+++ src/ldm.c	2014-07-28 15:29:30 +0000
@@ -46,7 +46,9 @@
  * get_ldm_env
  *  Setting up LDM env. variables
  */
-void get_ldm_env() {
+void
+get_ldm_env()
+{
     gchar *greeter_path, *wm_path;
 
     ldminfo_init(&host_list, getenv("LDM_SERVER"));
@@ -66,18 +68,19 @@
     if (!greeter_path)
         greeter_path = g_strdup("ldmgtkgreet");
 
-    if(greeter_path[0] != '/') {
-        ldm.greeter_prog = g_strjoin("/", LDM_EXEC_DIR, greeter_path, NULL);
+    if (greeter_path[0] != '/') {
+        ldm.greeter_prog =
+            g_strjoin("/", LDM_EXEC_DIR, greeter_path, NULL);
         g_free(greeter_path);
     } else {
         ldm.greeter_prog = greeter_path;
     }
 
     wm_path = g_strdup(getenv("LDM_WINMANAGER"));
-    if(!wm_path)
+    if (!wm_path)
         wm_path = g_strdup("wwm");
 
-    if(wm_path[0] != '/') {
+    if (wm_path[0] != '/') {
         ldm.wm_prog = g_strjoin("/", LDM_EXEC_DIR, wm_path, NULL);
         g_free(wm_path);
     } else {
@@ -89,19 +92,22 @@
 /*
  * main entry point
  */
-int main(int argc, char *argv[]) {
+int
+main(int argc, char *argv[])
+{
     /* decls */
     gchar *auth_plugin = NULL;
     struct sigaction action;
 
     /* Init log settings */
-    log_init(ldm_getenv_bool("LDM_SYSLOG"),ldm_getenv_int("LDM_LOGLEVEL",-1));
+    log_init(ldm_getenv_bool("LDM_SYSLOG"),
+             ldm_getenv_int("LDM_LOGLEVEL", -1));
 
 #ifdef ENABLE_NLS
-    setlocale (LC_ALL, "");
-    bindtextdomain (GETTEXT_PACKAGE, LOCALE_DIR);
-    bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-    textdomain (GETTEXT_PACKAGE);
+    setlocale(LC_ALL, "");
+    bindtextdomain(GETTEXT_PACKAGE, LOCALE_DIR);
+    bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
+    textdomain(GETTEXT_PACKAGE);
 #endif
 
     g_type_init();
@@ -110,21 +116,22 @@
     action.sa_handler = handle_sigchld;
     sigemptyset(&action.sa_mask);
     action.sa_flags = SA_SIGINFO;
-    sigaction (SIGCHLD, &action, NULL);
+    sigaction(SIGCHLD, &action, NULL);
 
     /*
      * Zero out our info struct.
      */
     bzero(&ldm, sizeof ldm);
 
-    ldm.pid = getpid();  /* Get our pid, to use in the command_socket */
+    ldm.pid = getpid();                          /* Get our pid, to use in the command_socket */
     ldm.display = g_strdup(getenv("DISPLAY"));
 
     /*
      * Get our IP address.
      */
     get_ipaddr();
-    log_entry("ldm",6,"started on client with IP address: %s", ldm.ipaddr);
+    log_entry("ldm", 6, "started on client with IP address: %s",
+              ldm.ipaddr);
 
     /*
      *  Put ip address in environment so that it is available to to the greeter
@@ -139,22 +146,22 @@
     /*
      * Load plugins
      */
-    if(ldm_load_plugins())
-        log_entry("ldm",3,"unable to load plugins");
+    if (ldm_load_plugins())
+        log_entry("ldm", 3, "unable to load plugins");
 
     /*
      * Begin running display manager
      */
-    log_entry("ldm",6,"calling rc.d init scripts");
-    rc_files("init");                      /* Execute any rc files */
+    log_entry("ldm", 6, "calling rc.d init scripts");
+    rc_files("init");                            /* Execute any rc files */
 
     if (!ldm.autologin) {
         /* start interactive greeter only if no autologin */
         gint rfd, wfd, rfd2, wfd2;
 
-        log_entry("ldm",7,"spawning window manager: %s", ldm.wm_prog);
+        log_entry("ldm", 7, "spawning window manager: %s", ldm.wm_prog);
         ldm.wmpid = ldm_spawn(ldm.wm_prog, &rfd2, &wfd2, NULL);
-        log_entry("ldm",7,"spawning greeter: %s", ldm.greeter_prog);
+        log_entry("ldm", 7, "spawning greeter: %s", ldm.greeter_prog);
         ldm.greeterpid = ldm_spawn(ldm.greeter_prog, &rfd, &wfd, NULL);
         set_greeter_pid(ldm.greeterpid);
         /* create GIOChannels for the greeter */
@@ -170,9 +177,11 @@
 
             /* allow choosing backend */
             backends = g_strjoinv("|", ldm_get_plugins());
-            cmd = g_strconcat("pref choice;backend;Authentication Backend;Select _Backend ...;session;",
-                              backends, "\n", NULL);
-            if(ask_greeter(cmd))
+            cmd =
+                g_strconcat
+                ("pref choice;backend;Authentication Backend;Select _Backend ...;session;",
+                 backends, "\n", NULL);
+            if (ask_greeter(cmd))
                 die("ldm", "%s from greeter failed", cmd);
             g_free(backends);
             g_free(cmd);
@@ -195,7 +204,8 @@
 
             /* Init plugin */
             set_current_plugin(auth_plugin);
-            log_entry("ldm",6,"authenticating with backend: %s", auth_plugin);
+            log_entry("ldm", 6, "authenticating with backend: %s",
+                      auth_plugin);
             ldm_setup_plugin();
         } while (ldm_auth_plugin());
     } else {
@@ -204,7 +214,8 @@
             auth_plugin = g_strdup(DEFAULT_AUTH_PLUGIN);
 
         set_current_plugin(auth_plugin);
-        log_entry("ldm",6,"guest authenticating with backend: %s", auth_plugin);
+        log_entry("ldm", 6, "guest authenticating with backend: %s",
+                  auth_plugin);
         ldm_setup_plugin();
 
         ldm_guest_auth_plugin();
@@ -221,10 +232,10 @@
      * From here plugins has taken control. When plugin return, close everything
      */
 
-    log_entry("ldm",6,"X session ended");
+    log_entry("ldm", 6, "X session ended");
 
-    log_entry("ldm",6,"calling rc.d stop scripts");
-    rc_files("stop");                       /* Execute any rc files */
+    log_entry("ldm", 6, "calling rc.d stop scripts");
+    rc_files("stop");                            /* Execute any rc files */
 
     /* Closing plugin */
     ldm_close_plugin();
@@ -244,7 +255,7 @@
     g_free(ldm.greeter_prog);
     g_free(ldm.control_socket);
     g_free(ldm.ipaddr);
-    g_list_foreach(host_list, (GFunc)g_free, NULL);
+    g_list_foreach(host_list, (GFunc) g_free, NULL);
     g_list_free(host_list);
 
     exit(EXIT_SUCCESS);

=== modified file 'src/ldmgreetercomm.c'
--- src/ldmgreetercomm.c	2012-08-21 14:33:07 +0000
+++ src/ldmgreetercomm.c	2014-07-28 15:29:30 +0000
@@ -19,21 +19,27 @@
 /*
  * set_greeter_pid
  */
-void set_greeter_pid(GPid p) {
+void
+set_greeter_pid(GPid p)
+{
     greeterpid = p;
 }
 
 /*
  * set_greeter_read_channel
  */
-void set_greeter_read_channel(GIOChannel *gr) {
+void
+set_greeter_read_channel(GIOChannel * gr)
+{
     greeterr = gr;
 }
 
 /*
  * set_greeter_read_channel
  */
-void set_greeter_write_channel(GIOChannel *gw) {
+void
+set_greeter_write_channel(GIOChannel * gw)
+{
     greeterw = gw;
 }
 
@@ -44,17 +50,20 @@
  *
  *  Return 1 if fails, else 0
  */
-int ask_greeter(gchar *cmd) {
+int
+ask_greeter(gchar * cmd)
+{
     /* Write command to io channel of the greeter */
     GError *ge = NULL;
-    if(g_io_channel_write_chars(greeterw, cmd, -1, NULL, &ge) != G_IO_STATUS_NORMAL) {
-        log_entry("ldm",4,"%s", ge->message);
+    if (g_io_channel_write_chars(greeterw, cmd, -1, NULL, &ge) !=
+        G_IO_STATUS_NORMAL) {
+        log_entry("ldm", 4, "%s", ge->message);
         return 1;
     }
 
     /* Flush buffer */
-    if(g_io_channel_flush(greeterw, &ge) != G_IO_STATUS_NORMAL) {
-        log_entry("ldm",4,"%s", ge->message);
+    if (g_io_channel_flush(greeterw, &ge) != G_IO_STATUS_NORMAL) {
+        log_entry("ldm", 4, "%s", ge->message);
         return 1;
     }
     return 0;
@@ -66,20 +75,22 @@
  *  Close greeter properly
  *      s_ldm -- struct ldm_info
  */
-void close_greeter() {
+void
+close_greeter()
+{
     gboolean failed = 0;
     gchar *cmd = "quit\n";
 
     if (!greeterpid)
         return;
 
-    if(ask_greeter(cmd))
+    if (ask_greeter(cmd))
         failed = 1;
 
-    if(failed) {
-        log_entry("ldm",3,"quit command failed. SIGTERM to greeter");
-        if(kill(greeterpid, SIGTERM) < 0) {
-            log_entry("ldm",3,"SIGTERM failed. SIGKILL to greeter");
+    if (failed) {
+        log_entry("ldm", 3, "quit command failed. SIGTERM to greeter");
+        if (kill(greeterpid, SIGTERM) < 0) {
+            log_entry("ldm", 3, "SIGTERM failed. SIGKILL to greeter");
             kill(greeterpid, SIGKILL);
         }
     }
@@ -96,14 +107,16 @@
  * set_message
  *  Ask greeter to print a message to UI
  */
-int set_message(gchar *msg) {
+int
+set_message(gchar * msg)
+{
     gchar *cmd;
 
     if (!greeterpid)
         return 1;
 
     cmd = g_strconcat("msg ", msg, "\n", NULL);
-    if(ask_greeter(cmd))
+    if (ask_greeter(cmd))
         return 1;
     g_free(cmd);
 
@@ -119,17 +132,20 @@
  *
  *  Return 1 if fails, else 0 and buffer with data in
  */
-int listen_greeter(gchar **buffer, gsize *buflen, gsize *end) {
+int
+listen_greeter(gchar ** buffer, gsize * buflen, gsize * end)
+{
     while (1) {
         /* Reads data from I/O channel of the greeter */
         GError *ge = NULL;
-        if(g_io_channel_read_line(greeterr, buffer, buflen, end, &ge) != G_IO_STATUS_NORMAL) {
-            log_entry("ldm",3,"%s", ge->message);
+        if (g_io_channel_read_line(greeterr, buffer, buflen, end, &ge) !=
+            G_IO_STATUS_NORMAL) {
+            log_entry("ldm", 3, "%s", ge->message);
             return 1;
         }
 
         g_strstrip(*buffer);
-        log_entry("ldm",7,"Got command: %s",*buffer);
+        log_entry("ldm", 7, "Got command: %s", *buffer);
 
         /* handle callbacks */
         if (**buffer == '@') {
@@ -153,13 +169,15 @@
  *      cmd -- command to send
  *      buffer -- buffer to write to answer
  */
-gchar *ask_value_greeter(gchar *cmd) {
+gchar *
+ask_value_greeter(gchar * cmd)
+{
     gsize len, end;
     gchar *buffer;
-    if(ask_greeter(cmd))
+    if (ask_greeter(cmd))
         die("ldm", "%s from greeter failed", cmd);
 
-    if(listen_greeter(&buffer, &len, &end))
+    if (listen_greeter(&buffer, &len, &end))
         die("ldm", "%s from greeter failed", cmd);
 
     return buffer;

=== modified file 'src/ldminfo.c'
--- src/ldminfo.c	2012-08-21 13:10:36 +0000
+++ src/ldminfo.c	2014-07-28 15:29:30 +0000
@@ -39,35 +39,41 @@
 static GHashTable *display_names;
 static GHashTable *ldminfo_hash = NULL;
 
-static void generate_hash_table(void) {
+static void
+generate_hash_table(void)
+{
     char buffer[1024];
-    FILE * file;
-    char ** ret;
-    display_names = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
+    FILE *file;
+    char **ret;
+    display_names =
+        g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
     file = fopen(RC_DIR "/locales", "r");
-    if(file == NULL) {
+    if (file == NULL) {
         return;
     }
-    while(fgets(buffer, sizeof(buffer), file) != NULL) {
+    while (fgets(buffer, sizeof(buffer), file) != NULL) {
         ret = g_strsplit(buffer, " ", 2);
-        g_hash_table_insert(display_names, g_strdup(ret[0]), g_strdup(g_strchomp(ret[1])));
+        g_hash_table_insert(display_names, g_strdup(ret[0]),
+                            g_strdup(g_strchomp(ret[1])));
         g_strfreev(ret);
     }
     fclose(file);
 }
 
-static gchar * get_display_name(gchar * locale) {
-    gchar * compare_to;
-    char ** ret;
-    gchar * result;
+static gchar *
+get_display_name(gchar * locale)
+{
+    gchar *compare_to;
+    char **ret;
+    gchar *result;
     ret = g_strsplit(locale, ".", 2);
     compare_to = g_strdup(ret[0]);
     g_strfreev(ret);
-    if(compare_to == NULL) {
+    if (compare_to == NULL) {
         return g_strdup(locale);
     }
     result = g_hash_table_lookup(display_names, compare_to);
-    if(result == NULL) {
+    if (result == NULL) {
         result = g_strdup(locale);
     }
     return result;
@@ -77,28 +83,36 @@
  * ldminfo_free
  *  ldminfo struct freed
  */
-void ldminfo_free() {
+void
+ldminfo_free()
+{
     g_hash_table_destroy(ldminfo_hash);
 }
 
 /*
  * ldminfo_lookup
  */
-ldminfo *ldminfo_lookup(gconstpointer key) {
+ldminfo *
+ldminfo_lookup(gconstpointer key)
+{
     return g_hash_table_lookup(ldminfo_hash, key);
 }
 
 /*
  * ldminfo_size
  */
-int ldminfo_size() {
+int
+ldminfo_size()
+{
     return g_hash_table_size(ldminfo_hash);
 }
 
 /*
  * ldminfo_init
  */
-void ldminfo_init(GList **host_list, const char *ldm_server) {
+void
+ldminfo_init(GList ** host_list, const char *ldm_server)
+{
     char **hosts_char = NULL;
     ldminfo *ldm_host_info = NULL;
     int i;
@@ -107,7 +121,7 @@
 
     /* Static hash table */
     ldminfo_hash = g_hash_table_new_full(g_str_hash, g_str_equal,
-                                          g_free, g_free);
+                                         g_free, g_free);
     hosts_char = g_strsplit(ldm_server, " ", -1);
 
     for (i = 0; hosts_char != NULL && hosts_char[i] != NULL; i++) {
@@ -151,7 +165,9 @@
  * external script.  This script will query ldminfo, perform ssh port testing,
  * etc. Things like nc -z hostname ssh, etc.
  */
-void _ldminfo_query_one(const char *hostname, ldminfo * ldm_host_info) {
+void
+_ldminfo_query_one(const char *hostname, ldminfo * ldm_host_info)
+{
     int filedes, numbytes;
     char buf[MAXBUFSIZE];
     char hostfile[BUFSIZ];
@@ -180,7 +196,9 @@
 /*
  * split string by line and then construct the ldm_host_info
  */
-void _ldminfo_parse_string(const char *s, ldminfo * ldm_host_info) {
+void
+_ldminfo_parse_string(const char *s, ldminfo * ldm_host_info)
+{
     char **lines = NULL;
     int i;
 
@@ -193,26 +211,34 @@
             ldm_host_info->languages =
                 g_list_append(ldm_host_info->languages, g_strdup(val[1]));
             ldm_host_info->language_names =
-                g_list_append(ldm_host_info->language_names, get_display_name(val[1]));
+                g_list_append(ldm_host_info->language_names,
+                              get_display_name(val[1]));
             g_strfreev(val);
-        } else if (!g_ascii_strncasecmp(lines[i], "session:", 8) && !g_strstr_len(s, -1, "session-with-name")) {
+        } else if (!g_ascii_strncasecmp(lines[i], "session:", 8)
+                   && !g_strstr_len(s, -1, "session-with-name")) {
             gchar **val;
             gchar *name;
             val = g_strsplit(lines[i], ":", 2);
             name = g_strrstr(val[1], "/");
-            if(name) {
+            if (name) {
                 name++;
             } else {
                 name = val[1];
             }
-            ldm_host_info->sessions = g_list_append(ldm_host_info->sessions, g_strdup(val[1]));
-            ldm_host_info->session_names = g_list_append(ldm_host_info->session_names, g_strdup(name));
+            ldm_host_info->sessions =
+                g_list_append(ldm_host_info->sessions, g_strdup(val[1]));
+            ldm_host_info->session_names =
+                g_list_append(ldm_host_info->session_names,
+                              g_strdup(name));
             g_strfreev(val);
         } else if (!g_ascii_strncasecmp(lines[i], "session-with-name:", 8)) {
             gchar **val;
             val = g_strsplit(lines[i], ":", 3);
-            ldm_host_info->sessions = g_list_append(ldm_host_info->sessions, g_strdup(val[2]));
-            ldm_host_info->session_names = g_list_append(ldm_host_info->session_names, g_strdup(val[1]));
+            ldm_host_info->sessions =
+                g_list_append(ldm_host_info->sessions, g_strdup(val[2]));
+            ldm_host_info->session_names =
+                g_list_append(ldm_host_info->session_names,
+                              g_strdup(val[1]));
             g_strfreev(val);
         } else if (!g_ascii_strncasecmp(lines[i], "rating:", 7)) {
             gchar **val;
@@ -237,10 +263,12 @@
  *  Return if env variable is set to true or false
  *      name -- env. variable name
  */
-int ldm_getenv_bool(const char *name) {
+int
+ldm_getenv_bool(const char *name)
+{
     char *env = getenv(name);
 
-    if(env) {
+    if (env) {
         if (*env == 'y' || *env == 't' || *env == 'T' || *env == 'Y')
             return 1;
     }
@@ -251,10 +279,12 @@
  * ldm_getenv_int
  *  Return an int, will return default_value if not set
  */
-int ldm_getenv_int(const char *name,int default_value) {
+int
+ldm_getenv_int(const char *name, int default_value)
+{
     char *env = getenv(name);
 
-    if(env) {
+    if (env) {
         return atoi(env);
     }
     return default_value;

=== modified file 'src/ldmplugin.c'
--- src/ldmplugin.c	2012-08-21 14:33:07 +0000
+++ src/ldmplugin.c	2014-07-28 15:29:30 +0000
@@ -12,20 +12,24 @@
 #include "ldmgreetercomm.h"
 #include "logging.h"
 
-GTree* plugin_list = NULL;
-gchar** plugin_names = NULL;
+GTree *plugin_list = NULL;
+gchar **plugin_names = NULL;
 static jmp_buf auth_jmp_buf;
-static gchar* current_plugin = NULL;
+static gchar *current_plugin = NULL;
 
-static int g_strcmp(gconstpointer a, gconstpointer b) {
-    return strcmp((char*)a, (char*)b);
+static int
+g_strcmp(gconstpointer a, gconstpointer b)
+{
+    return strcmp((char *) a, (char *) b);
 }
 
 /*
  * set_current_plugin
  *  Set current plugin name
  */
-void set_current_plugin(char *plug_name) {
+void
+set_current_plugin(char *plug_name)
+{
     current_plugin = plug_name;
 }
 
@@ -33,9 +37,12 @@
  * ldm_start_plugin
  *  Iterate over plugin_list and start plugin
  */
-void ldm_start_plugin() {
-    LdmBackend *desc = (LdmBackend*) g_tree_lookup(plugin_list, current_plugin);
-    if(desc->start_cb)
+void
+ldm_start_plugin()
+{
+    LdmBackend *desc =
+        (LdmBackend *) g_tree_lookup(plugin_list, current_plugin);
+    if (desc->start_cb)
         desc->start_cb();
 }
 
@@ -43,9 +50,12 @@
  * ldm_close_plugin
  *  Iterate over plugin_list and close plugin
  */
-void ldm_close_plugin() {
-    LdmBackend *desc = (LdmBackend*) g_tree_lookup(plugin_list, current_plugin);
-    if(desc->clean_cb)
+void
+ldm_close_plugin()
+{
+    LdmBackend *desc =
+        (LdmBackend *) g_tree_lookup(plugin_list, current_plugin);
+    if (desc->clean_cb)
         desc->clean_cb();
 }
 
@@ -53,10 +63,13 @@
  * ldm_setup_plugin
  *  Call setup callback function of plugin
  */
-void ldm_setup_plugin() {
-    log_entry("ldm",7,"setting up plugin: %s", current_plugin);
-    LdmBackend *desc = (LdmBackend*) g_tree_lookup(plugin_list, current_plugin);
-    if(desc->init_cb)
+void
+ldm_setup_plugin()
+{
+    log_entry("ldm", 7, "setting up plugin: %s", current_plugin);
+    LdmBackend *desc =
+        (LdmBackend *) g_tree_lookup(plugin_list, current_plugin);
+    if (desc->init_cb)
         desc->init_cb();
 }
 
@@ -64,10 +77,13 @@
  * ldm_guest_auth_plugin
  *  Call setup guest authentication values of plugin
  */
-void ldm_guest_auth_plugin() {
-    log_entry("ldm",7,"guest auth plugin: %s", current_plugin);
-    LdmBackend *desc = (LdmBackend*) g_tree_lookup(plugin_list, current_plugin);
-    if(desc->guest_cb)
+void
+ldm_guest_auth_plugin()
+{
+    log_entry("ldm", 7, "guest auth plugin: %s", current_plugin);
+    LdmBackend *desc =
+        (LdmBackend *) g_tree_lookup(plugin_list, current_plugin);
+    if (desc->guest_cb)
         desc->guest_cb();
 }
 
@@ -76,8 +92,11 @@
  *  Call auth callback function of plugin
  *  Returns 0 on success, 1 otherwise
  */
-int ldm_auth_plugin() {
-    LdmBackend *desc = (LdmBackend*) g_tree_lookup(plugin_list, current_plugin);
+int
+ldm_auth_plugin()
+{
+    LdmBackend *desc =
+        (LdmBackend *) g_tree_lookup(plugin_list, current_plugin);
 
     if (desc->guest_cb)
         ask_greeter("allowguest true\n");
@@ -85,19 +104,19 @@
         ask_greeter("allowguest false\n");
 
     switch (setjmp(auth_jmp_buf)) {
-        case AUTH_EXC_NONE:
-            if(desc->auth_cb)
-                desc->auth_cb();
-            return 0;
-        case AUTH_EXC_RELOAD_BACKEND:
-            ldm_close_plugin();
+    case AUTH_EXC_NONE:
+        if (desc->auth_cb)
+            desc->auth_cb();
+        return 0;
+    case AUTH_EXC_RELOAD_BACKEND:
+        ldm_close_plugin();
 
-            log_entry("ldm",7,"reloading backend");
-            return 1;
-        case AUTH_EXC_GUEST:
-            if(desc->guest_cb)
-                desc->guest_cb();
-            return 0;
+        log_entry("ldm", 7, "reloading backend");
+        return 1;
+    case AUTH_EXC_GUEST:
+        if (desc->guest_cb)
+            desc->guest_cb();
+        return 0;
     }
     return 1;
 }
@@ -107,22 +126,23 @@
  *  Init plugin function. Must be called at each plugin's init
  */
 void __attribute__ ((visibility("default")))
-ldm_init_plugin(LdmBackend* descriptor) {
-    gchar** new_plugin_names;
+    ldm_init_plugin(LdmBackend * descriptor)
+{
+    gchar **new_plugin_names;
     int plugin_names_len;
 
     plugin_names_len = g_strv_length(plugin_names);
     new_plugin_names = g_realloc(plugin_names,
-                                 (plugin_names_len+1)*sizeof(gchar*));
+                                 (plugin_names_len + 1) * sizeof(gchar *));
     if (new_plugin_names != plugin_names) {
         g_free(plugin_names);
         plugin_names = new_plugin_names;
     }
     plugin_names[plugin_names_len] = g_strdup(descriptor->name);
-    plugin_names[plugin_names_len+1] = NULL;
+    plugin_names[plugin_names_len + 1] = NULL;
 
     g_tree_replace(plugin_list, descriptor->name, descriptor);
-    log_entry("ldm",7,"%s initialized", descriptor->name);
+    log_entry("ldm", 7, "%s initialized", descriptor->name);
 }
 
 /*
@@ -130,45 +150,53 @@
  *  open plugin's lib
  *      path -- plugin path
  */
-void _load_plugin(const char *path) {
+void
+_load_plugin(const char *path)
+{
     void *handle = dlopen(path, RTLD_LAZY);
     if (handle) {
-        log_entry("ldm",7,"loaded %s", path);
+        log_entry("ldm", 7, "loaded %s", path);
         return;
     }
 
-    log_entry("ldm",4,"%s: Invalid LDM plugin %s", dlerror(), path);
+    log_entry("ldm", 4, "%s: Invalid LDM plugin %s", dlerror(), path);
 }
 
 /*
  * ldm_load_plugins
  *  Load all plugins at LDM_PLUG_DIR
  */
-int ldm_load_plugins() {
+int
+ldm_load_plugins()
+{
     plugin_list = g_tree_new(g_strcmp);
     g_tree_ref(plugin_list);
-    plugin_names = g_malloc0(sizeof(gchar*));
+    plugin_names = g_malloc0(sizeof(gchar *));
 
-    DIR* plugin_dir = opendir(LDM_PLUG_DIR);
+    DIR *plugin_dir = opendir(LDM_PLUG_DIR);
 
     if (!plugin_dir) {
-        log_entry("ldm",3,"unable to open plugin dir: %s", LDM_PLUG_DIR);
+        log_entry("ldm", 3, "unable to open plugin dir: %s", LDM_PLUG_DIR);
         return 1;
     }
-    struct dirent* entry;
-    while ( (entry = readdir(plugin_dir)) ) {
-        if ((entry->d_type == DT_REG || entry->d_type == DT_UNKNOWN) && (strstr(entry->d_name, ".so") != NULL)) {
-            int name_len = strlen(entry->d_name)+strlen(LDM_PLUG_DIR)+2;
-            char* plug_name = (char *) malloc(name_len);
-            snprintf(plug_name, name_len, "%s/%s", LDM_PLUG_DIR, entry->d_name);
-            log_entry("ldm",7,"loading: %s", plug_name);
+    struct dirent *entry;
+    while ((entry = readdir(plugin_dir))) {
+        if ((entry->d_type == DT_REG || entry->d_type == DT_UNKNOWN)
+            && (strstr(entry->d_name, ".so") != NULL)) {
+            int name_len =
+                strlen(entry->d_name) + strlen(LDM_PLUG_DIR) + 2;
+            char *plug_name = (char *) malloc(name_len);
+            snprintf(plug_name, name_len, "%s/%s", LDM_PLUG_DIR,
+                     entry->d_name);
+            log_entry("ldm", 7, "loading: %s", plug_name);
 
             _load_plugin(plug_name);
             free(plug_name);
         }
     }
 
-    if (errno) perror(strerror(errno));
+    if (errno)
+        perror(strerror(errno));
     closedir(plugin_dir);
     return 0;
 }
@@ -178,11 +206,14 @@
  * Will unwind the stack up to the frame above the callback and handle the
  * error before retrying.
  */
-void ldm_raise_auth_except(LdmAuthException n) {
+void
+ldm_raise_auth_except(LdmAuthException n)
+{
     longjmp(auth_jmp_buf, n);
 }
 
-gchar** ldm_get_plugins() {
+gchar **
+ldm_get_plugins()
+{
     return plugin_names;
 }
-

=== modified file 'src/ldmutils.c'
--- src/ldmutils.c	2012-08-21 14:33:07 +0000
+++ src/ldmutils.c	2014-07-28 15:29:30 +0000
@@ -21,11 +21,14 @@
  *
  * Run startup commands.
  */
-void rc_files(char *action) {
+void
+rc_files(char *action)
+{
     GPid rcpid;
     gchar *command;
 
-    command = g_strjoin(" ", "/bin/sh",  RC_DIR "/ldm-script", action, NULL);
+    command =
+        g_strjoin(" ", "/bin/sh", RC_DIR "/ldm-script", action, NULL);
 
     rcpid = ldm_spawn(command, NULL, NULL, NULL);
 
@@ -37,10 +40,12 @@
  * get_ipaddr
  *  Get ip address of host
  */
-void get_ipaddr() {
+void
+get_ipaddr()
+{
     int numreqs = 10;
     struct ifconf ifc;
-    struct ifreq *ifr;    /* netdevice(7) */
+    struct ifreq *ifr;          /* netdevice(7) */
     struct ifreq info;
     struct sockaddr_in *sa;
 
@@ -48,7 +53,7 @@
 
     skfd = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP);
     if (skfd < 0)
-        die("ldm","socket");
+        die("ldm", "socket");
 
     /*
      * Get a list of all the interfaces.
@@ -58,16 +63,16 @@
 
     while (TRUE) {
         ifc.ifc_len = sizeof(struct ifreq) * numreqs;
-        ifc.ifc_buf = (char *)realloc(ifc.ifc_buf, ifc.ifc_len);
+        ifc.ifc_buf = (char *) realloc(ifc.ifc_buf, ifc.ifc_len);
         if (ifc.ifc_buf == NULL)
-            die("ldm","out of memory");
+            die("ldm", "out of memory");
 
         if (ioctl(skfd, SIOCGIFCONF, &ifc) < 0) {
-            log_entry("ldm",4,"SIOCGIFCONF");
+            log_entry("ldm", 4, "SIOCGIFCONF");
             goto out;
         }
 
-        if (ifc.ifc_len == (int)sizeof(struct ifreq) * numreqs){
+        if (ifc.ifc_len == (int) sizeof(struct ifreq) * numreqs) {
             /* assume it overflowed and try again */
             numreqs += 10;
             continue;
@@ -88,7 +93,7 @@
 
         strcpy(info.ifr_name, ifr->ifr_name);
         if (ioctl(skfd, SIOCGIFFLAGS, &info) < 0) {
-            log_entry("ldm",4,"SIOCGIFFLAGS");
+            log_entry("ldm", 4, "SIOCGIFFLAGS");
             goto out;
         }
 
@@ -101,12 +106,12 @@
         ifr++;
     }
 
-out:
+  out:
     if (ifc.ifc_buf)
         free(ifc.ifc_buf);
 
     if (n == ifc.ifc_len)
-        die("ldm","no configured interface found");
+        die("ldm", "no configured interface found");
 }
 
 /*
@@ -114,37 +119,40 @@
  *
  * Execute commands.  Prints nice error message if failure.
  */
-GPid ldm_spawn(gchar *command, gint *rfd, gint *wfd,  GSpawnChildSetupFunc setup) {
+GPid
+ldm_spawn(gchar * command, gint * rfd, gint * wfd,
+          GSpawnChildSetupFunc setup)
+{
     GPid pid;
     GError *error = NULL;
     GSpawnFlags flags = G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD;
     gint argc;
     gchar **argv = NULL;
 
-    g_shell_parse_argv (command, &argc, &argv, NULL);
+    g_shell_parse_argv(command, &argc, &argv, NULL);
 
     if (!wfd)
         flags |= G_SPAWN_STDOUT_TO_DEV_NULL;
 
-    g_spawn_async_with_pipes (
-            NULL,             /* Working directory: inherit */
-            argv,             /* Arguments, null term */
-            NULL,             /* Environment, inherit from parent */
-            flags,            /* Flags, set above */
-            setup,            /* Child setup function: passed to us */
-            NULL,             /* No user data */
-            &pid,             /* child pid */
-            wfd,              /* Pointer to in file descriptor */
-            rfd,              /* Pointer to out file descriptor */
-            NULL,             /* No stderr */
-            &error);          /* GError handler */
+    g_spawn_async_with_pipes(NULL,               /* Working directory: inherit */
+                             argv,               /* Arguments, null term */
+                             NULL,               /* Environment, inherit from parent */
+                             flags,              /* Flags, set above */
+                             setup,              /* Child setup function: passed to us */
+                             NULL,               /* No user data */
+                             &pid,               /* child pid */
+                             wfd,                /* Pointer to in file descriptor */
+                             rfd,                /* Pointer to out file descriptor */
+                             NULL,               /* No stderr */
+                             &error);            /* GError handler */
 
     g_strfreev(argv);
 
     if (error) {
-        log_entry("ldm",3,"ldm_spawn failed to execute: %s", error->message);
+        log_entry("ldm", 3, "ldm_spawn failed to execute: %s",
+                  error->message);
     } else {
-        log_entry("ldm",7,"ldm_spawn: pid = %d", pid);
+        log_entry("ldm", 7, "ldm_spawn: pid = %d", pid);
     }
 
     return pid;
@@ -157,7 +165,9 @@
  * since we wait for things to happen in order via
  * ldm_wait
  */
-void handle_sigchld(int signo) {
+void
+handle_sigchld(int signo)
+{
     /* do nothing */
     child_exited = TRUE;
 }
@@ -167,17 +177,20 @@
  *
  * wait for child process
  */
-void ldm_wait(GPid pid) {
+void
+ldm_wait(GPid pid)
+{
     siginfo_t info;
-    log_entry("ldm",7,"waiting for process: %d", pid);
+    log_entry("ldm", 7, "waiting for process: %d", pid);
     do {
         int res;
-        res = waitid (P_PID, pid, &info, WEXITED | WSTOPPED);
+        res = waitid(P_PID, pid, &info, WEXITED | WSTOPPED);
         if (res == -1) {
             int temp;
             temp = errno;
-            log_entry("ldm",4,"waitid returned an error: %s", strerror(errno));
-            if(temp == ECHILD) {
+            log_entry("ldm", 4, "waitid returned an error: %s",
+                      strerror(errno));
+            if (temp == ECHILD) {
                 break;
             }
         } else {
@@ -188,19 +201,20 @@
                  */
                 break;
             } else {
-                log_entry("ldm",4,"unexpected terminated process, pid: %d",
-                        info.si_pid);
+                log_entry("ldm", 4,
+                          "unexpected terminated process, pid: %d",
+                          info.si_pid);
                 unexpected_child = TRUE;
             }
         }
     } while (TRUE);
 
     if (info.si_code == CLD_EXITED) {
-        log_entry("ldm",7,"process %d exited with status %d", info.si_pid,
-                WEXITSTATUS(info.si_status));
+        log_entry("ldm", 7, "process %d exited with status %d",
+                  info.si_pid, WEXITSTATUS(info.si_status));
     } else if (info.si_code == CLD_KILLED) {
-        log_entry("ldm",7,"process %d killed by signal %d", info.si_pid,
-                info.si_status);
+        log_entry("ldm", 7, "process %d killed by signal %d", info.si_pid,
+                  info.si_status);
     }
 }
 
@@ -208,16 +222,17 @@
  * close_wm
  *  Close window manager by SIGKILL
  */
-void close_wm() {
+void
+close_wm()
+{
     if (!(ldm.wmpid)) {
         return;
     }
 
-    log_entry("ldm",7,"closing window manager");
+    log_entry("ldm", 7, "closing window manager");
     if (kill(ldm.wmpid, SIGKILL) < 0) {
-        log_entry("ldm",3,"sending SIGKILL to window manager failed");
+        log_entry("ldm", 3, "sending SIGKILL to window manager failed");
     }
     ldm_wait(ldm.wmpid);
     ldm.wmpid = 0;
 }
-

=== modified file 'src/logging.c'
--- src/logging.c	2012-08-21 14:33:07 +0000
+++ src/logging.c	2014-07-28 15:29:30 +0000
@@ -30,7 +30,9 @@
 
 FILE *logfile = NULL;
 char *LOG_LEVEL_NAMES[] = { "EMERGENCY", "ALERT", "CRITICAL", "ERROR",
-                            "WARNING", "NOTICE", "INFO", "DEBUG" };
+    "WARNING", "NOTICE", "INFO", "DEBUG"
+};
+
 int loglevel = 0;
 
 /*
@@ -39,24 +41,24 @@
  *  Open log.  Will log locally or back to the server based upon
  *  the boolean LDM_SYSLOG.
  */
-void log_init(int syslog, int level) {
+void
+log_init(int syslog, int level)
+{
     if (level < 0 || level > 7) {
         loglevel = LOGLEVEL;
-    }
-    else {
+    } else {
         loglevel = level;
     }
 
     if (syslog) {
         openlog("ldm", LOG_PID | LOG_NOWAIT, LOG_DAEMON);
-    }
-    else {
+    } else {
         logfile = fopen(LOGFILE, "a");
         if (!logfile) {
             fprintf(stderr, "Couldn't open logfile " LOGFILE "\n");
             exit(1);
         }
-        setbuf(logfile, NULL);  /* unbuffered writes to the log file */
+        setbuf(logfile, NULL);                   /* unbuffered writes to the log file */
     }
 }
 
@@ -64,7 +66,9 @@
  * log_close
  *  Close logging and clean exit
  */
-void log_close() {
+void
+log_close()
+{
     if (logfile)
         fclose(logfile);
     else
@@ -75,7 +79,9 @@
 /*
  * log_entry: log messages to file or syslog
  */
-void log_entry(char *component, int level, const char *format, ...) {
+void
+log_entry(char *component, int level, const char *format, ...)
+{
     if (level < 0 || level > 7 || level > loglevel)
         return;
 
@@ -91,7 +97,8 @@
         ptr = localtime(&lt);
         strftime(timestr, sizeof(timestr), "%b %e %H:%M:%S", ptr);
 
-        fprintf(logfile, "%s: [%s] %s: ", timestr, component, LOG_LEVEL_NAMES[level]);
+        fprintf(logfile, "%s: [%s] %s: ", timestr, component,
+                LOG_LEVEL_NAMES[level]);
         vfprintf(logfile, format, ap);
         fprintf(logfile, "\n");
     } else {
@@ -107,7 +114,9 @@
  *  Shut things down gracefully if we can
  *      msg -- log message
  */
-void die(char *component, const char *format, ...) {
+void
+die(char *component, const char *format, ...)
+{
     va_list ap;
     va_start(ap, format);
 

=== modified file 'src/plugin.c'
--- src/plugin.c	2012-08-21 14:33:07 +0000
+++ src/plugin.c	2014-07-28 15:29:30 +0000
@@ -14,7 +14,9 @@
  * get_userid
  *  Ask the greeter to check autologin or get username
  */
-void get_userid(gchar **username) {
+void
+get_userid(gchar ** username)
+{
     gchar *cmd;
 
     cmd = g_strconcat("prompt <b>", _("Username"), "</b>\nuserid\n", NULL);
@@ -26,26 +28,33 @@
 /*
  * get_passwd
  */
-void get_passwd(gchar **password) {
+void
+get_passwd(gchar ** password)
+{
     gchar *cmd;
 
-    cmd = g_strconcat("prompts <b>", _("Password"), "</b>\npasswd\n", NULL);
-    *password = (gchar*) ask_value_greeter(cmd);
+    cmd =
+        g_strconcat("prompts <b>", _("Password"), "</b>\npasswd\n", NULL);
+    *password = (gchar *) ask_value_greeter(cmd);
 
-    set_message(g_strconcat("<b>", _("Verifying password.  Please wait."), "</b>", NULL));
+    set_message(g_strconcat
+                ("<b>", _("Verifying password.  Please wait."), "</b>",
+                 NULL));
     g_free(cmd);
 }
 
 /*
  * get_host
  */
-void get_host(gchar **server) {
+void
+get_host(gchar ** server)
+{
     gchar *cmd = "hostname\n";
     gchar *host;
 
-    host = (gchar*) ask_value_greeter(cmd);
-    if(g_ascii_strncasecmp(host, "None", 4)) {
-        if(*server)
+    host = (gchar *) ask_value_greeter(cmd);
+    if (g_ascii_strncasecmp(host, "None", 4)) {
+        if (*server)
             g_free(*server);
         *server = host;
     }
@@ -54,14 +63,16 @@
 /*
  * get_language
  */
-void get_language(gchar **language) {
+void
+get_language(gchar ** language)
+{
     gchar *cmd = "language\n";
     gchar *lang;
 
-    lang = (gchar*) ask_value_greeter(cmd);
+    lang = (gchar *) ask_value_greeter(cmd);
 
-    if(g_ascii_strncasecmp(lang, "None", 4)) {
-        if(*language)
+    if (g_ascii_strncasecmp(lang, "None", 4)) {
+        if (*language)
             g_free(*language);
         *language = lang;
         setenv("LDM_LANGUAGE", lang, 1);
@@ -71,11 +82,13 @@
 /*
  * get_session
  */
-void get_session(gchar **session) {
+void
+get_session(gchar ** session)
+{
     gchar *cmd = "session\n";
     gchar *sess;
 
-    sess = (gchar*) ask_value_greeter(cmd);
+    sess = (gchar *) ask_value_greeter(cmd);
 
     if (g_ascii_strncasecmp(sess, "None", 4)) {
         if (*session)
@@ -89,19 +102,23 @@
  *
  * Return to variable xsession the LDM_XSESSION info
  */
-void __attribute__ ((visibility("default"))) get_Xsession(gchar **xsession, gconstpointer server) {
+void __attribute__ ((visibility("default"))) get_Xsession(gchar **
+                                                          xsession,
+                                                          gconstpointer
+                                                          server)
+{
     ldminfo *curr_host = NULL;
     gchar *tmp_xsess = NULL;
     tmp_xsess = g_strdup(getenv("LDM_XSESSION"));
 
     if (!tmp_xsess || strlen(tmp_xsess) == 0) {
         curr_host = ldminfo_lookup(server);
-        if(curr_host) {
+        if (curr_host) {
             tmp_xsess = curr_host->xsession;
             if (!tmp_xsess || strlen(tmp_xsess) == 0) {
                 tmp_xsess = g_strdup(getenv("LDM_DEFAULT_XSESSION"));
                 if (!tmp_xsess || strlen(tmp_xsess) == 0)
-                    die("ldm","no Xsession");
+                    die("ldm", "no Xsession");
             }
         }
     }
@@ -115,13 +132,21 @@
  * Set LDM_SESSION and LDM_XSESSION env variable with param
  * Then run xsession script
  */
-void __attribute__ ((visibility("default"))) set_session_env(gchar *xsession, gchar *session) {
-    if (g_strcmp0(session,"default") != 0 || getenv("LDM_SESSION") == NULL) {
-        log_entry("ldm",7,"Export LDM_SELECTED_SESSION to environment: \"%s\"", session);
+void __attribute__ ((visibility("default"))) set_session_env(gchar *
+                                                             xsession,
+                                                             gchar *
+                                                             session)
+{
+    if (g_strcmp0(session, "default") != 0
+        || getenv("LDM_SESSION") == NULL) {
+        log_entry("ldm", 7,
+                  "Export LDM_SELECTED_SESSION to environment: \"%s\"",
+                  session);
         setenv("LDM_SELECTED_SESSION", session, 1);
-    }
-    else {
-        log_entry("ldm",7,"Using existing LDM_SESSION from environment: \"%s\"", getenv("LDM_SESSION"));
+    } else {
+        log_entry("ldm", 7,
+                  "Using existing LDM_SESSION from environment: \"%s\"",
+                  getenv("LDM_SESSION"));
     }
 
     setenv("LDM_XSESSION", xsession, 1);
@@ -134,19 +159,23 @@
  * get_ltsp_cfg
  *  Check for LTSP-Cluster. If true, contact loadbalancer for an IP
  */
-void __attribute__ ((visibility("default"))) get_ltsp_cfg(gchar **server) {
+void __attribute__ ((visibility("default"))) get_ltsp_cfg(gchar ** server)
+{
     /* Check for LTSP-Cluster, if true, contact the loadbalancer for an IP */
     if (access(LTSP_CLUSTER_CONFILE, F_OK) == 0) {
         FILE *fp;
         fp = popen("getltscfg-cluster -l ldm", "r");
         if (fp != NULL) {
-            log_entry("ltsp-cluster",6,"IP before load-balancing: %s", *server);
+            log_entry("ltsp-cluster", 6, "IP before load-balancing: %s",
+                      *server);
             if (fgets(*server, PATH_MAX, fp) == NULL)
-                log_entry("ltsp-cluster",4,"failed to get an IP from the load-balancer");
+                log_entry("ltsp-cluster", 4,
+                          "failed to get an IP from the load-balancer");
 
-            log_entry("ltsp-cluster",6,"IP after loadbalancing: %s", *server);
+            log_entry("ltsp-cluster", 6, "IP after loadbalancing: %s",
+                      *server);
         }
         if (pclose(fp) == -1)
-            log_entry("ltsp-cluster",3,"load-balancing failed");
+            log_entry("ltsp-cluster", 3, "load-balancing failed");
     }
 }

=== modified file 'src/plugins/rdesktop/rdesktop.c'
--- src/plugins/rdesktop/rdesktop.c	2012-08-21 14:33:07 +0000
+++ src/plugins/rdesktop/rdesktop.c	2014-07-28 15:29:30 +0000
@@ -22,8 +22,9 @@
 LdmBackend *descriptor;
 RdpInfo *rdpinfo;
 
-void __attribute__((constructor)) initialize() {
-    descriptor = (LdmBackend*) malloc(sizeof(LdmBackend));
+void __attribute__ ((constructor)) initialize()
+{
+    descriptor = (LdmBackend *) malloc(sizeof(LdmBackend));
     bzero(descriptor, sizeof(LdmBackend));
 
     descriptor->name = "rdesktop";
@@ -39,8 +40,10 @@
  * init_rdesktop
  *  Callback function for initialization
  */
-void init_rdesktop() {
-    rdpinfo = (RdpInfo*) malloc(sizeof(RdpInfo));
+void
+init_rdesktop()
+{
+    rdpinfo = (RdpInfo *) malloc(sizeof(RdpInfo));
     bzero(rdpinfo, sizeof(RdpInfo));
 
     /* Get ENV value */
@@ -52,46 +55,51 @@
  * start_rdesktop
  *  Callback function for starting rdesktop session
  */
-void start_rdesktop() {
+void
+start_rdesktop()
+{
     gboolean error = FALSE;
 
     /* Variable validation */
-    if(!rdpinfo->username) {
-        log_entry("rdesktop",3,"no username");
-        error = TRUE;
-    }
-
-    if(!rdpinfo->password) {
-        log_entry("rdesktop",3,"no password");
-        error = TRUE;
-    }
-
-    if(!rdpinfo->server) {
-        log_entry("rdesktop",3,"no server");
-        error = TRUE;
-    }
-
-    if(!rdpinfo->domain) {
-        log_entry("rdesktop",3,"no domain");
-        error = TRUE;
-    }
-
-    if(error) {
-        die("rdesktop","missing mandatory information");
+    if (!rdpinfo->username) {
+        log_entry("rdesktop", 3, "no username");
+        error = TRUE;
+    }
+
+    if (!rdpinfo->password) {
+        log_entry("rdesktop", 3, "no password");
+        error = TRUE;
+    }
+
+    if (!rdpinfo->server) {
+        log_entry("rdesktop", 3, "no server");
+        error = TRUE;
+    }
+
+    if (!rdpinfo->domain) {
+        log_entry("rdesktop", 3, "no domain");
+        error = TRUE;
+    }
+
+    if (error) {
+        die("rdesktop", "missing mandatory information");
     }
 
     /* Greeter not needed anymore */
     close_greeter();
 
-    log_entry("rdesktop",6,"starting rdesktop session to '%s' as '%s'", rdpinfo->server, rdpinfo->username);
+    log_entry("rdesktop", 6, "starting rdesktop session to '%s' as '%s'",
+              rdpinfo->server, rdpinfo->username);
     rdesktop_session();
-    log_entry("rdesktop",6,"closing rdesktop session");
+    log_entry("rdesktop", 6, "closing rdesktop session");
 }
 
 /*
  * _get_domain
  */
-void _get_domain() {
+void
+_get_domain()
+{
     gchar *cmd = "value domain\n";
 
     rdpinfo->domain = ask_value_greeter(cmd);
@@ -101,17 +109,23 @@
  * auth_rdesktop
  *  Callback function for authentication
  */
-void auth_rdesktop() {
+void
+auth_rdesktop()
+{
     gchar *cmd;
 
     /* Separator for domains : '|' */
     gchar *domains = getenv("RDP_DOMAIN");
-    cmd = g_strconcat("pref choice;domain;Domain;Select Domai_n ...;session;", domains, "\n", NULL);
+    cmd =
+        g_strconcat
+        ("pref choice;domain;Domain;Select Domai_n ...;session;", domains,
+         "\n", NULL);
     if (domains) {
-        if(ask_greeter(cmd))
+        if (ask_greeter(cmd))
             die("rdesktop", "%s from greeter failed", cmd);
     } else {
-        log_entry("rdesktop",7,"RDP_DOMAIN isn't defined, rdesktop will connect on default domain");
+        log_entry("rdesktop", 7,
+                  "RDP_DOMAIN isn't defined, rdesktop will connect on default domain");
     }
 
     /* Ask for UserID */
@@ -121,7 +135,7 @@
     get_passwd(&(rdpinfo->password));
 
     /* Get hostname */
-    if(!rdpinfo->server)
+    if (!rdpinfo->server)
         get_host(&(rdpinfo->server));
 
     /* Get Domain (rdesktop plugin specific) */
@@ -137,8 +151,10 @@
  * close_rdesktop
  *  Callback function for closing the plugins
  */
-void close_rdesktop() {
-    log_entry("rdesktop",7,"closing rdesktop session");
+void
+close_rdesktop()
+{
+    log_entry("rdesktop", 7, "closing rdesktop session");
     free(rdpinfo);
 }
 
@@ -146,17 +162,18 @@
  * rdesktop_session
  *  Start a rdesktop session to server
  */
-void rdesktop_session() {
+void
+rdesktop_session()
+{
     gchar *cmd;
 
     cmd = g_strjoin(" ", "rdesktop", "-f",
-            "-u", rdpinfo->username,
-            "-p", rdpinfo->password, NULL);
+                    "-u", rdpinfo->username,
+                    "-p", rdpinfo->password, NULL);
 
     /* Only append the domain if it's set */
-    if (g_strcmp0(rdpinfo->domain,"None") != 0) {
-        cmd = g_strjoin(" ", cmd,
-            "-d", rdpinfo->domain, NULL);
+    if (g_strcmp0(rdpinfo->domain, "None") != 0) {
+        cmd = g_strjoin(" ", cmd, "-d", rdpinfo->domain, NULL);
     }
 
     /* If we have custom options, append them */

=== modified file 'src/plugins/ssh/ssh.c'
--- src/plugins/ssh/ssh.c	2013-02-27 08:55:18 +0000
+++ src/plugins/ssh/ssh.c	2014-07-28 15:29:30 +0000
@@ -32,8 +32,9 @@
 LdmBackend *descriptor;
 SSHInfo *sshinfo;
 
-void __attribute__((constructor)) initialize() {
-    descriptor = (LdmBackend*) malloc(sizeof(LdmBackend));
+void __attribute__ ((constructor)) initialize()
+{
+    descriptor = (LdmBackend *) malloc(sizeof(LdmBackend));
     bzero(descriptor, sizeof(LdmBackend));
 
     descriptor->name = "ssh";
@@ -50,8 +51,10 @@
  * init_ssh
  *  Callback function for initialization
  */
-void init_ssh() {
-    sshinfo = (SSHInfo*) malloc(sizeof(SSHInfo));
+void
+init_ssh()
+{
+    sshinfo = (SSHInfo *) malloc(sizeof(SSHInfo));
     bzero(sshinfo, sizeof(SSHInfo));
 
     /* Get ENV Variables */
@@ -63,22 +66,24 @@
  * start_ssh
  *  Start ssh session
  */
-void start_ssh() {
+void
+start_ssh()
+{
     gboolean error = FALSE;
 
     /* Variable validation */
     if (!(sshinfo->username)) {
-        log_entry("ssh",3,"no username");
+        log_entry("ssh", 3, "no username");
         error = TRUE;
     }
 
     if (!(sshinfo->password)) {
-        log_entry("ssh",3,"no password");
+        log_entry("ssh", 3, "no password");
         error = TRUE;
     }
 
     if (!(sshinfo->server)) {
-        log_entry("ssh",3,"no server");
+        log_entry("ssh", 3, "no server");
         error = TRUE;
     }
 
@@ -86,7 +91,7 @@
         sshinfo->session = g_strdup("default");
 
     if (error) {
-        die("ssh","missing mandatory information");
+        die("ssh", "missing mandatory information");
     }
 
     /* Getting Xsession */
@@ -99,25 +104,28 @@
      * If we run multiple ldm sessions on multiply vty's we need separate
      * control sockets.
      */
-    sshinfo->ctl_socket = g_strdup_printf("/var/run/ldm_socket_%d_%s", ldm.pid, sshinfo->server);
+    sshinfo->ctl_socket =
+        g_strdup_printf("/var/run/ldm_socket_%d_%s", ldm.pid,
+                        sshinfo->server);
 
     /* Setting ENV variables for plugin */
     _set_env();
 
     /* Execute any rc files */
-    log_entry("ssh",6,"calling rc.d pressh scripts");
+    log_entry("ssh", 6, "calling rc.d pressh scripts");
     rc_files("pressh");
 
     ssh_session();
-    log_entry("ssh",6,"established ssh session on '%s' as '%s'",sshinfo->server,sshinfo->username);
+    log_entry("ssh", 6, "established ssh session on '%s' as '%s'",
+              sshinfo->server, sshinfo->username);
 
     /* Greeter not needed anymore */
     close_greeter();
 
-    log_entry("ssh",6,"calling rc.d start scripts");
-    rc_files("start");                      /* Execute any rc files */
+    log_entry("ssh", 6, "calling rc.d start scripts");
+    rc_files("start");                           /* Execute any rc files */
 
-    log_entry("ssh",6,"starting X session");
+    log_entry("ssh", 6, "starting X session");
     set_session_env(sshinfo->xsession, sshinfo->session);
 }
 
@@ -125,8 +133,10 @@
  * get_guest
  *  Callback function for setting guest login
  */
-void get_guest() {
-    log_entry("ssh",6,"setting guest login");
+void
+get_guest()
+{
+    log_entry("ssh", 6, "setting guest login");
 
     /* Get credentials */
     g_free(sshinfo->username);
@@ -178,11 +188,11 @@
         good = FALSE;
         if (sshinfo->server) {
             i = 0;
-            while(1) {
-                if(hosts_char[i] == NULL) {
+            while (1) {
+                if (hosts_char[i] == NULL) {
                     break;
                 }
-                if(!g_strcmp0(hosts_char[i], sshinfo->server)) {
+                if (!g_strcmp0(hosts_char[i], sshinfo->server)) {
                     good = TRUE;
                     break;
                 }
@@ -203,7 +213,9 @@
  * _set_env
  *  Set environment variables used by LDM and Greeter
  */
-void _set_env() {
+void
+_set_env()
+{
     setenv("LDM_SERVER", sshinfo->server, 1);
     setenv("LDM_USERNAME", sshinfo->username, 1);
     setenv("LDM_SOCKET", sshinfo->ctl_socket, 1);
@@ -213,7 +225,9 @@
  * get_auth
  *  Callback function for authentication
  */
-void get_auth() {
+void
+get_auth()
+{
     /* Get UserID */
     get_userid(&(sshinfo->username));
 
@@ -234,8 +248,10 @@
  * close_ssh
  *  Callback function for closing the plugins
  */
-void close_ssh() {
-    log_entry("ssh",7,"closing ssh session");
+void
+close_ssh()
+{
+    log_entry("ssh", 7, "closing ssh session");
     ssh_endsession();
 
     // leave no crumbs and free memory allocated for auth values
@@ -247,7 +263,9 @@
     free(sshinfo);
 }
 
-int expect(int fd, char *p, int seconds, ...) {
+int
+expect(int fd, char *p, int seconds, ...)
+{
     fd_set set;
     struct timeval timeout;
     int i, st;
@@ -281,8 +299,8 @@
      * Main loop.
      */
 
-    while(1) {
-        timeout.tv_sec = (long)1;             /* one second timeout */
+    while (1) {
+        timeout.tv_sec = (long) 1;               /* one second timeout */
         timeout.tv_usec = 0;
 
         FD_ZERO(&set);
@@ -290,10 +308,10 @@
         st = select(FD_SETSIZE, &set, NULL, NULL, &timeout);
 
         if (child_exited) {
-            break;                  /* someone died on us */
+            break;                               /* someone died on us */
         }
 
-        if (st < 0) {                 /* bad thing */
+        if (st < 0) {                            /* bad thing */
             break;
         }
 
@@ -301,8 +319,8 @@
             break;
         }
 
-        if (!st) {                  /* timeout */
-            loopcount--;            /* We've not seen the data we want */
+        if (!st) {                               /* timeout */
+            loopcount--;                         /* We've not seen the data we want */
             continue;
         }
 
@@ -332,19 +350,21 @@
         }
     }
 
-    log_entry("ldm",7,"expect saw: %s", p);
+    log_entry("ldm", 7, "expect saw: %s", p);
 
     if (size < 0 || st < 0 || child_exited) {
-        return ERROR;               /* error occured */
+        return ERROR;                            /* error occured */
     }
     if (loopcount == 0) {
-        return TIMED_OUT;           /* timed out */
+        return TIMED_OUT;                        /* timed out */
     } else {
-        return i;                   /* which expect did we see? */
+        return i;                                /* which expect did we see? */
     }
 }
 
-void ssh_chat(gint fd) {
+void
+ssh_chat(gint fd)
+{
     int seen;
     gchar lastseen[MAXEXP];
     int first_time = 1;
@@ -388,15 +408,17 @@
             set_message(_("No response from server, restarting..."));
             sleep(5);
             close_greeter();
-            die("ssh","no response, restarting");
+            die("ssh", "no response, restarting");
         }
     }
 }
 
-void ssh_tty_init(void) {
+void
+ssh_tty_init(void)
+{
     (void) setsid();
-    if (login_tty(sshinfo->sshslavefd) < 0 ) {
-        die("ssh","login_tty failed");
+    if (login_tty(sshinfo->sshslavefd) < 0) {
+        die("ssh", "login_tty failed");
     }
 }
 
@@ -404,25 +426,28 @@
  * ssh_session()
  * Start an ssh login to the server.
  */
-void ssh_session(void) {
+void
+ssh_session(void)
+{
     gchar *command;
     gchar *port = NULL;
     pthread_t pt;
 
     /* Check for port Override */
-    if(sshinfo->override_port)
-        port = g_strconcat(" -p ", sshinfo->override_port, " ",  NULL);
+    if (sshinfo->override_port)
+        port = g_strconcat(" -p ", sshinfo->override_port, " ", NULL);
 
     openpty(&(sshinfo->sshfd), &(sshinfo->sshslavefd), NULL, NULL, NULL);
 
     command = g_strjoin(" ", "ssh", "-Y", "-t", "-M",
-            "-S", sshinfo->ctl_socket,
-            "-o", "NumberOfPasswordPrompts=1",
-            "-l", sshinfo->username,
-            port ? port : "",
-            sshinfo->sshoptions ? sshinfo->sshoptions : "",
-            sshinfo->server, "echo " SENTINEL "; exec /bin/sh -", NULL);
-    log_entry("ssh",7,"ssh_session: %s", command);
+                        "-S", sshinfo->ctl_socket,
+                        "-o", "NumberOfPasswordPrompts=1",
+                        "-l", sshinfo->username,
+                        port ? port : "",
+                        sshinfo->sshoptions ? sshinfo->sshoptions : "",
+                        sshinfo->server,
+                        "echo " SENTINEL "; exec /bin/sh -", NULL);
+    log_entry("ssh", 7, "ssh_session: %s", command);
 
     sshinfo->sshpid = ldm_spawn(command, NULL, NULL, ssh_tty_init);
 
@@ -437,7 +462,9 @@
         g_free(port);
 }
 
-void ssh_endsession(void) {
+void
+ssh_endsession(void)
+{
     GPid pid;
     gchar *command;
     struct stat stbuf;
@@ -445,8 +472,10 @@
     if (!stat(sshinfo->ctl_socket, &stbuf)) {
         /* socket still exists, so we need to shut down the ssh link */
 
-        command = g_strjoin(" ", "ssh", "-S", sshinfo->ctl_socket, "-O", "exit", sshinfo->server, NULL);
-        log_entry("ssh",7,"closing ssh session: %s"), command;
+        command =
+            g_strjoin(" ", "ssh", "-S", sshinfo->ctl_socket, "-O", "exit",
+                      sshinfo->server, NULL);
+        log_entry("ssh", 7, "closing ssh session: %s"), command;
         pid = ldm_spawn(command, NULL, NULL, NULL);
         ldm_wait(pid);
         close(sshinfo->sshfd);
@@ -456,7 +485,9 @@
     }
 }
 
-void *eater() {
+void *
+eater()
+{
     fd_set set;
     struct timeval timeout;
     int st;
@@ -468,7 +499,7 @@
             break;
         }
 
-        timeout.tv_sec = (long)1;             /* one second timeout */
+        timeout.tv_sec = (long) 1;               /* one second timeout */
         timeout.tv_usec = 0;
         FD_ZERO(&set);
         FD_SET(sshinfo->sshfd, &set);

=== modified file 'wwm/client.c'
--- wwm/client.c	2010-10-05 21:34:03 +0000
+++ wwm/client.c	2014-07-28 15:29:30 +0000
@@ -20,12 +20,12 @@
 
     for (c = head_client; c; c = c->next)
         if (w == c->parent || w == c->window)
-            return(c);
-    return(NULL);
+            return (c);
+    return (NULL);
 }
 
 Client *
-next_client_on_vdesk(Client *c)
+next_client_on_vdesk(Client * c)
 {
     Client *newc = c, *marker = c;
     int v = vdesk_get();
@@ -37,16 +37,16 @@
         newc = (newc->next ? newc->next : head_client);
     while (newc != marker && newc->vdesk != v);
 
-    return((newc == marker) ? NULL : newc);
+    return ((newc == marker) ? NULL : newc);
 }
 
 void
-set_wm_state(Client *c, int state)
+set_wm_state(Client * c, int state)
 {
     long data[2];
 
     data[0] = (long) state;
-    data[1] = None;                         /* icon window */
+    data[1] = None;                              /* icon window */
 
     XChangeProperty(display, c->window, xa_wm_state, xa_wm_state,
                     sz_xInternAtomReply, PropModeReplace,
@@ -54,27 +54,28 @@
 }
 
 void
-send_config(Client *c)
+send_config(Client * c)
 {
     XConfigureEvent ce;
 
-    ce.type              = ConfigureNotify;
-    ce.event             = c->window;
-    ce.window            = c->window;
-    ce.x                 = c->x;
-    ce.y                 = c->y;
-    ce.width             = c->width;
-    ce.height            = c->height;
-    ce.border_width      = c->border;
-    ce.above             = None;
+    ce.type = ConfigureNotify;
+    ce.event = c->window;
+    ce.window = c->window;
+    ce.x = c->x;
+    ce.y = c->y;
+    ce.width = c->width;
+    ce.height = c->height;
+    ce.border_width = c->border;
+    ce.above = None;
     ce.override_redirect = False;
 
-    XSendEvent(display, c->window, False, StructureNotifyMask, (XEvent *) &ce);
+    XSendEvent(display, c->window, False, StructureNotifyMask,
+               (XEvent *) & ce);
     XSync(display, False);
 }
 
 void
-remove_client(Client *c, int from_cleanup)
+remove_client(Client * c, int from_cleanup)
 {
     Window root = ROOTWINDOW;
     Client *p;
@@ -104,7 +105,7 @@
     if (c->size)
         XFree(c->size);
     if (current == c)
-        current = NULL;     /* an enter event should set this up again */
+        current = NULL;                          /* an enter event should set this up again */
     free(c);
 
     XSync(display, False);
@@ -113,35 +114,35 @@
 }
 
 void
-change_gravity(Client *c, int invert)
+change_gravity(Client * c, int invert)
 {
     int dx = 0, dy = 0;
     int gravity = (c->size->flags & PWinGravity) ?
-                   c->size->win_gravity : NorthWestGravity;
+        c->size->win_gravity : NorthWestGravity;
 
     switch (gravity) {
-        case CenterGravity:
-        case StaticGravity:
-        case NorthWestGravity:
-        case NorthGravity:
-        case WestGravity:
-            dx = c->border;
-            dy = c->border;
-            break;
-        case NorthEastGravity:
-        case EastGravity:
-            dx = -(c->border);
-            dy = c->border;
-            break;
-        case SouthEastGravity:
-            dx = -(c->border);
-            dy = -(c->border);
-            break;
-        case SouthGravity:
-        case SouthWestGravity:
-            dx = c->border;
-            dy = -(c->border);
-            break;
+    case CenterGravity:
+    case StaticGravity:
+    case NorthWestGravity:
+    case NorthGravity:
+    case WestGravity:
+        dx = c->border;
+        dy = c->border;
+        break;
+    case NorthEastGravity:
+    case EastGravity:
+        dx = -(c->border);
+        dy = c->border;
+        break;
+    case SouthEastGravity:
+        dx = -(c->border);
+        dy = -(c->border);
+        break;
+    case SouthGravity:
+    case SouthWestGravity:
+        dx = c->border;
+        dy = -(c->border);
+        break;
     }
 
     if (invert) {
@@ -154,7 +155,7 @@
 }
 
 void
-send_wm_delete(Client *c)
+send_wm_delete(Client * c)
 {
     int i, n, found = 0;
     Atom *protocols;
@@ -180,19 +181,21 @@
 {
     XEvent ev;
 
-    ev.type                 = ClientMessage;
-    ev.xclient.window       = w;
+    ev.type = ClientMessage;
+    ev.xclient.window = w;
     ev.xclient.message_type = a;
-    ev.xclient.format       = 32;
-    ev.xclient.data.l[0]    = x;
-    ev.xclient.data.l[1]    = CurrentTime;
+    ev.xclient.format = 32;
+    ev.xclient.data.l[0] = x;
+    ev.xclient.data.l[1] = CurrentTime;
 
-    return(XSendEvent(display, w, False, NoEventMask, &ev));
+    return (XSendEvent(display, w, False, NoEventMask, &ev));
 }
 
 void
-set_shape(Client *c) {
-    int i, b;  unsigned int u;  /* dummies */
+set_shape(Client * c)
+{
+    int i, b;
+    unsigned int u;             /* dummies */
     int bounding_shaped;
     Status retval;
 
@@ -208,9 +211,11 @@
      * XShapeGetRectangles) worked _most_ of the time.
      */
 
-    retval = XShapeQueryExtents(display, c->window, &bounding_shaped, &i, &i,
-             &u, &u, &b, &i, &i, &u, &u);
+    retval =
+        XShapeQueryExtents(display, c->window, &bounding_shaped, &i, &i,
+                           &u, &u, &b, &i, &i, &u, &u);
     if (retval && bounding_shaped)
         XShapeCombineShape(display, c->parent, ShapeBounding,
-            c->border, c->border, c->window, ShapeBounding, ShapeSet);
+                           c->border, c->border, c->window, ShapeBounding,
+                           ShapeSet);
 }

=== modified file 'wwm/events.c'
--- wwm/events.c	2012-08-21 14:33:07 +0000
+++ wwm/events.c	2014-07-28 15:29:30 +0000
@@ -9,7 +9,7 @@
 #include "wwm.h"
 
 void
-handle_key_event(XKeyEvent *e)
+handle_key_event(XKeyEvent * e)
 {
     int i;
     Client *c = find_client(e->window);
@@ -34,13 +34,13 @@
 
     for (i = 0; keytab[i].key != 0; i++)
         if (keytab[i].key == key) {
-            keytab[i].f(c);             /* dispatch the function */
+            keytab[i].f(c);                      /* dispatch the function */
             break;
         }
 }
 
 void
-handle_button_event(XButtonEvent *e)
+handle_button_event(XButtonEvent * e)
 {
     // We want a minimal WM, so no mouse actions
     return;
@@ -51,27 +51,28 @@
     if (e->window == root) {
         return;
         switch (e->button) {
-            case Button4:               /* Scrolly wheel up in root */
-                prev_vdesk((Client *) NULL);
-                return;
-            case Button5:               /* Scrolly wheel down in root */
-                next_vdesk((Client *) NULL);
-                return;
+        case Button4:                           /* Scrolly wheel up in root */
+            prev_vdesk((Client *) NULL);
+            return;
+        case Button5:                           /* Scrolly wheel down in root */
+            next_vdesk((Client *) NULL);
+            return;
         }
     } else if (c) {
         switch (e->button) {
-            case Button1:               /* Left mouse = move */
-                move(c, 0);
-                return;
-            case Button3:               /* Right mouse = resize */
-                resize(c, 0);
+        case Button1:                           /* Left mouse = move */
+            move(c, 0);
+            return;
+        case Button3:                           /* Right mouse = resize */
+            resize(c, 0);
             return;
         }
     }
 }
 
 void
-handle_shape_event(XShapeEvent *e) {
+handle_shape_event(XShapeEvent * e)
+{
     Client *c = find_client(e->window);
 
     if (c)
@@ -79,7 +80,7 @@
 }
 
 void
-handle_configure_request(XConfigureRequestEvent *e)
+handle_configure_request(XConfigureRequestEvent * e)
 {
     Client *c = find_client(e->window);
     XWindowChanges wc;
@@ -121,7 +122,7 @@
 }
 
 void
-handle_map_request(XMapRequestEvent *e)
+handle_map_request(XMapRequestEvent * e)
 {
     Client *c = find_client(e->window);
 
@@ -134,7 +135,7 @@
 }
 
 void
-handle_unmap_event(XUnmapEvent *e)
+handle_unmap_event(XUnmapEvent * e)
 {
     Client *c = find_client(e->window);
     Client *focus_to;
@@ -156,19 +157,19 @@
 }
 
 void
-handle_client_message(XClientMessageEvent *e)
+handle_client_message(XClientMessageEvent * e)
 {
     Client *c = find_client(e->window);
 
-    if (c &&                                        /* Client exists */
-        e->message_type == xa_wm_change_state &&    /* Changing state */
-        e->format == sz_xInternAtomReply &&         /* Data is long */
-        e->data.l[0] == IconicState)                /* We're now iconic */
+    if (c &&                                     /* Client exists */
+        e->message_type == xa_wm_change_state && /* Changing state */
+        e->format == sz_xInternAtomReply &&      /* Data is long */
+        e->data.l[0] == IconicState)             /* We're now iconic */
         hide(c);
 }
 
 void
-handle_property_change(XPropertyEvent *e)
+handle_property_change(XPropertyEvent * e)
 {
     Client *c = find_client(e->window);
     long dummy;
@@ -179,11 +180,11 @@
 }
 
 void
-handle_enter_event(XCrossingEvent *e)
+handle_enter_event(XCrossingEvent * e)
 {
     Client *c = find_client(e->window);
 
-    if (nomousefocus || !c)           /* Ignore focus follows mouse */
+    if (nomousefocus || !c)                      /* Ignore focus follows mouse */
         return;
 
     if (c->vdesk != vdesk_get() && c->vdesk != LOCKED)

=== modified file 'wwm/main.c'
--- wwm/main.c	2012-03-12 19:35:24 +0000
+++ wwm/main.c	2014-07-28 15:29:30 +0000
@@ -13,25 +13,25 @@
 
 #include "wwm.h"
 
-void handle_shape_event(XShapeEvent *e);
+void handle_shape_event(XShapeEvent * e);
 
 /*
  * Globals definitions
  */
 
-Client *head_client = NULL;    /* First client */
-Client *current = NULL;        /* "current" client */
-Display *display;            /* Our display */
-Atom xa_wm_state;            /* atoms for window manager functions */
+Client *head_client = NULL;     /* First client */
+Client *current = NULL;         /* "current" client */
+Display *display;               /* Our display */
+Atom xa_wm_state;               /* atoms for window manager functions */
 Atom xa_wm_change_state;
 Atom xa_wm_protos;
 Atom xa_wm_delete;
-XColor fg, bg, fc;            /* Forground, Background, and locked colours */
-int nomousefocus = 0;        /* focus follows mouse status */
-int passthrough = 0;        /* current passthrough state */
-char *term = NULL;          /* terminal to launch */
-int have_shape = 0;         /* Do we support shaped windows? */
-int ignore_xerror = 0;      /* Ignore X errors */
+XColor fg, bg, fc;              /* Forground, Background, and locked colours */
+int nomousefocus = 0;           /* focus follows mouse status */
+int passthrough = 0;            /* current passthrough state */
+char *term = NULL;              /* terminal to launch */
+int have_shape = 0;             /* Do we support shaped windows? */
+int ignore_xerror = 0;          /* Ignore X errors */
 
 struct wmkeys keytab[] = {
     {0, dummy_func}
@@ -45,7 +45,7 @@
     XEvent ev;
     int shape_event;
 
-    dpy = getenv("DISPLAY");            /* manage the display in $DISPLAY */
+    dpy = getenv("DISPLAY");                     /* manage the display in $DISPLAY */
 
     if (!dpy)
         dpy = strdup(DEF_DISPLAY);
@@ -53,13 +53,13 @@
     act.sa_handler = handle_signal;
     sigemptyset(&act.sa_mask);
 #ifdef SA_NOCLDSTOP
-    act.sa_flags = SA_NOCLDSTOP;        /* don't care about STOP, CONT */
+    act.sa_flags = SA_NOCLDSTOP;                 /* don't care about STOP, CONT */
 #else
     act.sa_flags = 0;
 #endif
     sigaction(SIGTERM, &act, NULL);
-    sigaction(SIGINT,  &act, NULL);
-    sigaction(SIGHUP,  &act, NULL);
+    sigaction(SIGINT, &act, NULL);
+    sigaction(SIGHUP, &act, NULL);
     sigaction(SIGCHLD, &act, NULL);
 
     setup_display(dpy);
@@ -89,38 +89,38 @@
     for (;;) {
         XNextEvent(display, &ev);
         switch (ev.type) {
-            case KeyPress:
-                handle_key_event(&ev.xkey);
-                break;
-            case ButtonPress:
-                handle_button_event(&ev.xbutton);
-                break;
-            case ConfigureRequest:
-                handle_configure_request(&ev.xconfigurerequest);
-                break;
-            case MapRequest:
-                handle_map_request(&ev.xmaprequest);
-                break;
-            case ClientMessage:
-                handle_client_message(&ev.xclient);
-                break;
-            case EnterNotify:
-                handle_enter_event(&ev.xcrossing);
-                break;
-            case PropertyNotify:
-                handle_property_change(&ev.xproperty);
-                break;
-            case UnmapNotify:
-                handle_unmap_event(&ev.xunmap);
-                break;
-            default:
-                if (have_shape && ev.type == shape_event) {
-                    handle_shape_event((XShapeEvent *)&ev);
-                }
+        case KeyPress:
+            handle_key_event(&ev.xkey);
+            break;
+        case ButtonPress:
+            handle_button_event(&ev.xbutton);
+            break;
+        case ConfigureRequest:
+            handle_configure_request(&ev.xconfigurerequest);
+            break;
+        case MapRequest:
+            handle_map_request(&ev.xmaprequest);
+            break;
+        case ClientMessage:
+            handle_client_message(&ev.xclient);
+            break;
+        case EnterNotify:
+            handle_enter_event(&ev.xcrossing);
+            break;
+        case PropertyNotify:
+            handle_property_change(&ev.xproperty);
+            break;
+        case UnmapNotify:
+            handle_unmap_event(&ev.xunmap);
+            break;
+        default:
+            if (have_shape && ev.type == shape_event) {
+                handle_shape_event((XShapeEvent *) & ev);
+            }
         }
     }
 
-    return(1);                          /* ?!?  shouldn't get here */
+    return (1);                                  /* ?!?  shouldn't get here */
 }
 
 void
@@ -144,7 +144,7 @@
      */
 
     display = XOpenDisplay(dpy);
-    if (!display)                           /* couldn't open display */
+    if (!display)                                /* couldn't open display */
         exit(1);
 
     XSetErrorHandler(handle_xerror);
@@ -158,10 +158,10 @@
      * Set up our window management atoms.
      */
 
-    xa_wm_state        = XInternAtom(display, "WM_STATE",         False);
-    xa_wm_change_state = XInternAtom(display, "WM_CHANGE_STATE",  False);
-    xa_wm_protos       = XInternAtom(display, "WM_PROTOCOLS",     False);
-    xa_wm_delete       = XInternAtom(display, "WM_DELETE_WINDOW", False);
+    xa_wm_state = XInternAtom(display, "WM_STATE", False);
+    xa_wm_change_state = XInternAtom(display, "WM_CHANGE_STATE", False);
+    xa_wm_protos = XInternAtom(display, "WM_PROTOCOLS", False);
+    xa_wm_delete = XInternAtom(display, "WM_DELETE_WINDOW", False);
 
     XAllocNamedColor(display, colormap, DEF_FG, &fg, &dummy);
     XAllocNamedColor(display, colormap, DEF_BG, &bg, &dummy);
@@ -183,7 +183,7 @@
     XFreeModifiermap(modmap);
 
     attr.event_mask = KeyPressMask | ChildMask | PropertyChangeMask |
-                      EnterWindowMask | ButtonMask;
+        EnterWindowMask | ButtonMask;
     XChangeWindowAttributes(display, root, CWEventMask, &attr);
 
     for (i = 0; keytab[i].key != 0; i++) {
@@ -201,7 +201,7 @@
 {
     Window root = RootWindow(display, DefaultScreen(display));
     XGrabKey(display, XKeysymToKeycode(display, keycode),
-         modifiers, root, True, GrabModeAsync, GrabModeAsync);
+             modifiers, root, True, GrabModeAsync, GrabModeAsync);
 }
 
 void

=== modified file 'wwm/mapfunctions.c'
--- wwm/mapfunctions.c	2010-10-05 21:34:03 +0000
+++ wwm/mapfunctions.c	2014-07-28 15:29:30 +0000
@@ -14,7 +14,7 @@
  */
 
 void
-move_win_up(Client *c)
+move_win_up(Client * c)
 {
     if (!c)
         return;
@@ -27,7 +27,7 @@
  */
 
 void
-move_win_down(Client *c)
+move_win_down(Client * c)
 {
     if (!c)
         return;
@@ -40,7 +40,7 @@
  */
 
 void
-move_win_left(Client *c)
+move_win_left(Client * c)
 {
     if (!c)
         return;
@@ -53,7 +53,7 @@
  */
 
 void
-move_win_right(Client *c)
+move_win_right(Client * c)
 {
     if (!c)
         return;
@@ -66,7 +66,7 @@
  */
 
 void
-expand_win_y(Client *c)
+expand_win_y(Client * c)
 {
     if (!c)
         return;
@@ -79,7 +79,7 @@
  */
 
 void
-contract_win_y(Client *c)
+contract_win_y(Client * c)
 {
     if (!c || c->height <= WMDELTA)
         return;
@@ -88,7 +88,7 @@
 }
 
 void
-expand_win_x(Client *c)
+expand_win_x(Client * c)
 {
     if (!c)
         return;
@@ -97,7 +97,7 @@
 }
 
 void
-contract_win_x(Client *c)
+contract_win_x(Client * c)
 {
     if (!c || c->width <= WMDELTA)
         return;
@@ -106,7 +106,7 @@
 }
 
 void
-kill_client(Client *c)
+kill_client(Client * c)
 {
     if (!c)
         return;
@@ -114,7 +114,7 @@
 }
 
 void
-raise_client(Client *c)
+raise_client(Client * c)
 {
     if (!c)
         return;
@@ -122,7 +122,7 @@
 }
 
 void
-lower_client(Client *c)
+lower_client(Client * c)
 {
     if (!c)
         return;
@@ -130,118 +130,118 @@
 }
 
 void
-horizontal_toggle(Client *c)
-{
-    if (!c)
-        return;
-    maximise_horiz(c);
-    resize(c, 1);
-}
-
-void
-vertical_toggle(Client *c)
-{
-    if (!c)
-        return;
-    maximise_vert(c);
-    resize(c, 1);
-}
-
-void
-maximize_toggle(Client *c)
-{
-    if (!c)
-        return;
-    maximise_horiz(c);
-    maximise_vert(c);
-    resize(c, 1);
-}
-
-void
-lock_window(Client *c)
+horizontal_toggle(Client * c)
+{
+    if (!c)
+        return;
+    maximise_horiz(c);
+    resize(c, 1);
+}
+
+void
+vertical_toggle(Client * c)
+{
+    if (!c)
+        return;
+    maximise_vert(c);
+    resize(c, 1);
+}
+
+void
+maximize_toggle(Client * c)
+{
+    if (!c)
+        return;
+    maximise_horiz(c);
+    maximise_vert(c);
+    resize(c, 1);
+}
+
+void
+lock_window(Client * c)
 {
     if (!c)
         return;
     XSetWindowBackground(display, c->parent,
-             c->vdesk == LOCKED ? fg.pixel : fc.pixel);
+                         c->vdesk == LOCKED ? fg.pixel : fc.pixel);
     XClearWindow(display, c->parent);
     c->vdesk = c->vdesk == LOCKED ? vdesk_get() : LOCKED;
 }
 
 void
-new_term(Client *c)
+new_term(Client * c)
 {
     spawn(term);
 }
 
 void
-next_client(Client *c)
+next_client(Client * c)
 {
     next(current);
 }
 
 void
-quit_wm(Client *c)
+quit_wm(Client * c)
 {
     handle_signal(SIGHUP);
 }
 
 void
-start_passthrough(Client *c)
+start_passthrough(Client * c)
 {
     passthrough++;
 }
 
 void
-goto_vdesk_0(Client *c)
+goto_vdesk_0(Client * c)
 {
     switch_vdesk(0);
 }
 
 void
-goto_vdesk_1(Client *c)
+goto_vdesk_1(Client * c)
 {
     switch_vdesk(1);
 }
 
 void
-goto_vdesk_2(Client *c)
+goto_vdesk_2(Client * c)
 {
     switch_vdesk(2);
 }
 
 void
-goto_vdesk_3(Client *c)
+goto_vdesk_3(Client * c)
 {
     switch_vdesk(3);
 }
 
 void
-goto_vdesk_4(Client *c)
+goto_vdesk_4(Client * c)
 {
     switch_vdesk(4);
 }
 
 void
-goto_vdesk_5(Client *c)
+goto_vdesk_5(Client * c)
 {
     switch_vdesk(5);
 }
 
 void
-goto_vdesk_6(Client *c)
+goto_vdesk_6(Client * c)
 {
     switch_vdesk(6);
 }
 
 void
-goto_vdesk_7(Client *c)
+goto_vdesk_7(Client * c)
 {
     switch_vdesk(7);
 }
 
 void
-prev_vdesk(Client *c)
+prev_vdesk(Client * c)
 {
     int v = vdesk(VDESK_PREV, VDESK_NULL);
     switch_vdesk(v);
@@ -249,7 +249,7 @@
 }
 
 void
-next_vdesk(Client *c)
+next_vdesk(Client * c)
 {
     int v = vdesk(VDESK_NEXT, VDESK_NULL);
     switch_vdesk(v);
@@ -257,57 +257,57 @@
 }
 
 void
-top_left(Client *c)
-{
-    if (!c)
-        return;
-
-    c->x = c->border;
-    c->y = c->border;
-    move(c, 1);
-}
-
-void
-top_right(Client *c)
-{
-    if (!c)
-        return;
-
-    c->x = xmax() - (c->width + c->border);
-    c->y = c->border;
-    move(c, 1);
-}
-
-void
-bottom_left(Client *c)
-{
-    if (!c)
-        return;
-
-    c->x = c->border;
-    c->y = ymax() - (c->height + c->border);
-    move(c, 1);
-}
-
-void
-bottom_right(Client *c)
-{
-    if (!c)
-        return;
-
-    c->x = xmax() - (c->width + c->border);
-    c->y = ymax() - (c->height + c->border);
-    move(c, 1);
-}
-
-void
-toggle_focus(Client *c)
+top_left(Client * c)
+{
+    if (!c)
+        return;
+
+    c->x = c->border;
+    c->y = c->border;
+    move(c, 1);
+}
+
+void
+top_right(Client * c)
+{
+    if (!c)
+        return;
+
+    c->x = xmax() - (c->width + c->border);
+    c->y = c->border;
+    move(c, 1);
+}
+
+void
+bottom_left(Client * c)
+{
+    if (!c)
+        return;
+
+    c->x = c->border;
+    c->y = ymax() - (c->height + c->border);
+    move(c, 1);
+}
+
+void
+bottom_right(Client * c)
+{
+    if (!c)
+        return;
+
+    c->x = xmax() - (c->width + c->border);
+    c->y = ymax() - (c->height + c->border);
+    move(c, 1);
+}
+
+void
+toggle_focus(Client * c)
 {
     nomousefocus = (nomousefocus + 1) % 2;
 }
 
 void
-dummy_func(Client *c)
+dummy_func(Client * c)
 {
     return;
 }

=== modified file 'wwm/misc.c'
--- wwm/misc.c	2010-10-31 17:59:56 +0000
+++ wwm/misc.c	2014-07-28 15:29:30 +0000
@@ -52,12 +52,12 @@
 }
 
 int
-handle_xerror(Display *dpy, XErrorEvent *e)
+handle_xerror(Display * dpy, XErrorEvent * e)
 {
     Client *c = find_client(e->resourceid);
 
     if (ignore_xerror)
-        return(0);
+        return (0);
 
     if (e->error_code == BadAccess &&
         e->request_code == X_ChangeWindowAttributes)
@@ -66,11 +66,11 @@
     if (c)
         remove_client(c, NOT_QUITTING);
 
-    return(0);
+    return (0);
 }
 
 int
-handle_xexit(Display *dpy)
+handle_xexit(Display * dpy)
 {
     exit(0);
 }
@@ -81,16 +81,16 @@
     static int my_vdesk = 0;
 
     switch (vdesk_command) {
-        case VDESK_GET:
-            return(my_vdesk);
-        case VDESK_SET:
-            my_vdesk = vdesk_option;
-            return(my_vdesk);
-        case VDESK_NEXT:
-            return((my_vdesk + 1) % VDESK_MAX);
-        case VDESK_PREV:
-            return((my_vdesk ? my_vdesk - 1 : ( VDESK_MAX - 1)) % VDESK_MAX);
-        default:
-            return(my_vdesk);
+    case VDESK_GET:
+        return (my_vdesk);
+    case VDESK_SET:
+        my_vdesk = vdesk_option;
+        return (my_vdesk);
+    case VDESK_NEXT:
+        return ((my_vdesk + 1) % VDESK_MAX);
+    case VDESK_PREV:
+        return ((my_vdesk ? my_vdesk - 1 : (VDESK_MAX - 1)) % VDESK_MAX);
+    default:
+        return (my_vdesk);
     }
 }

=== modified file 'wwm/new.c'
--- wwm/new.c	2010-10-07 22:52:40 +0000
+++ wwm/new.c	2014-07-28 15:29:30 +0000
@@ -85,13 +85,13 @@
 
     XGetWindowAttributes(display, c->window, &attr);
 
-    c->x      = attr.x;
-    c->y      = attr.y;
-    c->width  = attr.width;
+    c->x = attr.x;
+    c->y = attr.y;
+    c->width = attr.width;
     c->height = attr.height;
     c->border = DEF_BW;
-    c->oldw   = c->oldh = 0;
-    c->vdesk  = vdesk_get();
+    c->oldw = c->oldh = 0;
+    c->vdesk = vdesk_get();
 
     /*
      * Check to make sure that windows are sized properly on map.
@@ -130,11 +130,11 @@
         set_shape(c);
     }
 
-    focus_client(c, RAISE);        /* new windows get focus */
+    focus_client(c, RAISE);                      /* new windows get focus */
 }
 
 void
-init_position(Client *c)
+init_position(Client * c)
 {
     int x, y;
     int xmax = xmax();
@@ -170,7 +170,7 @@
 }
 
 void
-reparent(Client *c)
+reparent(Client * c)
 {
     XSetWindowAttributes p_attr;
     int screen = DefaultScreen(display);
@@ -181,15 +181,15 @@
     p_attr.override_redirect = True;
     p_attr.background_pixel = bg.pixel;
     p_attr.event_mask =
-    ChildMask | ButtonPressMask | ExposureMask | EnterWindowMask;
+        ChildMask | ButtonPressMask | ExposureMask | EnterWindowMask;
     c->parent =
         XCreateWindow(display, root, c->x - c->border,
-              c->y - c->border, c->width + (2 * c->border),
-              c->height + (2 * c->border), 0, DefaultDepth(display,
-                                   screen),
-              CopyFromParent, DefaultVisual(display, screen),
-              CWOverrideRedirect | CWBackPixel | CWEventMask,
-              &p_attr);
+                      c->y - c->border, c->width + (2 * c->border),
+                      c->height + (2 * c->border), 0, DefaultDepth(display,
+                                                                   screen),
+                      CopyFromParent, DefaultVisual(display, screen),
+                      CWOverrideRedirect | CWBackPixel | CWEventMask,
+                      &p_attr);
 
     XAddToSaveSet(display, c->window);
     XSetWindowBorderWidth(display, c->window, 0);

=== modified file 'wwm/screen.c'
--- wwm/screen.c	2010-10-07 22:45:21 +0000
+++ wwm/screen.c	2014-07-28 15:29:30 +0000
@@ -7,7 +7,7 @@
 #include "wwm.h"
 
 void
-draw_outline(Client *c)
+draw_outline(Client * c)
 {
     Window root = ROOTWINDOW;
     static int gc_initialized = 0;
@@ -19,10 +19,11 @@
         gc_initialized++;
         gv.function = GXinvert;
         gv.subwindow_mode = IncludeInferiors;
-        gv.line_width = DEF_BW; /* opt_bw */
+        gv.line_width = DEF_BW;                  /* opt_bw */
 
         invert_gc = XCreateGC(display, root,
-                              GCFunction | GCSubwindowMode | GCLineWidth, &gv);
+                              GCFunction | GCSubwindowMode | GCLineWidth,
+                              &gv);
     }
 
     XDrawRectangle(display, root, invert_gc, c->x - c->border,
@@ -42,7 +43,7 @@
 }
 
 void
-recalculate_sweep(Client *c, int x1, int y1, int x2, int y2)
+recalculate_sweep(Client * c, int x1, int y1, int x2, int y2)
 {
     int basex, basey;
 
@@ -51,9 +52,9 @@
 
     if (c->size->flags & PResizeInc) {
         basex = (c->size->flags & PBaseSize) ? c->size->base_width :
-                (c->size->flags & PMinSize) ? c->size->min_width : 0;
+            (c->size->flags & PMinSize) ? c->size->min_width : 0;
         basey = (c->size->flags & PBaseSize) ? c->size->base_height :
-                (c->size->flags & PMinSize) ? c->size->min_height : 0;
+            (c->size->flags & PMinSize) ? c->size->min_height : 0;
         c->width -= (c->width - basex) % c->size->width_inc;
         c->height -= (c->height - basey) % c->size->height_inc;
     }
@@ -77,7 +78,7 @@
 }
 
 void
-sweep(Client *c)
+sweep(Client * c)
 {
     Window root = ROOTWINDOW;
     static int resize_cursor_initialized = 0;
@@ -98,31 +99,32 @@
 
     draw_outline(c);
 
-    XWarpPointer(display, None, c->window, 0, 0, 0, 0, c->width, c->height);
+    XWarpPointer(display, None, c->window, 0, 0, 0, 0, c->width,
+                 c->height);
 
     for (;;) {
         XMaskEvent(display, MouseMask, &ev);
         switch (ev.type) {
-            case MotionNotify:
-                draw_outline(c);    /* clear */
-                XUngrabServer(display);
-                recalculate_sweep(c, old_cx, old_cy,
-                                  ev.xmotion.x, ev.xmotion.y);
-                XSync(display, False);
-                XGrabServer(display);
-                draw_outline(c);
-                break;
-            case ButtonRelease:
-                draw_outline(c);    /* clear */
-                XUngrabServer(display);
-                XUngrabPointer(display, CurrentTime);
-                return;
+        case MotionNotify:
+            draw_outline(c);                     /* clear */
+            XUngrabServer(display);
+            recalculate_sweep(c, old_cx, old_cy,
+                              ev.xmotion.x, ev.xmotion.y);
+            XSync(display, False);
+            XGrabServer(display);
+            draw_outline(c);
+            break;
+        case ButtonRelease:
+            draw_outline(c);                     /* clear */
+            XUngrabServer(display);
+            XUngrabPointer(display, CurrentTime);
+            return;
         }
     }
 }
 
 void
-drag(Client *c)
+drag(Client * c)
 {
     Window root = ROOTWINDOW;
     static int drag_cursor_initialized = 0;
@@ -145,28 +147,28 @@
     for (;;) {
         XMaskEvent(display, MouseMask, &ev);
         switch (ev.type) {
-            case MotionNotify:
-                draw_outline(c);    /* clear */
-                XUngrabServer(display);
-                c->x = old_cx + (ev.xmotion.x - x1);
-                c->y = old_cy + (ev.xmotion.y - y1);
-                XSync(display, False);
-                XGrabServer(display);
-                draw_outline(c);
-                break;
-            case ButtonRelease:
-                draw_outline(c);    /* clear */
-                XUngrabServer(display);
-                XUngrabPointer(display, CurrentTime);
-                return;
-            default:
-                break;
+        case MotionNotify:
+            draw_outline(c);                     /* clear */
+            XUngrabServer(display);
+            c->x = old_cx + (ev.xmotion.x - x1);
+            c->y = old_cy + (ev.xmotion.y - y1);
+            XSync(display, False);
+            XGrabServer(display);
+            draw_outline(c);
+            break;
+        case ButtonRelease:
+            draw_outline(c);                     /* clear */
+            XUngrabServer(display);
+            XUngrabPointer(display, CurrentTime);
+            return;
+        default:
+            break;
         }
     }
 }
 
 void
-move(Client *c, int set)
+move(Client * c, int set)
 {
     if (!set)
         drag(c);
@@ -177,7 +179,7 @@
 }
 
 void
-resize(Client *c, int set)
+resize(Client * c, int set)
 {
     if (!set)
         sweep(c);
@@ -192,7 +194,7 @@
 }
 
 void
-maximise_horiz(Client *c)
+maximise_horiz(Client * c)
 {
     if (c->oldw) {
         c->x = c->oldx;
@@ -207,7 +209,7 @@
 }
 
 void
-maximise_vert(Client *c)
+maximise_vert(Client * c)
 {
     if (c->oldh) {
         c->y = c->oldy;
@@ -222,7 +224,7 @@
 }
 
 void
-hide(Client *c)
+hide(Client * c)
 {
     c->ignore_unmap = 2;
     XUnmapWindow(display, c->parent);
@@ -231,11 +233,12 @@
 }
 
 void
-unhide(Client *c, int raiseit)
+unhide(Client * c, int raiseit)
 {
     c->ignore_unmap = 0;
     XMapWindow(display, c->window);
-    raiseit ? XMapRaised(display, c->parent) : XMapWindow(display, c->parent);
+    raiseit ? XMapRaised(display, c->parent) : XMapWindow(display,
+                                                          c->parent);
     set_wm_state(c, NormalState);
 }
 
@@ -244,14 +247,14 @@
  */
 
 void
-next(Client *c)
+next(Client * c)
 {
     Client *newc;
 
-    newc = next_client_on_vdesk(( c ? c : head_client));
+    newc = next_client_on_vdesk((c ? c : head_client));
 
     if (!newc)
-        return;         /* couldn't find a next on this screen */
+        return;                                  /* couldn't find a next on this screen */
 
     focus_client(newc, RAISE);
 }
@@ -284,7 +287,7 @@
 }
 
 void
-focus_client(Client *c, int raiseit)
+focus_client(Client * c, int raiseit)
 {
     Client *cp;
 
@@ -304,7 +307,7 @@
 
 
 void
-unfocus_client(Client *c)
+unfocus_client(Client * c)
 {
     XSetInputFocus(display, PointerRoot, RevertToPointerRoot, CurrentTime);
     XSetWindowBackground(display, c->parent, bg.pixel);

=== modified file 'wwm/sendkey.c'
--- wwm/sendkey.c	2010-10-07 22:45:21 +0000
+++ wwm/sendkey.c	2014-07-28 15:29:30 +0000
@@ -12,16 +12,16 @@
  */
 
 void
-key_to_event(KeySym key, XEvent *event, Window w, int type)
+key_to_event(KeySym key, XEvent * event, Window w, int type)
 {
-    event->xkey.type    = type;
+    event->xkey.type = type;
     event->xkey.display = display;
-    event->xkey.root    = RootWindow(display, DefaultScreen(display));
-    event->xkey.time    = CurrentTime;
-    event->xkey.x       = event->xkey.y = 0;
-    event->xkey.x_root  = event->xkey.y_root = 0;
-    event->xkey.state   = WMMODMASK;
-    event->xkey.window  = w;
+    event->xkey.root = RootWindow(display, DefaultScreen(display));
+    event->xkey.time = CurrentTime;
+    event->xkey.x = event->xkey.y = 0;
+    event->xkey.x_root = event->xkey.y_root = 0;
+    event->xkey.state = WMMODMASK;
+    event->xkey.window = w;
     event->xkey.keycode = XKeysymToKeycode(display, key);
 }