36 lines
1.6 KiB
Text
36 lines
1.6 KiB
Text
From 0780809731c8ab1c364202b1900d3df106b28626 Mon Sep 17 00:00:00 2001
|
|
From: Robert Ancell <robert.ancell@canonical.com>
|
|
Date: Wed, 14 Oct 2015 10:09:49 +0100
|
|
Subject: Fix some compiler warnings
|
|
|
|
--- defaults/gconf-defaults.c.orig Tue Aug 16 04:59:31 2011
|
|
+++ defaults/gconf-defaults.c Mon Feb 29 10:02:03 2016
|
|
@@ -156,10 +156,7 @@ gconf_defaults_constructor (GType typ
|
|
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,
|
|
n_construct_properties,
|
|
@@ -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);
|
|
@@ -811,7 +808,7 @@ do_copy (GConfDefaults *mechanism,
|
|
else {
|
|
adata->annotation_key = "org.gnome.gconf.defaults.set-system.prefix";
|
|
adata->default_action = "org.gnome.gconf.defaults.set-system";
|
|
- cdata->dest_address = "xml:merged:" SYSGCONFDIR "/gconf.xml.system";
|
|
+ cdata->dest_address = "xml:merged:" SYSGCONFDIR "/gconf.xml.defaults";
|
|
}
|
|
|
|
polkit_authority_enumerate_actions (mechanism->priv->auth,
|