Author: rpmcruz
Date: Tue Sep 9 06:54:22 2008
New Revision: 50833
URL: http://svn.opensuse.org/viewcvs/yast?rev=50833&view=rev
Log:
* src/YGPackageSelector.cc: escaping the URL as some characters (like &)
were confusing the Pango parser. Use the FILE stock icon for the ISO.
Modified:
trunk/gtk/ChangeLog
trunk/gtk/src/YGPackageSelector.cc
Modified: trunk/gtk/ChangeLog
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=50833&r1=50832&r2=50833&view=diff
==============================================================================
--- trunk/gtk/ChangeLog (original)
+++ trunk/gtk/ChangeLog Tue Sep 9 06:54:22 2008
@@ -17,6 +17,8 @@
* src/yzyppwrapper.cc: fixed repositories query (related to bug 418781).
Was using some duplicated zypp API that is dysfunctional it seems.
+ * src/YGPackageSelector.cc: escaping the URL as some characters (like &)
+ were confusing the Pango parser. Use the FILE stock icon for the ISO.
2008-09-08 JP Rosevear
Modified: trunk/gtk/src/YGPackageSelector.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGPackageSelector.cc?rev=50833&r1=50832&r2=50833&view=diff
==============================================================================
--- trunk/gtk/src/YGPackageSelector.cc (original)
+++ trunk/gtk/src/YGPackageSelector.cc Tue Sep 9 06:54:22 2008
@@ -1198,14 +1198,17 @@
for (int i = 0; Ypp::get()->getRepository (i); i++) {
const Ypp::Repository *repo = Ypp::get()->getRepository (i);
gtk_tree_store_append (store, &iter, NULL);
- std::string text = repo->name + "\n<small>" + repo->url + "</small>";
+ std::string text = repo->name, url (repo->url);
+ YGUtils::escapeMarkup (url);
+ text += "\n<small>" + url + "</small>";
const gchar *icon;
if (repo->url.empty())
icon = GTK_STOCK_MISSING_IMAGE;
else if (repo->url.compare (0, 2, "cd", 2) == 0 ||
- repo->url.compare (0, 3, "dvd", 3) == 0 ||
- repo->url.compare (0, 3, "iso", 3) == 0)
+ repo->url.compare (0, 3, "dvd", 3) == 0)
icon = GTK_STOCK_CDROM;
+ else if (repo->url.compare (0, 3, "iso", 3) == 0)
+ icon = GTK_STOCK_FILE;
else
icon = GTK_STOCK_NETWORK;
gtk_tree_store_set (store, &iter, TEXT_COL, text.c_str(),
@@ -1214,7 +1217,7 @@
}
virtual void writeQuery (Ypp::QueryPool::Query *query,
- const std::list <gpointer> &ptrs)
+ const std::list <gpointer> &ptrs)
{
for (std::list <gpointer>::const_iterator it = ptrs.begin();
it != ptrs.end(); it++) {
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
