[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-bugs-dist
Subject:    [Bug 64182] When closing the konqueror window that created the
From:       Waldo Bastian <bastian () kde ! org>
Date:       2004-04-14 11:24:16
Message-ID: 20040414112416.7469.qmail () ktown ! kde ! org
[Download RAW message or body]

------- You are receiving this mail because: -------
You are on the CC list for the bug, or are watching someone who is.
      
http://bugs.kde.org/show_bug.cgi?id=64182      




------- Additional Comments From bastian kde org  2004-04-14 13:24 -------
CVS commit by waba: 

Preserve windowIds when refreshing a cookie. (BR64182)
Thanks to Harald Fielker for test-case.
CCMAIL: 64182 bugs kde org


  M +15 -3     kcookiejar.cpp   1.111.2.3


--- kdelibs/kioslave/http/kcookiejar/kcookiejar.cpp  #1.111.2.2:1.111.2.3
 @ -257,5 +257,5  @ KCookieJar::~KCookieJar()
 }
 
-static void removeDuplicateFromList(KHttpCookieList *list, KHttpCookie *cookiePtr, \
bool nameMatchOnly=false) +static void removeDuplicateFromList(KHttpCookieList *list, \
KHttpCookie *cookiePtr, bool nameMatchOnly=false, bool updateWindowId=false)  {
     QString domain1 = cookiePtr->domain();
 @ -277,4 +277,16  @ static void removeDuplicateFromList(KHtt
           )
        {
+          if (updateWindowId)
+          {
+            for(QValueList<long>::ConstIterator it = cookie->windowIds().begin();
+                it != cookie->windowIds().end(); ++it)
+            {
+               long windowId = *it;
+               if (windowId && (cookiePtr->windowIds().find(windowId) == \
cookiePtr->windowIds().end())) +               {
+                  cookiePtr->windowIds().append(windowId);
+               }
+            }
+          }
           KHttpCookiePtr old_cookie = cookie;
           cookie = list->next();
 @ -872,5 +884,5  @ void KCookieJar::addCookie(KHttpCookiePt
         if ( !list ) continue;
 
-        removeDuplicateFromList(list, cookiePtr);
+        removeDuplicateFromList(list, cookiePtr, false, true);
     }


[prev in list] [next in list] [prev in thread] [next in thread]