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

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

diff --git a/lib/pnd_pxml.c b/lib/pnd_pxml.c
index 52d5ceb..699f4c2 100644 (file)
--- a/lib/pnd_pxml.c
+++ b/lib/pnd_pxml.c
@@ -160,36 +160,18 @@ void pnd_pxml_delete ( pnd_pxml_handle h ) {
   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 -> associationitem1_filetype ) {
     free ( p -> associationitem3_filetype );
   }
-  if ( p -> associationitem1_command ) {
-    free ( p -> associationitem3_command );
-  }
-  if ( p -> associationitem1_args ) {
-    free ( p -> associationitem3_args );
-  }
   if ( p -> clockspeed ) {
     free ( p -> clockspeed );
   }
@@ -232,6 +214,9 @@ void pnd_pxml_delete ( pnd_pxml_handle h ) {
   if ( p -> package_version_build ) {
     free ( p -> package_version_build );
   }
+  if ( p -> exec_dashdash_args ) {
+    free ( p -> exec_dashdash_args );
+  }
 
   free(p); /*very important!*/
 
@@ -498,6 +483,11 @@ char *pnd_pxml_get_exec_option_no_x11 ( pnd_pxml_handle h ) {
   return ( p -> exec_no_x11 );
 }
 
+char *pnd_pxml_get_execdashdashargs ( pnd_pxml_handle h ) {
+  pnd_pxml_t *p = (pnd_pxml_t*) h;
+  return ( p -> exec_dashdash_args );
+}
+
 char *pnd_pxml_get_main_category ( pnd_pxml_handle h ) {
   pnd_pxml_t *p = (pnd_pxml_t*) h;
   return ( p -> main_category );
@@ -558,16 +548,6 @@ char *pnd_pxml_get_associationitem1_filetype ( pnd_pxml_handle h ) {
   return ( p -> associationitem1_filetype );
 }
 
-char *pnd_pxml_get_associationitem1_command ( pnd_pxml_handle h ) {
-  pnd_pxml_t *p = (pnd_pxml_t*) h;
-  return ( p -> associationitem1_command );
-}
-
-char *pnd_pxml_get_associationitem1_args ( pnd_pxml_handle h ) {
-  pnd_pxml_t *p = (pnd_pxml_t*) h;
-  return ( p -> associationitem1_args );
-}
-
 char *pnd_pxml_get_associationitem2_name ( pnd_pxml_handle h ) {
   pnd_pxml_t *p = (pnd_pxml_t*) h;
   return ( p -> associationitem2_name );
@@ -578,16 +558,6 @@ char *pnd_pxml_get_associationitem2_filetype ( pnd_pxml_handle h ) {
   return ( p -> associationitem2_filetype );
 }
 
-char *pnd_pxml_get_associationitem2_command ( pnd_pxml_handle h ) {
-  pnd_pxml_t *p = (pnd_pxml_t*) h;
-  return ( p -> associationitem2_command );
-}
-
-char *pnd_pxml_get_associationitem2_args ( pnd_pxml_handle h ) {
-  pnd_pxml_t *p = (pnd_pxml_t*) h;
-  return ( p -> associationitem2_args );
-}
-
 char *pnd_pxml_get_associationitem3_name ( pnd_pxml_handle h ) {
   pnd_pxml_t *p = (pnd_pxml_t*) h;
   return ( p -> associationitem3_name );
@@ -598,16 +568,6 @@ char *pnd_pxml_get_associationitem3_filetype ( pnd_pxml_handle h ) {
   return ( p -> associationitem3_filetype );
 }
 
-char *pnd_pxml_get_associationitem3_command ( pnd_pxml_handle h ) {
-  pnd_pxml_t *p = (pnd_pxml_t*) h;
-  return ( p -> associationitem3_command );
-}
-
-char *pnd_pxml_get_associationitem3_args ( pnd_pxml_handle h ) {
-  pnd_pxml_t *p = (pnd_pxml_t*) h;
-  return ( p -> associationitem3_args );
-}
-
 char *pnd_pxml_get_clockspeed ( pnd_pxml_handle h ) {
   pnd_pxml_t *p = (pnd_pxml_t*) h;
   return ( p -> clockspeed );