Quick change so back to single .desktop/info, no assoc .desktops, and no alternative...

[pandora-libraries.git] / lib / pnd_discovery.c

diff --git a/lib/pnd_discovery.c b/lib/pnd_discovery.c
index 90baba0..2fd1882 100644 (file)
--- a/lib/pnd_discovery.c
+++ b/lib/pnd_discovery.c
@@ -63,16 +63,7 @@ void pnd_disco_destroy ( pnd_disco_t *p ) {
   if ( p -> package_version_build ) { free ( p -> package_version_build ); }
   if ( p -> associationitem1_name ) { free ( p -> associationitem1_name ); }
   if ( p -> associationitem1_filetype ) { free ( p -> associationitem1_filetype ); }
-  if ( p -> associationitem1_command ) { free ( p -> associationitem1_command ); }
-  if ( p -> associationitem1_args ) { free ( p -> associationitem1_args ); }
-  if ( p -> associationitem2_name ) { free ( p -> associationitem2_name ); }
-  if ( p -> associationitem2_filetype ) { free ( p -> associationitem2_filetype ); }
-  if ( p -> associationitem2_command ) { free ( p -> associationitem2_command ); }
-  if ( p -> associationitem2_args ) { free ( p -> associationitem2_args ); }
-  if ( p -> associationitem3_name ) { free ( p -> associationitem3_name ); }
-  if ( p -> associationitem3_filetype ) { free ( p -> associationitem3_filetype ); }
-  if ( p -> associationitem3_command ) { free ( p -> associationitem3_command ); }
-  if ( p -> associationitem3_args ) { free ( p -> associationitem3_args ); }
+  if ( p -> exec_dashdash_args ) { free ( p -> exec_dashdash_args ); }
 
   return;
 }
@@ -353,23 +344,12 @@ static int pnd_disco_callback ( const char *fpath, const struct stat *sb,
       if ( pnd_pxml_get_associationitem1_name ( pxmlh ) ) {
        p -> associationitem1_name = strdup ( pnd_pxml_get_associationitem1_name ( pxmlh ) );
        p -> associationitem1_filetype = strdup ( pnd_pxml_get_associationitem1_filetype ( pxmlh ) );
-       p -> associationitem1_command = strdup ( pnd_pxml_get_associationitem1_command ( pxmlh ) );
-       p -> associationitem1_args = strdup ( pnd_pxml_get_associationitem1_args ( pxmlh ) );
        //pnd_log ( PND_LOG_DEFAULT, "  Disco: Found file association request in PXML (%s)\n", p -> title_en );
       }
-      if ( pnd_pxml_get_associationitem2_name ( pxmlh ) ) {
-       p -> associationitem2_name = strdup ( pnd_pxml_get_associationitem2_name ( pxmlh ) );
-       p -> associationitem2_filetype = strdup ( pnd_pxml_get_associationitem2_filetype ( pxmlh ) );
-       p -> associationitem2_command = strdup ( pnd_pxml_get_associationitem2_command ( pxmlh ) );
-       p -> associationitem2_args = strdup ( pnd_pxml_get_associationitem2_args ( pxmlh ) );
-      }
-      if ( pnd_pxml_get_associationitem3_name ( pxmlh ) ) {
-       p -> associationitem3_name = strdup ( pnd_pxml_get_associationitem3_name ( pxmlh ) );
-       p -> associationitem3_filetype = strdup ( pnd_pxml_get_associationitem3_filetype ( pxmlh ) );
-       p -> associationitem3_command = strdup ( pnd_pxml_get_associationitem3_command ( pxmlh ) );
-       p -> associationitem3_args = strdup ( pnd_pxml_get_associationitem3_args ( pxmlh ) );
-      }
 #endif
+      if ( pnd_pxml_get_execdashdashargs ( pxmlh ) ) {
+       p -> exec_dashdash_args = strdup ( pnd_pxml_get_execdashdashargs ( pxmlh ) );
+      }
 
       // look for any PXML overrides, if requested
       if ( disco_overrides ) {