aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2014-10-14 14:50:47 -0500
committerCharles Kerr <charles.kerr@canonical.com>2014-10-14 14:50:47 -0500
commit5f316dca4eab9f3b3048af82c680087949dc7d1f (patch)
treef653f27f740e38fff6e8010352036343618cd180
parentf599c1b1f4b7bc40d71b36409826dcab47e4b7af (diff)
downloadayatana-indicator-power-5f316dca4eab9f3b3048af82c680087949dc7d1f.tar.gz
ayatana-indicator-power-5f316dca4eab9f3b3048af82c680087949dc7d1f.tar.bz2
ayatana-indicator-power-5f316dca4eab9f3b3048af82c680087949dc7d1f.zip
in testing.c, make 'bus' a private field instead of a public GObject property
-rw-r--r--src/testing.c109
1 files changed, 48 insertions, 61 deletions
diff --git a/src/testing.c b/src/testing.c
index dadf942..2822b7e 100644
--- a/src/testing.c
+++ b/src/testing.c
@@ -33,7 +33,6 @@
enum
{
PROP_0,
- PROP_BUS,
PROP_SERVICE,
LAST_PROP
};
@@ -80,6 +79,52 @@ update_device_provider (IndicatorPowerTesting * self)
}
static void
+set_bus(IndicatorPowerTesting * self, GDBusConnection * bus)
+{
+ priv_t * p;
+ GDBusInterfaceSkeleton * skel;
+
+ g_return_if_fail(INDICATOR_IS_POWER_TESTING(self));
+ g_return_if_fail((bus == NULL) || G_IS_DBUS_CONNECTION(bus));
+
+ p = get_priv (self);
+
+ if (p->bus == bus)
+ return;
+
+ skel = G_DBUS_INTERFACE_SKELETON(p->skeleton);
+
+ if (p->bus != NULL)
+ {
+ if (skel != NULL)
+ g_dbus_interface_skeleton_unexport (skel);
+
+ g_clear_object (&p->bus);
+ }
+
+ if (bus != NULL)
+ {
+ GError * error;
+
+ p->bus = g_object_ref (bus);
+
+ error = NULL;
+ if (!g_dbus_interface_skeleton_export(skel,
+ bus,
+ BUS_PATH"/Testing",
+ &error))
+ {
+ g_warning ("Unable to export Testing properties: %s", error->message);
+ g_error_free (error);
+ }
+ }
+}
+
+/***
+****
+***/
+
+static void
on_mock_battery_enabled_changed(DbusTesting * skeleton G_GNUC_UNUSED,
GParamSpec * pspec G_GNUC_UNUSED,
IndicatorPowerTesting * self)
@@ -141,7 +186,7 @@ on_bus_changed(IndicatorPowerService * service,
{
GObject * bus = NULL;
g_object_get(service, "bus", &bus, NULL);
- indicator_power_testing_set_bus(self, G_DBUS_CONNECTION(bus));
+ set_bus(self, G_DBUS_CONNECTION(bus));
g_clear_object(&bus);
}
@@ -160,10 +205,6 @@ my_get_property(GObject * o,
switch (property_id)
{
- case PROP_BUS:
- g_value_set_object(value, p->bus);
- break;
-
case PROP_SERVICE:
g_value_set_object(value, p->service);
break;
@@ -184,10 +225,6 @@ my_set_property(GObject * o,
switch (property_id)
{
- case PROP_BUS:
- indicator_power_testing_set_bus(self, G_DBUS_CONNECTION(g_value_get_object(value)));
- break;
-
case PROP_SERVICE:
g_assert(p->service == NULL); /* G_PARAM_CONSTRUCT_ONLY */
p->service = g_value_dup_object(value);
@@ -204,7 +241,7 @@ my_dispose(GObject * o)
IndicatorPowerTesting * const self = INDICATOR_POWER_TESTING(o);
priv_t * const p = get_priv (self);
- indicator_power_testing_set_bus(self, NULL);
+ set_bus(self, NULL);
g_clear_object(&p->skeleton);
g_clear_object(&p->provider_upower);
g_clear_object(&p->provider_mock);
@@ -290,13 +327,6 @@ indicator_power_testing_class_init (IndicatorPowerTestingClass * klass)
object_class->get_property = my_get_property;
object_class->set_property = my_set_property;
- properties[PROP_BUS] = g_param_spec_object (
- "bus",
- "Bus",
- "The GDBusConnection on which to export menus",
- G_TYPE_OBJECT,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
-
properties[PROP_SERVICE] = g_param_spec_object (
"service",
"Servie",
@@ -319,46 +349,3 @@ indicator_power_testing_new (IndicatorPowerService * service)
return INDICATOR_POWER_TESTING (o);
}
-void
-indicator_power_testing_set_bus(IndicatorPowerTesting * self,
- GDBusConnection * bus)
-{
- priv_t * p;
- GDBusInterfaceSkeleton * skel;
-
- g_return_if_fail(INDICATOR_IS_POWER_TESTING(self));
- g_return_if_fail((bus == NULL) || G_IS_DBUS_CONNECTION(bus));
-
- p = get_priv (self);
-
- if (p->bus == bus)
- return;
-
- skel = G_DBUS_INTERFACE_SKELETON(p->skeleton);
-
- if (p->bus != NULL)
- {
- if (skel != NULL)
- g_dbus_interface_skeleton_unexport (skel);
-
- g_clear_object (&p->bus);
- }
-
- if (bus != NULL)
- {
- GError * error;
-
- p->bus = g_object_ref (bus);
-
- error = NULL;
- if (!g_dbus_interface_skeleton_export(skel,
- bus,
- BUS_PATH"/Testing",
- &error))
- {
- g_warning ("Unable to export Testing properties: %s", error->message);
- g_error_free (error);
- }
- }
-}
-