From: David Zeuthen <davidz@redhat.com>
Date: Tue, 19 May 2009 16:09:57 +0000 (-0400)
Subject: Catch up with latest polkit API changes
X-Git-Tag: upstream/2.1.2~850
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ef8c5aa8114f5dfa85be8d9f9508def3ba329682;p=platform%2Fupstream%2Fudisks2.git

Catch up with latest polkit API changes
---

diff --git a/src/devkit-disks-polkit-action-lookup.c b/src/devkit-disks-polkit-action-lookup.c
index 6937131..0d1be52 100644
--- a/src/devkit-disks-polkit-action-lookup.c
+++ b/src/devkit-disks-polkit-action-lookup.c
@@ -151,7 +151,7 @@ static const Map map[] = {
 static gchar *
 devkit_disks_action_lookup_get_message   (PolkitBackendActionLookup *lookup,
                                           const gchar               *action_id,
-                                          GHashTable                *details,
+                                          PolkitDetails             *details,
                                           PolkitActionDescription   *action_description)
 {
         const gchar *operation;
@@ -163,7 +163,7 @@ devkit_disks_action_lookup_get_message   (PolkitBackendActionLookup *lookup,
         if (!g_str_has_prefix (action_id, "org.freedesktop.devicekit.disks."))
                 goto out;
 
-        operation = g_hash_table_lookup (details, "operation");
+        operation = polkit_details_lookup (details, "operation");
         if (operation == NULL)
                 goto out;
 
@@ -182,7 +182,7 @@ devkit_disks_action_lookup_get_message   (PolkitBackendActionLookup *lookup,
 static gchar *
 devkit_disks_action_lookup_get_icon_name (PolkitBackendActionLookup *lookup,
                                           const gchar               *action_id,
-                                          GHashTable                *details,
+                                          PolkitDetails             *details,
                                           PolkitActionDescription   *action_description)
 {
         gchar *ret;
@@ -198,34 +198,34 @@ devkit_disks_action_lookup_get_icon_name (PolkitBackendActionLookup *lookup,
         return ret;
 }
 
-static GHashTable *
+static PolkitDetails *
 devkit_disks_action_lookup_get_details   (PolkitBackendActionLookup *lookup,
                                           const gchar               *action_id,
-                                          GHashTable                *details,
+                                          PolkitDetails             *details,
                                           PolkitActionDescription   *action_description)
 {
         const gchar *s;
         const gchar *s2;
         const gchar *s3;
         GString *str;
-        GHashTable *ret;
+        PolkitDetails *ret;
 
         if (!g_str_has_prefix (action_id, "org.freedesktop.devicekit.disks."))
                 return NULL;
 
-        ret = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, g_free);
+        ret = polkit_details_new ();
 
         /* see devkit_disks_daemon_local_check_auth() in devkit-disks-daemon.c
          * for where these keys are set
          */
 
-        s = g_hash_table_lookup (details, "unix-device");
+        s = polkit_details_lookup (details, "unix-device");
         if (s != NULL)
-                g_hash_table_insert (ret, _("Device"), g_strdup (s));
+                polkit_details_insert (ret, _("Device"), s);
 
-        s = g_hash_table_lookup (details, "drive-vendor");
-        s2 = g_hash_table_lookup (details, "drive-model");
-        s3 = g_hash_table_lookup (details, "drive-revision");
+        s = polkit_details_lookup (details, "drive-vendor");
+        s2 = polkit_details_lookup (details, "drive-model");
+        s3 = polkit_details_lookup (details, "drive-revision");
         str = g_string_new (NULL);
         if (s != NULL) {
                 g_string_append (str, s);
@@ -242,7 +242,7 @@ devkit_disks_action_lookup_get_details   (PolkitBackendActionLookup *lookup,
         }
 
         if (str->len > 0) {
-                g_hash_table_insert (ret, _("Drive"), g_strdup (str->str));
+                polkit_details_insert (ret, _("Drive"), str->str);
         }
         g_string_free (str, TRUE);