git.openpandora.org
/
pandora-libraries.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7109a4e
)
libpnd; fix for docs ("info") in pnds, being emitted into .desktops for mmenu sake
sz_beta3
author
skeezix
<skeezix@flotsam-vm.(none)>
Tue, 28 Feb 2012 20:58:04 +0000
(15:58 -0500)
committer
skeezix
<skeezix@flotsam-vm.(none)>
Tue, 28 Feb 2012 20:58:04 +0000
(15:58 -0500)
lib/pnd_desktop.c
patch
|
blob
|
history
diff --git
a/lib/pnd_desktop.c
b/lib/pnd_desktop.c
index
be58955
..
3fffa36
100644
(file)
--- a/
lib/pnd_desktop.c
+++ b/
lib/pnd_desktop.c
@@
-115,6
+115,12
@@
unsigned char pnd_emit_dotdesktop ( char *targetpath, char *pndrun, pnd_disco_t
if ( p -> alt_category2 ) {
fprintf ( f, "X-Pandora-AltCategory2=%s\n", p -> alt_category2 );
}
if ( p -> alt_category2 ) {
fprintf ( f, "X-Pandora-AltCategory2=%s\n", p -> alt_category2 );
}
+ if ( p -> info_filename ) {
+ fprintf ( f, "X-Pandora-Info-Filename=%s\n", p -> info_filename );
+ }
+ if ( p -> info_name ) {
+ fprintf ( f, "X-Pandora-Info-Name=%s\n", p -> info_name );
+ }
#if 0 // we let pnd_run.sh command line handle this instead of in .desktop
if ( p -> startdir ) {
#if 0 // we let pnd_run.sh command line handle this instead of in .desktop
if ( p -> startdir ) {
@@
-804,10
+810,13
@@
pnd_disco_t *pnd_parse_dotdesktop ( char *ddpath, unsigned int flags ) {
}
if ( strstr ( ddpath, ".desktop" ) == NULL ) {
}
if ( strstr ( ddpath, ".desktop" ) == NULL ) {
- return ( NULL );
+ return ( NULL );
// no .desktop in filename, must be something else... skip!
}
if ( strstr ( ddpath, "info.desktop" ) != NULL ) {
}
if ( strstr ( ddpath, "info.desktop" ) != NULL ) {
+ // ".....info.desktop" is the 'document help' (README) emitted from a pnd, not an actual app; minimenu rather
+ // expects the doc-info as part of the main app, not a separate app.. so lets drop it here, to avoid doubling up
+ // the number of applications, needlessly..
return ( NULL );
}
return ( NULL );
}
@@
-888,6
+897,11
@@
pnd_disco_t *pnd_parse_dotdesktop ( char *ddpath, unsigned int flags ) {
} else if ( strncmp ( dd, "X-Pandora-AltCategory2=", 23 ) == 0 ) {
p -> alt_category2 = strdup ( dd + 23 );
} else if ( strncmp ( dd, "X-Pandora-AltCategory2=", 23 ) == 0 ) {
p -> alt_category2 = strdup ( dd + 23 );
+ } else if ( strncmp ( dd, "X-Pandora-Info-Filename=", 24 ) == 0 ) {
+ p -> info_filename = strdup ( dd + 24 );
+ } else if ( strncmp ( dd, "X-Pandora-Info-Name=", 20 ) == 0 ) {
+ p -> info_name = strdup ( dd + 20 );
+
} else if ( strncmp ( dd, "Comment=", 8 ) == 0 ) {
p -> desc_en = strdup ( dd + 8 );
} else if ( strncmp ( dd, "Comment[en]=", 12 ) == 0 ) {
} else if ( strncmp ( dd, "Comment=", 8 ) == 0 ) {
p -> desc_en = strdup ( dd + 8 );
} else if ( strncmp ( dd, "Comment[en]=", 12 ) == 0 ) {