--- moin-1.6.orig/MoinMoin/theme/__init__.py	2007-12-01 17:11:30.000000000 +0200
+++ moin-1.6/MoinMoin/theme/__init__.py	2007-12-01 17:11:55.000000000 +0200
@@ -1219,10 +1219,10 @@
 
         _ = self.request.getText
         if self.request.user.isQuickLinkedTo([page.page_name]):
-            text = _("Remove Link", formatted=False)
+            action, text = 'quickunlink', _("Remove Link", formatted=False)
         else:
-            text = _("Add Link", formatted=False)
-        return page.link_to(self.request, text=text, querystr={'action': 'quicklink'}, css_class='nbquicklink', rel='nofollow')
+            action, text = 'quicklink', _("Add Link", formatted=False)
+        return page.link_to(self.request, text=text, querystr={'action': action}, css_class='nbquicklink', rel='nofollow')
 
     def attachmentsLink(self, page):
         """ Return link to page attachments """

--- moin-1.6.orig/MoinMoin/action/quicklink.py	2007-12-01 17:11:30.000000000 +0200
+++ moin-1.6/MoinMoin/action/quicklink.py	2007-12-01 17:12:07.000000000 +0200
@@ -15,16 +15,12 @@
 
     if not request.user.valid:
         msg = _("You must login to add a quicklink.", formatted=False)
-    elif request.user.isQuickLinkedTo([pagename]):
-        if request.user.removeQuicklink(pagename):
-            msg = _('Your quicklink to this page has been removed.', formatted=False)
-        else: # should not happen
-            msg = _('Your quicklink to this page could not be removed.', formatted=False)
-    else:
+    elif not request.user.isQuickLinkedTo([pagename]):
         if request.user.addQuicklink(pagename):
             msg = _('A quicklink to this page has been added for you.', formatted=False)
         else: # should not happen
             msg = _('A quicklink to this page could not be added for you.', formatted=False)
+    else:
+        msg = _('You already have a quicklink to this page.', formatted=False)
 
-    Page(request, pagename).send_page(msg=msg)
-
+    Page(request, pagename).send_page(msg=msg)

--- moin-1.6.orig/MoinMoin/action/quickunlink.py	1970-01-01 02:00:00.000000000 +0200
+++ moin-1.6/MoinMoin/action/quickunlink.py	2007-12-01 17:12:07.000000000 +0200
@@ -0,0 +1,26 @@
+# -*- coding: iso-8859-1 -*-
+"""
+    MoinMoin - remove a quicklink from the user's quicklinks
+
+    @copyright: 2000-2004 Juergen Hermann <jh@web.de>,
+                2006 MoinMoin:ThomasWaldmann
+    @license: GNU GPL, see COPYING for details.
+"""
+from MoinMoin.Page import Page
+
+def execute(pagename, request):
+    """ Remove the current wiki page from the user's quicklinks """
+    _ = request.getText
+    msg = None
+
+    if not request.user.valid:
+        msg = _("You must login to remove a quicklink.", formatted=False)
+    elif request.user.isQuickLinkedTo([pagename]):
+        if request.user.removeQuicklink(pagename):
+            msg = _('Your quicklink to this page has been removed.', formatted=False)
+        else: # should not happen
+            msg = _('Your quicklink to this page could not be removed.', formatted=False)
+    else:
+        msg = _('You need to have a quicklink to this page to remove it.', formatted=False)
+
+    Page(request, pagename).send_page(msg=msg)