gchar **strippedlabel, guint *position,
gboolean *always_show);
-
static void client_dest(ObClient *client, gpointer data)
{
/* menus can be associated with a client, so close any that are since
parse_tree(menu_parse_inst, doc, node->children);
xmlFreeDoc(doc);
} 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) {
parse_tree(menu_parse_inst, doc, node->children);
xmlFreeDoc(doc);
} else
- g_message(_("Unable to find a valid menu file '%s'"),
+ g_message(_("Unable to find a valid menu file \"%s\""),
"menu.xml");
}
menu_clear_entries(menu);
}
-void menu_clear_pipe_caches()
+void menu_clear_pipe_caches(void)
{
/* delete any pipe menus' submenus */
g_hash_table_foreach_remove(menu_hash, menu_pipe_submenu, NULL);
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;
parse_tree(menu_parse_inst, doc, node->children);
xmlFreeDoc(doc);
} 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_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;
}
/* you have to use a printable ascii character for shortcuts
don't allow space either, so you can have like "a _ b"
*/
- if (VALID_SHORTCUT(*(i+1))) {
- shortcut = g_unichar_tolower(g_utf8_get_char(i+1));
- *position = i - *strippedlabel;
- *always_show = TRUE;
+ if (VALID_SHORTCUT(*(i+1)) || *(i+1) == '_') {
+ /* Allow you to escape the first _ by putting __ */
+ if (*(i+1) != '_') {
+ shortcut = g_unichar_tolower(g_utf8_get_char(i+1));
+ *position = i - *strippedlabel;
+ *always_show = TRUE;
+ }
/* remove the '_' from the string */
for (; *i != '\0'; ++i)
self->more_menu->data = data;
self->more_menu->shortcut = g_unichar_tolower(g_utf8_get_char("M"));
- self->more_menu->show_func = self->show_func;
- self->more_menu->hide_func = self->hide_func;
- self->more_menu->update_func = self->update_func;
- self->more_menu->execute_func = self->execute_func;
- self->more_menu->destroy_func = self->destroy_func;
- self->more_menu->place_func = self->place_func;
-
return self;
}
}
}
-gboolean menu_hide_delay_reached()
+gboolean menu_hide_delay_reached(void)
{
return menu_can_hide;
}
if (self && --self->ref == 0) {
switch (self->type) {
case OB_MENU_ENTRY_TYPE_NORMAL:
+ RrImageUnref(self->data.normal.icon);
g_free(self->data.normal.label);
while (self->data.normal.actions) {
actions_act_unref(self->data.normal.actions->data);
g_free(self->data.submenu.name);
break;
case OB_MENU_ENTRY_TYPE_SEPARATOR:
+ g_free(self->data.separator.label);
break;
}
void menu_set_show_func(ObMenu *self, ObMenuShowFunc func)
{
self->show_func = func;
- self->more_menu->show_func = func; /* keep it in sync */
}
void menu_set_hide_func(ObMenu *self, ObMenuHideFunc func)
{
self->hide_func = func;
- self->more_menu->hide_func = func; /* keep it in sync */
}
void menu_set_update_func(ObMenu *self, ObMenuUpdateFunc func)
{
self->update_func = func;
- self->more_menu->update_func = func; /* keep it in sync */
}
void menu_set_execute_func(ObMenu *self, ObMenuExecuteFunc func)
void menu_set_destroy_func(ObMenu *self, ObMenuDestroyFunc func)
{
self->destroy_func = func;
- self->more_menu->destroy_func = func; /* keep it in sync */
}
void menu_set_place_func(ObMenu *self, ObMenuPlaceFunc func)
{
self->place_func = func;
- self->more_menu->place_func = func; /* keep it in sync */
}
ObMenuEntry* menu_find_entry_id(ObMenu *self, gint id)