--- ../orig/xfce-desktop-settings.c	2007-11-17 20:31:41.000000000 +0100
+++ ../really_new_and_good/xfce-desktop-settings.c	2008-03-17 09:53:35.000000000 +0100
@@ -218,6 +218,7 @@
     gint screen, i, nmonitors;
     XfceBackdrop *backdrop;
     GdkColor color;
+    McsResult result;
     
     TRACE("entering");
     
@@ -245,13 +246,19 @@
     } else
         xfce_desktop_set_icon_style(desktop, XFCE_DESKTOP_ICON_STYLE_WINDOWS);
     
-    if(MCS_SUCCESS == mcs_client_get_setting(mcs_client, "icons_font_size",
-                                             BACKDROP_CHANNEL, &setting))
+    result = mcs_client_get_setting(mcs_client, "icons_font_size",
+                                    BACKDROP_CHANNEL, &setting);
+    if(MCS_SUCCESS == result)
     {
         xfce_desktop_set_icon_font_size(desktop, setting->data.v_int);
-        mcs_setting_free(setting);
-        setting = NULL;
     }
+    else if(MCS_NO_ENTRY == result)
+    {
+        /* Using 12px as the default icon font size: */
+        xfce_desktop_set_icon_font_size(desktop, 12);
+    }
+    mcs_setting_free(setting);
+    setting = NULL;
     
     if(MCS_SUCCESS == mcs_client_get_setting(mcs_client, 
                                              "icons_use_system_font_size",