nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't strip leading whitespace from menu labels (Fix bug 4782)

Browse source
This commit is contained in:
Dana Jansens 2012-09-30 15:50:26 -04:00
parent 3aee1ac3a1
commit dff5276482
3 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
obt/xml.c
View file

@ -321,16 +321,22 @@ void obt_xml_tree_from_root(ObtXmlInst *i)
obt_xml_tree(i, i->root->children); obt_xml_tree(i, i->root->children);
} }
gchar *obt_xml_node_string(xmlNodePtr node) gchar *obt_xml_node_string_unstripped(xmlNodePtr node)
{ {
xmlChar *c = xmlNodeGetContent(node); xmlChar *c = xmlNodeGetContent(node);
gchar *s; gchar *s;
if (c) g_strstrip((char*)c); /* strip leading/trailing whitespace */
s = g_strdup(c ? (gchar*)c : ""); s = g_strdup(c ? (gchar*)c : "");
xmlFree(c); xmlFree(c);
return s; return s;
} }
gchar *obt_xml_node_string(xmlNodePtr node)
{
gchar* result = obt_xml_node_string_unstripped(node);
g_strstrip(result); /* strip leading/trailing whitespace */
return result;
}
gint obt_xml_node_int(xmlNodePtr node) gint obt_xml_node_int(xmlNodePtr node)
{ {
xmlChar *c = xmlNodeGetContent(node); xmlChar *c = xmlNodeGetContent(node);
@ -413,13 +419,12 @@ gboolean obt_xml_attr_int(xmlNodePtr node, const gchar *name, gint *value)
return r; return r;
} }
gboolean obt_xml_attr_string(xmlNodePtr node, const gchar *name, gboolean obt_xml_attr_string_unstripped(xmlNodePtr node, const gchar *name,
gchar **value) gchar **value)
{ {
xmlChar *c = xmlGetProp(node, (const xmlChar*) name); xmlChar *c = xmlGetProp(node, (const xmlChar*) name);
gboolean r = FALSE; gboolean r = FALSE;
if (c) { if (c) {
g_strstrip((char*)c); /* strip leading/trailing whitespace */
*value = g_strdup((gchar*)c); *value = g_strdup((gchar*)c);
r = TRUE; r = TRUE;
} }
@ -427,6 +432,15 @@ gboolean obt_xml_attr_string(xmlNodePtr node, const gchar *name,
return r; return r;
} }
gboolean obt_xml_attr_string(xmlNodePtr node, const gchar *name,
gchar **value)
{
gboolean result = obt_xml_attr_string_unstripped(node, name, value);
if (result)
g_strstrip(*value); /* strip leading/trailing whitespace */
return result;
}
gboolean obt_xml_attr_contains(xmlNodePtr node, const gchar *name, gboolean obt_xml_attr_contains(xmlNodePtr node, const gchar *name,
const gchar *val) const gchar *val)
{ {

3
obt/xml.h
View file

@ -72,12 +72,15 @@ void obt_xml_tree_from_root(ObtXmlInst *i);
xmlNodePtr obt_xml_find_node (xmlNodePtr node, const gchar *name); xmlNodePtr obt_xml_find_node (xmlNodePtr node, const gchar *name);
gboolean obt_xml_node_contains (xmlNodePtr node, const gchar *val); gboolean obt_xml_node_contains (xmlNodePtr node, const gchar *val);
gchar *obt_xml_node_string_unstripped(xmlNodePtr node);
gchar *obt_xml_node_string (xmlNodePtr node); gchar *obt_xml_node_string (xmlNodePtr node);
gint obt_xml_node_int (xmlNodePtr node); gint obt_xml_node_int (xmlNodePtr node);
gboolean obt_xml_node_bool (xmlNodePtr node); gboolean obt_xml_node_bool (xmlNodePtr node);
gboolean obt_xml_attr_contains (xmlNodePtr node, const gchar *name, gboolean obt_xml_attr_contains (xmlNodePtr node, const gchar *name,
const gchar *val); const gchar *val);
gboolean obt_xml_attr_string_unstripped(xmlNodePtr node, const gchar *name,
gchar **value);
gboolean obt_xml_attr_string (xmlNodePtr node, const gchar *name, gboolean obt_xml_attr_string (xmlNodePtr node, const gchar *name,
gchar **value); gchar **value);
gboolean obt_xml_attr_int (xmlNodePtr node, const gchar *name, gboolean obt_xml_attr_int (xmlNodePtr node, const gchar *name,

6
openbox/menu.c
View file

@ -279,7 +279,7 @@ static void parse_menu_item(xmlNodePtr node, gpointer data)
/* Don't try to extract "icon" attribute if icons in user-defined /* Don't try to extract "icon" attribute if icons in user-defined
menus are not enabled. */ menus are not enabled. */
if (obt_xml_attr_string(node, "label", &label)) { if (obt_xml_attr_string_unstripped(node, "label", &label)) {
xmlNodePtr c; xmlNodePtr c;
GSList *acts = NULL; GSList *acts = NULL;
@ -314,7 +314,7 @@ static void parse_menu_separator(xmlNodePtr node, gpointer data)
if (state->parent) { if (state->parent) {
gchar *label; gchar *label;
if (!obt_xml_attr_string(node, "label", &label)) if (!obt_xml_attr_string_unstripped(node, "label", &label))
label = NULL; label = NULL;
menu_add_separator(state->parent, -1, label); menu_add_separator(state->parent, -1, label);
@ -334,7 +334,7 @@ static void parse_menu(xmlNodePtr node, gpointer data)
goto parse_menu_fail; goto parse_menu_fail;
if (!g_hash_table_lookup(menu_hash, name)) { if (!g_hash_table_lookup(menu_hash, name)) {
if (!obt_xml_attr_string(node, "label", &title)) if (!obt_xml_attr_string_unstripped(node, "label", &title))
goto parse_menu_fail; goto parse_menu_fail;
if ((menu = menu_new(name, title, TRUE, NULL))) { if ((menu = menu_new(name, title, TRUE, NULL))) {