X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-libraries.git;a=blobdiff_plain;f=minimenu%2Fmmenu.c;h=be38fb0c6189c88e23b9e20e3bf01b6cd4d4a2a5;hp=f8ba263a895542dde8348827df7ba86e073770aa;hb=8290d9ca651c95ff7f5108b7019987162293287c;hpb=b5d6255f28c58bae0d6424ab5080fae1c2928575 diff --git a/minimenu/mmenu.c b/minimenu/mmenu.c index f8ba263..be38fb0 100644 --- a/minimenu/mmenu.c +++ b/minimenu/mmenu.c @@ -448,7 +448,7 @@ static unsigned int is_dir_empty ( char *fullpath ) { } else { // something else came in, so dir must not be empty closedir ( d ); - return ( 0 ); + return ( 0 ); } de = readdir ( d ); @@ -663,7 +663,7 @@ void applications_scan ( void ) { ( pnd_pxml_get_x11 ( iter -> option_no_x11 ) == pnd_pxml_x11_required && g_x11_present == 1 ) ) { - + if ( iter -> title_en == NULL || iter -> title_en [ 0 ] == '\0' ) { // null title; just skip it. } else { @@ -677,12 +677,19 @@ void applications_scan ( void ) { // is this app suppressed? if not, show it in whatever categories the user is allowing if ( iter -> unique_id && app_is_visible ( g_conf, iter -> unique_id ) ) { +#if 0 + pnd_log ( pndn_rem, "App %s [%s] cat %s %s %s alt %s %s %s\n", + iter -> unique_id, IFNULL(iter->title_en,"n/a"), + IFNULL(iter->main_category,"n/a"), IFNULL(iter->main_category1,"n/a"), IFNULL(iter->main_category2,"n/a"), + IFNULL(iter->alt_category,"n/a"), IFNULL(iter->alt_category1,"n/a"), IFNULL(iter->alt_category2,"n/a") ); +#endif + // main categories category_meta_push ( iter -> main_category, NULL /* no parent cat */, iter, ovrh, cat_is_visible ( g_conf, iter -> main_category ), 1); category_meta_push ( iter -> main_category1, iter -> main_category, iter, ovrh, cat_is_visible ( g_conf, iter -> main_category1 ), 0 ); category_meta_push ( iter -> main_category2, iter -> main_category, iter, ovrh, cat_is_visible ( g_conf, iter -> main_category2 ), 0 ); // alt categories - category_meta_push ( iter -> alt_category, NULL /* no parent cat */, iter, ovrh, cat_is_visible ( g_conf, iter -> alt_category ), 1 ); + category_meta_push ( iter -> alt_category, NULL /* no parent cat */, iter, ovrh, cat_is_visible ( g_conf, iter -> alt_category ), 2 ); category_meta_push ( iter -> alt_category1, iter -> alt_category, iter, ovrh, cat_is_visible ( g_conf, iter -> alt_category1 ), 0 ); category_meta_push ( iter -> alt_category2, iter -> alt_category, iter, ovrh, cat_is_visible ( g_conf, iter -> alt_category2 ), 0 ); @@ -829,7 +836,7 @@ void emit_and_run ( char *buffer ) { } else { // child, do it execl ( "/bin/sh", "/bin/sh", "-c", buffer + strlen(MM_RUN) + 1, (char*) NULL ); - } + } return; }