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

[pandora-libraries.git] / include / pnd_pxml.h

diff --git a/include/pnd_pxml.h b/include/pnd_pxml.h
index d1c8862..432e218 100644 (file)
--- a/include/pnd_pxml.h
+++ b/include/pnd_pxml.h
@@ -70,6 +70,7 @@ char *pnd_pxml_get_version_build ( pnd_pxml_handle h );
 char *pnd_pxml_get_exec ( pnd_pxml_handle h );
 char *pnd_pxml_get_execargs ( pnd_pxml_handle h );
 char *pnd_pxml_get_exec_option_no_x11 ( pnd_pxml_handle h );
+char *pnd_pxml_get_execdashdashargs ( pnd_pxml_handle h );
 char *pnd_pxml_get_main_category ( pnd_pxml_handle h );
 char *pnd_pxml_get_subcategory1 ( pnd_pxml_handle h );
 char *pnd_pxml_get_subcategory2 ( pnd_pxml_handle h );
@@ -82,16 +83,10 @@ char *pnd_pxml_get_osversion_release ( pnd_pxml_handle h );
 char *pnd_pxml_get_osversion_build ( pnd_pxml_handle h );
 char *pnd_pxml_get_associationitem1_name ( pnd_pxml_handle h );
 char *pnd_pxml_get_associationitem1_filetype ( pnd_pxml_handle h );
-char *pnd_pxml_get_associationitem1_command ( pnd_pxml_handle h );
-char *pnd_pxml_get_associationitem1_args ( pnd_pxml_handle h );
-char *pnd_pxml_get_associationitem2_name ( pnd_pxml_handle h );
-char *pnd_pxml_get_associationitem2_filetype ( pnd_pxml_handle h );
-char *pnd_pxml_get_associationitem2_command ( pnd_pxml_handle h );
-char *pnd_pxml_get_associationitem2_args ( pnd_pxml_handle h );
-char *pnd_pxml_get_associationitem3_name ( pnd_pxml_handle h );
-char *pnd_pxml_get_associationitem3_filetype ( pnd_pxml_handle h );
-char *pnd_pxml_get_associationitem3_command ( pnd_pxml_handle h );
-char *pnd_pxml_get_associationitem3_args ( pnd_pxml_handle h );
+char *pnd_pxml_get_associationitem2_name ( pnd_pxml_handle h );          // may not be used
+char *pnd_pxml_get_associationitem2_filetype ( pnd_pxml_handle h );      // may not be used
+char *pnd_pxml_get_associationitem3_name ( pnd_pxml_handle h );          // may not be used
+char *pnd_pxml_get_associationitem3_filetype ( pnd_pxml_handle h );      // may not be used
 char *pnd_pxml_get_clockspeed ( pnd_pxml_handle h );
 char *pnd_pxml_get_background ( pnd_pxml_handle h );
 char *pnd_pxml_get_startdir ( pnd_pxml_handle h );
@@ -160,13 +155,13 @@ typedef struct
        char *osversion_build;
        char *associationitem1_name;
        char *associationitem1_filetype;
-       char *associationitem1_command;
-       char *associationitem2_name;
-       char *associationitem2_filetype;
-       char *associationitem2_command;
-       char *associationitem3_name;
-       char *associationitem3_filetype;
-       char *associationitem3_command;
+        char *_unused1; // was previously unused, but slotted for association stuff
+       char *associationitem2_name;      // may not be used
+       char *associationitem2_filetype;  // may not be used
+        char *_unused2; // was previously unused, but slotted for association stuff
+       char *associationitem3_name;      // may not be used
+       char *associationitem3_filetype;  // may not be used
+        char *_unused3; // was previously unused, but slotted for association stuff
        char *clockspeed;
        char *background;
        char *startdir;
@@ -175,7 +170,6 @@ typedef struct
        char *package_name;
        char *package_release_date;
         char *mkdir_sp; // a colon separated list of paths to be mkdir'd (silently fail) when pnd is autodiscovered. path is always relative to the root of the hosting device.
-
         char *info_name;      // should be a struct..
         char *info_filename;
         char *info_type;
@@ -183,9 +177,7 @@ typedef struct
         char *package_version_minor;
         char *package_version_release;
         char *package_version_build;
-        char *associationitem1_args; // wish it could be above, but that would break existing ABI
-        char *associationitem2_args; // wish it could be above, but that would break existing ABI
-        char *associationitem3_args; // wish it could be above, but that would break existing ABI
+        char *exec_dashdash_args;
 
 }  pnd_pxml_t;