Imported Upstream version 1.1.91 upstream/1.1.91

1 files changed, 10 insertions, 14 deletions

diff --git a/libnm-glib/nm-client.c b/libnm-glib/nm-client.c
index 248b9d97..fc105e53 100644
--- a/libnm-glib/nm-client.c
+++ b/libnm-glib/nm-client.c
@@ -19,14 +19,15 @@
  * Copyright 2007 - 2013 Red Hat, Inc.
  */
 
-#include "config.h"
+#include "nm-default.h"
+
+#include "nm-client.h"
 
 #include <dbus/dbus-glib.h>
 #include <string.h>
-#include <nm-utils.h>
 
-#include "nm-default.h"
-#include "nm-client.h"
+#include "nm-utils.h"
+
 #include "nm-device-ethernet.h"
 #include "nm-device-wifi.h"
 #include "nm-device-private.h"
@@ -317,16 +318,13 @@ static gboolean
 get_permissions_sync (NMClient *self, GError **error)
 {
 	gboolean success;
-	GHashTable *permissions = NULL;
+	gs_unref_hashtable GHashTable *permissions = NULL;
 
 	success = dbus_g_proxy_call_with_timeout (NM_CLIENT_GET_PRIVATE (self)->client_proxy,
 	                                          "GetPermissions", 3000, error,
 	                                          G_TYPE_INVALID,
 	                                          DBUS_TYPE_G_MAP_OF_STRING, &permissions, G_TYPE_INVALID);
 	update_permissions (self, success ? permissions : NULL);
-	if (permissions)
-		g_hash_table_destroy (permissions);
-
 	return success;
 }
 
@@ -336,15 +334,14 @@ get_permissions_reply (DBusGProxy *proxy,
                        gpointer user_data)
 {
 	NMClient *self = NM_CLIENT (user_data);
-	GHashTable *permissions;
-	GError *error = NULL;
+	gs_unref_hashtable GHashTable *permissions = NULL;
+	gs_free_error GError *error = NULL;
 
 	dbus_g_proxy_end_call (proxy, call, &error,
 	                       DBUS_TYPE_G_MAP_OF_STRING, &permissions,
 	                       G_TYPE_INVALID);
 	NM_CLIENT_GET_PRIVATE (self)->perm_call = NULL;
 	update_permissions (NM_CLIENT (user_data), error ? NULL : permissions);
-	g_clear_error (&error);
 }
 
 static void
@@ -1930,14 +1927,13 @@ static void
 init_async_got_permissions (DBusGProxy *proxy, DBusGProxyCall *call, gpointer user_data)
 {
 	NMClientInitData *init_data = user_data;
-	GHashTable *permissions;
-	GError *error = NULL;
+	gs_unref_hashtable GHashTable *permissions = NULL;
+	gs_free_error GError *error = NULL;
 
 	dbus_g_proxy_end_call (proxy, call, &error,
 	                       DBUS_TYPE_G_MAP_OF_STRING, &permissions,
 	                       G_TYPE_INVALID);
 	update_permissions (init_data->client, error ? NULL : permissions);
-	g_clear_error (&error);
 
 	init_data->permissions_pending = FALSE;
 	init_async_complete (init_data);