[Xfce4-commits] <xfwm4:libxfce4ui> Fix a bug introduced yesterday, xfwm4 would not set teh nu, ber of workspaces at startup anymore.

[Olivier Fourdan]

Updating branch refs/heads/libxfce4ui
         to 2622b81065db009ce29ab68f283c7b69820a06ed (commit)
       from 6326bfdd74094ff7f700aa069d02dd965316fcda (commit)

commit 2622b81065db009ce29ab68f283c7b69820a06ed
Author: Olivier Fourdan <fourdan at xfce.org>
Date:   Fri Sep 11 17:20:13 2009 +0200

    Fix a bug introduced yesterday, xfwm4 would not set teh nu,ber of workspaces at startup anymore.

 src/screen.c   |    2 +-
 src/screen.h   |    6 +++---
 src/settings.c |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/screen.c b/src/screen.c
index 3aacc12..aa4969a 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -208,7 +208,7 @@ myScreenInit (DisplayInfo *display_info, GdkScreen *gscr, unsigned long event_ma
     screen_info->margins[STRUTS_RIGHT] = screen_info->gnome_margins[STRUTS_RIGHT] = 0;
     screen_info->margins[STRUTS_BOTTOM] = screen_info->gnome_margins[STRUTS_BOTTOM] = 0;
 
-    screen_info->workspace_count = -1;
+    screen_info->workspace_count = 0;
     screen_info->workspace_names = NULL;
     screen_info->workspace_names_items = 0;
 
diff --git a/src/screen.h b/src/screen.h
index 282060e..8c4b0ac 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -73,10 +73,10 @@ struct _ScreenInfo
     Client *last_raise;
     GList *windows;
     Client *clients;
-    unsigned int client_count;
+    guint client_count;
     unsigned long client_serial;
-    int key_grabs;
-    int pointer_grabs;
+    gint key_grabs;
+    gint pointer_grabs;
 
     /* Theme pixmaps and other params, per screen */
     XfwmColor title_colors[2];
diff --git a/src/settings.c b/src/settings.c
index e75d227..0969faf 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -865,7 +865,7 @@ loadSettings (ScreenInfo *screen_info)
     if (screen_info->workspace_count == 0)
     {
         guint workspace_count;
-        workspace_count = MAX ((guint) getIntValue ("workspace_count", rc), 0);
+        workspace_count = MAX ((guint) getIntValue ("workspace_count", rc), 1);
         workspaceSetCount (screen_info, workspace_count);
     }