- if (!reconfig)
- screen_num_desktops = 0;
- screen_set_num_desktops(config_desktops_num);
- if (!reconfig) {
- guint32 d;
- /* start on the current desktop when a wm was already running */
- if (PROP_GET32(RootWindow(ob_display, ob_screen),
- net_current_desktop, cardinal, &d) &&
- d < screen_num_desktops)
- {
- screen_set_desktop(d, FALSE);
- } else if (session_desktop >= 0)
- screen_set_desktop(MIN((guint)session_desktop,
- screen_num_desktops), FALSE);
- else
- screen_set_desktop(MIN(config_screen_firstdesk,
- screen_num_desktops) - 1, FALSE);
+ /* set the number of desktops, if it's not already set.
+
+ this will also set the default names from the config file up for
+ desktops that don't have names yet */
+ screen_num_desktops = 0;
+ if (PROP_GET32(RootWindow(ob_display, ob_screen),
+ net_number_of_desktops, cardinal, &d))
+ screen_set_num_desktops(d);
+ /* restore from session if possible */
+ else if (session_num_desktops)
+ screen_set_num_desktops(session_num_desktops);
+ else
+ screen_set_num_desktops(config_desktops_num);
+
+ /* start on the current desktop when a wm was already running */
+ if (PROP_GET32(RootWindow(ob_display, ob_screen),
+ net_current_desktop, cardinal, &d) &&
+ d < screen_num_desktops)
+ {
+ screen_set_desktop(d, FALSE);
+ } else if (session_desktop >= 0)
+ screen_set_desktop(MIN((guint)session_desktop,
+ screen_num_desktops), FALSE);
+ else
+ screen_set_desktop(MIN(config_screen_firstdesk,
+ screen_num_desktops) - 1, FALSE);