From b0d57862123de3b5de24738e542ca8949521220d Mon Sep 17 00:00:00 2001
From: Carsten Haitzler <raster@rasterman.com>
Date: Sat, 19 Mar 2005 12:33:24 +0000
Subject: [PATCH] fixed pager stick/unstick/duplication problem (thanks
 catalyst/JC) :)

SVN revision: 13789
---
 TODO                           |  1 -
 src/modules/pager/e_mod_main.c | 46 ++++++++++++++++++++++++++--------
 2 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/TODO b/TODO
index ccd23099e..a43d57f53 100644
--- a/TODO
+++ b/TODO
@@ -30,7 +30,6 @@ Current freeze issues are:
 ISSUES:
 
 * ibar doesnt handle autoscroll when it starts up (only after a gadman resize)
-* consoldiate client lists - we have client lists for containers, zones, desks AND e_borders.c consolidate into 1 list that has all borders with their stacking and what desk they belong to (and thus zone and container)
 * virtual desktops need an overhaul. hacked in waay too quickly.
 * virtual desktops need fixing to work with zones properly
 * gadman gadget menu needs icons :)
diff --git a/src/modules/pager/e_mod_main.c b/src/modules/pager/e_mod_main.c
index e743c6958..f7f9eac9b 100644
--- a/src/modules/pager/e_mod_main.c
+++ b/src/modules/pager/e_mod_main.c
@@ -131,7 +131,7 @@ int
 about(E_Module *module)
 {
    e_error_dialog_show("Enlightenment Pager Module",
-		       "A pager module to navigate E17 desktops.");
+		       "A pager module to navigate virtual desktops.");
    return 1;
 }
 
@@ -929,22 +929,46 @@ _pager_face_cb_event_border_desk_set(void *data, int type, void *event)
    Pager_Face              *face;
    Pager_Win               *pw;
    Pager_Desk              *pd;
-
+   Evas_List               *l;
+   int                      found = 0;
+   
    face = data;
    ev = event;
    if (face->zone != ev->border->zone) return 1;
    if (ev->border->sticky) return 1;
 
-   pw = _pager_face_border_find(face, ev->border);
-   pd = _pager_face_desk_find(face, ev->border->desk);
-   if ((pw) && (pd))
+   for (l = face->desks; l; l = l->next)
      {
-	pw->desk->wins = evas_list_remove(pw->desk->wins, pw);
-	pw->desk = pd;
-	pd->wins = evas_list_append(pd->wins, pw);
-	e_layout_unpack(pw->window_object);
-	e_layout_pack(pd->layout_object, pw->window_object);
-	_pager_window_move(face, pw);
+	pd = l->data;
+        if (ev->border->desk != pd->desk)
+	  {
+	     pw = _pager_desk_border_find(pd, ev->border);
+	     if (pw)
+	       {
+		  pd->wins = evas_list_remove(pd->wins, pw);
+		  _pager_window_free(pw);
+	       }
+	  }
+	else
+	  {
+	     pw = _pager_desk_border_find(pd, ev->border);
+	     if (pw) found = 1;
+	  }
+     }
+   if (!found)
+     {
+	pw = _pager_face_border_find(face, ev->border);
+	pd = _pager_face_desk_find(face, ev->border->desk);
+	if ((pw) && (pd))
+	  {
+	     pw->desk->wins = evas_list_remove(pw->desk->wins, pw);
+	     e_layout_unpack(pw->window_object);
+	     
+	     pw->desk = pd;
+	     pd->wins = evas_list_append(pd->wins, pw);
+	     e_layout_pack(pd->layout_object, pw->window_object);
+	     _pager_window_move(face, pw);
+	  }
      }
    return 1;
 }