From 3a76eaef692dadbd1b974bd9c678ce5cdc3afe68 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Sat, 8 Jan 2011 18:25:20 +0000 Subject: [PATCH] wow.. well.. seems this became a .in file - that explains why it was rtemoved. modify .in. SVN revision: 55996 --- src/bin/e_fm_shared_types.h | 119 --------------------------------- src/bin/e_fm_shared_types.h.in | 1 + 2 files changed, 1 insertion(+), 119 deletions(-) delete mode 100644 src/bin/e_fm_shared_types.h diff --git a/src/bin/e_fm_shared_types.h b/src/bin/e_fm_shared_types.h deleted file mode 100644 index a60edef96..000000000 --- a/src/bin/e_fm_shared_types.h +++ /dev/null @@ -1,119 +0,0 @@ -#ifndef E_FM_SHARED_TYPES -#define E_FM_SHARED_TYPES - -#include -#include - -#if 0 -# include -# include -#endif -#if 1 -# include -#endif - -# define E_DEVICE_TYPE_STORAGE 1 -# define E_DEVICE_TYPE_VOLUME 2 -typedef struct _E_Storage E_Storage; -typedef struct _E_Volume E_Volume; -typedef struct _E_Fm2_Mount E_Fm2_Mount; - -typedef enum -{ - EFM_MODE_USING_RASTER_MOUNT, - EFM_MODE_USING_HAL_MOUNT, - EFM_MODE_USING_UDISKS_MOUNT, - EFM_MODE_USING_EEZE_MOUNT -} Efm_Mode; - -typedef enum -{ - E_VOLUME_OP_TYPE_NONE, - E_VOLUME_OP_TYPE_MOUNT, - E_VOLUME_OP_TYPE_UNMOUNT, - E_VOLUME_OP_TYPE_EJECT -} E_Volume_Op_Type; - -struct _E_Storage -{ - int type; - const char *udi; /* with eeze, this is actually the syspath */ - const char *drive_type; - - const char *model, *vendor, *serial; - - Eina_Bool removable; - Eina_Bool media_available; - Eina_Bool system_internal; - unsigned long long media_size; - - Eina_Bool requires_eject; - Eina_Bool hotpluggable; - Eina_Bool media_check_enabled; - - struct - { - const char *drive, *volume; - } icon; - - Eina_List *volumes; - - Eina_Bool validated : 1; - Eina_Bool trackable : 1; -#if 0 - Eeze_Disk *disk; -#endif - const char *bus; -}; - -struct _E_Volume -{ - int type; - const char *udi, *uuid; - const char *label, *icon, *fstype; - unsigned long long size; - - Eina_Bool partition; - int partition_number; - const char *partition_label; - Eina_Bool mounted; - const char *mount_point; - - const char *parent; - E_Storage *storage; - Eina_List *mounts; - - Eina_Bool validated : 1; - - 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 - E_Volume_Op_Type optype; - Efm_Mode efm_mode; - - Eina_Bool encrypted; - Eina_Bool unlocked; - -#if 1 - DBusPendingCall *op; // d-bus call handle - void *prop_handler; -#endif -}; - -struct _E_Fm2_Mount -{ - const char *udi; - const char *mount_point; - - Ecore_Cb mount_ok; - Ecore_Cb mount_fail; - Ecore_Cb unmount_ok; - Ecore_Cb unmount_fail; - void *data; - - E_Volume *volume; - - Eina_Bool mounted : 1; -}; - -#endif diff --git a/src/bin/e_fm_shared_types.h.in b/src/bin/e_fm_shared_types.h.in index f078e19ab..066a89b81 100644 --- a/src/bin/e_fm_shared_types.h.in +++ b/src/bin/e_fm_shared_types.h.in @@ -44,6 +44,7 @@ struct _E_Storage Eina_Bool removable; Eina_Bool media_available; + Eina_Bool system_internal; unsigned long long media_size; Eina_Bool requires_eject;