Changeset 2051

Timestamp:

02/21/10 01:30:04 (5 months ago)

Author:

tpgww

Message:

cleanups

Files:

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

trunk/src/filesystem/e2_devkit.c

@@ -1 +1 @@
 /* $Id$
 
-Copyright (C) 2009 tooar <tooar@emelfm2.net>
+Copyright (C) 2009-2010 tooar <tooar@emelfm2.net>
 
 This file is part of emelFM2.
@@ -48 +48 @@
 //PATH_ROOT supplied to funcs will be "/org/freedesktop/UDisks/devices/"
 
-//subset of available device-properties
+//device-properties that are useful here, a subset of all available properties
 typedef struct _DeviceProperties
 {
@@ -75 +75 @@
 //      gboolean drive_requires_eject; not application-controllable ?
         gboolean optical_disc_is_blank;
-        gboolean ignored;       //flag for device not relevant, not a devkit property
+
+        gboolean ignored;       //flag for device not relevant, not a daemon property
 } DeviceProperties;
 
@@ -113 +114 @@
 @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.
+well-known-name @a iface on the DBus system message bus.
 @param bus pointer to dbus connection object
 @param iface string like "org.freedesktop.DeviceKit.Disks"
@@ -124 +125 @@
         gchar *version;
         DBusGProxy *prop_proxy;
-        GValue value1 = {0};
+        GValue value = {0};
         GError *error;
 
@@ -147 +148 @@
                         G_TYPE_INVALID,
                         G_TYPE_VALUE,
-                        &value1,
+                        &value,
                         G_TYPE_INVALID))
         {
-                version = g_strdup (g_value_get_string (&value1));
-                g_value_unset (&value1);
+                version = g_strdup (g_value_get_string (&value));
+                g_value_unset (&value);
                 printd (DEBUG,"DaemonVersion property for %s is \"%s\"", object_path, version);
         }
@@ -181 +182 @@
         gchar *device_iface;
         DBusGProxy *prop_proxy;
-        GValue value1 = {0};
+        GValue value = {0};
         GError *error;
         GHashTable *hash_table;
@@ -199 +200 @@
         memset (props, 0, sizeof(DeviceProperties));
         error = NULL;
-        //no point in doing async interrogations here
-        //since most devices are not relevant, best to do some separate, minimal,
+        //No point in doing async interrogations here
+        //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,
@@ -211 +212 @@
                         G_TYPE_INVALID,
                         G_TYPE_VALUE,
-                        &value1,
+                        &value,
                         G_TYPE_INVALID))
         {
-                if (g_value_get_boolean (&value1))
-                        props->device_is_drive = TRUE;
-                else
-                {
-                        g_value_unset (&value1);
+                props->device_is_drive = g_value_get_boolean (&value);
+                if (!props->device_is_drive)
+                {
+                        g_value_unset (&value);
 abort:
                         g_free (device_iface);
@@ -229 +229 @@
         {
                 printd (DEBUG,"Failed to get DeviceIsDrive property for %s: %s",
-                        device_iface, error->message);
+                        object_path, error->message);
                 g_error_free (error);
                 g_free (device_iface);
+                g_object_unref (G_OBJECT(prop_proxy));
                 return FALSE;
         }
 
-        g_value_unset (&value1);
+        g_value_unset (&value);
 
         if (dbus_g_proxy_call (prop_proxy,
@@ -246 +247 @@
                         G_TYPE_INVALID,
                         G_TYPE_VALUE,
-                        &value1,
+                        &value,
                         G_TYPE_INVALID))
         {
-                props->device_is_removable = g_value_get_boolean (&value1);
-                g_value_unset (&value1);
+                props->device_is_removable = g_value_get_boolean (&value);
         }
         else
         {
                 printd (DEBUG,"Failed to get DeviceIsRemovable property for %s: %s",
-                        device_iface, error->message);
+                        object_path, error->message);
                 g_error_free (error);
                 g_free (device_iface);
+                g_object_unref (G_OBJECT(prop_proxy));
                 return FALSE;
         }
+
+        g_value_unset (&value);
 
 #ifdef DEVKIT_IFACE
@@ -274 +277 @@
                                 G_TYPE_INVALID,
                                 G_TYPE_VALUE,
-                                &value1,
+                                &value,
                                 G_TYPE_INVALID))
                 {
-                        props->device_is_detachable = g_value_get_boolean (&value1);
-                        g_value_unset (&value1);
+                        props->device_is_detachable = g_value_get_boolean (&value);
+                        if (props->device_is_detachable)
+                                printd (DEBUG,"Device %s is detachable", object_path);
                 }
                 else
                 {
                         printd (DEBUG,"Failed to get DriveCanDetach property for %s: %s",
-                                device_iface, error->message);
+                                object_path, error->message);
                         g_error_free (error);
                         g_free (device_iface);
+                        g_object_unref (G_OBJECT(prop_proxy));
                         return FALSE;
                 }
+                g_value_unset (&value);
 #ifdef DEVKIT_IFACE
         }
@@ -379 +385 @@
         //CHECKME props->ignored = ?
         g_free (device_iface);
-        g_object_unref (prop_proxy);
+        g_object_unref (G_OBJECT(prop_proxy));
 
         return retval;