summaryrefslogtreecommitdiff
path: root/defaults
diff options
context:
space:
mode:
authorRobert Ancell <robert.ancell@canonical.com>2015-10-14 10:09:49 +0100
committerRobert Ancell <robert.ancell@canonical.com>2015-10-14 10:09:49 +0100
commit0780809731c8ab1c364202b1900d3df106b28626 (patch)
treeab9010535a69863d4cb8f50b164f38efabaa5183 /defaults
parent4ef012c2a62d9abd759adb3aeb9d3b9cee17f721 (diff)
downloadgconf-0780809731c8ab1c364202b1900d3df106b28626.tar.gz
Fix some compiler warningsHEADmaster
Diffstat (limited to 'defaults')
-rw-r--r--defaults/gconf-defaults-main.c4
-rw-r--r--defaults/gconf-defaults.c5
2 files changed, 2 insertions, 7 deletions
diff --git a/defaults/gconf-defaults-main.c b/defaults/gconf-defaults-main.c
index 7ed77004..aad76c3a 100644
--- a/defaults/gconf-defaults-main.c
+++ b/defaults/gconf-defaults-main.c
@@ -107,7 +107,6 @@ get_system_bus (void)
{
GError *error;
DBusGConnection *bus;
- DBusConnection *connection;
error = NULL;
bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
@@ -117,7 +116,7 @@ get_system_bus (void)
goto out;
}
- connection = dbus_g_connection_get_connection (bus);
+ dbus_g_connection_get_connection (bus);
out:
return bus;
}
@@ -162,7 +161,6 @@ main (int argc, char **argv)
g_thread_init (NULL);
}
dbus_g_thread_init ();
- g_type_init ();
options = g_option_context_new (NULL);
g_option_context_add_main_entries (options, entries, NULL);
diff --git a/defaults/gconf-defaults.c b/defaults/gconf-defaults.c
index b84c632d..76aa7e9d 100644
--- a/defaults/gconf-defaults.c
+++ b/defaults/gconf-defaults.c
@@ -156,9 +156,6 @@ gconf_defaults_constructor (GType type,
GObjectConstructParam *construct_properties)
{
GConfDefaults *mechanism;
- GConfDefaultsClass *klass;
-
- klass = GCONF_DEFAULTS_CLASS (g_type_class_peek (GCONF_TYPE_DEFAULTS));
mechanism = GCONF_DEFAULTS (G_OBJECT_CLASS (gconf_defaults_parent_class)->constructor (
type,
@@ -228,7 +225,7 @@ register_mechanism (GConfDefaults *mechanism)
{
GError *error = NULL;
- mechanism->priv->auth = polkit_authority_get ();
+ mechanism->priv->auth = polkit_authority_get_sync (NULL, NULL);
error = NULL;
mechanism->priv->system_bus_connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);