menu.c for the Openbox window manager
Copyright (c) 2006 Mikael Magnusson
- Copyright (c) 2003 Ben Jansens
+ Copyright (c) 2003-2007 Dana Jansens
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include "client_menu.h"
#include "client_list_menu.h"
#include "client_list_combined_menu.h"
+#include "gettext.h"
#include "parser/parse.h"
typedef struct _ObMenuParseState ObMenuParseState;
loaded = TRUE;
parse_tree(menu_parse_inst, doc, node->children);
xmlFreeDoc(doc);
- }
+ } else
+ g_message(_("Unable to find a valid menu file '%s'"),
+ (const gchar*)it->data);
}
if (!loaded) {
if (parse_load_menu("menu.xml", &doc, &node)) {
parse_tree(menu_parse_inst, doc, node->children);
xmlFreeDoc(doc);
- }
+ } else
+ g_message(_("Unable to find a valid menu file '%s'"),
+ "menu.xml");
}
g_assert(menu_parse_state.parent == NULL);
return;
if (!g_spawn_command_line_sync(self->execute, &output, NULL, NULL, &err)) {
- g_warning("Failed to execute command for pipe-menu: %s", err->message);
+ 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_warning("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_warning("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;
}
{
ObMenuParseState *state = data;
- if (state->parent)
- menu_add_separator(state->parent, -1);
+ if (state->parent) {
+ gchar *label;
+
+ if (!parse_attr_string("label", node, &label))
+ label = NULL;
+
+ menu_add_separator(state->parent, -1, label);
+ g_free(label);
+ }
}
static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
return e;
}
-ObMenuEntry* menu_add_separator(ObMenu *self, gint id)
+ObMenuEntry* menu_add_separator(ObMenu *self, gint id, const gchar *label)
{
ObMenuEntry *e;
e = menu_entry_new(self, OB_MENU_ENTRY_TYPE_SEPARATOR, id);
+ e->data.separator.label = g_strdup(label);
self->entries = g_list_append(self->entries, e);
return e;