From 66e1fcc6827a89205bb44ff4b9b29c9c0ef91fab Mon Sep 17 00:00:00 2001
From: Charles Haley <>
Date: Sun, 6 Mar 2011 10:21:17 +0000
Subject: [PATCH] Fix #9293 - Category rename is not case sensitive, name can
 clash with itself

---
 src/calibre/gui2/tag_view.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/calibre/gui2/tag_view.py b/src/calibre/gui2/tag_view.py
index 586715afd0..11b696d861 100644
--- a/src/calibre/gui2/tag_view.py
+++ b/src/calibre/gui2/tag_view.py
@@ -1340,7 +1340,8 @@ class TagsModel(QAbstractItemModel): # {{{
             for c in sorted(user_cats.keys(), key=sort_key):
                 if icu_lower(c).startswith(ckey_lower):
                     if len(c) == len(ckey):
-                        if nkey_lower in user_cat_keys_lower:
+                        if strcmp(ckey, nkey) != 0 and \
+                                nkey_lower in user_cat_keys_lower:
                             error_dialog(self.tags_view, _('Rename user category'),
                                 _('The name %s is already used')%nkey, show=True)
                             return False
@@ -1348,7 +1349,8 @@ class TagsModel(QAbstractItemModel): # {{{
                         del user_cats[ckey]
                     elif c[len(ckey)] == '.':
                         rest = c[len(ckey):]
-                        if icu_lower(nkey + rest) in user_cat_keys_lower:
+                        if strcmp(ckey, nkey) != 0 and \
+                                    icu_lower(nkey + rest) in user_cat_keys_lower:
                             error_dialog(self.tags_view, _('Rename user category'),
                                 _('The name %s is already used')%(nkey+rest), show=True)
                             return False