Changeset 2050

Timestamp:

02/20/10 23:28:51 (5 months ago)

Author:

tpgww

Message:

enable UDisks usage if available

Files:

• trunk/src/filesystem/e2_devkit.c (modified) (49 diffs)

trunk/src/filesystem/e2_devkit.c

@@ -26 +26 @@
 /*
 TODO
-confirm that mount-point and -options are effectively hardcoded within devkit mount opration
+confirm that mount-point is effectively hardcoded in daemon's mount-opration
+check how to work with detachable devices (udisks)
 */
 
@@ -36 +37 @@
 #include "e2_fs.h"
 
-#define DEVKIT_IFACE_NAME "org.freedesktop.DeviceKit.Disks"
-#define DEVKIT_PATH_ROOT "/org/freedesktop/DeviceKit/Disks/devices/"
-
-//subset of all possible device-properties
+#define DEVKIT_IFACE
+
+#ifdef DEVKIT_IFACE
+# define DEVKIT_IFACE_NAME "org.freedesktop.DeviceKit.Disks"
+# define DEVKIT_BUS_PATH "/org/freedesktop/DeviceKit/Disks"
+//PATH_ROOT supplied to funcs will be "/org/freedesktop/DeviceKit/Disks/devices/"
+#endif
+#define UDISK_IFACE_NAME "org.freedesktop.UDisks"
+#define UDISK_BUS_PATH "/org/freedesktop/UDisks"
+//PATH_ROOT supplied to funcs will be "/org/freedesktop/UDisks/devices/"
+
+//subset of available device-properties
 typedef struct _DeviceProperties
 {
         gchar   *device_file;           //e.g. /dev/sda
-//      gchar  **device_file_by_id; //NULL terminated array of unique target(s) linked to corresponding device(s)
-                                                                //e.g. /dev/disk/by-id/ata-ST910021AS_3MH05AVA-part1 >> /dev/sda1
-                                                                //AND ALSO uid(s) linked to device(s)
-                                                                //e.g. /dev/disk/by-uuid/4165-968D >> /dev/sda1
-//      gchar  **device_file_by_path; //NULL terminated array of port/partition(s) linked to corresponding device(s)
-                                                                //e.g. /dev/disk/by-path/pci-0000:00:1f.2-scsi-0:0:1:0 >> /dev/sda2
-                                                                //i.e. can get a count of mountpoints for the device_file
+#ifdef DEVKIT_IFACE
         gchar   *device_mount_path;     //where the device is mounted, valid only if device-is-mounted is TRUE
-//      gchar   *device_presentation_name; //device name for UI use
+#endif
+        //for udisks
+        gchar   **device_mount_paths;//NULL terminated array of paths where the device is mounted,
+                                                                //valid only if device-is-mounted is TRUE
+
         gchar   *id_usage;      //filesystem; crypto; partitiontable; raid; other; blank=(unknown)
         gchar   *id_type;       //per id-usage: ext3, vfat etc swap blank=(unknown)
@@ -57 +64 @@
 //      guint64 device_media_detection_time;
         gboolean device_is_removable;
+        gboolean device_is_detachable; //udisks only
         gboolean device_is_media_available;
         gboolean device_is_media_change_detected;
@@ -72 +80 @@
 typedef struct _DeviceData
 {
-        gchar *object_path; //DEVKIT_PATH_ROOT"<native-path-cleaned-basename>" i.e. with any '-' >> '_'
+        gchar *object_path; //=PATH_ROOT"<native-path-cleaned-basename>" i.e. with any '-' >> '_'
         DBusGProxy *devproxy;   //not the same as the session-proxy, per-device to support async usage of the proxy
         DeviceProperties props;
@@ -78 +86 @@
 } DeviceData;
 
-typedef struct _SessionDevices
-{
+typedef struct _DevicesSession
+{
+#ifdef DEVKIT_IFACE
+        gboolean udisks;                //TRUE for udisks session, FALSE for devkit-disks (saves parsing daemon_version)
+#endif
+        gchar *daemon_version;
+        const gchar *iface_name;//DEVKIT_IFACE_NAME or UDISK_IFACE_NAME
         DBusGConnection *bus;   //connection to system bus
         DBusGProxy *proxy;              //abstracted proxy for interface exported by a connection on bus
-        GHashTable *logged_devices; /* known removable devices, with
-                key = (const) device object path, value = the corresponding DeviceData */
-} SessionDevices;
-
-static SessionDevices devicesdata;
-
-static void _e2_devkit_device_properties_clear (DeviceProperties *props);
+        GHashTable *logged_devices; //known removable devices, with
+                                                                // key = (const) device object path,
+                                                                // value = the corresponding DeviceData*
+} DevicesSession;
+
+static DevicesSession session;
+
 static void _e2_devkit_device_changed_cb (DBusGProxy *proxy,
         const gchar *object_path, gpointer user_data);
@@ -98 +111 @@
 
 /**
-@brief cleanup allocated properties data for a device
-@param props the data struct to be processed
-@return
-*/
-static void _e2_devkit_device_properties_clear (DeviceProperties *props)
-{
-        g_free (props->device_file);
-//      g_strfreev (props->device_file_by_id);
-//      g_strfreev (props->device_file_by_path);
-        g_free (props->device_mount_path);
-//      g_free (props->device_presentation_name);
-        g_free (props->id_usage);
-        g_free (props->id_type);
-        g_free (props->drive_media);
+@brief get daemon version
+Queries the DaemonVersion property on @a iface of @a object_path owned by the
+well-known name @a iface on the D-Bus system message bus.
+@param bus pointer to dbus connection object
+@param iface string like "org.freedesktop.DeviceKit.Disks"
+@param object_path string like "/org/freedesktop/DeviceKit/Disks"
+@return newly-allocated string containing version descriptor, or NULL upon error
+*/
+static gchar *_e2_devkit_get_version (DBusGConnection *bus,
+        const gchar *iface, const gchar *object_path)
+{
+        gchar *version;
+        DBusGProxy *prop_proxy;
+        GValue value1 = {0};
+        GError *error;
+
+        prop_proxy = dbus_g_proxy_new_for_name (bus,
+                iface,
+                object_path,
+                "org.freedesktop.DBus.Properties");
+        if (prop_proxy == NULL)
+        {
+//              _e2_devkit_advise (_("some warning ..."), NULL);
+                printd (WARN, "Unable to establish dbus connection for daemon interrogation");
+                return NULL;
+        }
+        error = NULL;
+        if (dbus_g_proxy_call (prop_proxy,
+                        "Get",
+                        &error,
+                        G_TYPE_STRING,
+                        iface,
+                        G_TYPE_STRING,
+                        "DaemonVersion",
+                        G_TYPE_INVALID,
+                        G_TYPE_VALUE,
+                        &value1,
+                        G_TYPE_INVALID))
+        {
+                version = g_strdup (g_value_get_string (&value1));
+                g_value_unset (&value1);
+                printd (DEBUG,"DaemonVersion property for %s is \"%s\"", object_path, version);
+        }
+        else
+        {
+                version = NULL;
+                printd (DEBUG,"Failed to get DaemonVersion property for %s: %s",
+                        object_path, error->message);
+                g_error_free (error);
+        }
+
+        g_object_unref (G_OBJECT(prop_proxy));
+        return version;
 }
 /**
@@ -118 +170 @@
 The property-names conform to the ones used in gnome-disk-utility 2.28
 like "DeviceIsDrive", replacing ones like "device-is-drive"
-@param bus connection to system bus for this session
-@param object_path DEVKIT_PATH_ROOT etc
+@param sessionptr pointer to connection data struct for this session
+@param object_path PATH_ROOT...
 @param props pointer to empty (0'd) properties struct to be populated
 @return TRUE if process completes successfully, FALSE upon error
 */
-static gboolean _e2_devkit_device_properties_get (DBusGConnection *bus,
+static gboolean _e2_devkit_device_properties_get (DevicesSession *sessionptr,
         const gchar *object_path, DeviceProperties *props)
 {
         gboolean retval;
+        gchar *device_iface;
         DBusGProxy *prop_proxy;
         GValue value1 = {0};
@@ -132 +185 @@
         GHashTable *hash_table;
 
-        memset (props, 0, sizeof(DeviceProperties));    //start with clear data
-
-        prop_proxy = dbus_g_proxy_new_for_name (bus, DEVKIT_IFACE_NAME,
-                object_path, "org.freedesktop.DBus.Properties");
+        prop_proxy = dbus_g_proxy_new_for_name (sessionptr->bus,
+                sessionptr->iface_name,
+                object_path,
+                "org.freedesktop.DBus.Properties");
         if (prop_proxy == NULL)
         {
-//              _e2_devkit_advise (_("message"), NULL);
-                printd (WARN, "Unable to connect to devicekit daemon");
+//              _e2_devkit_advise (_("some warning ..."), NULL);
+                printd (WARN, "Unable to establish dbus connection for properties interrogation");
                 return FALSE;
         }
 
+        device_iface = g_strconcat (sessionptr->iface_name, ".Device", NULL);
+        memset (props, 0, sizeof(DeviceProperties));
         error = NULL;
         //no point in doing async interrogations here
-        //since most devices are not relevant, best to do a separate, minmimal,
-        //check before getting full set of device properties
+        //since most devices are not relevant, best to do some separate, minimal,
+        //checks before getting full set of device properties
         if (dbus_g_proxy_call (prop_proxy,
                         "Get",
                         &error,
                         G_TYPE_STRING,
-                        DEVKIT_IFACE_NAME".Device",
+                        device_iface,
                         G_TYPE_STRING,
                         "DeviceIsDrive",
@@ -163 +218 @@
                 else
                 {
+                        g_value_unset (&value1);
 abort:
-                        g_value_unset (&value1);
+                        g_free (device_iface);
+                        g_object_unref (G_OBJECT(prop_proxy));
                         props->ignored = TRUE;
-                        g_object_unref (G_OBJECT(prop_proxy));
                         return TRUE;
                 }
@@ -172 +228 @@
         else
         {
-                printd (DEBUG,"Get() failed to get properties for %s: %s",
-                        object_path, error->message);
+                printd (DEBUG,"Failed to get DeviceIsDrive property for %s: %s",
+                        device_iface, error->message);
                 g_error_free (error);
+                g_free (device_iface);
                 return FALSE;
         }
@@ -184 +241 @@
                         &error,
                         G_TYPE_STRING,
-                        DEVKIT_IFACE_NAME".Device",
+                        device_iface,
                         G_TYPE_STRING,
                         "DeviceIsRemovable",
@@ -192 +249 @@
                         G_TYPE_INVALID))
         {
-                if (g_value_get_boolean (&value1))
-                        props->device_is_removable = TRUE;
+                props->device_is_removable = g_value_get_boolean (&value1);
+                g_value_unset (&value1);
+        }
+        else
+        {
+                printd (DEBUG,"Failed to get DeviceIsRemovable property for %s: %s",
+                        device_iface, error->message);
+                g_error_free (error);
+                g_free (device_iface);
+                return FALSE;
+        }
+
+#ifdef DEVKIT_IFACE
+        if (sessionptr->udisks)
+        {
+#endif
+                if (dbus_g_proxy_call (prop_proxy,
+                                "Get",
+                                &error,
+                                G_TYPE_STRING,
+                                device_iface,
+                                G_TYPE_STRING,
+                                "DriveCanDetach",
+                                G_TYPE_INVALID,
+                                G_TYPE_VALUE,
+                                &value1,
+                                G_TYPE_INVALID))
+                {
+                        props->device_is_detachable = g_value_get_boolean (&value1);
+                        g_value_unset (&value1);
+                }
                 else
-                        goto abort;
-        }
-
-        g_value_unset (&value1);
+                {
+                        printd (DEBUG,"Failed to get DriveCanDetach property for %s: %s",
+                                device_iface, error->message);
+                        g_error_free (error);
+                        g_free (device_iface);
+                        return FALSE;
+                }
+#ifdef DEVKIT_IFACE
+        }
+#endif
+        if (!(props->device_is_removable || props->device_is_detachable))
+                goto abort;
 
         //populate other properties the slow and lazy way (get all properties then filter them)
@@ -205 +299 @@
                         &error,
                         G_TYPE_STRING,
-                        DEVKIT_IFACE_NAME".Device",
+                        device_iface,
                         G_TYPE_INVALID,
                         dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE),
@@ -216 +310 @@
                 if (propvalue != NULL)
                         props->device_file = g_strdup (g_value_get_string (propvalue));
-//              propvalue = g_hash_table_lookup (hash_table, "DeviceFileById");
-//              if (propvalue != NULL)
-//                      props->device_file_by_id = g_strdupv (g_value_get_boxed (propvalue));
-//              propvalue = g_hash_table_lookup (hash_table, "DeviceFileByPath");
-//              if (propvalue != NULL)
-//                      props->device_file_by_path = g_strdupv (g_value_get_boxed (propvalue));
-                propvalue = g_hash_table_lookup (hash_table, "DeviceMountPath");
-                if (propvalue != NULL)
-                        props->device_mount_path = g_strdup (g_value_get_string (propvalue));
-//              propvalue = g_hash_table_lookup (hash_table, "DevicePresentationName");
-//              if (propvalue != NULL)
-//                      props->device_presentation_name = g_strdup (g_value_get_string (propvalue));
+#ifdef DEVKIT_IFACE
+                if (!sessionptr->udisks)
+                {
+                        propvalue = g_hash_table_lookup (hash_table, "DeviceMountPath");
+                        if (propvalue != NULL)
+                                props->device_mount_path = g_strdup (g_value_get_string (propvalue));
+                }
+                else
+                {
+#endif
+                        propvalue = g_hash_table_lookup (hash_table, "DeviceMountPaths");
+                        if (propvalue != NULL)
+                                props->device_mount_paths = g_strdupv (g_value_get_boxed (propvalue));
+#ifdef DEVKIT_IFACE
+                }
+#endif
                 propvalue = g_hash_table_lookup (hash_table, "IdUsage");
                 if (propvalue != NULL)
@@ -274 +372 @@
         else
         {
-                printd (DEBUG,"GetAll() failed to get properties for %s: %s",
+                printd (DEBUG,"Failed to get all properties for %s: %s",
                         object_path, error->message);
                 g_error_free (error);
                 retval = FALSE;
         }
+        //CHECKME props->ignored = ?
+        g_free (device_iface);
         g_object_unref (prop_proxy);
 
@@ -284 +384 @@
 }
 /**
+@brief cleanup allocated properties data for a device
+@param props the data struct to be processed
+@return
+*/
+static void _e2_devkit_device_properties_clear (DeviceProperties *props)
+{
+        g_free (props->device_file);
+#ifdef DEVKIT_IFACE
+        g_free (props->device_mount_path);
+#endif
+        g_strfreev (props->device_mount_paths);
+        g_free (props->id_usage);
+        g_free (props->id_type);
+        g_free (props->drive_media);
+}
+/**
 @brief cleanup device-data
-@param data data for a device
+@param data pointer to data struct for a device
 @return
 */
@@ -296 +412 @@
         }
         g_free (data->object_path);
+        g_object_unref (G_OBJECT(data->devproxy));
         _e2_devkit_device_properties_clear (&data->props);
-        g_object_unref(G_OBJECT(data->devproxy));
 
         DEALLOCATE (DeviceData, data);
@@ -309 +425 @@
 {
         //NOTE: ensure this cleanup conforms to the contents of data->props
+#ifdef DEVKIT_IFACE
         g_free (data->props.device_mount_path);
         data->props.device_mount_path = NULL;
+#endif
+        g_strfreev (data->props.device_mount_paths);
+        data->props.device_mount_paths = NULL;
 
         g_free (data->props.id_usage);
@@ -327 +447 @@
 @brief determine whether @a object_path represents a device we're interested in,
  and if so, set up data for it.
-@param pool
-@param object_path DEVKIT_PATH_ROOT etc
+@param sessionptr pointer to session data struct
+@param object_path PATH_ROOT...
 @return pointer to device data, or NULL if not wanted or error
 */
-static DeviceData *_e2_devkit_device_get (SessionDevices *pool,
+static DeviceData *_e2_devkit_device_get (DevicesSession *sessionptr,
         const gchar *object_path)
 {
         DeviceProperties props;
-        if (!_e2_devkit_device_properties_get (pool->bus, object_path, &props))
-        {
-                printd (DEBUG, "Devkit: Cannot determine properties for device %s", object_path);
+        if (!_e2_devkit_device_properties_get (sessionptr, object_path, &props))
+        {
+                printd (DEBUG, "Devices deamon cannot determine properties for device %s", object_path);
                 return NULL;
         }
@@ -343 +463 @@
         if (props.ignored)
         {
-//              printd (DEBUG, "Devkit: Not interested in device %s", object_path);
+//              printd (DEBUG, "Devices deamon not interested in device %s", object_path);
                 return NULL;
         }
@@ -349 +469 @@
         {
                 //this is a device of interest
+                gchar *device_iface;
                 DeviceData *device;
                 DBusGProxy *dev_proxy; //CHECKME needed ?
@@ -355 +476 @@
                 CHECKALLOCATEDWARN (device, _e2_devkit_device_properties_clear (&props);return NULL;)
 
-                dev_proxy = dbus_g_proxy_new_for_name (pool->bus,
-                        DEVKIT_IFACE_NAME,
+                device_iface = g_strconcat (sessionptr->iface_name, ".Device", NULL);
+                dev_proxy = dbus_g_proxy_new_for_name (sessionptr->bus,
+                        sessionptr->iface_name,
                         object_path,
-                        DEVKIT_IFACE_NAME".Device");
+                        device_iface);
+                g_free (device_iface);
 
                 if (dev_proxy == NULL)
@@ -384 +507 @@
 /**
 @brief log current removable devices
-@param pool pointer to devkit data struct
+@param sessionptr pointer to devkit data struct
 @return TRUE if enumeration succeeded
 */
-static gboolean _e2_devkit_detect_current_removables (SessionDevices *pool)
+static gboolean _e2_devkit_detect_current_removables (DevicesSession *sessionptr)
 {
         guint i;
@@ -396 +519 @@
         error = NULL;
         //CHECKME synchronous process ok ?
-        if (!dbus_g_proxy_call (pool->proxy, "EnumerateDevices", &error, G_TYPE_INVALID,
+        if (!dbus_g_proxy_call (sessionptr->proxy, "EnumerateDevices", &error, G_TYPE_INVALID,
                         dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_OBJECT_PATH),
                         &devices, G_TYPE_INVALID))
@@ -405 +528 @@
         }
 
-//      printd (DEBUG, "Devkit: %d devices reported", devices->len);
+//      printd (DEBUG, "Devices daemon reported %u devices", devices->len);
         for (i = 0; i < devices->len; i++)
         {
-                DeviceData *device = _e2_devkit_device_get (pool, devices->pdata[i]);
+                DeviceData *device = _e2_devkit_device_get (sessionptr, devices->pdata[i]);
                 if (device != NULL)
                 {
-                        printd (DEBUG, "Devkit: Logging device %s", devices->pdata[i]);
-                        g_hash_table_insert (pool->logged_devices,
+                        printd (DEBUG, "Logging removable device %s", device->props.device_file);
+                        g_hash_table_insert (sessionptr->logged_devices,
                                 (gpointer) device->object_path, //not another copy, not truncated
                                 (gpointer) device);
                 }
 //              else
-//                      printd (DEBUG, "Devkit: Skipping device %s @ %x", devices->pdata[i], device);
+//                      printd (DEBUG, "Skipping device %s @ %x", device->props.device_file, device);
 
                 g_free (devices->pdata[i]); //CHECKME does the array-data self-destruct (glib >= 2.22)
@@ -429 +552 @@
 @brief automount a volume
 This is called from within timer callback i.e. BGL is off
-@param pool
+@param sessionptr
 @param device
 
 @return TRUE if the mount is performed successfully or is not needed
 */
-static gboolean _e2_devkit_mount_volume (SessionDevices *pool, DeviceData *device)
+static gboolean _e2_devkit_mount_volume (DevicesSession *sessionptr, DeviceData *device)
 {
         gboolean optical;
@@ -447 +570 @@
                 )
         {
-                printd (DEBUG, "Devkit: device does not need to be mounted");
+                printd (DEBUG, "Device %s does not need to be mounted", device->props.device_file);
                 return TRUE;
         }
 
         fstype = device->props.id_usage;
-        if (fstype == NULL || strcmp (fstype, "filesystem"))    //CHECKME "crypto", "raid", "other"
-        {
-                printd (DEBUG, "Devkit: mounting this device-type is not supported");
+        if (fstype == NULL ||
+                !( strcmp (fstype, "filesystem") == 0
+                || strcmp (fstype, "raid") == 0 //OK ?
+                || strcmp (fstype, "crypto") == 0)) //OK ? //CHECKME "other"
+        {
+                printd (DEBUG, "Unmountable device %s", device->props.device_file);
                 return TRUE;    //some unmountable sort of device
         }
@@ -461 +587 @@
         if (fstype == NULL || *fstype == '\0')
         {
-                printd (DEBUG, "Devkit: device filesystem-type is not recognised");
+                printd (DEBUG, "Unrecognised filesystem-type for device %s", device->props.device_file);
                 return TRUE;    //not a data-medium
         }
 
-#if 0
-        //determine a suitable mountpoint ... apparently unusable if devkit does the mounting
-
-#define FIRSTOPTIC 10
-        const gchar *disktypes[] =
-        {
-                //for DeviceKit-Disks 004
-                "flash",
-                "flash_cf",
-                "flash_ms",
-                "flash_sm",             //aka "smart"
-
-                "flash_sd",
-                "flash_sdhc",
-                "flash_mmc",    //aka "sd_mmc"
-
-                "floppy",
-                "floppy_zip",   //aka "zip"
-                "floppy_jaz",   //aka "jaz"
-
-                "optical_cd",   //"cd", index 10
-                "optical_cd_r", //"cdrom"
-                "optical_cd_rw", //"cd" writable, index 12
-                "optical_dvd",  //"dvd"
-                "optical_dvd_r", //"dvdrom"
-                "optical_dvd_rw", //"dvd" writable 15
-                "optical_dvd_ram", //writable 16
-                "optical_dvd_plus_r",
-                "optical_dvd_plus_rw", //writable 18
-                "optical_dvd_plus_r_dl",
-                "optical_dvd_plus_rw_dl", //writable 20
-                "optical_bd",
-                "optical_bd_r",
-                "optical_bd_re",
-                "optical_hddvd", //24
-                "optical_hddvd_r",
-                "optical_hddvd_rw", //writable 26
-                "optical_mo",
-                "optical_mrw",
-                "optical_mrw_w", //writable 29
-        };
-
-        const gchar *last;
-        gboolean readonly;
-        gint i;
-
-/*      check for an available mountpoint
-        mountpoint from lsb spec:
-                /media
-                        /floppy Floppy drive (optional)
-                        /cdrom  CD-ROM drive (optional)
-                        /cdrecorder     CD writer (optional)
-                        /zip    Zip drive (optional)
-        Where more than one device exists for mounting a certain type of media, mount
-        directories can be created by appending a digit to the name, starting with
-        '0', but the unqualified name must also exist
-
-        for device names:
-        Partitions or volumes will appear as device-appended numbers, like
-           sda1, sda2 ....
-        Some devices e.g. cdrom are themselves treated as a volume, and will then
-        have no partition number
-        Devices to be mounted may already exist in /dev
-*/
-        if (optical)
-        {       //this volume is, or is part of, an optical disk
-                gint count = sizeof (disktypes) / sizeof (const gchar *);
-                if (device->props.drive_media == NULL || *device->props.drive_media == '\0')
-                        i = count;      //set defaults
-                else
-                {
-                        for (i = FIRSTOPTIC; i < count; i++)
-                        {
-                                if (!strcmp (disktypes[i], device->props.drive_media))
-                                {
-                                        switch (i)
-                                        {
-                                                case 12:
-                                                case 15:
-                                                case 16:
-                                                case 18:
-                                                case 20:
-                                                case 26:
-                                                case 29:
-                                                        if (i <= 12)
-                                                                last = "cdrecorder";
-                                                        else if (i <= 20 || i == 24 || i == 25 || i == 26)
-                                                                last = "dvdrecorder";
-                                                        else
-                                                                last = "recorder";
-                                                        readonly = FALSE;
-                                                        break;
-                                                default:
-                                                        if (i <= 12)
-                                                                last = "cdrom";
-                                                        else if (i <= 20 || i == 24 || i == 25 || i == 26)
-                                                                last = "dvdrom";
-                                                        else
-                                                                last = "disk";
-                                                        readonly = TRUE;
-                                                        break;
-                                        }
-                                        break;
-                                }
-                        }
-                }
-                if (i == count)
-                {       //defaults
-                        last = "cdrom";
-                        readonly = TRUE;
-                }
-        }
-        else //not an optical disk
-        {
-                if (device->props.drive_media == NULL || *device->props.drive_media == '\0')
-                        i = FIRSTOPTIC; //set defaults
-                else
-                {
-                        for (i = 0; i < FIRSTOPTIC; i++)
-                        {
-                                last = disktypes[i];
-                                if (!strcmp (last, device->props.drive_media))
-                                {
-                                        switch (i)
-                                        {
-                                                default:
-                                                        last = "disk";  //FIXME
-                                                        break;
-                                                case 7:
-                                                        last = "floppy";
-                                                        break;
-                                                case 8:
-                                                        last = "zip";
-                                                        break;
-                                                case 9:
-                                                        last = "jaz";
-                                                        break;
-                                        }
-                                        readonly = FALSE;
-                                        break;
-                                }
-                        }
-                }
-                if (i == FIRSTOPTIC)
-                {       //defaults
-                        last = "disk";
-                        readonly = FALSE;
-                }
-        }
-
-        GList *mounts_now, *member;
-        gchar *str, *utf, *mountpoint;
-
-        mounts_now = e2_fs_mount_get_mounts_list ();
-        mountpoint = g_build_filename (E2_MOUNTPLACE, last, NULL);
-        str = g_strdup (mountpoint);
-        utf = F_FILENAME_FROM_LOCALE (str);     //not strictly necessary, the default path is all ASCII
-        guint count = 0;
-retry:
-        for (member = mounts_now; member != NULL; member = member->next)
-        {
-                if (!strcmp ((gchar*)member->data, utf))
-                {
-                        g_free (str);
-                        F_FREE (utf, str);
-                        str = g_strdup_printf ("%s%d", mountpoint, count++);
-                        utf = F_FILENAME_FROM_LOCALE (str);
-                        goto retry;
-                }
-        }
-
-        g_free (mountpoint);
-        F_FREE (utf, str);
-        e2_list_free_with_data (&mounts_now);
-        mountpoint = str;
-
-        //determine mount options from the available ones ... apparently unusable if devkit does the mounting
-
-        gboolean readonly_valid = FALSE;
-        gint freeindex = -1;
-
-        GPtrArray *extra_options = g_ptr_array_sized_new (6);
-        gboolean FIXME; //get suitable options
-        gchar **mountopts = NULL;
-        if (mountopts != NULL)
-        {
-                gchar **thisopt;
-                for (thisopt = mountopts; *thisopt != NULL; thisopt++)
-                {
-                //CHECKME which mount options are most suitable ?
-                //e.g. ro,sync,dirsync,noatime,nodiratime,noexec,quiet,remount,exec,utf8
-                //shortname=,codepage=,iocharset=,umask=,dmask=,fmask=,uid=,flush
-                        if (strcmp (*thisopt, "exec") == 0)
-                        {
-                                g_ptr_array_add (extra_options, *thisopt);
-                        }
-                        else if (strncmp (*thisopt, "umask=", 6) == 0)
-                        {
-                                g_ptr_array_add (extra_options, g_strconcat (*thisopt, "0", NULL));
-                                freeindex = extra_options->len - 1; //for leak fix
-                        }
-                        else if (strcmp (*thisopt, "sync") == 0)
-                        {
-                                g_ptr_array_add (extra_options, *thisopt);
-                        }
-                        else if (strcmp (*thisopt, "ro") == 0)
-                        {
-                                readonly_valid = TRUE;
-                                if (readonly)
-                                        g_ptr_array_add (extra_options, *thisopt);
-                        }
-                        else if (readonly)
-                        {
-                                readonly_valid = TRUE;
-                                        g_ptr_array_add (extra_options, "ro");
-                        }
-
-                }
-        }
-        g_ptr_array_add (extra_options, NULL);  //terminate the array
-#endif //0
-
-        gboolean retval;
-
-        //do it
-# if 0 //direct
-        gint res = run command
-        retval = (res == 0);
-/*      if (retval)
-        {
-                //"refresh" the filelist(s) if needed
-                gchar *utf = F_FILENAME_FROM_LOCALE (mountpoint);
-                if (g_str_has_prefix (curr_view->dir, utf))
-                        do something
-                if (g_str_has_prefix (other_view->dir, utf))
-                        do something
-                F_FREE (utf, mountpoint);
-        }
-*/
-# else //via devkit
-        gpointer cb_data = device;
-#if 1
-        gchar *options[2];
-
-        options[0] = NULL;
-#endif
-
-        retval =
+        //apparently, a mountpoint can't be specified to the daemon
+        //so we don't bother with non-default mount-options, either
+        return
                 (dbus_g_proxy_begin_call (device->devproxy, "FilesystemMount",
-                _e2_devkit_mount_async_cb,
-                cb_data, (GDestroyNotify) NULL,
-                G_TYPE_STRING, fstype,
-#  if 0
-                G_TYPE_STRV, extra_options->pdata,
-#  else
-                G_TYPE_STRV, options,  //no mount options
-#  endif
-                G_TYPE_INVALID) != NULL);
-# endif
-#if 0
-        //cleanup
-        g_free (mountpoint);
-        //CHECKME free all options ? does the array-data self-destruct (glib >= 2.22)
-        if (freeindex != -1)
-                g_free (g_ptr_array_index (extra_options, freeindex));
-        g_ptr_array_free (extra_options, TRUE);
-#endif
-        return retval;
+                        _e2_devkit_mount_async_cb,
+                        device, (GDestroyNotify) NULL,
+                        G_TYPE_STRING, fstype,
+                        G_TYPE_STRV, NULL,  //no mount options
+                        G_TYPE_INVALID)
+                != NULL);
+}
+
+/**
+@brief if possible, change CWD out of @mountpoint so we don't ourself block the unmount
+@param mountpoint a mountpoint path supplied by the daemon, converted to UTF-8
+
+@return
+*/
+static void _e2_devkit_skipaway (const gchar *mountpoint)
+{
+        gchar *elsewhere, *s;
+
+        if (mountpoint == NULL)
+                return;
+        elsewhere = g_strdup (mountpoint);
+        g_strchug (elsewhere); //just in case ...
+        if (*mountpoint != G_DIR_SEPARATOR)
+        {
+                g_free (elsewhere);
+                return;
+        }
+        if (e2_utils_pass_whitespace ((gchar *)(mountpoint + 1)) == NULL)
+        {
+                g_free (elsewhere);
+                return; //nothing to do
+        }
+        while ((s = strrchr (elsewhere, G_DIR_SEPARATOR)) != NULL)
+        {
+                if (s > elsewhere) //keep the root dir
+                        *s = '\0';
+                if (!g_str_has_prefix (elsewhere, mountpoint))
+                {
+                        e2_fs_get_valid_path (&elsewhere, TRUE E2_ERR_NONE());
+                        e2_pane_change_dir (NULL, elsewhere);
+                        break;
+                }
+                else if (s == elsewhere)
+                        break; //nowhere to go
+        }
+        g_free (elsewhere);
 }
 
@@ -738 +646 @@
 @brief auto-unmount a volume
 This is called from within timer callback i.e. BGL is off
-@param pool pointer to devkit data struct
+@param sessionptr pointer to devkit data struct
 @param device pointer to data for the device
 
 @return TRUE if the unmount is performed successfully or is not needed
 */
-static gboolean _e2_devkit_unmount_volume (SessionDevices *pool, DeviceData *device)
+static gboolean _e2_devkit_unmount_volume (DevicesSession *sessionptr, DeviceData *device)
 {
         //CHECKME upstream check for still-need-unmount is too racy?
@@ -752 +660 @@
         }
 
-        const gchar *mountpoint = device->props.device_mount_path;
-        if (mountpoint != NULL  //should never happen
+        gchar *mountpoint;
+#ifdef DEVKIT_IFACE
+        mountpoint = device->props.device_mount_path;
+        gboolean moved;
+        if (!sessionptr->udisks && mountpoint != NULL) //this is a devkit-disks session
+        {
+                mountpoint = F_FILENAME_FROM_LOCALE (mountpoint);
+# ifdef E2_VFSTMP
+                //FIXME dir when not mounted local
+# endif
+                if (g_str_has_prefix (curr_view->dir, mountpoint))
+                {
+                        _e2_devkit_skipaway (mountpoint);
+                        moved = TRUE;
+                }
+                else
+                        moved = FALSE;
+                F_FREE (mountpoint, device->props.device_mount_path);
+        }
+        else
+                moved = FALSE;
+
+        if (sessionptr->udisks && !moved)
+        {
+#endif
+                gchar **allmounts;
+                for (allmounts = device->props.device_mount_paths;
+                        (mountpoint = *allmounts) != NULL;
+                        allmounts++)
+                {
+                        mountpoint = F_FILENAME_FROM_LOCALE (mountpoint);
 #ifdef E2_VFSTMP
-        //FIXME dir when not mounted local
-#else
-                && g_str_has_prefix (curr_view->dir, mountpoint))
-#endif
-        {       //if possible, change CWD out of mountpoint so we don't ourself block the unmount
-                gchar *elsewhere;
-                const gchar *s = strrchr (mountpoint, G_DIR_SEPARATOR); //assumes no trailer on mountpoint string
-                if (s > mountpoint + 1) //not doing root dir
-                        elsewhere = g_strndup (mountpoint, s - mountpoint);
-                else //can't cd
-                        elsewhere = g_strdup (G_DIR_SEPARATOR_S);
-
-                e2_fs_get_valid_path (&elsewhere, TRUE E2_ERR_NONE());
-                e2_pane_change_dir (NULL, elsewhere);
-                g_free (elsewhere);
-        }
-
+                        //FIXME dir when not mounted local
+#endif
+                        if (g_str_has_prefix (curr_view->dir, mountpoint))
+                        {
+                                _e2_devkit_skipaway (mountpoint);
+                                F_FREE (mountpoint, device->props.device_mount_path);
+                                break;
+                        }
+                        F_FREE (mountpoint, device->props.device_mount_path);
+                }
+#ifdef DEVKIT_IFACE
+        }
+#endif
         //do it
-# if 0 //direct
-        gint res = run command
+#if 0 //direct
+        gint res = run unmount command
         retval = (res == 0);
         //do stuff if successful
@@ -780 +713 @@
                 _e2_devkit_device_data_freshen (device);
         return retval;
-# else //via devkit
-        gpointer cb_data = device;
-        gchar *options[2];
-
-#ifdef DEBUG_MESSAGES
-        gboolean CHECKME;
-#endif
-        options[0] = NULL;
-
+#else //via the daemon
+//      gpointer cb_data = device;
+//      gchar *options[2];
+//      options[0] = NULL;
+//# ifdef DEBUG_MESSAGES
+//      gboolean CHECKME;
+//# endif
         return
                 (dbus_g_proxy_begin_call (device->devproxy, "FilesystemUnmount",
-                _e2_devkit_unmount_async_cb,
-                cb_data, (GDestroyNotify) NULL,
-                G_TYPE_STRV, options, G_TYPE_INVALID) != NULL);
-# endif
+                        _e2_devkit_unmount_async_cb,
+                        device, (GDestroyNotify) NULL,
+                        G_TYPE_STRV, /*options*/NULL, G_TYPE_INVALID)
+                != NULL);
+#endif
 }
 
@@ -854 +786 @@
                 //do stuff ?
                 DeviceData *device = (DeviceData *)user_data;
-                printd (DEBUG, "Device %s unmounted", device->object_path);
+                printd (DEBUG, "Device %s unmounted", device->props.device_file);
                 _e2_devkit_device_data_freshen (device);
         }
@@ -876 +808 @@
         device->timer_id = 0;   //ASAP indicate to any other process
                                                         //but we don't remove this source in case mount fails
-        printd (DEBUG, "Devkit: mount timer callback, device %s", device->props.device_file);
+        printd (DEBUG, "Device-mount timer callback, device %s", device->props.device_file);
 
         if (!device->props.device_is_mounted
@@ -882 +814 @@
                 )
         {
-                printd (DEBUG, "device needs to be mounted");
+                printd (DEBUG, "device still not mounted");
 #ifdef DEBUG_MESSAGES
-                gboolean retval = !_e2_devkit_mount_volume (&devicesdata, device);
+                gboolean retval = !_e2_devkit_mount_volume (&session, device);
                 if (retval)
                         printd (DEBUG, "mount operation failed");
                 return retval;  //try again in case of failure
 #else
-                return (!_e2_devkit_mount_volume (&devicesdata, device));
+                return (!_e2_devkit_mount_volume (&session, device));
 #endif
         }
@@ -898 +830 @@
 @brief callback for a device-add event
 @param proxy connection to devkit daemon
-@param object_path DEVKIT_PATH_ROOT etc
+@param object_path PATH_ROOT...
 @param user_data pointer to device monitor data struct specified when callback was connected
 @return
@@ -905 +837 @@
         const gchar *object_path, gpointer user_data)
 {
-        SessionDevices *pool;
+        DevicesSession *sessionptr;
         DeviceData *device;
 
-        pool = (SessionDevices *)user_data;
-        device = g_hash_table_lookup (pool->logged_devices, object_path);
+        sessionptr = (DevicesSession *)user_data;
+        device = g_hash_table_lookup (sessionptr->logged_devices, object_path);
 
         if (G_LIKELY(device == NULL))
         {
-                device = _e2_devkit_device_get (pool, object_path);
+                device = _e2_devkit_device_get (sessionptr, object_path);
                 if (device != NULL)
                 {
                         //new device is one we want
-                        printd (DEBUG, "Devkit: Logging device %s @ %x", object_path, device);
-                        g_hash_table_insert (pool->logged_devices,
+                        printd (DEBUG, "Logging device %s @ %x", device->props.device_file, device);
+                        g_hash_table_insert (sessionptr->logged_devices,
                                 (gpointer) device->object_path, //not another copy, not truncated
                                 (gpointer) device);
-                        //CHECKME is 2-sec delay long enough ?
+                        //CHECKME is 5-sec delay long enough ?
                         device->timer_id =
 #ifdef USE_GLIB2_14
-                                g_timeout_add_seconds (2,
+                                g_timeout_add_seconds (5,
 #else
-                                g_timeout_add (2000,
+                                g_timeout_add (5000,
 #endif
                                 (GSourceFunc) _e2_devkit_check_mount, device);
@@ -941 +873 @@
                         device->timer_id = 0;
                 }
-                printd (WARN, "Devkit: add-event for previously added device %s, treat as change",
+                printd (WARN, "Devices daemon add-event for previously added device %s, treat as change",
                         object_path);
                 _e2_devkit_device_changed_cb (proxy, object_path, user_data);
@@ -964 +896 @@
         }
 
-        printd (DEBUG, "Devkit: unmount timer callback");
+        printd (DEBUG, "Device unmount timer-callback");
 
         if (device->props.device_is_mounted)
         {
-                        printd (DEBUG, "device needs to be unmounted");
-                        retval = !_e2_devkit_unmount_volume (&devicesdata, device);
+                printd (DEBUG, "device is still mounted");
+                retval = !_e2_devkit_unmount_volume (&session, device);
 #ifdef DEBUG_MESSAGES
-                        if (retval)
-                                printd (DEBUG, "but unmount operation failed");
+                if (retval)
+                        printd (DEBUG, "but unmount operation failed");
 #endif
         }
@@ -987 +919 @@
 @brief callback for a device-remove event
 @param proxy
-@param object_path DEVKIT_PATH_ROOT etc
+@param object_path PATH_ROOT...
 @param user_data pointer to device monitor data struct specified when callback was connected
 @return
@@ -994 +926 @@
         const gchar *object_path, gpointer user_data)
 {
-        SessionDevices *pool;
+        DevicesSession *sessionptr;
         DeviceData *device;
 
-        pool = (SessionDevices *)user_data;
-        if (pool->logged_devices == NULL)
+        sessionptr = (DevicesSession *)user_data;
+        if (sessionptr->logged_devices == NULL)
                 return;
-        device = g_hash_table_lookup (pool->logged_devices, object_path);
+        device = g_hash_table_lookup (sessionptr->logged_devices, object_path);
 
         if (G_LIKELY(device != NULL))
@@ -1024 +956 @@
 This will be called twice when a device is added/removed. The 2nd call does nothing.
 @param proxy connection to devkit daemon
-@param object_path DEVKIT_PATH_ROOT/devicename (e.g. sr0, but with any '-' converted to '_')
+@param object_path PATH_ROOT/devicename (e.g. sr0, but with any '-' converted to '_')
 @param user_data pointer to session-devices data struct specified when callback was connected
 @return
@@ -1031 +963 @@
         const gchar *object_path, gpointer user_data)
 {
-        SessionDevices *pool;
+        DevicesSession *sessionptr;
         DeviceData *device;
 
         printd (DEBUG,"_e2_devkit_device_changed_cb: device %s", object_path);
-        pool = (SessionDevices *)user_data;
-        if (pool->logged_devices == NULL)
+        sessionptr = (DevicesSession *)user_data;
+        if (sessionptr->logged_devices == NULL)
         {
 #ifdef DEBUG_MESSAGES
@@ -1044 +976 @@
                 return;
         }
-        device = g_hash_table_lookup (pool->logged_devices, object_path);
+        device = g_hash_table_lookup (sessionptr->logged_devices, object_path);
 
         if (G_LIKELY(device != NULL))
@@ -1056 +988 @@
                 }
 
-                if (_e2_devkit_device_properties_get (pool->bus, object_path, &new_properties))
+                if (_e2_devkit_device_properties_get (sessionptr, object_path, &new_properties))
                 {
                         if (G_LIKELY(!new_properties.ignored))
@@ -1112 +1044 @@
 This callback happens only at idle-time, and before any device-changed callback.
 There is no info on what properties have changed, so we must poll.
-@param object UNUSED DEVKIT_DISKS_DEVICE object
+@param object UNUSED object
 @param user_data pointer to data struct for device that's changed
 @return
@@ -1155 +1087 @@
 gboolean e2_devkit_device_is_removable (const gchar *devpath)
 {
-        if (devicesdata.logged_devices != NULL)
-        {
-                return (g_hash_table_find (devicesdata.logged_devices,
+        if (session.logged_devices != NULL)
+        {
+                return (g_hash_table_find (session.logged_devices,
                                 (GHRFunc) _e2_devkit_check_device_path,
                                 (gpointer)devpath) != NULL);
@@ -1170 +1102 @@
 gboolean e2_devkit_device_is_ejectable (const gchar *devpath)
 {
-        if (devicesdata.logged_devices != NULL)
+        if (session.logged_devices != NULL)
         {
                 DeviceData *dev;
-                dev = (DeviceData *)g_hash_table_find (devicesdata.logged_devices,
+                dev = (DeviceData *)g_hash_table_find (session.logged_devices,
                                 (GHRFunc) _e2_devkit_check_device_path,
                                 (gpointer)devpath);
@@ -1189 +1121 @@
 void e2_devkit_init (void)
 {
-        SessionDevices *pool;
+        DevicesSession *sessionptr;
         GError *error;
-
-        pool = &devicesdata;
+        const gchar *iface_name, *object_path;
+        gchar *version;
+
         error = NULL;
-
-        pool->bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
-        if (pool->bus == NULL)
-        {
-//              _e2_devkit_advise (_("message"), NULL);
+        object_path = NULL; //warning prevention
+
+        session.bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
+        if (session.bus == NULL)
+        {
+//              _e2_devkit_advise (_("some warning ..."), NULL);
                 printd (WARN, "Unable to connect to system bus: %s", error->message);
                 g_error_free (error);
                 return;
         }
-        pool->proxy = dbus_g_proxy_new_for_name (pool->bus,
-                                                                                        DEVKIT_IFACE_NAME,
-                                                                                        "/org/freedesktop/DeviceKit/Disks",
-                                                                                        DEVKIT_IFACE_NAME);
-        //CHECKME specifically confirm daemon presence ?
-        if (pool->proxy == NULL)
-        {
-//              _e2_devkit_advise (_("message"), NULL);
-                printd (WARN, "Unable to connect to devicekit daemon");
-                dbus_g_connection_unref (pool->bus);
+
+        //check for daemon presence
+        iface_name = UDISK_IFACE_NAME;
+        version = _e2_devkit_get_version (session.bus, iface_name, UDISK_BUS_PATH);
+        if (version != NULL)
+        {
+#ifdef DEVKIT_IFACE
+                session.udisks = TRUE;
+#endif
+                session.daemon_version = version;
+                session.iface_name = iface_name;
+                object_path = UDISK_BUS_PATH;
+        }
+        else
+        {
+#ifdef DEVKIT_IFACE
+                iface_name = DEVKIT_IFACE_NAME;
+                version = _e2_devkit_get_version (session.bus, iface_name, DEVKIT_BUS_PATH);
+                if (version != NULL)
+                {
+                        session.daemon_version = version;
+                        session.iface_name = iface_name;
+                        object_path = DEVKIT_BUS_PATH;
+                }
+                else
+                {
+//                      _e2_devkit_advise (_("some warning ..."), NULL);
+                        printd (WARN, "Unable to connect to any devices daemon");
+                        dbus_g_connection_unref (session.bus);
+                        session.bus = NULL;
+                        return;
+                }
+#else
+//              _e2_devkit_advise (_("some warning ..."), NULL);
+                printd (WARN, "Unable to connect to a udisks daemon");
+                dbus_g_connection_unref (session.bus);
+                session.bus = NULL;
                 return;
-        }
-
-        //table with key = D-Bus object path, value = the corresponding device data struct
-        pool->logged_devices = g_hash_table_new_full (
-                g_str_hash, g_str_equal, NULL,
-                (GDestroyNotify)_e2_devkit_device_data_clear);
-
-        if (_e2_devkit_detect_current_removables (pool))
+#endif
+        }
+
+        session.proxy = dbus_g_proxy_new_for_name (session.bus,
+                iface_name,
+                object_path,
+                iface_name);
+        if (session.proxy == NULL)
+        {
+//              _e2_devkit_advise (_("some warning ..."), NULL);
+                printd (WARN, "Unable to create proxy for dbus connection");
+                dbus_g_connection_unref (session.bus);
+                session.bus = NULL;
+                return;
+        }
+
+        //table with: key = D-Bus object path, value = the corresponding device data struct
+        session.logged_devices = g_hash_table_new_full (
+                g_str_hash, g_str_equal,
+                NULL, (GDestroyNotify)_e2_devkit_device_data_clear);
+
+        sessionptr = &session;
+        if (_e2_devkit_detect_current_removables (sessionptr))
         {
                 const gchar *signame;
 
                 signame = "DeviceAdded";
-                dbus_g_proxy_add_signal (pool->proxy, signame, DBUS_TYPE_G_OBJECT_PATH,
-                        G_TYPE_INVALID);
-                dbus_g_proxy_connect_signal (pool->proxy, signame,
-                         G_CALLBACK (_e2_devkit_device_added_cb), pool, NULL);
+                dbus_g_proxy_add_signal (session.proxy, signame,
+                        DBUS_TYPE_G_OBJECT_PATH, G_TYPE_INVALID);
+                dbus_g_proxy_connect_signal (session.proxy, signame,
+                         G_CALLBACK (_e2_devkit_device_added_cb), sessionptr, NULL);
                 signame = "DeviceRemoved";
-                dbus_g_proxy_add_signal (pool->proxy, signame, DBUS_TYPE_G_OBJECT_PATH,
-                        G_TYPE_INVALID);
-                dbus_g_proxy_connect_signal (pool->proxy, signame,
-                         G_CALLBACK (_e2_devkit_device_removed_cb), pool, NULL);
+                dbus_g_proxy_add_signal (session.proxy, signame,
+                        DBUS_TYPE_G_OBJECT_PATH, G_TYPE_INVALID);
+                dbus_g_proxy_connect_signal (session.proxy, signame,
+                         G_CALLBACK (_e2_devkit_device_removed_cb), sessionptr, NULL);
                 signame = "DeviceChanged";
-                dbus_g_proxy_add_signal (pool->proxy, signame, DBUS_TYPE_G_OBJECT_PATH,
-                        G_TYPE_INVALID);
-                dbus_g_proxy_connect_signal (pool->proxy, signame,
-                         G_CALLBACK (_e2_devkit_device_changed_cb), pool, NULL);
-        }
-        else
-        {
-//              _e2_devkit_advise (_("message"), NULL);
-                dbus_g_connection_unref (pool->bus);
-                g_object_unref (G_OBJECT(pool->proxy));
-                g_hash_table_destroy (pool->logged_devices);
-                memset (pool, 0, sizeof (SessionDevices));
+                dbus_g_proxy_add_signal (session.proxy, signame,
+                        DBUS_TYPE_G_OBJECT_PATH, G_TYPE_INVALID);
+                dbus_g_proxy_connect_signal (session.proxy, signame,
+                         G_CALLBACK (_e2_devkit_device_changed_cb), sessionptr, NULL);
+        }
+        else
+        {
+//              _e2_devkit_advise (_("some warning ..."), NULL);
+                dbus_g_connection_unref (session.bus);
+                g_object_unref (G_OBJECT(session.proxy));
+                g_hash_table_destroy (session.logged_devices);
+                memset (sessionptr, 0, sizeof (DevicesSession));
         }
 }
@@ -1256 +1232 @@
 void e2_devkit_disconnect (void)
 {
-        SessionDevices *pool;
-
-        pool = &devicesdata;
-        if (pool->bus != NULL)
-                dbus_g_connection_unref (pool->bus);
-        if (pool->proxy != NULL)
-                g_object_unref (G_OBJECT(pool->proxy));
-        if (pool->logged_devices != NULL)
-                g_hash_table_destroy (pool->logged_devices);
+        if (session.daemon_version != NULL)
+                g_free (session.daemon_version);
+        if (session.bus != NULL)
+                dbus_g_connection_unref (session.bus);
+        if (session.proxy != NULL)
+                g_object_unref (G_OBJECT(session.proxy));
+        if (session.logged_devices != NULL)
+                g_hash_table_destroy (session.logged_devices);
 }
 #endif //def E2_DEVKIT