Merge windows+cc branch into cairocanvas branch. Not finished, need to now merge...

[ardour.git] / libs / clearlooks-newer / clearlooks_rc_style.c

diff --git a/libs/clearlooks-newer/clearlooks_rc_style.c b/libs/clearlooks-newer/clearlooks_rc_style.c
index 9f8fbd4945273f47b11c5b7092232fbc6be1c0d8..8d6e0aa898139aa92d9c49b51400405d106669ee 100644 (file)
--- a/libs/clearlooks-newer/clearlooks_rc_style.c
+++ b/libs/clearlooks-newer/clearlooks_rc_style.c
@@ -173,9 +173,9 @@ clearlooks_gtk2_rc_parse_boolean (GtkSettings *settings,
                      GScanner     *scanner,
                      gboolean *retval)
 {
-       (void) settings;
-       
        guint token;
+
+       (void) settings;
        token = g_scanner_get_next_token(scanner);
 
        token = g_scanner_get_next_token(scanner);
@@ -198,10 +198,10 @@ clearlooks_gtk2_rc_parse_color(GtkSettings  *settings,
                  GScanner     *scanner,
                  GdkColor     *color)
 {
-       (void) settings;
-       
        guint token;
 
+       (void) settings;
+
        /* Skip 'blah_color' */
        token = g_scanner_get_next_token(scanner);
 
@@ -217,10 +217,10 @@ clearlooks_gtk2_rc_parse_double (GtkSettings  *settings,
                                  GScanner     *scanner,
                                  gdouble      *val)
 {
-       (void) settings;
-       
        guint token;
 
+       (void) settings;
+
        /* Skip 'blah' */
        token = g_scanner_get_next_token(scanner);
 
@@ -242,10 +242,10 @@ clearlooks_gtk2_rc_parse_int (GtkSettings  *settings,
                         GScanner     *scanner,
                         guint8       *progressbarstyle)
 {
-       (void) settings;
-
        guint token;
 
+       (void) settings;
+
        /* Skip 'sunkenmenubar' */
        token = g_scanner_get_next_token(scanner);
 
@@ -267,10 +267,10 @@ clearlooks_gtk2_rc_parse_style (GtkSettings      *settings,
                                 GScanner         *scanner,
                                 ClearlooksStyles *style)
 {
-       (void) settings;
-
        guint token;
 
+       (void) settings;
+
        g_assert (CL_NUM_STYLES == CL_STYLE_GUMMY + 1); /* so that people don't forget ;-) */
 
        /* Skip 'style' */
@@ -308,10 +308,10 @@ clearlooks_gtk2_rc_parse_dummy (GtkSettings      *settings,
                                 GScanner         *scanner,
                                 const gchar      *name)
 {
-       (void) settings;
-
        guint token;
 
+       (void) settings;
+
        /* Skip option */
        token = g_scanner_get_next_token (scanner);