From: Mikael Magnusson <mikachu@gmail.com>
Date: Sun, 8 Feb 2009 07:52:07 +0000 (+0100)
Subject: Merge branch 'mikabox/maybe' into wip/mikabox
X-Git-Tag: mikabox-3.4.7.2~18
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=56c80ed489ab78a4c254d9c0802959fa41a41f2b;p=mikachu%2Fopenbox.git

Merge branch 'mikabox/maybe' into wip/mikabox

Conflicts:
	openbox/client_list_combined_menu.c
---

56c80ed489ab78a4c254d9c0802959fa41a41f2b
diff --cc openbox/client_list_combined_menu.c
index 464036f7,49f11853..2b2ff47d
--- a/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)) {