Index: src/menu.c =================================================================== RCS file: /var/cvs/xfce/xfce4/xfwm4/src/menu.c,v retrieving revision 1.37 diff -u -u -r1.37 menu.c --- src/menu.c 3 Jan 2004 21:21:56 -0000 1.37 +++ src/menu.c 5 Mar 2004 23:00:56 -0000 @@ -157,21 +157,25 @@ GtkWidget *menu_widget; GtkWidget *mi; MenuData *md; - gchar *name; + NetkScreen *netk_screen = netk_screen_get_default (); + NetkWorkspace *nkws; menu_widget = gtk_menu_new (); + netk_screen_force_update (netk_screen); + for (i = 0; i < nws; i++) { - name = g_strdup_printf (_("Workspace %i"), i + 1); - mi = gtk_check_menu_item_new_with_label (name); + nkws = netk_screen_get_workspace (netk_screen, i); + if (!NETK_IS_WORKSPACE (nkws)) + continue; + mi = gtk_check_menu_item_new_with_label (netk_workspace_get_name (nkws)); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (mi), (i == ws)); gtk_widget_show (mi); if (insensitive & MENU_OP_WORKSPACES) { gtk_widget_set_sensitive (mi, FALSE); } - g_free (name); md = g_new (MenuData, 1); md->menu = menu;