mangavalk/lcdproc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

correct generation of sub-menus

Browse Source
This commit is contained in:
marschap
2006-06-05 09:59:23 +00:00
parent 34193a935c
commit 629b0a7c90
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/lcdexec/menu.c
+8 -6
View File
@@ -96,17 +96,18 @@ int menu_sock_send(MenuEntry *me, MenuEntry *parent, int sock)
if ((me != NULL) && (sock > 0)) { if ((me != NULL) && (sock > 0)) {
char parent_id[12]; char parent_id[12];
if (parent == NULL) // set parent_id depending on the parent given
strcpy(parent_id, ""); if ((parent != NULL) && (parent->id != 0))
sprintf(parent_id, "%d", parent->id);
else else
sprintf(parent_id, "%d", parent->id); strcpy(parent_id, "");
switch (me->type) { switch (me->type) {
MenuEntry *entry; MenuEntry *entry;
case menu: case menu:
// don't create a separate entry fro the main menu // don't create a separate entry for the main menu
if (parent != NULL) { if ((parent != NULL) && (me->id != 0)) {
if (sock_printf(sock, "menu_add_item \"%s\" \"%d\" menu \"%s\"\n", if (sock_printf(sock, "menu_add_item \"%s\" \"%d\" menu \"%s\"\n",
parent_id, me->id, me->displayname) < 0) parent_id, me->id, me->displayname) < 0)
return -1; return -1;
@@ -114,7 +115,7 @@ int menu_sock_send(MenuEntry *me, MenuEntry *parent, int sock)
// recursively do it for the menu's sub-menus // recursively do it for the menu's sub-menus
for (entry = me->entries; entry != NULL; entry = entry->next) { for (entry = me->entries; entry != NULL; entry = entry->next) {
if (menu_sock_send(entry, (parent != NULL) ? me : NULL, sock) < 0) if (menu_sock_send(entry, me, sock) < 0)
return -1; return -1;
} }
break; break;
@@ -215,6 +216,7 @@ void menu_free(MenuEntry *me)
void menu_dump(MenuEntry *me) void menu_dump(MenuEntry *me)
{ {
if (me != NULL) { if (me != NULL) {
report(RPT_DEBUG, "# menu ID: %d", me->id);
report(RPT_DEBUG, "[%s]", me->name); report(RPT_DEBUG, "[%s]", me->name);
if (me->displayname != NULL) if (me->displayname != NULL)
report(RPT_DEBUG, "DisplayName=\"%s\"", me->displayname); report(RPT_DEBUG, "DisplayName=\"%s\"", me->displayname);