Merge lp:~parthpanchl/gtg/workspace into lp:~gtg/gtg/old-trunk

[Parth Panchal]

Fixes Bug #1261772

Fixes Bug #1261772:
-> Escapes the tagname in the Treeview preserving xml formatting tags by parsing it using regex.
-> XML libraries couldn't be used for parsing because the tagname may contain unescaped characters.

[lp:~parthpanchl/gtg/workspace]

1361. By Parth Panchal on 2014-03-05

Fixes unecessary comments & newlines

1362. By Parth Panchal on 2014-03-05

Resolves conflicts

[Parin Porecha (parinporecha)]

Parth >

I reviewed your patch, it solves the bug. Great !
However the Gtk warnings are still there

Gtk-WARNING **: Failed to set text from markup due to error parsing markup: Error on line 1: Entity did not end with a semicolon; most likely you used an ampersand character without intending to start an entity - escape ampersand as &

Please fix them, and I'll merge the patch.

review: Needs Fixing

[Izidor Matušov (izidor)]

GTG moved the primary code hosting over to Github: https://github.com/getting-things-gnome

If your patch is still relevant and you would like to get it merged, create a pull request on github against branch https://github.com/getting-things-gnome/gtg

[Parth Panchal (parthpanchl)]

Izidor >
I couldn't find time for this bug, so it just slipped out of my mind. I'll fix it & send the pull request directly to the Github repo.

Unmerged revisions

1362. By Parth Panchal on 2014-03-05

Resolves conflicts

1361. By Parth Panchal on 2014-03-05

Fixes unecessary comments & newlines

1360. By Parth Panchal on 2014-03-04

Updates Changelog & Authors

1359. By Parth Panchal on 2014-03-04

Fixes Bug #1261772

=== modified file 'AUTHORS'
--- AUTHORS	2014-03-01 21:15:24 +0000
+++ AUTHORS	2014-03-05 18:57:07 +0000
@@ -132,4 +132,5 @@
 * Sagar Ghuge <[e-mail]>
 * Sushant Raikar <[e-mail]>
 * Atit Anand <[e-mail]>
-* Sara Ribeiro <[e-mail]>
+* Parth P. Panchal <[e-mail]>
+* Sara Ribeiro <[e-mail]>
\ No newline at end of file

=== modified file 'CHANGELOG'
--- CHANGELOG	2014-03-01 21:15:24 +0000
+++ CHANGELOG	2014-03-05 18:57:07 +0000
@@ -17,6 +17,7 @@
     * Fix for bug #644993 : Automatic generation of tag color, by Atit Anand
     * Fix for bug #1286491 : RTM sync backend fails to load, by Pawan Hegde
     * Fix for bug #1286493 : GTG cannot connect to RTM, by Pawan Hegde
+    * Fix for bug #1261772 : Creating a tag with "&" in it causes it to be not displayed in tag sidebar, by Parth Panchal
     * Fix for bug #1288011 : More intuitive title label for tasks, by Sara Ribeiro
 
 2013-11-24 Getting Things GNOME! 0.3.1

=== modified file 'GTG/gtk/browser/treeview_factory.py'
--- GTG/gtk/browser/treeview_factory.py	2014-03-01 21:15:24 +0000
+++ GTG/gtk/browser/treeview_factory.py	2014-03-05 18:57:07 +0000
@@ -20,6 +20,7 @@
 from gi.repository import GObject, Gtk, Pango
 import xml.sax.saxutils as saxutils
 import locale
+import re
 
 from GTG import _
 from GTG.core import CoreConfig
@@ -217,7 +218,15 @@
         if node.get_attribute("nonworkview") == "True":
             return "<span color='%s'>%s</span>" % (self.unactive_color, label)
         else:
-            return label
+            formatted = re.search(">.+?</", label)
+            if formatted:
+                # Get position of the data between formatting tags
+                start = formatted.start() + 1
+                end = formatted.end() - 2
+                # Escapes data
+                return label[ : start] + saxutils.escape(label[start : end]) + label[end : ]
+            else:
+                return saxutils.escape(label)
 
     def get_tag_count(self, node):
         if node.get_id() == 'search':