[Xfce4-commits] [xfce/xfce4-power-manager] 01/01: Fix some runtime warnings
noreply at xfce.org
noreply at xfce.org
Wed Mar 25 13:37:37 CET 2015
This is an automated email from the git hooks/post-receive script.
eric pushed a commit to branch master
in repository xfce/xfce4-power-manager.
commit fb190d279fab075e24f40dafc979a5d2565cbd3a
Author: Eric Koegel <eric.koegel at gmail.com>
Date: Wed Mar 25 15:26:39 2015 +0300
Fix some runtime warnings
---
libdbus/xfpm-dbus.c | 14 ++++++++++----
src/xfpm-console-kit.c | 22 ++++++++++++++++------
src/xfpm-kbd-backlight.c | 15 ++++++++++++---
src/xfpm-polkit.c | 10 ++++++----
4 files changed, 44 insertions(+), 17 deletions(-)
diff --git a/libdbus/xfpm-dbus.c b/libdbus/xfpm-dbus.c
index 3026f95..f89410d 100644
--- a/libdbus/xfpm-dbus.c
+++ b/libdbus/xfpm-dbus.c
@@ -40,9 +40,11 @@ xfpm_dbus_name_has_owner (GDBusConnection *connection, const gchar *name)
NULL,
&error);
if (var)
- g_variant_get (var, "(&s)", &owner);
+ {
+ g_variant_get (var, "(&s)", &owner);
+ g_variant_unref (var);
+ }
ret = (owner != NULL);
- g_variant_unref (var);
if ( error )
{
@@ -75,8 +77,11 @@ gboolean xfpm_dbus_register_name(GDBusConnection *connection, const gchar *name)
&error);
if (var)
+ {
g_variant_get (var, "(u)", &ret);
- g_variant_unref (var);
+ g_variant_unref (var);
+ }
+
if ( error )
{
g_warning("Error: %s\n",error->message);
@@ -108,7 +113,8 @@ gboolean xfpm_dbus_release_name(GDBusConnection *connection, const gchar *name)
-1,
NULL,
&error);
- g_variant_unref (var);
+ if (var)
+ g_variant_unref (var);
if ( error )
{
diff --git a/src/xfpm-console-kit.c b/src/xfpm-console-kit.c
index dc82dc4..5f2f941 100644
--- a/src/xfpm-console-kit.c
+++ b/src/xfpm-console-kit.c
@@ -82,10 +82,13 @@ xfpm_console_kit_get_info (XfpmConsoleKit *console)
&error);
if (var)
+ {
g_variant_get (var,
"(b)",
&console->priv->can_shutdown);
- g_variant_unref (var);
+ g_variant_unref (var);
+ }
+
if ( error )
{
g_warning ("'CanStop' method failed : %s", error->message);
@@ -99,10 +102,13 @@ xfpm_console_kit_get_info (XfpmConsoleKit *console)
&error);
if (var)
+ {
g_variant_get (var,
"(b)",
&console->priv->can_restart);
- g_variant_unref (var);
+ g_variant_unref (var);
+ }
+
if ( error )
{
g_warning ("'CanRestart' method failed : %s", error->message);
@@ -316,7 +322,8 @@ void xfpm_console_kit_shutdown (XfpmConsoleKit *console, GError **error)
-1, NULL,
error);
- g_variant_unref (var);
+ if (var)
+ g_variant_unref (var);
}
void xfpm_console_kit_reboot (XfpmConsoleKit *console, GError **error)
@@ -331,7 +338,8 @@ void xfpm_console_kit_reboot (XfpmConsoleKit *console, GError **error)
-1, NULL,
error);
- g_variant_unref (var);
+ if (var)
+ g_variant_unref (var);
}
void
@@ -348,7 +356,8 @@ xfpm_console_kit_suspend (XfpmConsoleKit *console,
-1, NULL,
error);
- g_variant_unref (var);
+ if (var)
+ g_variant_unref (var);
}
void
@@ -365,5 +374,6 @@ xfpm_console_kit_hibernate (XfpmConsoleKit *console,
-1, NULL,
error);
- g_variant_unref (var);
+ if (var)
+ g_variant_unref (var);
}
diff --git a/src/xfpm-kbd-backlight.c b/src/xfpm-kbd-backlight.c
index 982a915..d572e8b 100644
--- a/src/xfpm-kbd-backlight.c
+++ b/src/xfpm-kbd-backlight.c
@@ -89,10 +89,13 @@ xfpm_kbd_backlight_init_max_level (XfpmKbdBacklight *backlight)
&error);
if (var)
+ {
g_variant_get (var,
"(i)",
&backlight->priv->max_level);
- g_variant_unref (var);
+ g_variant_unref (var);
+ }
+
if ( error )
{
g_warning ("Failed to get keyboard max brightness level : %s", error->message);
@@ -142,10 +145,13 @@ xfpm_kbd_backlight_get_level (XfpmKbdBacklight *backlight)
-1, NULL,
&error);
if (var)
+ {
g_variant_get (var,
"(i)",
&level);
- g_variant_unref (var);
+ g_variant_unref (var);
+ }
+
if ( error )
{
g_warning ("Failed to get keyboard brightness level : %s", error->message);
@@ -167,7 +173,10 @@ xfpm_kbd_backlight_set_level (XfpmKbdBacklight *backlight, gint32 level)
G_DBUS_CALL_FLAGS_NONE,
-1, NULL,
&error);
- g_variant_unref (var);
+
+ if (var)
+ g_variant_unref (var);
+
if ( error )
{
g_warning ("Failed to set keyboard brightness level : %s", error->message);
diff --git a/src/xfpm-polkit.c b/src/xfpm-polkit.c
index b0892b7..4fc14ef 100644
--- a/src/xfpm-polkit.c
+++ b/src/xfpm-polkit.c
@@ -334,13 +334,15 @@ xfpm_polkit_check_auth_intern (XfpmPolkit *polkit, const gchar *action_id)
g_return_val_if_fail (polkit->priv->proxy != NULL, FALSE);
g_return_val_if_fail (polkit->priv->subject_valid, FALSE);
-
+
var = g_variant_new ("(@(sa{sv})s at a{ss}us)",
polkit->priv->subject,
action_id,
polkit->priv->details,
0,
- NULL);
+ "");
+
+ XFPM_DEBUG ("polkit request: %s", g_variant_print (var, TRUE));
var = g_dbus_proxy_call_sync (polkit->priv->proxy, "CheckAuthorization",
var,
@@ -352,14 +354,14 @@ xfpm_polkit_check_auth_intern (XfpmPolkit *polkit, const gchar *action_id)
{
g_variant_get (var, "((bba{ss}))",
&is_authorized, NULL, NULL);
+
+ g_variant_unref (var);
}
else if ( error )
{
g_warning ("'CheckAuthorization' failed with %s", error->message);
g_error_free (error);
}
-
- g_variant_unref (var);
XFPM_DEBUG ("Action=%s is authorized=%s", action_id, xfpm_bool_to_string (is_authorized));
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list