Merge lp:~jibel/synaptic/bug.567172 into lp:synaptic

[Jean-Baptiste Lallement]

it's a bit of a hammer, because only '<' need to be escaped.

=== modified file 'gtk/rgmainwindow.cc'
--- gtk/rgmainwindow.cc	2010-03-25 20:34:44 +0000
+++ gtk/rgmainwindow.cc	2010-04-21 22:59:12 +0000
@@ -142,7 +142,7 @@
       if(gtk_tree_model_get_iter_first(model, &iter)) {
 	 do {
 	    gtk_tree_model_get(model, &iter, 0, &str, -1);
-	    if(strcoll(str,subView.c_str()) == 0) {
+	    if(strcoll(str, MarkupEscapeString(subView).c_str()) == 0) {
 	       gtk_tree_selection_select_iter(selection, &iter);
 	       break;
 	    }
@@ -167,6 +167,9 @@
 
    vector<string> subViews = _lister->getSubViews();
 
+   for(unsigned int i=0; i<subViews.size(); i++)
+       subViews[i] = MarkupEscapeString(subViews[i]);
+
    gchar *str = g_strdup_printf("<b>%s</b>", _("All"));
    subViews.insert(subViews.begin(), str);
    g_free(str);
@@ -2645,7 +2648,7 @@
    // at us, see LP: #38397 for more information
    gtk_tree_view_set_model(GTK_TREE_VIEW(me->_treeView), NULL);
 
-   string selected = me->selectedSubView();
+   string selected = MarkupUnescapeString(me->selectedSubView());
    me->_lister->setSubView(utf8(selected.c_str()));
    me->refreshTable(NULL, false);
    me->setBusyCursor(false);

=== modified file 'gtk/rgutils.cc'
--- gtk/rgutils.cc	2008-08-21 14:32:18 +0000
+++ gtk/rgutils.cc	2010-04-21 22:59:12 +0000
@@ -162,6 +162,62 @@
    return _str;
 }
 
+/*
+ * MarkupEscapeString: Escape markup from a string
+ * ----------------------------------------------------
+ * @unescaped: string to escape markup from
+ *
+ * we use g_markup_escape_text which only support 5 standard entities: 
+ * &amp; &lt; &gt; &quot; &apos;
+ * We must escape the string used as list item of a GtkTree
+ */
+ string MarkupEscapeString(string unescaped) {
+   string escaped;
+   char *c_esc = g_markup_escape_text(unescaped.c_str(), -1);
+   escaped = string(c_esc);
+   g_free(c_esc);
+   return escaped;  
+}
+
+/*
+ * MarkupUnescapeString: Unescape markup from a string
+ * ----------------------------------------------------
+ * @escaped: string to unescape markup from
+ * unescaped entities: &amp; &lt; &gt; &quot; &apos;
+ *
+ * sadly there is no simple way to unescape a previously escaped string with 
+ * g_markup_escape_text
+ */
+ string MarkupUnescapeString(string escaped) {
+   size_t pos = 0, end = 0;
+   string entity, str;
+   while ((pos = escaped.find("&", pos)) != string::npos ) {
+      end = escaped.find(";", pos);
+      if (end == string::npos)
+          break;
+
+      entity = escaped.substr(pos,end-pos+1);
+      str = "";
+      if(entity == "&lt;")
+         str = "<";
+      else if(entity == "&gt;")
+         str = ">";
+      else if(entity == "&amp;")
+         str = "&";
+      else if(entity == "&quot;")
+         str = "\"";
+      else if(entity == "&apos;")
+         str = "'";
+
+      if(!str.empty()) {
+          escaped.replace(pos, entity.size(), str);
+          pos++; 
+      } else {
+          pos = end;
+      }
+   }
+   return escaped;
+}
 
 
 

=== modified file 'gtk/rgutils.h'
--- gtk/rgutils.h	2008-08-21 14:32:18 +0000
+++ gtk/rgutils.h	2010-04-21 22:59:12 +0000
@@ -56,5 +56,7 @@
 
 string SizeToStr(double Bytes);
 
+string MarkupEscapeString(string str);
+string MarkupUnescapeString(string str);
 
 #endif