[gnome-control-center] power: Replace GObject boilerplace with G_DECLARE_TYPE
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] power: Replace GObject boilerplace with G_DECLARE_TYPE
- Date: Wed, 30 May 2018 23:21:18 +0000 (UTC)
commit f51932978fd96a418949e60bed283b31fd7ce9f6
Author: Robert Ancell <robert ancell canonical com>
Date: Wed May 30 11:40:23 2018 +1200
power: Replace GObject boilerplace with G_DECLARE_TYPE
panels/power/cc-power-panel.c | 593 ++++++++++++++++++++----------------------
panels/power/cc-power-panel.h | 41 +--
2 files changed, 284 insertions(+), 350 deletions(-)
---
diff --git a/panels/power/cc-power-panel.c b/panels/power/cc-power-panel.c
index 7b7c4a24d..98f1c26aa 100644
--- a/panels/power/cc-power-panel.c
+++ b/panels/power/cc-power-panel.c
@@ -48,13 +48,10 @@
#define WID(b, w) (GtkWidget *) gtk_builder_get_object (b, w)
-CC_PANEL_REGISTER (CcPowerPanel, cc_power_panel)
-
-#define POWER_PANEL_PRIVATE(o) \
- (G_TYPE_INSTANCE_GET_PRIVATE ((o), CC_TYPE_POWER_PANEL, CcPowerPanelPrivate))
-
-struct _CcPowerPanelPrivate
+struct _CcPowerPanel
{
+ CcPanel parent_instance;
+
GSettings *gsd_settings;
GSettings *session_settings;
GCancellable *cancellable;
@@ -115,6 +112,8 @@ struct _CcPowerPanelPrivate
GtkAdjustment *focus_adjustment;
};
+CC_PANEL_REGISTER (CcPowerPanel, cc_power_panel)
+
enum
{
ACTION_MODEL_TEXT,
@@ -124,38 +123,38 @@ enum
static void
cc_power_panel_dispose (GObject *object)
{
- CcPowerPanelPrivate *priv = CC_POWER_PANEL (object)->priv;
+ CcPowerPanel *self = CC_POWER_PANEL (object);
- g_clear_pointer (&priv->chassis_type, g_free);
- g_clear_object (&priv->gsd_settings);
- g_clear_object (&priv->session_settings);
- if (priv->cancellable != NULL)
+ g_clear_pointer (&self->chassis_type, g_free);
+ g_clear_object (&self->gsd_settings);
+ g_clear_object (&self->session_settings);
+ if (self->cancellable != NULL)
{
- g_cancellable_cancel (priv->cancellable);
- g_object_unref (priv->cancellable);
- priv->cancellable = NULL;
+ g_cancellable_cancel (self->cancellable);
+ g_object_unref (self->cancellable);
+ self->cancellable = NULL;
}
- g_clear_pointer (&priv->automatic_suspend_dialog, gtk_widget_destroy);
- g_clear_object (&priv->builder);
- g_clear_object (&priv->screen_proxy);
- g_clear_object (&priv->kbd_proxy);
- if (priv->devices)
+ g_clear_pointer (&self->automatic_suspend_dialog, gtk_widget_destroy);
+ g_clear_object (&self->builder);
+ g_clear_object (&self->screen_proxy);
+ g_clear_object (&self->kbd_proxy);
+ if (self->devices)
{
- g_ptr_array_foreach (priv->devices, (GFunc) g_object_unref, NULL);
- g_clear_pointer (&priv->devices, g_ptr_array_unref);
+ g_ptr_array_foreach (self->devices, (GFunc) g_object_unref, NULL);
+ g_clear_pointer (&self->devices, g_ptr_array_unref);
}
- g_clear_object (&priv->up_client);
- g_clear_object (&priv->bt_rfkill);
- g_clear_object (&priv->bt_properties);
- g_clear_object (&priv->iio_proxy);
+ g_clear_object (&self->up_client);
+ g_clear_object (&self->bt_rfkill);
+ g_clear_object (&self->bt_properties);
+ g_clear_object (&self->iio_proxy);
#ifdef HAVE_NETWORK_MANAGER
- g_clear_object (&priv->nm_client);
+ g_clear_object (&self->nm_client);
#endif
- g_clear_pointer (&priv->boxes, g_list_free);
- g_clear_pointer (&priv->boxes_reverse, g_list_free);
- if (priv->iio_proxy_watch_id != 0)
- g_bus_unwatch_name (priv->iio_proxy_watch_id);
- priv->iio_proxy_watch_id = 0;
+ g_clear_pointer (&self->boxes, g_list_free);
+ g_clear_pointer (&self->boxes_reverse, g_list_free);
+ if (self->iio_proxy_watch_id != 0)
+ g_bus_unwatch_name (self->iio_proxy_watch_id);
+ self->iio_proxy_watch_id = 0;
G_OBJECT_CLASS (cc_power_panel_parent_class)->dispose (object);
}
@@ -172,8 +171,6 @@ cc_power_panel_class_init (CcPowerPanelClass *klass)
GObjectClass *object_class = G_OBJECT_CLASS (klass);
CcPanelClass *panel_class = CC_PANEL_CLASS (klass);
- g_type_class_add_private (klass, sizeof (CcPowerPanelPrivate));
-
object_class->dispose = cc_power_panel_dispose;
panel_class->get_help_uri = cc_power_panel_get_help_uri;
@@ -362,7 +359,6 @@ get_details_string (gdouble percentage, UpDeviceState state, guint64 time)
static void
set_primary (CcPowerPanel *panel, UpDevice *device)
{
- CcPowerPanelPrivate *priv = panel->priv;
gchar *details = NULL;
gdouble percentage;
guint64 time_empty, time_full, time;
@@ -426,21 +422,20 @@ set_primary (CcPowerPanel *panel, UpDevice *device)
ATK_RELATION_LABELLED_BY,
gtk_widget_get_accessible (label));
- gtk_container_add (GTK_CONTAINER (priv->battery_list), row);
- gtk_size_group_add_widget (priv->row_sizegroup, row);
+ gtk_container_add (GTK_CONTAINER (panel->battery_list), row);
+ gtk_size_group_add_widget (panel->row_sizegroup, row);
gtk_widget_show_all (row);
g_object_set_data (G_OBJECT (row), "primary", GINT_TO_POINTER (TRUE));
g_free (details);
- gtk_widget_set_visible (priv->battery_section, TRUE);
+ gtk_widget_set_visible (panel->battery_section, TRUE);
}
static void
add_battery (CcPowerPanel *panel, UpDevice *device)
{
- CcPowerPanelPrivate *priv = panel->priv;
gdouble percentage;
UpDeviceKind kind;
UpDeviceState state;
@@ -473,7 +468,7 @@ add_battery (CcPowerPanel *panel, UpDevice *device)
box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
label = gtk_label_new (name);
gtk_widget_set_halign (label, GTK_ALIGN_START);
- gtk_size_group_add_widget (priv->battery_sizegroup, box2);
+ gtk_size_group_add_widget (panel->battery_sizegroup, box2);
gtk_widget_set_margin_start (label, 20);
gtk_widget_set_margin_end (label, 20);
gtk_widget_set_margin_top (label, 6);
@@ -502,7 +497,7 @@ add_battery (CcPowerPanel *panel, UpDevice *device)
gtk_widget_set_halign (label, GTK_ALIGN_END);
gtk_style_context_add_class (gtk_widget_get_style_context (label), GTK_STYLE_CLASS_DIM_LABEL);
gtk_box_pack_start (GTK_BOX (box2), label, FALSE, TRUE, 0);
- gtk_size_group_add_widget (priv->charge_sizegroup, label);
+ gtk_size_group_add_widget (panel->charge_sizegroup, label);
levelbar = gtk_level_bar_new ();
gtk_level_bar_set_value (GTK_LEVEL_BAR (levelbar), percentage / 100.0);
@@ -510,7 +505,7 @@ add_battery (CcPowerPanel *panel, UpDevice *device)
gtk_widget_set_halign (levelbar, GTK_ALIGN_FILL);
gtk_widget_set_valign (levelbar, GTK_ALIGN_CENTER);
gtk_box_pack_start (GTK_BOX (box2), levelbar, TRUE, TRUE, 0);
- gtk_size_group_add_widget (priv->level_sizegroup, levelbar);
+ gtk_size_group_add_widget (panel->level_sizegroup, levelbar);
gtk_box_pack_start (GTK_BOX (box), box2, TRUE, TRUE, 0);
atk_object_add_relationship (gtk_widget_get_accessible (levelbar),
@@ -519,13 +514,13 @@ add_battery (CcPowerPanel *panel, UpDevice *device)
g_object_set_data (G_OBJECT (row), "kind", GINT_TO_POINTER (kind));
- gtk_container_add (GTK_CONTAINER (priv->battery_list), row);
- gtk_size_group_add_widget (priv->row_sizegroup, row);
+ gtk_container_add (GTK_CONTAINER (panel->battery_list), row);
+ gtk_size_group_add_widget (panel->row_sizegroup, row);
gtk_widget_show_all (row);
g_free (icon_name);
- gtk_widget_set_visible (priv->battery_section, TRUE);
+ gtk_widget_set_visible (panel->battery_section, TRUE);
}
static const char *
@@ -583,7 +578,6 @@ get_battery_level (UpDevice *device)
static void
add_device (CcPowerPanel *panel, UpDevice *device)
{
- CcPowerPanelPrivate *priv = panel->priv;
UpDeviceKind kind;
UpDeviceState state;
GtkWidget *row;
@@ -676,7 +670,7 @@ add_device (CcPowerPanel *panel, UpDevice *device)
gtk_widget_set_margin_top (widget, 6);
gtk_widget_set_margin_bottom (widget, 6);
gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, TRUE, 0);
- gtk_size_group_add_widget (priv->battery_sizegroup, widget);
+ gtk_size_group_add_widget (panel->battery_sizegroup, widget);
box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
gtk_widget_set_margin_start (box2, 20);
@@ -698,7 +692,7 @@ add_device (CcPowerPanel *panel, UpDevice *device)
gtk_widget_set_halign (widget, GTK_ALIGN_END);
gtk_style_context_add_class (gtk_widget_get_style_context (widget), GTK_STYLE_CLASS_DIM_LABEL);
gtk_box_pack_start (GTK_BOX (box2), widget, FALSE, TRUE, 0);
- gtk_size_group_add_widget (priv->charge_sizegroup, widget);
+ gtk_size_group_add_widget (panel->charge_sizegroup, widget);
widget = gtk_level_bar_new ();
gtk_widget_set_halign (widget, TRUE);
@@ -706,18 +700,18 @@ add_device (CcPowerPanel *panel, UpDevice *device)
gtk_widget_set_valign (widget, GTK_ALIGN_CENTER);
gtk_level_bar_set_value (GTK_LEVEL_BAR (widget), percentage / 100.0f);
gtk_box_pack_start (GTK_BOX (box2), widget, TRUE, TRUE, 0);
- gtk_size_group_add_widget (priv->level_sizegroup, widget);
+ gtk_size_group_add_widget (panel->level_sizegroup, widget);
gtk_box_pack_start (GTK_BOX (hbox), box2, TRUE, TRUE, 0);
gtk_widget_show_all (row);
- gtk_container_add (GTK_CONTAINER (priv->device_list), row);
- gtk_size_group_add_widget (priv->row_sizegroup, row);
+ gtk_container_add (GTK_CONTAINER (panel->device_list), row);
+ gtk_size_group_add_widget (panel->row_sizegroup, row);
g_object_set_data (G_OBJECT (row), "kind", GINT_TO_POINTER (kind));
g_string_free (description, TRUE);
g_string_free (status, TRUE);
- gtk_widget_set_visible (priv->device_section, TRUE);
+ gtk_widget_set_visible (panel->device_section, TRUE);
}
static void
@@ -725,7 +719,6 @@ up_client_changed (UpClient *client,
UpDevice *device,
CcPowerPanel *self)
{
- CcPowerPanelPrivate *priv = self->priv;
GList *children, *l;
gint i;
UpDeviceKind kind;
@@ -734,17 +727,17 @@ up_client_changed (UpClient *client,
UpDevice *composite;
gchar *s;
- children = gtk_container_get_children (GTK_CONTAINER (priv->battery_list));
+ children = gtk_container_get_children (GTK_CONTAINER (self->battery_list));
for (l = children; l != NULL; l = l->next)
- gtk_container_remove (GTK_CONTAINER (priv->battery_list), l->data);
+ gtk_container_remove (GTK_CONTAINER (self->battery_list), l->data);
g_list_free (children);
- gtk_widget_hide (priv->battery_section);
+ gtk_widget_hide (self->battery_section);
- children = gtk_container_get_children (GTK_CONTAINER (priv->device_list));
+ children = gtk_container_get_children (GTK_CONTAINER (self->device_list));
for (l = children; l != NULL; l = l->next)
- gtk_container_remove (GTK_CONTAINER (priv->device_list), l->data);
+ gtk_container_remove (GTK_CONTAINER (self->device_list), l->data);
g_list_free (children);
- gtk_widget_hide (priv->device_section);
+ gtk_widget_hide (self->device_section);
#ifdef TEST_FAKE_DEVICES
{
@@ -764,7 +757,7 @@ up_client_changed (UpClient *client,
"time-to-empty", 287,
"icon-name", "battery-full-symbolic",
NULL);
- g_ptr_array_add (priv->devices, device);
+ g_ptr_array_add (self->devices, device);
device = up_device_new ();
g_object_set (device,
"kind", UP_DEVICE_KIND_KEYBOARD,
@@ -775,7 +768,7 @@ up_client_changed (UpClient *client,
"time-to-empty", 250,
"icon-name", "battery-good-symbolic",
NULL);
- g_ptr_array_add (priv->devices, device);
+ g_ptr_array_add (self->devices, device);
device = up_device_new ();
g_object_set (device,
"kind", UP_DEVICE_KIND_BATTERY,
@@ -789,14 +782,14 @@ up_client_changed (UpClient *client,
"time-to-empty", 400,
"icon-name", "battery-full-charged-symbolic",
NULL);
- g_ptr_array_add (priv->devices, device);
+ g_ptr_array_add (self->devices, device);
}
}
#endif
on_ups = FALSE;
n_batteries = 0;
- composite = up_client_get_display_device (priv->up_client);
+ composite = up_client_get_display_device (self->up_client);
g_object_get (composite, "kind", &kind, NULL);
if (kind == UP_DEVICE_KIND_UPS)
{
@@ -807,9 +800,9 @@ up_client_changed (UpClient *client,
gboolean is_extra_battery = FALSE;
/* Count the batteries */
- for (i = 0; priv->devices != NULL && i < priv->devices->len; i++)
+ for (i = 0; self->devices != NULL && i < self->devices->len; i++)
{
- UpDevice *device = (UpDevice*) g_ptr_array_index (priv->devices, i);
+ UpDevice *device = (UpDevice*) g_ptr_array_index (self->devices, i);
g_object_get (device, "kind", &kind, NULL);
if (kind == UP_DEVICE_KIND_BATTERY)
{
@@ -827,15 +820,15 @@ up_client_changed (UpClient *client,
s = g_strdup_printf ("<b>%s</b>", _("Batteries"));
else
s = g_strdup_printf ("<b>%s</b>", _("Battery"));
- gtk_label_set_label (GTK_LABEL (priv->battery_heading), s);
+ gtk_label_set_label (GTK_LABEL (self->battery_heading), s);
g_free (s);
if (!on_ups && n_batteries > 1)
set_primary (self, composite);
- for (i = 0; priv->devices != NULL && i < priv->devices->len; i++)
+ for (i = 0; self->devices != NULL && i < self->devices->len; i++)
{
- UpDevice *device = (UpDevice*) g_ptr_array_index (priv->devices, i);
+ UpDevice *device = (UpDevice*) g_ptr_array_index (self->devices, i);
g_object_get (device, "kind", &kind, NULL);
if (kind == UP_DEVICE_KIND_LINE_POWER)
{
@@ -867,25 +860,24 @@ up_client_device_removed (UpClient *client,
const char *object_path,
CcPowerPanel *self)
{
- CcPowerPanelPrivate *priv = self->priv;
guint i;
- if (priv->devices == NULL)
+ if (self->devices == NULL)
return;
- for (i = 0; i < priv->devices->len; i++)
+ for (i = 0; i < self->devices->len; i++)
{
- UpDevice *device = g_ptr_array_index (priv->devices, i);
+ UpDevice *device = g_ptr_array_index (self->devices, i);
if (g_strcmp0 (object_path, up_device_get_object_path (device)) == 0)
{
g_object_unref (device);
- g_ptr_array_remove_index (priv->devices, i);
+ g_ptr_array_remove_index (self->devices, i);
break;
}
}
- up_client_changed (self->priv->up_client, NULL, self);
+ up_client_changed (self->up_client, NULL, self);
}
static void
@@ -893,27 +885,25 @@ up_client_device_added (UpClient *client,
UpDevice *device,
CcPowerPanel *self)
{
- CcPowerPanelPrivate *priv = self->priv;
-
- g_ptr_array_add (priv->devices, g_object_ref (device));
+ g_ptr_array_add (self->devices, g_object_ref (device));
g_signal_connect (G_OBJECT (device), "notify",
G_CALLBACK (up_client_changed), self);
- up_client_changed (priv->up_client, NULL, self);
+ up_client_changed (self->up_client, NULL, self);
}
static void
set_brightness_cb (GObject *source_object, GAsyncResult *res, gpointer user_data)
{
+ CcPowerPanel *self = CC_POWER_PANEL (user_data);
GError *error = NULL;
GVariant *result;
- CcPowerPanelPrivate *priv = CC_POWER_PANEL (user_data)->priv;
GDBusProxy *proxy = G_DBUS_PROXY (source_object);
/* not setting, so pay attention to changed signals */
- if (proxy == priv->screen_proxy)
- priv->setting_brightness = FALSE;
- else if (proxy == priv->kbd_proxy)
- priv->kbd_setting_brightness = FALSE;
+ if (proxy == self->screen_proxy)
+ self->setting_brightness = FALSE;
+ else if (proxy == self->kbd_proxy)
+ self->kbd_setting_brightness = FALSE;
result = g_dbus_proxy_call_finish (proxy, res, &error);
if (result == NULL)
@@ -928,21 +918,21 @@ set_brightness_cb (GObject *source_object, GAsyncResult *res, gpointer user_data
static void
brightness_slider_value_changed_cb (GtkRange *range, gpointer user_data)
{
+ CcPowerPanel *self = CC_POWER_PANEL (user_data);
guint percentage;
- CcPowerPanelPrivate *priv = CC_POWER_PANEL (user_data)->priv;
GVariant *variant;
GDBusProxy *proxy;
percentage = (guint) gtk_range_get_value (range);
- if (range == GTK_RANGE (priv->brightness_scale))
+ if (range == GTK_RANGE (self->brightness_scale))
{
/* do not loop */
- if (priv->setting_brightness)
+ if (self->setting_brightness)
return;
- priv->setting_brightness = TRUE;
- proxy = priv->screen_proxy;
+ self->setting_brightness = TRUE;
+ proxy = self->screen_proxy;
variant = g_variant_new_parsed ("('org.gnome.SettingsDaemon.Power.Screen',"
"'Brightness', %v)",
@@ -951,11 +941,11 @@ brightness_slider_value_changed_cb (GtkRange *range, gpointer user_data)
else
{
/* do not loop */
- if (priv->kbd_setting_brightness)
+ if (self->kbd_setting_brightness)
return;
- priv->kbd_setting_brightness = TRUE;
- proxy = priv->kbd_proxy;
+ self->kbd_setting_brightness = TRUE;
+ proxy = self->kbd_proxy;
variant = g_variant_new_parsed ("('org.gnome.SettingsDaemon.Power.Keyboard',"
"'Brightness', %v)",
@@ -968,7 +958,7 @@ brightness_slider_value_changed_cb (GtkRange *range, gpointer user_data)
variant,
G_DBUS_CALL_FLAGS_NONE,
-1,
- priv->cancellable,
+ self->cancellable,
set_brightness_cb,
user_data);
}
@@ -981,7 +971,7 @@ sync_kbd_brightness (CcPowerPanel *self)
gboolean visible;
GtkRange *range;
- result = g_dbus_proxy_get_cached_property (self->priv->kbd_proxy, "Brightness");
+ result = g_dbus_proxy_get_cached_property (self->kbd_proxy, "Brightness");
if (result)
{
/* set the slider */
@@ -993,16 +983,16 @@ sync_kbd_brightness (CcPowerPanel *self)
visible = FALSE;
}
- gtk_widget_set_visible (self->priv->kbd_brightness_row, visible);
+ gtk_widget_set_visible (self->kbd_brightness_row, visible);
if (visible)
{
- range = GTK_RANGE (self->priv->kbd_brightness_scale);
+ range = GTK_RANGE (self->kbd_brightness_scale);
gtk_range_set_range (range, 0, 100);
gtk_range_set_increments (range, 1, 10);
- self->priv->kbd_setting_brightness = TRUE;
+ self->kbd_setting_brightness = TRUE;
gtk_range_set_value (range, brightness);
- self->priv->kbd_setting_brightness = FALSE;
+ self->kbd_setting_brightness = FALSE;
g_variant_unref (result);
}
}
@@ -1015,7 +1005,7 @@ sync_screen_brightness (CcPowerPanel *self)
gboolean visible;
GtkRange *range;
- result = g_dbus_proxy_get_cached_property (self->priv->screen_proxy, "Brightness");
+ result = g_dbus_proxy_get_cached_property (self->screen_proxy, "Brightness");
if (result)
{
@@ -1028,17 +1018,17 @@ sync_screen_brightness (CcPowerPanel *self)
visible = FALSE;
}
- gtk_widget_set_visible (self->priv->brightness_row, visible);
- gtk_widget_set_visible (self->priv->dim_screen_row, visible);
+ gtk_widget_set_visible (self->brightness_row, visible);
+ gtk_widget_set_visible (self->dim_screen_row, visible);
if (visible)
{
- range = GTK_RANGE (self->priv->brightness_scale);
+ range = GTK_RANGE (self->brightness_scale);
gtk_range_set_range (range, 0, 100);
gtk_range_set_increments (range, 1, 10);
- self->priv->setting_brightness = TRUE;
+ self->setting_brightness = TRUE;
gtk_range_set_value (range, brightness);
- self->priv->setting_brightness = FALSE;
+ self->setting_brightness = FALSE;
g_variant_unref (result);
}
}
@@ -1051,21 +1041,20 @@ als_switch_changed (GtkSwitch *sw,
gboolean enabled;
enabled = gtk_switch_get_active (sw);
g_debug ("Setting ALS enabled %s", enabled ? "on" : "off");
- g_settings_set_boolean (panel->priv->gsd_settings, "ambient-enabled", enabled);
+ g_settings_set_boolean (panel->gsd_settings, "ambient-enabled", enabled);
}
static void
als_enabled_state_changed (CcPowerPanel *self)
{
- CcPowerPanelPrivate *priv = self->priv;
gboolean enabled;
gboolean has_brightness = FALSE;
gboolean visible = FALSE;
GVariant *v;
- if (priv->screen_proxy != NULL)
+ if (self->screen_proxy != NULL)
{
- v = g_dbus_proxy_get_cached_property (priv->screen_proxy, "Brightness");
+ v = g_dbus_proxy_get_cached_property (self->screen_proxy, "Brightness");
if (v != NULL)
{
has_brightness = g_variant_get_int32 (v) >= 0.0;
@@ -1073,9 +1062,9 @@ als_enabled_state_changed (CcPowerPanel *self)
}
}
- if (priv->iio_proxy != NULL)
+ if (self->iio_proxy != NULL)
{
- v = g_dbus_proxy_get_cached_property (priv->iio_proxy, "HasAmbientLight");
+ v = g_dbus_proxy_get_cached_property (self->iio_proxy, "HasAmbientLight");
if (v != NULL)
{
visible = g_variant_get_boolean (v);
@@ -1083,12 +1072,12 @@ als_enabled_state_changed (CcPowerPanel *self)
}
}
- enabled = g_settings_get_boolean (priv->gsd_settings, "ambient-enabled");
+ enabled = g_settings_get_boolean (self->gsd_settings, "ambient-enabled");
g_debug ("ALS enabled: %s", enabled ? "on" : "off");
- g_signal_handlers_block_by_func (priv->als_switch, als_switch_changed, self);
- gtk_switch_set_active (GTK_SWITCH (priv->als_switch), enabled);
- gtk_widget_set_visible (priv->als_row, visible && has_brightness);
- g_signal_handlers_unblock_by_func (priv->als_switch, als_switch_changed, self);
+ g_signal_handlers_block_by_func (self->als_switch, als_switch_changed, self);
+ gtk_switch_set_active (GTK_SWITCH (self->als_switch), enabled);
+ gtk_widget_set_visible (self->als_row, visible && has_brightness);
+ g_signal_handlers_unblock_by_func (self->als_switch, als_switch_changed, self);
}
static void
@@ -1118,7 +1107,7 @@ got_screen_proxy_cb (GObject *source_object, GAsyncResult *res, gpointer user_da
}
self = CC_POWER_PANEL (user_data);
- self->priv->screen_proxy = screen_proxy;
+ self->screen_proxy = screen_proxy;
/* we want to change the bar if the user presses brightness buttons */
g_signal_connect_object (screen_proxy, "g-properties-changed",
@@ -1141,8 +1130,8 @@ on_kbd_property_change (GDBusProxy *proxy,
static void
got_kbd_proxy_cb (GObject *source_object, GAsyncResult *res, gpointer user_data)
{
+ CcPowerPanel *self = CC_POWER_PANEL (user_data);
GError *error = NULL;
- CcPowerPanel *self;
GDBusProxy *kbd_proxy;
kbd_proxy = cc_object_storage_create_dbus_proxy_finish (res, &error);
@@ -1154,8 +1143,7 @@ got_kbd_proxy_cb (GObject *source_object, GAsyncResult *res, gpointer user_data)
return;
}
- self = CC_POWER_PANEL (user_data);
- self->priv->kbd_proxy = kbd_proxy;
+ self->kbd_proxy = kbd_proxy;
/* we want to change the bar if the user presses brightness buttons */
g_signal_connect_object (kbd_proxy, "g-properties-changed",
@@ -1185,7 +1173,7 @@ combo_time_changed_cb (GtkWidget *widget, CcPowerPanel *self)
-1);
/* set both keys */
- g_settings_set_int (self->priv->gsd_settings, key, value);
+ g_settings_set_int (self->gsd_settings, key, value);
}
/* Copied from src/properties/bacon-video-widget-properties.c
@@ -1288,7 +1276,7 @@ set_ac_battery_ui_mode (CcPowerPanel *self)
GPtrArray *devices;
guint i;
- devices = up_client_get_devices (self->priv->up_client);
+ devices = up_client_get_devices (self->up_client);
g_debug ("got %d devices from upower\n", devices ? devices->len : 0);
for (i = 0; devices != NULL && i < devices->len; i++)
@@ -1316,15 +1304,15 @@ set_ac_battery_ui_mode (CcPowerPanel *self)
has_batteries = FALSE;
#endif
- self->priv->has_batteries = has_batteries;
+ self->has_batteries = has_batteries;
if (!has_batteries)
{
- gtk_widget_hide (WID (self->priv->builder, "suspend_on_battery_switch"));
- gtk_widget_hide (WID (self->priv->builder, "suspend_on_battery_label"));
- gtk_widget_hide (WID (self->priv->builder, "suspend_on_battery_delay_label"));
- gtk_widget_hide (WID (self->priv->builder, "suspend_on_battery_delay_combo"));
- gtk_label_set_label (GTK_LABEL (WID (self->priv->builder, "suspend_on_ac_label")),
+ gtk_widget_hide (WID (self->builder, "suspend_on_battery_switch"));
+ gtk_widget_hide (WID (self->builder, "suspend_on_battery_label"));
+ gtk_widget_hide (WID (self->builder, "suspend_on_battery_delay_label"));
+ gtk_widget_hide (WID (self->builder, "suspend_on_battery_delay_combo"));
+ gtk_label_set_label (GTK_LABEL (WID (self->builder, "suspend_on_ac_label")),
_("When _idle"));
}
}
@@ -1333,13 +1321,13 @@ static void
bt_set_powered (CcPowerPanel *self,
gboolean powered)
{
- g_dbus_proxy_call (self->priv->bt_properties,
+ g_dbus_proxy_call (self->bt_properties,
"Set",
g_variant_new_parsed ("('org.gnome.SettingsDaemon.Rfkill', 'BluetoothAirplaneMode', %v)",
g_variant_new_boolean (!powered)),
G_DBUS_CALL_FLAGS_NONE,
-1,
- self->priv->cancellable,
+ self->cancellable,
NULL, NULL);
}
@@ -1360,32 +1348,31 @@ bt_switch_changed (GtkSwitch *sw,
static void
bt_powered_state_changed (CcPowerPanel *panel)
{
- CcPowerPanelPrivate *priv = panel->priv;
gboolean powered, has_airplane_mode;
GVariant *v;
- v = g_dbus_proxy_get_cached_property (priv->bt_rfkill, "BluetoothHasAirplaneMode");
+ v = g_dbus_proxy_get_cached_property (panel->bt_rfkill, "BluetoothHasAirplaneMode");
has_airplane_mode = g_variant_get_boolean (v);
g_variant_unref (v);
if (!has_airplane_mode)
{
g_debug ("BluetoothHasAirplaneMode is false, hiding Bluetooth power row");
- gtk_widget_hide (priv->bt_row);
+ gtk_widget_hide (panel->bt_row);
return;
}
- v = g_dbus_proxy_get_cached_property (priv->bt_rfkill, "BluetoothAirplaneMode");
+ v = g_dbus_proxy_get_cached_property (panel->bt_rfkill, "BluetoothAirplaneMode");
powered = !g_variant_get_boolean (v);
g_variant_unref (v);
g_debug ("bt powered state changed to %s", powered ? "on" : "off");
- gtk_widget_show (priv->bt_row);
+ gtk_widget_show (panel->bt_row);
- g_signal_handlers_block_by_func (priv->bt_switch, bt_switch_changed, panel);
- gtk_switch_set_active (GTK_SWITCH (priv->bt_switch), powered);
- g_signal_handlers_unblock_by_func (priv->bt_switch, bt_switch_changed, panel);
+ g_signal_handlers_block_by_func (panel->bt_switch, bt_switch_changed, panel);
+ gtk_switch_set_active (GTK_SWITCH (panel->bt_switch), powered);
+ g_signal_handlers_unblock_by_func (panel->bt_switch, bt_switch_changed, panel);
}
#ifdef HAVE_NETWORK_MANAGER
@@ -1427,7 +1414,7 @@ wifi_switch_changed (GtkSwitch *sw,
enabled = gtk_switch_get_active (sw);
g_debug ("Setting wifi %s", enabled ? "enabled" : "disabled");
- nm_client_wireless_set_enabled (panel->priv->nm_client, enabled);
+ nm_client_wireless_set_enabled (panel->nm_client, enabled);
}
static gboolean
@@ -1469,9 +1456,9 @@ mobile_switch_changed (GtkSwitch *sw,
enabled = gtk_switch_get_active (sw);
g_debug ("Setting wwan %s", enabled ? "enabled" : "disabled");
- nm_client_wwan_set_enabled (panel->priv->nm_client, enabled);
+ nm_client_wwan_set_enabled (panel->nm_client, enabled);
g_debug ("Setting wimax %s", enabled ? "enabled" : "disabled");
- nm_client_wimax_set_enabled (panel->priv->nm_client, enabled);
+ nm_client_wimax_set_enabled (panel->nm_client, enabled);
}
static void
@@ -1479,12 +1466,11 @@ nm_client_state_changed (NMClient *client,
GParamSpec *pspec,
CcPowerPanel *self)
{
- CcPowerPanelPrivate *priv = self->priv;
gboolean visible;
gboolean active;
gboolean sensitive;
- visible = has_wifi_devices (priv->nm_client);
+ visible = has_wifi_devices (self->nm_client);
active = nm_client_networking_get_enabled (client) &&
nm_client_wireless_get_enabled (client) &&
nm_client_wireless_hardware_get_enabled (client);
@@ -1493,13 +1479,13 @@ nm_client_state_changed (NMClient *client,
g_debug ("wifi state changed to %s", active ? "enabled" : "disabled");
- g_signal_handlers_block_by_func (priv->wifi_switch, wifi_switch_changed, self);
- gtk_switch_set_active (GTK_SWITCH (priv->wifi_switch), active);
- gtk_widget_set_sensitive (priv->wifi_switch, sensitive);
- gtk_widget_set_visible (priv->wifi_row, visible);
- g_signal_handlers_unblock_by_func (priv->wifi_switch, wifi_switch_changed, self);
+ g_signal_handlers_block_by_func (self->wifi_switch, wifi_switch_changed, self);
+ gtk_switch_set_active (GTK_SWITCH (self->wifi_switch), active);
+ gtk_widget_set_sensitive (self->wifi_switch, sensitive);
+ gtk_widget_set_visible (self->wifi_row, visible);
+ g_signal_handlers_unblock_by_func (self->wifi_switch, wifi_switch_changed, self);
- visible = has_mobile_devices (priv->nm_client);
+ visible = has_mobile_devices (self->nm_client);
active = nm_client_networking_get_enabled (client) &&
nm_client_wimax_get_enabled (client) &&
nm_client_wireless_hardware_get_enabled (client);
@@ -1508,11 +1494,11 @@ nm_client_state_changed (NMClient *client,
g_debug ("mobile state changed to %s", active ? "enabled" : "disabled");
- g_signal_handlers_block_by_func (priv->mobile_switch, mobile_switch_changed, self);
- gtk_switch_set_active (GTK_SWITCH (priv->mobile_switch), active);
- gtk_widget_set_sensitive (priv->mobile_switch, sensitive);
- gtk_widget_set_visible (priv->mobile_row, visible);
- g_signal_handlers_unblock_by_func (priv->mobile_switch, mobile_switch_changed, self);
+ g_signal_handlers_block_by_func (self->mobile_switch, mobile_switch_changed, self);
+ gtk_switch_set_active (GTK_SWITCH (self->mobile_switch), active);
+ gtk_widget_set_sensitive (self->mobile_switch, sensitive);
+ gtk_widget_set_visible (self->mobile_row, visible);
+ g_signal_handlers_unblock_by_func (self->mobile_switch, mobile_switch_changed, self);
}
static void
@@ -1520,29 +1506,25 @@ nm_device_changed (NMClient *client,
NMDevice *device,
CcPowerPanel *self)
{
- CcPowerPanelPrivate *priv = self->priv;
-
- gtk_widget_set_visible (priv->wifi_row, has_wifi_devices (priv->nm_client));
- gtk_widget_set_visible (priv->mobile_row, has_mobile_devices (priv->nm_client));
+ gtk_widget_set_visible (self->wifi_row, has_wifi_devices (self->nm_client));
+ gtk_widget_set_visible (self->mobile_row, has_mobile_devices (self->nm_client));
}
static void
setup_nm_client (CcPowerPanel *self,
NMClient *client)
{
- CcPowerPanelPrivate *priv = self->priv;
-
- priv->nm_client = client;
+ self->nm_client = client;
- g_signal_connect_object (priv->nm_client, "notify",
+ g_signal_connect_object (self->nm_client, "notify",
G_CALLBACK (nm_client_state_changed), self, 0);
- g_signal_connect_object (priv->nm_client, "device-added",
+ g_signal_connect_object (self->nm_client, "device-added",
G_CALLBACK (nm_device_changed), self, 0);
- g_signal_connect_object (priv->nm_client, "device-removed",
+ g_signal_connect_object (self->nm_client, "device-removed",
G_CALLBACK (nm_device_changed), self, 0);
- nm_client_state_changed (priv->nm_client, NULL, self);
- nm_device_changed (priv->nm_client, NULL, self);
+ nm_client_state_changed (self->nm_client, NULL, self);
+ nm_device_changed (self->nm_client, NULL, self);
}
static void
@@ -1563,8 +1545,8 @@ nm_client_ready_cb (GObject *source_object,
error->message);
self = user_data;
- gtk_widget_set_sensitive (self->priv->wifi_row, FALSE);
- gtk_widget_set_sensitive (self->priv->mobile_row, FALSE);
+ gtk_widget_set_sensitive (self->wifi_row, FALSE);
+ gtk_widget_set_sensitive (self->mobile_row, FALSE);
}
g_error_free (error);
return;
@@ -1584,16 +1566,15 @@ nm_client_ready_cb (GObject *source_object,
static gboolean
keynav_failed (GtkWidget *list, GtkDirectionType direction, CcPowerPanel *self)
{
- CcPowerPanelPrivate *priv = self->priv;
GtkWidget *next_list = NULL;
GList *item, *boxes_list;
gdouble value, lower, upper, page;
/* Find the list in the list of GtkListBoxes */
if (direction == GTK_DIR_DOWN)
- boxes_list = priv->boxes;
+ boxes_list = self->boxes;
else
- boxes_list = priv->boxes_reverse;
+ boxes_list = self->boxes_reverse;
item = g_list_find (boxes_list, list);
g_assert (item);
@@ -1622,19 +1603,19 @@ keynav_failed (GtkWidget *list, GtkDirectionType direction, CcPowerPanel *self)
return TRUE;
}
- value = gtk_adjustment_get_value (priv->focus_adjustment);
- lower = gtk_adjustment_get_lower (priv->focus_adjustment);
- upper = gtk_adjustment_get_upper (priv->focus_adjustment);
- page = gtk_adjustment_get_page_size (priv->focus_adjustment);
+ value = gtk_adjustment_get_value (self->focus_adjustment);
+ lower = gtk_adjustment_get_lower (self->focus_adjustment);
+ upper = gtk_adjustment_get_upper (self->focus_adjustment);
+ page = gtk_adjustment_get_page_size (self->focus_adjustment);
if (direction == GTK_DIR_UP && value > lower)
{
- gtk_adjustment_set_value (priv->focus_adjustment, lower);
+ gtk_adjustment_set_value (self->focus_adjustment, lower);
return TRUE;
}
else if (direction == GTK_DIR_DOWN && value < upper - page)
{
- gtk_adjustment_set_value (priv->focus_adjustment, upper - page);
+ gtk_adjustment_set_value (self->focus_adjustment, upper - page);
return TRUE;
}
@@ -1661,7 +1642,7 @@ combo_idle_delay_changed_cb (GtkWidget *widget, CcPowerPanel *self)
-1);
/* set both keys */
- g_settings_set_uint (self->priv->session_settings, "idle-delay", value);
+ g_settings_set_uint (self->session_settings, "idle-delay", value);
}
static void
@@ -1684,7 +1665,7 @@ combo_power_button_changed_cb (GtkWidget *widget, CcPowerPanel *self)
-1);
/* set both keys */
- g_settings_set_enum (self->priv->gsd_settings, "power-button-action", value);
+ g_settings_set_enum (self->gsd_settings, "power-button-action", value);
}
static GtkWidget *
@@ -1692,7 +1673,6 @@ add_brightness_row (CcPowerPanel *self,
const char *text,
GtkWidget **brightness_scale)
{
- CcPowerPanelPrivate *priv = self->priv;
GtkWidget *row, *box, *label, *box2, *w, *scale;
row = no_prelight_row_new ();
@@ -1707,11 +1687,11 @@ add_brightness_row (CcPowerPanel *self,
gtk_widget_set_margin_top (label, 6);
gtk_widget_set_margin_bottom (label, 6);
gtk_box_pack_start (GTK_BOX (box), label, FALSE, TRUE, 0);
- gtk_size_group_add_widget (priv->battery_sizegroup, label);
+ gtk_size_group_add_widget (self->battery_sizegroup, label);
box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
w = gtk_label_new ("");
gtk_box_pack_start (GTK_BOX (box2), w, FALSE, TRUE, 0);
- gtk_size_group_add_widget (priv->charge_sizegroup, w);
+ gtk_size_group_add_widget (self->charge_sizegroup, w);
*brightness_scale = scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, 0, 100, 1);
gtk_label_set_mnemonic_widget (GTK_LABEL (label), scale);
@@ -1719,7 +1699,7 @@ add_brightness_row (CcPowerPanel *self,
gtk_widget_set_margin_start (scale, 20);
gtk_widget_set_margin_end (scale, 20);
gtk_box_pack_start (GTK_BOX (box2), scale, TRUE, TRUE, 0);
- gtk_size_group_add_widget (priv->level_sizegroup, scale);
+ gtk_size_group_add_widget (self->level_sizegroup, scale);
g_signal_connect (scale, "value-changed",
G_CALLBACK (brightness_slider_value_changed_cb), self);
@@ -1745,7 +1725,7 @@ iio_proxy_appeared_cb (GDBusConnection *connection,
CcPowerPanel *self = CC_POWER_PANEL (user_data);
GError *error = NULL;
- self->priv->iio_proxy =
+ self->iio_proxy =
cc_object_storage_create_dbus_proxy_sync (G_BUS_TYPE_SYSTEM,
G_DBUS_PROXY_FLAGS_NONE,
"net.hadess.SensorProxy",
@@ -1760,7 +1740,7 @@ iio_proxy_appeared_cb (GDBusConnection *connection,
return;
}
- g_signal_connect_swapped (G_OBJECT (self->priv->iio_proxy), "g-properties-changed",
+ g_signal_connect_swapped (G_OBJECT (self->iio_proxy), "g-properties-changed",
G_CALLBACK (als_enabled_state_changed), self);
als_enabled_state_changed (self);
}
@@ -1771,14 +1751,13 @@ iio_proxy_vanished_cb (GDBusConnection *connection,
gpointer user_data)
{
CcPowerPanel *self = CC_POWER_PANEL (user_data);
- g_clear_object (&self->priv->iio_proxy);
+ g_clear_object (&self->iio_proxy);
als_enabled_state_changed (self);
}
static void
add_power_saving_section (CcPowerPanel *self)
{
- CcPowerPanelPrivate *priv = self->priv;
GtkWidget *vbox;
GtkWidget *widget, *box, *label, *row;
GtkWidget *combo;
@@ -1788,7 +1767,7 @@ add_power_saving_section (CcPowerPanel *self)
int value;
gchar *s;
- vbox = WID (priv->builder, "vbox_power");
+ vbox = WID (self->builder, "vbox_power");
s = g_strdup_printf ("<b>%s</b>", _("Power Saving"));
label = gtk_label_new (s);
@@ -1800,7 +1779,7 @@ add_power_saving_section (CcPowerPanel *self)
gtk_widget_show (label);
widget = gtk_list_box_new ();
- priv->boxes_reverse = g_list_prepend (priv->boxes_reverse, widget);
+ self->boxes_reverse = g_list_prepend (self->boxes_reverse, widget);
g_signal_connect (widget, "keynav-failed", G_CALLBACK (keynav_failed), self);
gtk_list_box_set_selection_mode (GTK_LIST_BOX (widget), GTK_SELECTION_NONE);
gtk_list_box_set_header_func (GTK_LIST_BOX (widget),
@@ -1821,23 +1800,23 @@ add_power_saving_section (CcPowerPanel *self)
gtk_container_add (GTK_CONTAINER (box), widget);
gtk_box_pack_start (GTK_BOX (vbox), box, FALSE, TRUE, 0);
- row = add_brightness_row (self, _("_Screen brightness"), &priv->brightness_scale);
- priv->brightness_row = row;
+ row = add_brightness_row (self, _("_Screen brightness"), &self->brightness_scale);
+ self->brightness_row = row;
gtk_container_add (GTK_CONTAINER (widget), row);
- gtk_size_group_add_widget (priv->row_sizegroup, row);
+ gtk_size_group_add_widget (self->row_sizegroup, row);
/* ambient light sensor */
- priv->iio_proxy_watch_id =
+ self->iio_proxy_watch_id =
g_bus_watch_name (G_BUS_TYPE_SYSTEM,
"net.hadess.SensorProxy",
G_BUS_NAME_WATCHER_FLAGS_NONE,
iio_proxy_appeared_cb,
iio_proxy_vanished_cb,
self, NULL);
- g_signal_connect (priv->gsd_settings, "changed",
+ g_signal_connect (self->gsd_settings, "changed",
G_CALLBACK (als_enabled_setting_changed), self);
- priv->als_row = row = no_prelight_row_new ();
+ self->als_row = row = no_prelight_row_new ();
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 50);
gtk_container_add (GTK_CONTAINER (row), box);
label = gtk_label_new (_("Automatic brightness"));
@@ -1849,24 +1828,24 @@ add_power_saving_section (CcPowerPanel *self)
gtk_widget_set_margin_bottom (label, 6);
gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
- priv->als_switch = sw = gtk_switch_new ();
+ self->als_switch = sw = gtk_switch_new ();
gtk_widget_set_margin_start (sw, 20);
gtk_widget_set_margin_end (sw, 20);
gtk_widget_set_valign (sw, GTK_ALIGN_CENTER);
gtk_box_pack_start (GTK_BOX (box), sw, FALSE, TRUE, 0);
gtk_label_set_mnemonic_widget (GTK_LABEL (label), sw);
gtk_container_add (GTK_CONTAINER (widget), row);
- gtk_size_group_add_widget (priv->row_sizegroup, row);
- g_signal_connect (G_OBJECT (priv->als_switch), "notify::active",
+ gtk_size_group_add_widget (self->row_sizegroup, row);
+ g_signal_connect (G_OBJECT (self->als_switch), "notify::active",
G_CALLBACK (als_switch_changed), self);
- row = add_brightness_row (self, _("_Keyboard brightness"), &priv->kbd_brightness_scale);
- priv->kbd_brightness_row = row;
+ row = add_brightness_row (self, _("_Keyboard brightness"), &self->kbd_brightness_scale);
+ self->kbd_brightness_row = row;
gtk_container_add (GTK_CONTAINER (widget), row);
- gtk_size_group_add_widget (priv->row_sizegroup, row);
+ gtk_size_group_add_widget (self->row_sizegroup, row);
- priv->dim_screen_row = row = no_prelight_row_new ();
+ self->dim_screen_row = row = no_prelight_row_new ();
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 50);
gtk_container_add (GTK_CONTAINER (row), box);
@@ -1880,7 +1859,7 @@ add_power_saving_section (CcPowerPanel *self)
gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
sw = gtk_switch_new ();
- g_settings_bind (priv->gsd_settings, "idle-dim",
+ g_settings_bind (self->gsd_settings, "idle-dim",
sw, "active",
G_SETTINGS_BIND_DEFAULT);
gtk_widget_set_margin_start (sw, 20);
@@ -1889,7 +1868,7 @@ add_power_saving_section (CcPowerPanel *self)
gtk_box_pack_start (GTK_BOX (box), sw, FALSE, TRUE, 0);
gtk_label_set_mnemonic_widget (GTK_LABEL (label), sw);
gtk_container_add (GTK_CONTAINER (widget), row);
- gtk_size_group_add_widget (priv->row_sizegroup, row);
+ gtk_size_group_add_widget (self->row_sizegroup, row);
row = no_prelight_row_new ();
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 50);
@@ -1907,8 +1886,8 @@ add_power_saving_section (CcPowerPanel *self)
combo = gtk_combo_box_text_new ();
gtk_combo_box_set_entry_text_column (GTK_COMBO_BOX (combo), 0);
gtk_combo_box_set_model (GTK_COMBO_BOX (combo),
- GTK_TREE_MODEL (gtk_builder_get_object (priv->builder, "liststore_idle_time")));
- value = g_settings_get_uint (priv->session_settings, "idle-delay");
+ GTK_TREE_MODEL (gtk_builder_get_object (self->builder, "liststore_idle_time")));
+ value = g_settings_get_uint (self->session_settings, "idle-delay");
set_value_for_combo (GTK_COMBO_BOX (combo), value);
g_signal_connect (combo, "changed",
G_CALLBACK (combo_idle_delay_changed_cb), self);
@@ -1918,10 +1897,10 @@ add_power_saving_section (CcPowerPanel *self)
gtk_box_pack_start (GTK_BOX (box), combo, FALSE, TRUE, 0);
gtk_label_set_mnemonic_widget (GTK_LABEL (label), combo);
gtk_container_add (GTK_CONTAINER (widget), row);
- gtk_size_group_add_widget (priv->row_sizegroup, row);
+ gtk_size_group_add_widget (self->row_sizegroup, row);
#ifdef HAVE_NETWORK_MANAGER
- priv->wifi_row = row = no_prelight_row_new ();
+ self->wifi_row = row = no_prelight_row_new ();
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 50);
gtk_container_add (GTK_CONTAINER (row), box);
@@ -1942,16 +1921,16 @@ add_power_saving_section (CcPowerPanel *self)
gtk_style_context_add_class (gtk_widget_get_style_context (w), GTK_STYLE_CLASS_DIM_LABEL);
gtk_box_pack_start (GTK_BOX (box2), w, TRUE, TRUE, 0);
- priv->wifi_switch = sw = gtk_switch_new ();
+ self->wifi_switch = sw = gtk_switch_new ();
gtk_widget_set_margin_start (sw, 20);
gtk_widget_set_margin_end (sw, 20);
gtk_widget_set_valign (sw, GTK_ALIGN_CENTER);
gtk_box_pack_start (GTK_BOX (box), sw, FALSE, TRUE, 0);
gtk_label_set_mnemonic_widget (GTK_LABEL (label), sw);
gtk_container_add (GTK_CONTAINER (widget), row);
- gtk_size_group_add_widget (priv->row_sizegroup, row);
+ gtk_size_group_add_widget (self->row_sizegroup, row);
- priv->mobile_row = row = no_prelight_row_new ();
+ self->mobile_row = row = no_prelight_row_new ();
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 50);
gtk_container_add (GTK_CONTAINER (row), box);
@@ -1972,31 +1951,31 @@ add_power_saving_section (CcPowerPanel *self)
gtk_style_context_add_class (gtk_widget_get_style_context (w), GTK_STYLE_CLASS_DIM_LABEL);
gtk_box_pack_start (GTK_BOX (box2), w, TRUE, TRUE, 0);
- priv->mobile_switch = sw = gtk_switch_new ();
+ self->mobile_switch = sw = gtk_switch_new ();
gtk_widget_set_margin_start (sw, 20);
gtk_widget_set_margin_end (sw, 20);
gtk_widget_set_valign (sw, GTK_ALIGN_CENTER);
gtk_box_pack_start (GTK_BOX (box), sw, FALSE, TRUE, 0);
gtk_label_set_mnemonic_widget (GTK_LABEL (label), sw);
gtk_container_add (GTK_CONTAINER (widget), row);
- gtk_size_group_add_widget (priv->row_sizegroup, row);
+ gtk_size_group_add_widget (self->row_sizegroup, row);
- g_signal_connect (G_OBJECT (priv->mobile_switch), "notify::active",
+ g_signal_connect (G_OBJECT (self->mobile_switch), "notify::active",
G_CALLBACK (mobile_switch_changed), self);
/* Create and store a NMClient instance if it doesn't exist yet */
if (cc_object_storage_has_object (CC_OBJECT_NMCLIENT))
setup_nm_client (self, cc_object_storage_get_object (CC_OBJECT_NMCLIENT));
else
- nm_client_new_async (priv->cancellable, nm_client_ready_cb, self);
+ nm_client_new_async (self->cancellable, nm_client_ready_cb, self);
- g_signal_connect (G_OBJECT (priv->wifi_switch), "notify::active",
+ g_signal_connect (G_OBJECT (self->wifi_switch), "notify::active",
G_CALLBACK (wifi_switch_changed), self);
#endif
#ifdef HAVE_BLUETOOTH
- priv->bt_rfkill = cc_object_storage_create_dbus_proxy_sync (G_BUS_TYPE_SESSION,
+ self->bt_rfkill = cc_object_storage_create_dbus_proxy_sync (G_BUS_TYPE_SESSION,
G_DBUS_PROXY_FLAGS_NONE,
"org.gnome.SettingsDaemon.Rfkill",
"/org/gnome/SettingsDaemon/Rfkill",
@@ -2004,9 +1983,9 @@ add_power_saving_section (CcPowerPanel *self)
NULL,
NULL);
- if (priv->bt_rfkill)
+ if (self->bt_rfkill)
{
- priv->bt_properties = cc_object_storage_create_dbus_proxy_sync (G_BUS_TYPE_SESSION,
+ self->bt_properties = cc_object_storage_create_dbus_proxy_sync (G_BUS_TYPE_SESSION,
G_DBUS_PROXY_FLAGS_NONE,
"org.gnome.SettingsDaemon.Rfkill",
"/org/gnome/SettingsDaemon/Rfkill",
@@ -2036,20 +2015,20 @@ add_power_saving_section (CcPowerPanel *self)
gtk_style_context_add_class (gtk_widget_get_style_context (label), GTK_STYLE_CLASS_DIM_LABEL);
gtk_box_pack_start (GTK_BOX (box2), label, TRUE, TRUE, 0);
- priv->bt_switch = sw = gtk_switch_new ();
+ self->bt_switch = sw = gtk_switch_new ();
gtk_widget_set_margin_start (sw, 20);
gtk_widget_set_margin_end (sw, 20);
gtk_widget_set_valign (sw, GTK_ALIGN_CENTER);
gtk_box_pack_start (GTK_BOX (box), sw, FALSE, TRUE, 0);
gtk_label_set_mnemonic_widget (GTK_LABEL (label), sw);
gtk_container_add (GTK_CONTAINER (widget), row);
- gtk_size_group_add_widget (priv->row_sizegroup, row);
+ gtk_size_group_add_widget (self->row_sizegroup, row);
gtk_widget_show_all (box);
gtk_widget_set_no_show_all (row, TRUE);
- priv->bt_row = row;
- g_signal_connect_object (priv->bt_rfkill, "g-properties-changed",
+ self->bt_row = row;
+ g_signal_connect_object (self->bt_rfkill, "g-properties-changed",
G_CALLBACK (bt_powered_state_changed), self, G_CONNECT_SWAPPED);
- g_signal_connect (G_OBJECT (priv->bt_switch), "notify::active",
+ g_signal_connect (G_OBJECT (self->bt_switch), "notify::active",
G_CALLBACK (bt_switch_changed), self);
bt_powered_state_changed (self);
@@ -2063,17 +2042,16 @@ add_power_saving_section (CcPowerPanel *self)
static void
update_automatic_suspend_label (CcPowerPanel *self)
{
- CcPowerPanelPrivate *priv = self->priv;
GsdPowerActionType ac_action;
GsdPowerActionType battery_action;
gint ac_timeout;
gint battery_timeout;
const gchar *s;
- ac_action = g_settings_get_enum (priv->gsd_settings, "sleep-inactive-ac-type");
- battery_action = g_settings_get_enum (priv->gsd_settings, "sleep-inactive-battery-type");
- ac_timeout = g_settings_get_int (priv->gsd_settings, "sleep-inactive-ac-timeout");
- battery_timeout = g_settings_get_int (priv->gsd_settings, "sleep-inactive-battery-timeout");
+ ac_action = g_settings_get_enum (self->gsd_settings, "sleep-inactive-ac-type");
+ battery_action = g_settings_get_enum (self->gsd_settings, "sleep-inactive-battery-type");
+ ac_timeout = g_settings_get_int (self->gsd_settings, "sleep-inactive-ac-timeout");
+ battery_timeout = g_settings_get_int (self->gsd_settings, "sleep-inactive-battery-timeout");
if (ac_timeout < 0)
g_warning ("Invalid negative timeout for 'sleep-inactive-ac-timeout': %d", ac_timeout);
@@ -2085,7 +2063,7 @@ update_automatic_suspend_label (CcPowerPanel *self)
if (battery_action == GSD_POWER_ACTION_NOTHING || battery_timeout < 0)
battery_timeout = NEVER;
- if (priv->has_batteries)
+ if (self->has_batteries)
{
if (ac_timeout == NEVER && battery_timeout == NEVER)
s = _("Off");
@@ -2104,8 +2082,8 @@ update_automatic_suspend_label (CcPowerPanel *self)
s = _("On");
}
- if (priv->automatic_suspend_label)
- gtk_label_set_label (GTK_LABEL (priv->automatic_suspend_label), s);
+ if (self->automatic_suspend_label)
+ gtk_label_set_label (GTK_LABEL (self->automatic_suspend_label), s);
}
static void
@@ -2123,13 +2101,12 @@ static void
activate_row (CcPowerPanel *self,
GtkListBoxRow *row)
{
- CcPowerPanelPrivate *priv = self->priv;
GtkWidget *w;
GtkWidget *toplevel;
- if (row == GTK_LIST_BOX_ROW (priv->automatic_suspend_row))
+ if (row == GTK_LIST_BOX_ROW (self->automatic_suspend_row))
{
- w = priv->automatic_suspend_dialog;
+ w = self->automatic_suspend_dialog;
toplevel = gtk_widget_get_toplevel (GTK_WIDGET (self));
gtk_window_set_transient_for (GTK_WINDOW (w), GTK_WINDOW (toplevel));
gtk_window_set_modal (GTK_WINDOW (w), TRUE);
@@ -2142,7 +2119,7 @@ automatic_suspend_activate (GtkWidget *widget,
gboolean cycle,
CcPowerPanel *self)
{
- activate_row (self, GTK_LIST_BOX_ROW (self->priv->automatic_suspend_row));
+ activate_row (self, GTK_LIST_BOX_ROW (self->automatic_suspend_row));
return TRUE;
}
@@ -2214,7 +2191,6 @@ static gboolean
can_suspend_or_hibernate (CcPowerPanel *self,
const char *method_name)
{
- CcPowerPanelPrivate *priv = self->priv;
GDBusConnection *connection;
GVariant *variant;
gboolean result = FALSE;
@@ -2222,7 +2198,7 @@ can_suspend_or_hibernate (CcPowerPanel *self,
const char *s;
connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM,
- priv->cancellable,
+ self->cancellable,
&error);
if (!connection)
{
@@ -2241,7 +2217,7 @@ can_suspend_or_hibernate (CcPowerPanel *self,
NULL,
G_DBUS_CALL_FLAGS_NONE,
-1,
- priv->cancellable,
+ self->cancellable,
&error);
g_object_unref (connection);
@@ -2265,7 +2241,6 @@ can_suspend_or_hibernate (CcPowerPanel *self,
static void
add_suspend_and_power_off_section (CcPowerPanel *self)
{
- CcPowerPanelPrivate *priv = self->priv;
GtkWidget *vbox;
GtkWidget *widget, *box, *label;
GtkWidget *sw, *row;
@@ -2290,18 +2265,18 @@ add_suspend_and_power_off_section (CcPowerPanel *self)
* For our switch/combobox combination, the second choice works
* much better, so translate the first to the second here.
*/
- if (g_settings_get_int (priv->gsd_settings, "sleep-inactive-ac-timeout") == 0)
+ if (g_settings_get_int (self->gsd_settings, "sleep-inactive-ac-timeout") == 0)
{
- g_settings_set_enum (priv->gsd_settings, "sleep-inactive-ac-type", GSD_POWER_ACTION_NOTHING);
- g_settings_set_int (priv->gsd_settings, "sleep-inactive-ac-timeout", 3600);
+ g_settings_set_enum (self->gsd_settings, "sleep-inactive-ac-type", GSD_POWER_ACTION_NOTHING);
+ g_settings_set_int (self->gsd_settings, "sleep-inactive-ac-timeout", 3600);
}
- if (g_settings_get_int (priv->gsd_settings, "sleep-inactive-battery-timeout") == 0)
+ if (g_settings_get_int (self->gsd_settings, "sleep-inactive-battery-timeout") == 0)
{
- g_settings_set_enum (priv->gsd_settings, "sleep-inactive-battery-type", GSD_POWER_ACTION_NOTHING);
- g_settings_set_int (priv->gsd_settings, "sleep-inactive-battery-timeout", 1800);
+ g_settings_set_enum (self->gsd_settings, "sleep-inactive-battery-type", GSD_POWER_ACTION_NOTHING);
+ g_settings_set_int (self->gsd_settings, "sleep-inactive-battery-timeout", 1800);
}
- vbox = WID (priv->builder, "vbox_power");
+ vbox = WID (self->builder, "vbox_power");
/* Frame header */
s = g_markup_printf_escaped ("<b>%s</b>", _("Suspend & Power Button"));
@@ -2314,7 +2289,7 @@ add_suspend_and_power_off_section (CcPowerPanel *self)
gtk_widget_show (label);
widget = gtk_list_box_new ();
- priv->boxes_reverse = g_list_prepend (priv->boxes_reverse, widget);
+ self->boxes_reverse = g_list_prepend (self->boxes_reverse, widget);
g_signal_connect (widget, "keynav-failed", G_CALLBACK (keynav_failed), self);
gtk_list_box_set_selection_mode (GTK_LIST_BOX (widget), GTK_SELECTION_NONE);
gtk_list_box_set_header_func (GTK_LIST_BOX (widget),
@@ -2340,11 +2315,11 @@ add_suspend_and_power_off_section (CcPowerPanel *self)
/* Automatic suspend row */
if (can_suspend)
{
- self->priv->automatic_suspend_row = row = gtk_list_box_row_new ();
+ self->automatic_suspend_row = row = gtk_list_box_row_new ();
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 50);
gtk_container_add (GTK_CONTAINER (row), box);
label = gtk_label_new (_("_Automatic suspend"));
- atk_object_set_name (ATK_OBJECT (gtk_widget_get_accessible (self->priv->automatic_suspend_row)),
_("Automatic suspend"));
+ atk_object_set_name (ATK_OBJECT (gtk_widget_get_accessible (self->automatic_suspend_row)),
_("Automatic suspend"));
gtk_widget_set_halign (label, GTK_ALIGN_START);
gtk_label_set_use_underline (GTK_LABEL (label), TRUE);
gtk_widget_set_margin_start (label, 20);
@@ -2353,7 +2328,7 @@ add_suspend_and_power_off_section (CcPowerPanel *self)
gtk_widget_set_margin_bottom (label, 6);
gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
- priv->automatic_suspend_label = sw = gtk_label_new ("");
+ self->automatic_suspend_label = sw = gtk_label_new ("");
gtk_label_set_mnemonic_widget (GTK_LABEL (label), sw);
g_signal_connect (sw, "mnemonic-activate",
G_CALLBACK (automatic_suspend_activate), self);
@@ -2362,36 +2337,36 @@ add_suspend_and_power_off_section (CcPowerPanel *self)
gtk_widget_set_margin_end (sw, 24);
gtk_box_pack_start (GTK_BOX (box), sw, FALSE, TRUE, 0);
gtk_container_add (GTK_CONTAINER (widget), row);
- gtk_size_group_add_widget (priv->row_sizegroup, row);
+ gtk_size_group_add_widget (self->row_sizegroup, row);
- dialog = priv->automatic_suspend_dialog;
+ dialog = self->automatic_suspend_dialog;
g_signal_connect (dialog, "delete-event", G_CALLBACK (gtk_widget_hide_on_delete), NULL);
- g_signal_connect (priv->gsd_settings, "changed", G_CALLBACK (on_suspend_settings_changed), self);
+ g_signal_connect (self->gsd_settings, "changed", G_CALLBACK (on_suspend_settings_changed), self);
- sw = WID (priv->builder, "suspend_on_battery_switch");
- g_settings_bind_with_mapping (priv->gsd_settings, "sleep-inactive-battery-type",
+ sw = WID (self->builder, "suspend_on_battery_switch");
+ g_settings_bind_with_mapping (self->gsd_settings, "sleep-inactive-battery-type",
sw, "active",
G_SETTINGS_BIND_DEFAULT,
get_sleep_type, set_sleep_type, NULL, NULL);
- combo = WID (priv->builder, "suspend_on_battery_delay_combo");
+ combo = WID (self->builder, "suspend_on_battery_delay_combo");
g_object_set_data (G_OBJECT (combo), "_gsettings_key", "sleep-inactive-battery-timeout");
- value = g_settings_get_int (priv->gsd_settings, "sleep-inactive-battery-timeout");
+ value = g_settings_get_int (self->gsd_settings, "sleep-inactive-battery-timeout");
set_value_for_combo (GTK_COMBO_BOX (combo), value);
g_signal_connect (combo, "changed",
G_CALLBACK (combo_time_changed_cb), self);
g_object_bind_property (sw, "active", combo, "sensitive",
G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE);
- sw = WID (priv->builder, "suspend_on_ac_switch");
- g_settings_bind_with_mapping (priv->gsd_settings, "sleep-inactive-ac-type",
+ sw = WID (self->builder, "suspend_on_ac_switch");
+ g_settings_bind_with_mapping (self->gsd_settings, "sleep-inactive-ac-type",
sw, "active",
G_SETTINGS_BIND_DEFAULT,
get_sleep_type, set_sleep_type, NULL, NULL);
- combo = WID (priv->builder, "suspend_on_ac_delay_combo");
+ combo = WID (self->builder, "suspend_on_ac_delay_combo");
g_object_set_data (G_OBJECT (combo), "_gsettings_key", "sleep-inactive-ac-timeout");
- value = g_settings_get_int (priv->gsd_settings, "sleep-inactive-ac-timeout");
+ value = g_settings_get_int (self->gsd_settings, "sleep-inactive-ac-timeout");
set_value_for_combo (GTK_COMBO_BOX (combo), value);
g_signal_connect (combo, "changed",
G_CALLBACK (combo_time_changed_cb), self);
@@ -2402,8 +2377,8 @@ add_suspend_and_power_off_section (CcPowerPanel *self)
update_automatic_suspend_label (self);
}
- if (g_strcmp0 (priv->chassis_type, "vm") == 0 ||
- g_strcmp0 (priv->chassis_type, "tablet") == 0)
+ if (g_strcmp0 (self->chassis_type, "vm") == 0 ||
+ g_strcmp0 (self->chassis_type, "tablet") == 0)
goto out;
/* Power button row */
@@ -2422,10 +2397,10 @@ add_suspend_and_power_off_section (CcPowerPanel *self)
combo = gtk_combo_box_text_new ();
gtk_combo_box_set_entry_text_column (GTK_COMBO_BOX (combo), 0);
- model = GTK_TREE_MODEL (gtk_builder_get_object (priv->builder, "liststore_power_button"));
+ model = GTK_TREE_MODEL (gtk_builder_get_object (self->builder, "liststore_power_button"));
populate_power_button_model (model, can_suspend, can_hibernate);
gtk_combo_box_set_model (GTK_COMBO_BOX (combo), model);
- button_value = g_settings_get_enum (priv->gsd_settings, "power-button-action");
+ button_value = g_settings_get_enum (self->gsd_settings, "power-button-action");
set_value_for_combo (GTK_COMBO_BOX (combo), button_value);
g_signal_connect (combo, "changed",
G_CALLBACK (combo_power_button_changed_cb), self);
@@ -2435,7 +2410,7 @@ add_suspend_and_power_off_section (CcPowerPanel *self)
gtk_box_pack_start (GTK_BOX (box), combo, FALSE, TRUE, 0);
gtk_label_set_mnemonic_widget (GTK_LABEL (label), combo);
gtk_container_add (GTK_CONTAINER (widget), row);
- gtk_size_group_add_widget (priv->row_sizegroup, row);
+ gtk_size_group_add_widget (self->row_sizegroup, row);
out:
gtk_widget_show_all (widget);
@@ -2468,20 +2443,19 @@ battery_sort_func (gconstpointer a, gconstpointer b, gpointer data)
static void
add_battery_section (CcPowerPanel *self)
{
- CcPowerPanelPrivate *priv = self->priv;
GtkWidget *vbox;
GtkWidget *widget, *box;
GtkWidget *frame;
gchar *s;
- vbox = WID (priv->builder, "vbox_power");
+ vbox = WID (self->builder, "vbox_power");
- priv->battery_section = box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+ self->battery_section = box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_set_margin_bottom (box, 32);
gtk_box_pack_start (GTK_BOX (vbox), box, FALSE, TRUE, 0);
s = g_markup_printf_escaped ("<b>%s</b>", _("Battery"));
- priv->battery_heading = widget = gtk_label_new (s);
+ self->battery_heading = widget = gtk_label_new (s);
g_free (s);
gtk_label_set_use_markup (GTK_LABEL (widget), TRUE);
gtk_widget_set_halign (widget, GTK_ALIGN_START);
@@ -2489,8 +2463,8 @@ add_battery_section (CcPowerPanel *self)
gtk_widget_set_margin_bottom (box, 32);
gtk_box_pack_start (GTK_BOX (box), widget, FALSE, TRUE, 0);
- priv->battery_list = widget = GTK_WIDGET (gtk_list_box_new ());
- priv->boxes_reverse = g_list_prepend (priv->boxes_reverse, priv->battery_list);
+ self->battery_list = widget = GTK_WIDGET (gtk_list_box_new ());
+ self->boxes_reverse = g_list_prepend (self->boxes_reverse, self->battery_list);
g_signal_connect (widget, "keynav-failed", G_CALLBACK (keynav_failed), self);
gtk_list_box_set_selection_mode (GTK_LIST_BOX (widget), GTK_SELECTION_NONE);
gtk_list_box_set_header_func (GTK_LIST_BOX (widget),
@@ -2499,12 +2473,12 @@ add_battery_section (CcPowerPanel *self)
gtk_list_box_set_sort_func (GTK_LIST_BOX (widget),
(GtkListBoxSortFunc)battery_sort_func, NULL, NULL);
- atk_object_add_relationship (ATK_OBJECT (gtk_widget_get_accessible (priv->battery_heading)),
+ atk_object_add_relationship (ATK_OBJECT (gtk_widget_get_accessible (self->battery_heading)),
ATK_RELATION_LABEL_FOR,
- ATK_OBJECT (gtk_widget_get_accessible (priv->battery_list)));
- atk_object_add_relationship (ATK_OBJECT (gtk_widget_get_accessible (priv->battery_list)),
+ ATK_OBJECT (gtk_widget_get_accessible (self->battery_list)));
+ atk_object_add_relationship (ATK_OBJECT (gtk_widget_get_accessible (self->battery_list)),
ATK_RELATION_LABELLED_BY,
- ATK_OBJECT (gtk_widget_get_accessible (priv->battery_heading)));
+ ATK_OBJECT (gtk_widget_get_accessible (self->battery_heading)));
frame = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
@@ -2517,29 +2491,28 @@ add_battery_section (CcPowerPanel *self)
static void
add_device_section (CcPowerPanel *self)
{
- CcPowerPanelPrivate *priv = self->priv;
GtkWidget *vbox;
GtkWidget *widget, *box;
GtkWidget *frame;
gchar *s;
- vbox = WID (priv->builder, "vbox_power");
+ vbox = WID (self->builder, "vbox_power");
- priv->device_section = box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+ self->device_section = box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_set_margin_top (box, 6);
gtk_widget_set_margin_bottom (box, 32);
gtk_box_pack_start (GTK_BOX (vbox), box, FALSE, TRUE, 0);
s = g_markup_printf_escaped ("<b>%s</b>", _("Devices"));
- priv->device_heading = widget = gtk_label_new (s);
+ self->device_heading = widget = gtk_label_new (s);
g_free (s);
gtk_label_set_use_markup (GTK_LABEL (widget), TRUE);
gtk_widget_set_halign (widget, GTK_ALIGN_START);
gtk_widget_set_margin_bottom (widget, 12);
gtk_box_pack_start (GTK_BOX (box), widget, FALSE, TRUE, 0);
- priv->device_list = widget = gtk_list_box_new ();
- priv->boxes_reverse = g_list_prepend (priv->boxes_reverse, priv->device_list);
+ self->device_list = widget = gtk_list_box_new ();
+ self->boxes_reverse = g_list_prepend (self->boxes_reverse, self->device_list);
g_signal_connect (widget, "keynav-failed", G_CALLBACK (keynav_failed), self);
gtk_list_box_set_selection_mode (GTK_LIST_BOX (widget), GTK_SELECTION_NONE);
gtk_list_box_set_header_func (GTK_LIST_BOX (widget),
@@ -2548,12 +2521,12 @@ add_device_section (CcPowerPanel *self)
gtk_list_box_set_sort_func (GTK_LIST_BOX (widget),
(GtkListBoxSortFunc)battery_sort_func, NULL, NULL);
- atk_object_add_relationship (ATK_OBJECT (gtk_widget_get_accessible (priv->device_heading)),
+ atk_object_add_relationship (ATK_OBJECT (gtk_widget_get_accessible (self->device_heading)),
ATK_RELATION_LABEL_FOR,
- ATK_OBJECT (gtk_widget_get_accessible (priv->device_list)));
- atk_object_add_relationship (ATK_OBJECT (gtk_widget_get_accessible (priv->device_list)),
+ ATK_OBJECT (gtk_widget_get_accessible (self->device_list)));
+ atk_object_add_relationship (ATK_OBJECT (gtk_widget_get_accessible (self->device_list)),
ATK_RELATION_LABELLED_BY,
- ATK_OBJECT (gtk_widget_get_accessible (priv->device_heading)));
+ ATK_OBJECT (gtk_widget_get_accessible (self->device_heading)));
frame = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
@@ -2585,19 +2558,17 @@ on_content_size_changed (GtkWidget *widget, GtkAllocation *allocation, gpointer
static void
cc_power_panel_init (CcPowerPanel *self)
{
- CcPowerPanelPrivate *priv;
GError *error;
GtkWidget *widget;
GtkWidget *box;
guint i;
- priv = self->priv = POWER_PANEL_PRIVATE (self);
g_resources_register (cc_power_get_resource ());
- priv->builder = gtk_builder_new ();
+ self->builder = gtk_builder_new ();
error = NULL;
- gtk_builder_add_from_resource (self->priv->builder,
+ gtk_builder_add_from_resource (self->builder,
"/org/gnome/control-center/power/power.ui",
&error);
@@ -2608,16 +2579,16 @@ cc_power_panel_init (CcPowerPanel *self)
return;
}
- priv->automatic_suspend_dialog = WID (priv->builder, "automatic_suspend_dialog");
+ self->automatic_suspend_dialog = WID (self->builder, "automatic_suspend_dialog");
- priv->cancellable = g_cancellable_new ();
+ self->cancellable = g_cancellable_new ();
cc_object_storage_create_dbus_proxy (G_BUS_TYPE_SESSION,
G_DBUS_PROXY_FLAGS_NONE,
"org.gnome.SettingsDaemon.Power",
"/org/gnome/SettingsDaemon/Power",
"org.gnome.SettingsDaemon.Power.Screen",
- priv->cancellable,
+ self->cancellable,
got_screen_proxy_cb,
self);
cc_object_storage_create_dbus_proxy (G_BUS_TYPE_SESSION,
@@ -2625,43 +2596,43 @@ cc_power_panel_init (CcPowerPanel *self)
"org.gnome.SettingsDaemon.Power",
"/org/gnome/SettingsDaemon/Power",
"org.gnome.SettingsDaemon.Power.Keyboard",
- priv->cancellable,
+ self->cancellable,
got_kbd_proxy_cb,
self);
- priv->chassis_type = get_chassis_type (priv->cancellable);
+ self->chassis_type = get_chassis_type (self->cancellable);
- priv->up_client = up_client_new ();
+ self->up_client = up_client_new ();
- priv->gsd_settings = g_settings_new ("org.gnome.settings-daemon.plugins.power");
- priv->session_settings = g_settings_new ("org.gnome.desktop.session");
+ self->gsd_settings = g_settings_new ("org.gnome.settings-daemon.plugins.power");
+ self->session_settings = g_settings_new ("org.gnome.desktop.session");
- priv->row_sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_VERTICAL);
- priv->battery_sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
- priv->charge_sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
- priv->level_sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+ self->row_sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_VERTICAL);
+ self->battery_sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+ self->charge_sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+ self->level_sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
add_battery_section (self);
add_device_section (self);
add_power_saving_section (self);
add_suspend_and_power_off_section (self);
- priv->boxes = g_list_copy (priv->boxes_reverse);
- priv->boxes = g_list_reverse (priv->boxes);
+ self->boxes = g_list_copy (self->boxes_reverse);
+ self->boxes = g_list_reverse (self->boxes);
/* populate batteries */
- g_signal_connect (priv->up_client, "device-added", G_CALLBACK (up_client_device_added), self);
- g_signal_connect (priv->up_client, "device-removed", G_CALLBACK (up_client_device_removed), self);
+ g_signal_connect (self->up_client, "device-added", G_CALLBACK (up_client_device_added), self);
+ g_signal_connect (self->up_client, "device-removed", G_CALLBACK (up_client_device_removed), self);
- priv->devices = up_client_get_devices (priv->up_client);
- for (i = 0; priv->devices != NULL && i < priv->devices->len; i++) {
- UpDevice *device = g_ptr_array_index (priv->devices, i);
+ self->devices = up_client_get_devices (self->up_client);
+ for (i = 0; self->devices != NULL && i < self->devices->len; i++) {
+ UpDevice *device = g_ptr_array_index (self->devices, i);
g_signal_connect (G_OBJECT (device), "notify",
G_CALLBACK (up_client_changed), self);
}
- up_client_changed (priv->up_client, NULL, self);
+ up_client_changed (self->up_client, NULL, self);
- widget = WID (priv->builder, "main_box");
+ widget = WID (self->builder, "main_box");
box = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (box),
GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
@@ -2671,6 +2642,6 @@ cc_power_panel_init (CcPowerPanel *self)
gtk_container_add (GTK_CONTAINER (self), box);
gtk_container_add (GTK_CONTAINER (box), widget);
- priv->focus_adjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (box));
- gtk_container_set_focus_vadjustment (GTK_CONTAINER (widget), priv->focus_adjustment);
+ self->focus_adjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (box));
+ gtk_container_set_focus_vadjustment (GTK_CONTAINER (widget), self->focus_adjustment);
}
diff --git a/panels/power/cc-power-panel.h b/panels/power/cc-power-panel.h
index d4b69546e..4ea08a28c 100644
--- a/panels/power/cc-power-panel.h
+++ b/panels/power/cc-power-panel.h
@@ -25,45 +25,8 @@
G_BEGIN_DECLS
-#define CC_TYPE_POWER_PANEL cc_power_panel_get_type()
-
-#define CC_POWER_PANEL(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
- CC_TYPE_POWER_PANEL, CcPowerPanel))
-
-#define CC_POWER_PANEL_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST ((klass), \
- CC_TYPE_POWER_PANEL, CcPowerPanelClass))
-
-#define CC_IS_POWER_PANEL(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
- CC_TYPE_POWER_PANEL))
-
-#define CC_IS_POWER_PANEL_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_TYPE ((klass), \
- CC_TYPE_POWER_PANEL))
-
-#define CC_POWER_PANEL_GET_CLASS(obj) \
- (G_TYPE_INSTANCE_GET_CLASS ((obj), \
- CC_TYPE_POWER_PANEL, CcPowerPanelClass))
-
-typedef struct _CcPowerPanel CcPowerPanel;
-typedef struct _CcPowerPanelClass CcPowerPanelClass;
-typedef struct _CcPowerPanelPrivate CcPowerPanelPrivate;
-
-struct _CcPowerPanel
-{
- CcPanel parent;
-
- CcPowerPanelPrivate *priv;
-};
-
-struct _CcPowerPanelClass
-{
- CcPanelClass parent_class;
-};
-
-GType cc_power_panel_get_type (void) G_GNUC_CONST;
+#define CC_TYPE_POWER_PANEL (cc_power_panel_get_type ())
+G_DECLARE_FINAL_TYPE (CcPowerPanel, cc_power_panel, CC, POWER_PANEL, CcPanel)
G_END_DECLS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
