diff --git a/src/client.c b/src/client.c
index 58f18d9b90488008bb7bf1d799bbea30bdd7a0ff..8801ffb3feab52251b0bc8e46c52603ec26994c3 100644
--- a/src/client.c
+++ b/src/client.c
@@ -2462,7 +2462,7 @@ clientToggleShowDesktop (ScreenInfo *screen_info)
         {
             Client *c = (Client *) index->data;
             if ((c->type & WINDOW_REGULAR_FOCUSABLE) 
-                && !FLAG_TEST_ALL (c->flags, CLIENT_FLAG_ICONIFIED | CLIENT_FLAG_SKIP_TASKBAR))
+                && !FLAG_TEST (c->flags, CLIENT_FLAG_ICONIFIED | CLIENT_FLAG_SKIP_TASKBAR))
             {
                 FLAG_SET (c->xfwm_flags, XFWM_FLAG_WAS_SHOWN);
                 clientHide (c, c->win_workspace, TRUE);
diff --git a/src/main.c b/src/main.c
index 261dd6fe9baefce538615be32beb6d6f7cee280d..12edf80ee02f19571ac963ea70c2e4eb25b7ce93 100644
--- a/src/main.c
+++ b/src/main.c
@@ -400,7 +400,7 @@ initialize (int argc, char **argv, gint compositor_mode)
 
     TRACE ("entering initialize");
 
-    xfce_textdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
+    xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
 
     gtk_init (&argc, &argv);
 
@@ -439,13 +439,13 @@ initialize (int argc, char **argv, gint compositor_mode)
     sigaction (SIGUSR1, &act, NULL);
     sigaction (SIGSEGV, &act, NULL);
 
-    nscreens = gdk_display_get_n_screens(display_info->gdisplay);
+    nscreens = gdk_display_get_n_screens (display_info->gdisplay);
     for(i = 0; i < nscreens; i++)
     {
         ScreenInfo *screen_info;
         GdkScreen *gscr;
 
-        gscr = gdk_display_get_screen(display_info->gdisplay, i);
+        gscr = gdk_display_get_screen (display_info->gdisplay, i);
         screen_info = myScreenInit (display_info, gscr, MAIN_EVENT_MASK);
 
         if (!screen_info)
@@ -549,12 +549,12 @@ main (int argc, char **argv)
             compositor = parse_compositor (argv[i]);
         }
 #endif /* HAVE_COMPOSITOR */
-        else if (!strcmp(argv[i], "--version") || !strcmp(argv[i], "-V"))
+        else if (!strcmp (argv[i], "--version") || !strcmp (argv[i], "-V"))
         {
             print_version ();
             exit (0);
         }
-        else if (!strcmp(argv[i], "--help") || !strcmp(argv[i], "-H"))
+        else if (!strcmp (argv[i], "--help") || !strcmp (argv[i], "-H"))
         {
             print_usage ();
             exit (0);
@@ -581,9 +581,9 @@ main (int argc, char **argv)
             if (daemon_mode)
             {
 #ifdef HAVE_DAEMON
-                if (daemon(TRUE, TRUE) < 0)
+                if (daemon (TRUE, TRUE) < 0)
                 {
-                        g_warning("Failed to enter daemon mode: %s", g_strerror(errno));
+                        g_warning ("Failed to enter daemon mode: %s", g_strerror(errno));
                         exit(EXIT_FAILURE);
                 }
 #else /* !HAVE_DAEMON */