Merge lp:~parinporecha/gtg/more_patches into lp:~gtg/gtg/old-trunk

[Parin Porecha]

This is a patch for the Bug #1079143 ( Adding the same custom color in tag editor multiple times raises an Exception ).

[lp:~parinporecha/gtg/more_patches]

1275. By Parin Porecha on 2013-01-13

updated patch, removed set function, added simpler way

[Izidor Matušov (izidor)]

Thank you for your contribution!

review: Approve (code, running)

=== modified file 'CHANGELOG'
--- CHANGELOG	2013-01-11 15:14:38 +0000
+++ CHANGELOG	2013-01-13 20:52:19 +0000
@@ -10,6 +10,7 @@
     * Russian localization of help by DmDr
     * Fix for bug #1096622: Damaged image in the help, by Parin Porecha
     * Fix for bug #1095390: Quick Add bar incorrectly parses tags, by Parin Porecha
+    * Fix for bug #1079143: Adding the same custom color in tag editor multiple times raises an Exception, by Parin Porecha
 
 2012-11-06 Getting Things GNOME! 0.3
     * Hide tasks with due date someday, #931376

=== modified file 'GTG/gtk/browser/simple_color_selector.py'
--- GTG/gtk/browser/simple_color_selector.py	2012-12-09 12:18:39 +0000
+++ GTG/gtk/browser/simple_color_selector.py	2013-01-13 20:52:19 +0000
@@ -303,7 +303,8 @@
 
     def add_custom_color(self, col):
         """Add a color to the palette, at the first position"""
-        self.custom_colors.insert(0, col)
+        if col not in self.custom_colors:
+            self.custom_colors.insert(0, col)
         if len(self.custom_colors) > self.width:
             self.custom_colors.pop()
         self.__build_custom_palette()