Merge branch 'mikabox/maybe' into wip/mikabox

Conflicts:
	openbox/client_list_combined_menu.c

diff --cc openbox/client_list_combined_menu.c
index 464036f768445398359ad5ec8cfb3bbfda9638f0,49f11853da113ab317e153bf8563024260d0ea20..2b2ff47d687785ead69780a9c3bcf05cecff977f
--- 1/openbox/client_list_combined_menu.c
--- 2/openbox/client_list_combined_menu.c
+++ b/openbox/client_list_combined_menu.c
@@@ -46,10 -46,15 +46,16 @@@ static gboolean self_update(ObMenuFram
  
      menu_clear_entries(menu);
  
-     for (desktop = 0; desktop < screen_num_desktops; desktop++) {
+     for (desktop_it = 0; desktop_it < screen_num_desktops; desktop_it++) {
          gboolean empty = TRUE;
          gboolean onlyiconic = TRUE;
 +        gboolean noicons = TRUE;
+         
+         desktop = desktop_it;
+         if (desktop == 0)
+             desktop = screen_desktop;
+         else if (desktop <= screen_desktop)
+             desktop -= 1;
  
          menu_add_separator(menu, SEPARATOR, screen_desktop_names[desktop]);
          for (it = focus_order; it; it = g_list_next(it)) {

diff --cc openbox/menu.h
Simple merge

diff --cc openbox/menuframe.c
Simple merge