okay, this should work a bit better as a generated header now

SVN revision: 55835

diff --git a/src/bin/e_fm_shared_types.h.in b/src/bin/e_fm_shared_types.h.in
index 0de4567..5ba045d 100644 (file)
--- a/src/bin/e_fm_shared_types.h.in
+++ b/src/bin/e_fm_shared_types.h.in
@@ -3,7 +3,14 @@
 
 #include <Eina.h>
 #include <Ecore.h>
-#include <E_DBus.h>
+
+#if @EEZE_MOUNT_CONFIG@
+# include <Eeze.h>
+# include <Eeze_Disk.h>
+#endif
+#if @DBUS_MOUNT_CONFIG@
+# include <E_DBus.h>
+#endif
 
 # define E_DEVICE_TYPE_STORAGE 1
 # define E_DEVICE_TYPE_VOLUME  2
@@ -11,12 +18,10 @@ typedef struct _E_Storage E_Storage;
 typedef struct _E_Volume  E_Volume;
 typedef struct _E_Fm2_Mount  E_Fm2_Mount;
 
-#if @EEZE_MOUNT_CONFIG@
-#else
 struct _E_Storage
 {
    int type;
-   const char *udi, *bus;
+   const char *udi; /* with eeze, this is actually the syspath */
    const char *drive_type;
 
    const char *model, *vendor, *serial;
@@ -38,6 +43,10 @@ struct _E_Storage
 
    Eina_Bool validated : 1;
    Eina_Bool trackable : 1;
+#if @EEZE_MOUNT_CONFIG@
+   Eeze_Disk *disk;
+#endif
+   const char *bus;
 };
 
 struct _E_Volume
@@ -55,7 +64,6 @@ struct _E_Volume
 
    const char *parent;
    E_Storage *storage;
-   void *prop_handler;
    Eina_List *mounts;
 
    Eina_Bool validated : 1;
@@ -63,7 +71,10 @@ struct _E_Volume
    Eina_Bool auto_unmount : 1;                  // unmount, when last associated fm window closed
    Eina_Bool first_time;                    // volume discovery in init sequence
    Ecore_Timer *guard;                 // operation guard timer
+#if @DBUS_MOUNT_CONFIG@
    DBusPendingCall *op;                // d-bus call handle
+   void *prop_handler;
+#endif
 };
 
 struct _E_Fm2_Mount
@@ -83,4 +94,3 @@ struct _E_Fm2_Mount
 };
 
 #endif
-#endif