projects
/
dana
/
openbox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'backport' into work
[dana/openbox.git]
/
openbox
/
menu.c
diff --git
a/openbox/menu.c
b/openbox/menu.c
index
63b74b9
..
432aa2b
100644
(file)
--- a/
openbox/menu.c
+++ b/
openbox/menu.c
@@
-98,7
+98,7
@@
void menu_startup(gboolean reconfig)
obt_parse_tree_from_root(menu_parse_inst);
obt_parse_close(menu_parse_inst);
} else
obt_parse_tree_from_root(menu_parse_inst);
obt_parse_close(menu_parse_inst);
} else
- g_message(_("Unable to find a valid menu file
'%s'
"),
+ g_message(_("Unable to find a valid menu file
\"%s\"
"),
(const gchar*)it->data);
}
if (!loaded) {
(const gchar*)it->data);
}
if (!loaded) {
@@
-110,7
+110,7
@@
void menu_startup(gboolean reconfig)
obt_parse_tree_from_root(menu_parse_inst);
obt_parse_close(menu_parse_inst);
} else
obt_parse_tree_from_root(menu_parse_inst);
obt_parse_close(menu_parse_inst);
} else
- g_message(_("Unable to find a valid menu file
'%s'
"),
+ g_message(_("Unable to find a valid menu file
\"%s\"
"),
"menu.xml");
}
"menu.xml");
}
@@
-168,7
+168,7
@@
void menu_pipe_execute(ObMenu *self)
return;
if (!g_spawn_command_line_sync(self->execute, &output, NULL, NULL, &err)) {
return;
if (!g_spawn_command_line_sync(self->execute, &output, NULL, NULL, &err)) {
- g_message(_("Failed to execute command for pipe-menu
'%s'
: %s"),
+ g_message(_("Failed to execute command for pipe-menu
\"%s\"
: %s"),
self->execute, err->message);
g_error_free(err);
return;
self->execute, err->message);
g_error_free(err);
return;
@@
-182,7
+182,7
@@
void menu_pipe_execute(ObMenu *self)
obt_parse_tree_from_root(menu_parse_inst);
obt_parse_close(menu_parse_inst);
} else {
obt_parse_tree_from_root(menu_parse_inst);
obt_parse_close(menu_parse_inst);
} else {
- g_message(_("Invalid output from pipe-menu
'%s'
"), self->execute);
+ g_message(_("Invalid output from pipe-menu
\"%s\"
"), self->execute);
}
g_free(output);
}
g_free(output);
@@
-195,7
+195,7
@@
static ObMenu* menu_from_name(gchar *name)
g_assert(name != NULL);
if (!(self = g_hash_table_lookup(menu_hash, name)))
g_assert(name != NULL);
if (!(self = g_hash_table_lookup(menu_hash, name)))
- g_message(_("Attempted to access menu
'%s'
but it does not exist"),
+ g_message(_("Attempted to access menu
\"%s\"
but it does not exist"),
name);
return self;
}
name);
return self;
}