Title: [104018] trunk/Tools
- Revision
- 104018
- Author
- [email protected]
- Date
- 2012-01-03 23:37:49 -0800 (Tue, 03 Jan 2012)
Log Message
[GTK] Fix a runtime warning when hovering hyperlink auditing setting in MiniBroweser settings dialog
https://bugs.webkit.org/show_bug.cgi?id=75475
Reviewed by Martin Robinson.
The problem is that the property blurb contains <a ping> and tree
view uses gtk_tooltip_set_markup() internally, so we need to
escape the text.
* MiniBrowser/gtk/BrowserSettingsDialog.c:
(browserSettingsDialogConstructed): Escape property blurb before
storing it in the GtkTreeModel.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (104017 => 104018)
--- trunk/Tools/ChangeLog 2012-01-04 07:35:21 UTC (rev 104017)
+++ trunk/Tools/ChangeLog 2012-01-04 07:37:49 UTC (rev 104018)
@@ -1,3 +1,18 @@
+2012-01-03 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Fix a runtime warning when hovering hyperlink auditing setting in MiniBroweser settings dialog
+ https://bugs.webkit.org/show_bug.cgi?id=75475
+
+ Reviewed by Martin Robinson.
+
+ The problem is that the property blurb contains <a ping> and tree
+ view uses gtk_tooltip_set_markup() internally, so we need to
+ escape the text.
+
+ * MiniBrowser/gtk/BrowserSettingsDialog.c:
+ (browserSettingsDialogConstructed): Escape property blurb before
+ storing it in the GtkTreeModel.
+
2012-01-03 Jochen Eisinger <[email protected]>
When showing results.html pass a correct URL to webbrowser.open
Modified: trunk/Tools/MiniBrowser/gtk/BrowserSettingsDialog.c (104017 => 104018)
--- trunk/Tools/MiniBrowser/gtk/BrowserSettingsDialog.c 2012-01-04 07:35:21 UTC (rev 104017)
+++ trunk/Tools/MiniBrowser/gtk/BrowserSettingsDialog.c 2012-01-04 07:37:49 UTC (rev 104018)
@@ -146,15 +146,17 @@
uIntProperty->maximum, 1, 1, 1);
}
+ char *blurb = g_markup_escape_text(g_param_spec_get_blurb(property), -1);
GtkTreeIter iter;
gtk_list_store_append(model, &iter);
gtk_list_store_set(model, &iter,
SETTINGS_LIST_COLUMN_NAME, name,
SETTINGS_LIST_COLUMN_NICK, nick,
- SETTINGS_LIST_COLUMN_BLURB, g_param_spec_get_blurb(property),
+ SETTINGS_LIST_COLUMN_BLURB, blurb,
SETTINGS_LIST_COLUMN_VALUE, &value,
SETTINGS_LIST_COLUMN_ADJUSTMENT, adjustment,
-1);
+ g_free(blurb);
g_value_unset(&value);
}
g_free(properties);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
