diff --git a/po/POTFILES.in b/po/POTFILES.in
index 863181610fae34d85c67143858e1a711fd7af5de..ccb35591625a99edcf01536f2b73ca796ddddb4d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -4,7 +4,7 @@ settings/xfpm-settings.c
settings/xfpm-settings-main.c
settings/xfce4-power-manager-settings.desktop.in
common/xfpm-common.c
-src/xfpm-dkp.c
+src/xfpm-power.c
src/xfpm-power-common.c
src/xfpm-battery.c
src/xfpm-battery.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 560dd8f09db1732c48881d85464723c2547aee9d..9792b337eb12dd183ec02731a672573c22b6de2a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,8 +8,8 @@ xfce4_power_manager_SOURCES = \
xfpm-main.c \
xfpm-manager.c \
xfpm-manager.h \
- xfpm-dkp.c \
- xfpm-dkp.h \
+ xfpm-power.c \
+ xfpm-power.h \
xfpm-power-common.c \
xfpm-power-common.h \
xfpm-battery.c \
@@ -147,7 +147,7 @@ xfce-power-manager-dbus-client.h: $(srcdir)/org.xfce.Power.Manager.xml
dbus-binding-tool --mode=glib-client --prefix=xfpm_manager $< >$@
org.freedesktop.PowerManagement.h: $(srcdir)/org.freedesktop.PowerManagement.xml
- dbus-binding-tool --mode=glib-server --prefix=xfpm_dkp $< >$@
+ dbus-binding-tool --mode=glib-server --prefix=xfpm_power $< >$@
org.freedesktop.PowerManagement.Inhibit.h: $(srcdir)/org.freedesktop.PowerManagement.Inhibit.xml
dbus-binding-tool --mode=glib-server --prefix=xfpm_inhibit $< >$@
diff --git a/src/org.freedesktop.PowerManagement.xml b/src/org.freedesktop.PowerManagement.xml
index 9d8a74e997113f0d412c8ac1ad5ae69b28f491a2..ae00d7a71eacbf31f7eaf311b04f647defe1487d 100644
--- a/src/org.freedesktop.PowerManagement.xml
+++ b/src/org.freedesktop.PowerManagement.xml
@@ -3,9 +3,9 @@
<node name="/org/freedesktop/PowerManagement">
<interface name="org.freedesktop.PowerManagement">
<annotation name="org.freedesktop.DBus.GLib.CSymbol"
- value="xfpm_dkp_dbus"/>
+ value="xfpm_power_dbus"/>
<annotation name="org.freedesktop.DBus.GLib.ClientCSymbol"
- value="xfpm_dkp_dbus_client"/>
+ value="xfpm_power_dbus_client"/>
<method name="Shutdown">
</method>
diff --git a/src/xfpm-backlight.c b/src/xfpm-backlight.c
index ddc3147c102748fc593768fe628a52c4a8c55f85..bdf6d229d07ac1abd0b1773c3cc9a5a36d5fd090 100644
--- a/src/xfpm-backlight.c
+++ b/src/xfpm-backlight.c
@@ -35,7 +35,7 @@
#include "egg-idletime.h"
#include "xfpm-notify.h"
#include "xfpm-xfconf.h"
-#include "xfpm-dkp.h"
+#include "xfpm-power.h"
#include "xfpm-config.h"
#include "xfpm-button.h"
#include "xfpm-brightness.h"
@@ -57,7 +57,7 @@ static void xfpm_backlight_create_popup (XfpmBacklight *backlight);
struct XfpmBacklightPrivate
{
XfpmBrightness *brightness;
- XfpmDkp *dkp;
+ XfpmPower *power;
EggIdletime *idle;
XfpmXfconf *conf;
XfpmButton *button;
@@ -358,7 +358,7 @@ xfpm_backlight_set_timeouts (XfpmBacklight *backlight)
}
static void
-xfpm_backlight_on_battery_changed_cb (XfpmDkp *dkp, gboolean on_battery, XfpmBacklight *backlight)
+xfpm_backlight_on_battery_changed_cb (XfpmPower *power, gboolean on_battery, XfpmBacklight *backlight)
{
backlight->priv->on_battery = on_battery;
}
@@ -386,7 +386,7 @@ xfpm_backlight_init (XfpmBacklight *backlight)
backlight->priv->idle = NULL;
backlight->priv->conf = NULL;
backlight->priv->button = NULL;
- backlight->priv->dkp = NULL;
+ backlight->priv->power = NULL;
backlight->priv->dimmed = FALSE;
backlight->priv->block = FALSE;
backlight->priv->destroy_id = 0;
@@ -401,7 +401,7 @@ xfpm_backlight_init (XfpmBacklight *backlight)
backlight->priv->idle = egg_idletime_new ();
backlight->priv->conf = xfpm_xfconf_new ();
backlight->priv->button = xfpm_button_new ();
- backlight->priv->dkp = xfpm_dkp_get ();
+ backlight->priv->power = xfpm_power_get ();
backlight->priv->notify = xfpm_notify_new ();
backlight->priv->max_level = xfpm_brightness_get_max_level (backlight->priv->brightness);
#ifdef WITH_HAL
@@ -423,9 +423,9 @@ xfpm_backlight_init (XfpmBacklight *backlight)
g_signal_connect_swapped (backlight->priv->conf, "notify::" BRIGHTNESS_ON_BATTERY,
G_CALLBACK (xfpm_backlight_brightness_on_battery_settings_changed), backlight);
- g_signal_connect (backlight->priv->dkp, "on-battery-changed",
+ g_signal_connect (backlight->priv->power, "on-battery-changed",
G_CALLBACK (xfpm_backlight_on_battery_changed_cb), backlight);
- g_object_get (G_OBJECT (backlight->priv->dkp),
+ g_object_get (G_OBJECT (backlight->priv->power),
"on-battery", &backlight->priv->on_battery,
NULL);
xfpm_brightness_get_level (backlight->priv->brightness, &backlight->priv->last_level);
@@ -454,8 +454,8 @@ xfpm_backlight_finalize (GObject *object)
if ( backlight->priv->button )
g_object_unref (backlight->priv->button);
- if ( backlight->priv->dkp )
- g_object_unref (backlight->priv->dkp);
+ if ( backlight->priv->power )
+ g_object_unref (backlight->priv->power);
if ( backlight->priv->notify)
g_object_unref (backlight->priv->notify);
diff --git a/src/xfpm-battery.c b/src/xfpm-battery.c
index aed541a13eb83c7aba64022fe8307414c2541ccf..dea3a90d0840587431839fe56250dded01d2d2c0 100644
--- a/src/xfpm-battery.c
+++ b/src/xfpm-battery.c
@@ -57,8 +57,8 @@ struct XfpmBatteryPrivate
gchar *icon_prefix;
XfpmBatteryCharge charge;
- XfpmDkpDeviceState state;
- XfpmDkpDeviceType type;
+ XfpmDeviceState state;
+ XfpmDeviceType type;
gboolean ac_online;
gboolean present;
guint percentage;
@@ -87,18 +87,18 @@ static guint signals [LAST_SIGNAL] = { 0 };
G_DEFINE_TYPE (XfpmBattery, xfpm_battery, GTK_TYPE_STATUS_ICON)
static const gchar * G_GNUC_CONST
-xfpm_battery_get_icon_index (XfpmDkpDeviceType type, guint percent)
+xfpm_battery_get_icon_index (XfpmDeviceType type, guint percent)
{
if (percent < 10) {
return "000";
} else if (percent < 30) {
- return ( (type == XFPM_DKP_DEVICE_TYPE_BATTERY || type == XFPM_DKP_DEVICE_TYPE_UPS) ? "020" : "030");
+ return ( (type == XFPM_DEVICE_TYPE_BATTERY || type == XFPM_DEVICE_TYPE_UPS) ? "020" : "030");
} else if (percent < 50) {
- return ( (type == XFPM_DKP_DEVICE_TYPE_BATTERY || type == XFPM_DKP_DEVICE_TYPE_UPS ) ? "040" : "030");
+ return ( (type == XFPM_DEVICE_TYPE_BATTERY || type == XFPM_DEVICE_TYPE_UPS ) ? "040" : "030");
} else if (percent < 70) {
return "060";
} else if (percent < 90) {
- return ((type == XFPM_DKP_DEVICE_TYPE_BATTERY || type == XFPM_DKP_DEVICE_TYPE_UPS) ? "080" : "060");
+ return ((type == XFPM_DEVICE_TYPE_BATTERY || type == XFPM_DEVICE_TYPE_UPS) ? "080" : "060");
}
return "100";
}
@@ -125,7 +125,7 @@ xfpm_battery_refresh_visible (XfpmBattery *battery)
}
else if ( show_icon == SHOW_ICON_WHEN_BATTERY_CHARGING_DISCHARGING )
{
- if ( battery->priv->state == XFPM_DKP_DEVICE_STATE_FULLY_CHARGED )
+ if ( battery->priv->state == XFPM_DEVICE_STATE_FULLY_CHARGED )
visible = FALSE;
else visible = TRUE;
}
@@ -137,17 +137,17 @@ xfpm_battery_refresh_visible (XfpmBattery *battery)
static const gchar * G_GNUC_CONST
-xfpm_battery_get_message_from_battery_state (XfpmDkpDeviceState state, gboolean ac_online)
+xfpm_battery_get_message_from_battery_state (XfpmDeviceState state, gboolean ac_online)
{
switch (state)
{
- case XFPM_DKP_DEVICE_STATE_FULLY_CHARGED:
+ case XFPM_DEVICE_STATE_FULLY_CHARGED:
return _("Your battery is fully charged");
break;
- case XFPM_DKP_DEVICE_STATE_CHARGING:
+ case XFPM_DEVICE_STATE_CHARGING:
return _("Your battery is charging");
break;
- case XFPM_DKP_DEVICE_STATE_DISCHARGING:
+ case XFPM_DEVICE_STATE_DISCHARGING:
return ac_online ? _("Your battery is discharging"): _("System is running on battery power");
break;
default:
@@ -162,27 +162,27 @@ xfpm_battery_refresh_icon (XfpmBattery *battery)
XFPM_DEBUG ("Battery state %d", battery->priv->state);
- if ( battery->priv->type == XFPM_DKP_DEVICE_TYPE_BATTERY ||
- battery->priv->type == XFPM_DKP_DEVICE_TYPE_UPS )
+ if ( battery->priv->type == XFPM_DEVICE_TYPE_BATTERY ||
+ battery->priv->type == XFPM_DEVICE_TYPE_UPS )
{
if (!battery->priv->present)
{
g_snprintf (icon_name, 128, "%s%s", battery->priv->icon_prefix, "missing");
}
- else if (battery->priv->state == XFPM_DKP_DEVICE_STATE_FULLY_CHARGED )
+ else if (battery->priv->state == XFPM_DEVICE_STATE_FULLY_CHARGED )
{
g_snprintf (icon_name, 128, "%s%s", battery->priv->icon_prefix, battery->priv->ac_online ? "charged" : "100");
}
- else if ( battery->priv->state == XFPM_DKP_DEVICE_STATE_CHARGING ||
- battery->priv->state == XFPM_DKP_DEVICE_STATE_PENDING_CHARGING)
+ else if ( battery->priv->state == XFPM_DEVICE_STATE_CHARGING ||
+ battery->priv->state == XFPM_DEVICE_STATE_PENDING_CHARGING)
{
g_snprintf (icon_name, 128, "%s%s-%s",
battery->priv->icon_prefix,
xfpm_battery_get_icon_index (battery->priv->type, battery->priv->percentage),
"charging");
}
- else if ( battery->priv->state == XFPM_DKP_DEVICE_STATE_DISCHARGING ||
- battery->priv->state == XFPM_DKP_DEVICE_STATE_PENDING_DISCHARGING)
+ else if ( battery->priv->state == XFPM_DEVICE_STATE_DISCHARGING ||
+ battery->priv->state == XFPM_DEVICE_STATE_PENDING_DISCHARGING)
{
g_snprintf (icon_name, 128, "%s%s",
battery->priv->icon_prefix,
@@ -195,11 +195,11 @@ xfpm_battery_refresh_icon (XfpmBattery *battery)
{
g_snprintf (icon_name, 128, "%s-000", battery->priv->icon_prefix);
}
- else if ( battery->priv->state == XFPM_DKP_DEVICE_STATE_FULLY_CHARGED )
+ else if ( battery->priv->state == XFPM_DEVICE_STATE_FULLY_CHARGED )
{
g_snprintf (icon_name, 128, "%s-100", battery->priv->icon_prefix);
}
- else if ( battery->priv->state == XFPM_DKP_DEVICE_STATE_DISCHARGING )
+ else if ( battery->priv->state == XFPM_DEVICE_STATE_DISCHARGING )
{
g_snprintf (icon_name, 128, "%s-%s",
battery->priv->icon_prefix,
@@ -243,8 +243,8 @@ xfpm_battery_notify_state (XfpmBattery *battery)
if ( !gtk_status_icon_get_visible (GTK_STATUS_ICON (battery)) )
return;
- if ( battery->priv->type == XFPM_DKP_DEVICE_TYPE_BATTERY ||
- battery->priv->type == XFPM_DKP_DEVICE_TYPE_UPS )
+ if ( battery->priv->type == XFPM_DEVICE_TYPE_BATTERY ||
+ battery->priv->type == XFPM_DEVICE_TYPE_UPS )
{
if ( starting_up )
{
@@ -320,9 +320,9 @@ xfpm_battery_set_tooltip_primary (XfpmBattery *battery, GtkTooltip *tooltip)
power_status = g_strdup_printf (battery->priv->ac_online ? _("Adaptor is online") : _("System is running on battery power"));
- battery_name = battery->priv->type == XFPM_DKP_DEVICE_TYPE_BATTERY ? _("Battery") : _("UPS");
+ battery_name = battery->priv->type == XFPM_DEVICE_TYPE_BATTERY ? _("Battery") : _("UPS");
- if ( battery->priv->state == XFPM_DKP_DEVICE_STATE_FULLY_CHARGED )
+ if ( battery->priv->state == XFPM_DEVICE_STATE_FULLY_CHARGED )
{
if ( battery->priv->time_to_empty > 0 )
{
@@ -342,7 +342,7 @@ xfpm_battery_set_tooltip_primary (XfpmBattery *battery, GtkTooltip *tooltip)
battery->priv->percentage);
}
}
- else if ( battery->priv->state == XFPM_DKP_DEVICE_STATE_CHARGING )
+ else if ( battery->priv->state == XFPM_DEVICE_STATE_CHARGING )
{
if ( battery->priv->time_to_full != 0 )
{
@@ -362,7 +362,7 @@ xfpm_battery_set_tooltip_primary (XfpmBattery *battery, GtkTooltip *tooltip)
battery->priv->percentage);
}
}
- else if ( battery->priv->state == XFPM_DKP_DEVICE_STATE_DISCHARGING )
+ else if ( battery->priv->state == XFPM_DEVICE_STATE_DISCHARGING )
{
if ( battery->priv->time_to_empty != 0 )
{
@@ -383,15 +383,15 @@ xfpm_battery_set_tooltip_primary (XfpmBattery *battery, GtkTooltip *tooltip)
}
}
- else if ( battery->priv->state == XFPM_DKP_DEVICE_STATE_PENDING_CHARGING )
+ else if ( battery->priv->state == XFPM_DEVICE_STATE_PENDING_CHARGING )
{
tip = g_strdup_printf (_("%s\n%s waiting to discharge (%i%%)."), power_status, battery_name, battery->priv->percentage);
}
- else if ( battery->priv->state == XFPM_DKP_DEVICE_STATE_PENDING_DISCHARGING )
+ else if ( battery->priv->state == XFPM_DEVICE_STATE_PENDING_DISCHARGING )
{
tip = g_strdup_printf (_("%s\n%s waiting to charge (%i%%)."), power_status, battery_name, battery->priv->percentage);
}
- else if ( battery->priv->state == XFPM_DKP_DEVICE_STATE_EMPTY )
+ else if ( battery->priv->state == XFPM_DEVICE_STATE_EMPTY )
{
tip = g_strdup_printf (_("%s\nYour %s is empty"), power_status, battery_name);
}
@@ -477,8 +477,8 @@ xfpm_battery_refresh (XfpmBattery *battery, GHashTable *props)
xfpm_battery_refresh_icon (battery);
- if ( battery->priv->type == XFPM_DKP_DEVICE_TYPE_BATTERY ||
- battery->priv->type == XFPM_DKP_DEVICE_TYPE_UPS )
+ if ( battery->priv->type == XFPM_DEVICE_TYPE_BATTERY ||
+ battery->priv->type == XFPM_DEVICE_TYPE_UPS )
{
value = g_hash_table_lookup (props, "TimeToEmpty");
@@ -527,8 +527,8 @@ xfpm_battery_query_tooltip (GtkStatusIcon *icon,
battery = XFPM_BATTERY (icon);
- if ( battery->priv->type == XFPM_DKP_DEVICE_TYPE_BATTERY ||
- battery->priv->type == XFPM_DKP_DEVICE_TYPE_UPS )
+ if ( battery->priv->type == XFPM_DEVICE_TYPE_BATTERY ||
+ battery->priv->type == XFPM_DEVICE_TYPE_UPS )
{
xfpm_battery_set_tooltip_primary (battery, tooltip);
return TRUE;
@@ -623,8 +623,8 @@ xfpm_battery_class_init (XfpmBatteryClass *klass)
PROP_DEVICE_TYPE,
g_param_spec_enum ("device-type",
NULL, NULL,
- XFPM_TYPE_DKP_DEVICE_TYPE,
- XFPM_DKP_DEVICE_TYPE_UNKNOWN,
+ XFPM_TYPE_DEVICE_TYPE,
+ XFPM_DEVICE_TYPE_UNKNOWN,
G_PARAM_READABLE));
g_object_class_install_property (object_class,
@@ -646,8 +646,8 @@ xfpm_battery_init (XfpmBattery *battery)
battery->priv->conf = xfpm_xfconf_new ();
battery->priv->notify = xfpm_notify_new ();
battery->priv->proxy_prop = NULL;
- battery->priv->state = XFPM_DKP_DEVICE_STATE_UNKNOWN;
- battery->priv->type = XFPM_DKP_DEVICE_TYPE_UNKNOWN;
+ battery->priv->state = XFPM_DEVICE_STATE_UNKNOWN;
+ battery->priv->type = XFPM_DEVICE_TYPE_UNKNOWN;
battery->priv->charge = XFPM_BATTERY_CHARGE_UNKNOWN;
battery->priv->icon_prefix = NULL;
battery->priv->time_to_full = 0;
@@ -682,25 +682,25 @@ xfpm_battery_finalize (GObject *object)
}
static gchar *
-xfpm_battery_get_icon_prefix_device_enum_type (XfpmDkpDeviceType type)
+xfpm_battery_get_icon_prefix_device_enum_type (XfpmDeviceType type)
{
- if ( type == XFPM_DKP_DEVICE_TYPE_BATTERY )
+ if ( type == XFPM_DEVICE_TYPE_BATTERY )
{
return g_strdup (XFPM_PRIMARY_ICON_PREFIX);
}
- else if ( type == XFPM_DKP_DEVICE_TYPE_UPS )
+ else if ( type == XFPM_DEVICE_TYPE_UPS )
{
return g_strdup (XFPM_UPS_ICON_PREFIX);
}
- else if ( type == XFPM_DKP_DEVICE_TYPE_MOUSE )
+ else if ( type == XFPM_DEVICE_TYPE_MOUSE )
{
return g_strdup (XFPM_MOUSE_ICON_PREFIX);
}
- else if ( type == XFPM_DKP_DEVICE_TYPE_KBD )
+ else if ( type == XFPM_DEVICE_TYPE_KBD )
{
return g_strdup (XFPM_KBD_ICON_PREFIX);
}
- else if ( type == XFPM_DKP_DEVICE_TYPE_PHONE )
+ else if ( type == XFPM_DEVICE_TYPE_PHONE )
{
return g_strdup (XFPM_PHONE_ICON_PREFIX);
}
@@ -721,7 +721,7 @@ xfpm_battery_new (void)
void xfpm_battery_monitor_device (XfpmBattery *battery,
DBusGProxy *proxy,
DBusGProxy *proxy_prop,
- XfpmDkpDeviceType device_type)
+ XfpmDeviceType device_type)
{
battery->priv->type = device_type;
battery->priv->proxy_prop = proxy_prop;
@@ -739,9 +739,9 @@ void xfpm_battery_monitor_device (XfpmBattery *battery,
xfpm_battery_changed_cb (proxy, battery);
}
-XfpmDkpDeviceType xfpm_battery_get_device_type (XfpmBattery *battery)
+XfpmDeviceType xfpm_battery_get_device_type (XfpmBattery *battery)
{
- g_return_val_if_fail (XFPM_IS_BATTERY (battery), XFPM_DKP_DEVICE_TYPE_UNKNOWN );
+ g_return_val_if_fail (XFPM_IS_BATTERY (battery), XFPM_DEVICE_TYPE_UNKNOWN );
return battery->priv->type;
}
diff --git a/src/xfpm-battery.h b/src/xfpm-battery.h
index 57fd30e32e9be284423f1b69a42c1e37167e54e2..2d0728af87dbcd386f9ef4e1a0a8d6de8a2bc2f8 100644
--- a/src/xfpm-battery.h
+++ b/src/xfpm-battery.h
@@ -25,7 +25,6 @@
#include <gtk/gtk.h>
#include <dbus/dbus-glib.h>
-#include "xfpm-dkp.h"
#include "xfpm-enum-glib.h"
G_BEGIN_DECLS
@@ -59,9 +58,9 @@ GtkStatusIcon *xfpm_battery_new (void);
void xfpm_battery_monitor_device (XfpmBattery *battery,
DBusGProxy *proxy,
DBusGProxy *proxy_prop,
- XfpmDkpDeviceType device_type);
+ XfpmDeviceType device_type);
-XfpmDkpDeviceType xfpm_battery_get_device_type (XfpmBattery *battery);
+XfpmDeviceType xfpm_battery_get_device_type (XfpmBattery *battery);
XfpmBatteryCharge xfpm_battery_get_charge (XfpmBattery *battery);
diff --git a/src/xfpm-disks.c b/src/xfpm-disks.c
index d9728a28b45da9f3edcba4a0c8b44a5937fc160d..bde079f2471ef45ffe98d098447f76fdab3fcaf2 100644
--- a/src/xfpm-disks.c
+++ b/src/xfpm-disks.c
@@ -31,7 +31,7 @@
#include "xfpm-disks.h"
#include "xfpm-polkit.h"
#include "xfpm-xfconf.h"
-#include "xfpm-dkp.h"
+#include "xfpm-power.h"
#include "xfpm-config.h"
#include "xfpm-debug.h"
@@ -43,7 +43,7 @@ static void xfpm_disks_finalize (GObject *object);
struct XfpmDisksPrivate
{
XfpmXfconf *conf;
- XfpmDkp *dkp;
+ XfpmPower *power;
XfpmPolkit *polkit;
DBusGConnection *bus;
@@ -125,7 +125,7 @@ xfpm_disks_set_spin_timeouts (XfpmDisks *disks)
if (!disks->priv->can_spin )
return;
- g_object_get (G_OBJECT (disks->priv->dkp),
+ g_object_get (G_OBJECT (disks->priv->power),
"on-battery", &on_battery,
NULL);
@@ -177,7 +177,7 @@ xfpm_disks_init (XfpmDisks *disks)
disks->priv->bus = NULL;
disks->priv->proxy = NULL;
disks->priv->conf = NULL;
- disks->priv->dkp = NULL;
+ disks->priv->power = NULL;
disks->priv->cookie = NULL;
disks->priv->polkit = NULL;
@@ -202,7 +202,7 @@ xfpm_disks_init (XfpmDisks *disks)
}
disks->priv->conf = xfpm_xfconf_new ();
- disks->priv->dkp = xfpm_dkp_get ();
+ disks->priv->power = xfpm_power_get ();
disks->priv->polkit = xfpm_polkit_get ();
xfpm_disks_get_is_auth_to_spin (disks);
@@ -210,7 +210,7 @@ xfpm_disks_init (XfpmDisks *disks)
g_signal_connect_swapped (disks->priv->polkit, "auth-changed",
G_CALLBACK (xfpm_disks_get_is_auth_to_spin), disks);
- g_signal_connect_swapped (disks->priv->dkp, "on-battery-changed",
+ g_signal_connect_swapped (disks->priv->power, "on-battery-changed",
G_CALLBACK (xfpm_disks_set_spin_timeouts), disks);
g_signal_connect_swapped (disks->priv->conf, "notify::" SPIN_DOWN_ON_AC,
@@ -254,8 +254,8 @@ xfpm_disks_finalize (GObject *object)
if ( disks->priv->conf )
g_object_unref (disks->priv->conf);
- if ( disks->priv->dkp )
- g_object_unref (disks->priv->dkp );
+ if ( disks->priv->power )
+ g_object_unref (disks->priv->power );
G_OBJECT_CLASS (xfpm_disks_parent_class)->finalize (object);
}
diff --git a/src/xfpm-dpms.c b/src/xfpm-dpms.c
index 855f70fdc8de3c4ca18e9d9ba6310de3b4c7568b..0b306e881324d7b928e262082b9555819e88fab9 100644
--- a/src/xfpm-dpms.c
+++ b/src/xfpm-dpms.c
@@ -34,7 +34,7 @@
#include "xfpm-common.h"
#include "xfpm-dpms.h"
-#include "xfpm-dkp.h"
+#include "xfpm-power.h"
#include "xfpm-xfconf.h"
#include "xfpm-config.h"
#include "xfpm-debug.h"
@@ -49,7 +49,7 @@ static void xfpm_dpms_finalize (GObject *object);
struct XfpmDpmsPrivate
{
XfpmXfconf *conf;
- XfpmDkp *dkp;
+ XfpmPower *power;
gboolean dpms_capable;
gboolean inhibited;
@@ -202,7 +202,7 @@ xfpm_dpms_settings_changed_cb (GObject *obj, GParamSpec *spec, XfpmDpms *dpms)
}
static void
-xfpm_dpms_on_battery_changed_cb (XfpmDkp *dkp, gboolean on_battery, XfpmDpms *dpms)
+xfpm_dpms_on_battery_changed_cb (XfpmPower *power, gboolean on_battery, XfpmDpms *dpms)
{
dpms->priv->on_battery = on_battery;
xfpm_dpms_refresh (dpms);
@@ -232,16 +232,16 @@ xfpm_dpms_init(XfpmDpms *dpms)
if ( dpms->priv->dpms_capable )
{
- dpms->priv->dkp = xfpm_dkp_get ();
+ dpms->priv->power = xfpm_power_get ();
dpms->priv->conf = xfpm_xfconf_new ();
- g_signal_connect (dpms->priv->dkp, "on-battery-changed",
+ g_signal_connect (dpms->priv->power, "on-battery-changed",
G_CALLBACK(xfpm_dpms_on_battery_changed_cb), dpms);
g_signal_connect (dpms->priv->conf, "notify",
G_CALLBACK (xfpm_dpms_settings_changed_cb), dpms);
- g_object_get (G_OBJECT (dpms->priv->dkp),
+ g_object_get (G_OBJECT (dpms->priv->power),
"on-battery", &dpms->priv->on_battery,
NULL);
@@ -261,7 +261,7 @@ xfpm_dpms_finalize(GObject *object)
dpms = XFPM_DPMS (object);
g_object_unref (dpms->priv->conf);
- g_object_unref (dpms->priv->dkp);
+ g_object_unref (dpms->priv->power);
G_OBJECT_CLASS(xfpm_dpms_parent_class)->finalize(object);
}
diff --git a/src/xfpm-enum-glib.h b/src/xfpm-enum-glib.h
index 3116752ecc4091570e914ad536b0fd462f338791..9a5c3ff1ba61642e757fa37d91db7d0c253e6b6c 100644
--- a/src/xfpm-enum-glib.h
+++ b/src/xfpm-enum-glib.h
@@ -29,29 +29,29 @@ G_BEGIN_DECLS
typedef enum
{
- XFPM_DKP_DEVICE_TYPE_UNKNOWN,
- XFPM_DKP_DEVICE_TYPE_LINE_POWER,
- XFPM_DKP_DEVICE_TYPE_BATTERY,
- XFPM_DKP_DEVICE_TYPE_UPS,
- XFPM_DKP_DEVICE_TYPE_MONITOR,
- XFPM_DKP_DEVICE_TYPE_MOUSE,
- XFPM_DKP_DEVICE_TYPE_KBD,
- XFPM_DKP_DEVICE_TYPE_PDA,
- XFPM_DKP_DEVICE_TYPE_PHONE
+ XFPM_DEVICE_TYPE_UNKNOWN,
+ XFPM_DEVICE_TYPE_LINE_POWER,
+ XFPM_DEVICE_TYPE_BATTERY,
+ XFPM_DEVICE_TYPE_UPS,
+ XFPM_DEVICE_TYPE_MONITOR,
+ XFPM_DEVICE_TYPE_MOUSE,
+ XFPM_DEVICE_TYPE_KBD,
+ XFPM_DEVICE_TYPE_PDA,
+ XFPM_DEVICE_TYPE_PHONE
-} XfpmDkpDeviceType;
+} XfpmDeviceType;
typedef enum
{
- XFPM_DKP_DEVICE_STATE_UNKNOWN,
- XFPM_DKP_DEVICE_STATE_CHARGING,
- XFPM_DKP_DEVICE_STATE_DISCHARGING,
- XFPM_DKP_DEVICE_STATE_EMPTY,
- XFPM_DKP_DEVICE_STATE_FULLY_CHARGED,
- XFPM_DKP_DEVICE_STATE_PENDING_CHARGING,
- XFPM_DKP_DEVICE_STATE_PENDING_DISCHARGING
+ XFPM_DEVICE_STATE_UNKNOWN,
+ XFPM_DEVICE_STATE_CHARGING,
+ XFPM_DEVICE_STATE_DISCHARGING,
+ XFPM_DEVICE_STATE_EMPTY,
+ XFPM_DEVICE_STATE_FULLY_CHARGED,
+ XFPM_DEVICE_STATE_PENDING_CHARGING,
+ XFPM_DEVICE_STATE_PENDING_DISCHARGING
-} XfpmDkpDeviceState;
+} XfpmDeviceState;
/*
* Order matters
diff --git a/src/xfpm-manager.c b/src/xfpm-manager.c
index ee9f995efec71879173e2c3a347ccd66301e20ad..b9c157a4082e579f8559eee9fca32e7383f7eb48 100644
--- a/src/xfpm-manager.c
+++ b/src/xfpm-manager.c
@@ -38,7 +38,7 @@
#include <libnotify/notify.h>
-#include "xfpm-dkp.h"
+#include "xfpm-power.h"
#include "xfpm-dbus.h"
#include "xfpm-disks.h"
#include "xfpm-dpms.h"
@@ -76,7 +76,7 @@ struct XfpmManagerPrivate
XfceSMClient *client;
- XfpmDkp *dkp;
+ XfpmPower *power;
XfpmButton *button;
XfpmXfconf *conf;
XfpmBacklight *backlight;
@@ -126,7 +126,7 @@ xfpm_manager_finalize (GObject *object)
if ( manager->priv->session_bus )
dbus_g_connection_unref (manager->priv->session_bus);
- g_object_unref (manager->priv->dkp);
+ g_object_unref (manager->priv->power);
g_object_unref (manager->priv->button);
g_object_unref (manager->priv->conf);
g_object_unref (manager->priv->client);
@@ -227,10 +227,10 @@ xfpm_manager_sleep_request (XfpmManager *manager, XfpmShutdownRequest req, gbool
case XFPM_DO_NOTHING:
break;
case XFPM_DO_SUSPEND:
- xfpm_dkp_suspend (manager->priv->dkp, force);
+ xfpm_power_suspend (manager->priv->power, force);
break;
case XFPM_DO_HIBERNATE:
- xfpm_dkp_hibernate (manager->priv->dkp, force);
+ xfpm_power_hibernate (manager->priv->power, force);
break;
case XFPM_DO_SHUTDOWN:
xfpm_manager_shutdown (manager);
@@ -298,12 +298,12 @@ xfpm_manager_button_pressed_cb (XfpmButton *bt, XfpmButtonKey type, XfpmManager
}
static void
-xfpm_manager_lid_changed_cb (XfpmDkp *dkp, gboolean lid_is_closed, XfpmManager *manager)
+xfpm_manager_lid_changed_cb (XfpmPower *power, gboolean lid_is_closed, XfpmManager *manager)
{
XfpmLidTriggerAction action;
gboolean on_battery;
- g_object_get (G_OBJECT (dkp),
+ g_object_get (G_OBJECT (power),
"on-battery", &on_battery,
NULL);
@@ -370,7 +370,7 @@ xfpm_manager_alarm_timeout_cb (EggIdletime *idle, guint id, XfpmManager *manager
INACTIVITY_SLEEP_MODE, &sleep_mode,
NULL);
- g_object_get (G_OBJECT (manager->priv->dkp),
+ g_object_get (G_OBJECT (manager->priv->power),
"on-battery", &on_battery,
NULL);
@@ -441,7 +441,7 @@ xfpm_manager_set_idle_alarm_on_battery (XfpmManager *manager)
}
static void
-xfpm_manager_on_battery_changed_cb (XfpmDkp *dkp, gboolean on_battery, XfpmManager *manager)
+xfpm_manager_on_battery_changed_cb (XfpmPower *power, gboolean on_battery, XfpmManager *manager)
{
egg_idletime_alarm_reset_all (manager->priv->idle);
}
@@ -510,7 +510,7 @@ void xfpm_manager_start (XfpmManager *manager)
NULL,
XFPM_TYPE_ERROR);
- manager->priv->dkp = xfpm_dkp_get ();
+ manager->priv->power = xfpm_power_get ();
manager->priv->button = xfpm_button_new ();
manager->priv->conf = xfpm_xfconf_new ();
manager->priv->console = xfpm_console_kit_new ();
@@ -545,22 +545,22 @@ void xfpm_manager_start (XfpmManager *manager)
g_signal_connect (manager->priv->button, "button_pressed",
G_CALLBACK (xfpm_manager_button_pressed_cb), manager);
- g_signal_connect (manager->priv->dkp, "lid-changed",
+ g_signal_connect (manager->priv->power, "lid-changed",
G_CALLBACK (xfpm_manager_lid_changed_cb), manager);
- g_signal_connect (manager->priv->dkp, "on-battery-changed",
+ g_signal_connect (manager->priv->power, "on-battery-changed",
G_CALLBACK (xfpm_manager_on_battery_changed_cb), manager);
- g_signal_connect_swapped (manager->priv->dkp, "waking-up",
+ g_signal_connect_swapped (manager->priv->power, "waking-up",
G_CALLBACK (xfpm_manager_reset_sleep_timer), manager);
- g_signal_connect_swapped (manager->priv->dkp, "sleeping",
+ g_signal_connect_swapped (manager->priv->power, "sleeping",
G_CALLBACK (xfpm_manager_reset_sleep_timer), manager);
- g_signal_connect_swapped (manager->priv->dkp, "ask-shutdown",
+ g_signal_connect_swapped (manager->priv->power, "ask-shutdown",
G_CALLBACK (xfpm_manager_ask_shutdown), manager);
- g_signal_connect_swapped (manager->priv->dkp, "shutdown",
+ g_signal_connect_swapped (manager->priv->power, "shutdown",
G_CALLBACK (xfpm_manager_shutdown), manager);
out:
@@ -599,7 +599,7 @@ GHashTable *xfpm_manager_get_config (XfpmManager *manager)
"can-shutdown", &can_shutdown,
NULL);
- g_object_get (G_OBJECT (manager->priv->dkp),
+ g_object_get (G_OBJECT (manager->priv->power),
"auth-suspend", &auth_suspend,
"auth-hibernate", &auth_hibernate,
"can-suspend", &can_suspend,
@@ -610,7 +610,7 @@ GHashTable *xfpm_manager_get_config (XfpmManager *manager)
can_spin = xfpm_disks_get_can_spin (manager->priv->disks);
devkit_disk = xfpm_disks_kit_is_running (manager->priv->disks);
- has_battery = xfpm_dkp_has_battery (manager->priv->dkp);
+ has_battery = xfpm_power_has_battery (manager->priv->power);
has_lcd_brightness = xfpm_backlight_has_hw (manager->priv->backlight);
mapped_buttons = xfpm_button_get_mapped (manager->priv->button);
diff --git a/src/xfpm-power-common.c b/src/xfpm-power-common.c
index 565851ad99943a9869f37c3fcc7ac1949394d7ec..0b4dd1baa141a46adbaf0c60a8115679ebe542cc 100644
--- a/src/xfpm-power-common.c
+++ b/src/xfpm-power-common.c
@@ -117,23 +117,23 @@ xfpm_power_translate_device_type (guint type)
{
switch (type)
{
- case XFPM_DKP_DEVICE_TYPE_BATTERY:
+ case XFPM_DEVICE_TYPE_BATTERY:
return _("Battery");
- case XFPM_DKP_DEVICE_TYPE_UPS:
+ case XFPM_DEVICE_TYPE_UPS:
return _("UPS");
- case XFPM_DKP_DEVICE_TYPE_LINE_POWER:
+ case XFPM_DEVICE_TYPE_LINE_POWER:
return _("Line power");
- case XFPM_DKP_DEVICE_TYPE_MOUSE:
+ case XFPM_DEVICE_TYPE_MOUSE:
return _("Mouse");
- case XFPM_DKP_DEVICE_TYPE_KBD:
+ case XFPM_DEVICE_TYPE_KBD:
return _("Keyboard");
- case XFPM_DKP_DEVICE_TYPE_MONITOR:
+ case XFPM_DEVICE_TYPE_MONITOR:
return _("Monitor");
- case XFPM_DKP_DEVICE_TYPE_PDA:
+ case XFPM_DEVICE_TYPE_PDA:
return _("PDA");
- case XFPM_DKP_DEVICE_TYPE_PHONE:
+ case XFPM_DEVICE_TYPE_PHONE:
return _("Phone");
- case XFPM_DKP_DEVICE_TYPE_UNKNOWN:
+ case XFPM_DEVICE_TYPE_UNKNOWN:
return _("Unknown");
}
@@ -171,23 +171,23 @@ const gchar *xfpm_power_get_icon_name (guint device_type)
{
switch (device_type)
{
- case XFPM_DKP_DEVICE_TYPE_BATTERY:
+ case XFPM_DEVICE_TYPE_BATTERY:
return XFPM_BATTERY_ICON;
- case XFPM_DKP_DEVICE_TYPE_UPS:
+ case XFPM_DEVICE_TYPE_UPS:
return XFPM_UPS_ICON;
- case XFPM_DKP_DEVICE_TYPE_LINE_POWER:
+ case XFPM_DEVICE_TYPE_LINE_POWER:
return XFPM_AC_ADAPTER_ICON;
- case XFPM_DKP_DEVICE_TYPE_MOUSE:
+ case XFPM_DEVICE_TYPE_MOUSE:
return XFPM_MOUSE_ICON;
- case XFPM_DKP_DEVICE_TYPE_KBD:
+ case XFPM_DEVICE_TYPE_KBD:
return XFPM_KBD_ICON;
- case XFPM_DKP_DEVICE_TYPE_MONITOR:
+ case XFPM_DEVICE_TYPE_MONITOR:
return "monitor";
- case XFPM_DKP_DEVICE_TYPE_PDA:
+ case XFPM_DEVICE_TYPE_PDA:
return XFPM_PDA_ICON;
- case XFPM_DKP_DEVICE_TYPE_PHONE:
+ case XFPM_DEVICE_TYPE_PHONE:
return XFPM_PHONE_ICON;
- case XFPM_DKP_DEVICE_TYPE_UNKNOWN:
+ case XFPM_DEVICE_TYPE_UNKNOWN:
return XFPM_BATTERY_ICON;
}
diff --git a/src/xfpm-power-info.c b/src/xfpm-power-info.c
index 4f732c8ce4f3cbfa402a92f73dc3ba955ec7731c..6a8bbce6328571594a541c8188bed70928eec19a 100644
--- a/src/xfpm-power-info.c
+++ b/src/xfpm-power-info.c
@@ -378,7 +378,7 @@ xfpm_info_add_device_view (XfpmInfo *info, GHashTable *props, const gchar *objec
i++;
}
- if ( type != XFPM_DKP_DEVICE_TYPE_LINE_POWER )
+ if ( type != XFPM_DEVICE_TYPE_LINE_POWER )
{
/*Model*/
value = g_hash_table_lookup (props, "Model");
diff --git a/src/xfpm-dkp.c b/src/xfpm-power.c
similarity index 59%
rename from src/xfpm-dkp.c
rename to src/xfpm-power.c
index f30d75931323b67a6bcad6ee6a3288eaf7c58586..6911b86c8453bc63d2930a0c7a56b2ed776bdedd 100644
--- a/src/xfpm-dkp.c
+++ b/src/xfpm-power.c
@@ -32,7 +32,7 @@
#include <libxfce4util/libxfce4util.h>
#include <libxfce4ui/libxfce4ui.h>
-#include "xfpm-dkp.h"
+#include "xfpm-power.h"
#include "xfpm-dbus.h"
#include "xfpm-battery.h"
#include "xfpm-xfconf.h"
@@ -50,22 +50,22 @@
#include "xfpm-debug.h"
#include "xfpm-enum-types.h"
-static void xfpm_dkp_finalize (GObject *object);
+static void xfpm_power_finalize (GObject *object);
-static void xfpm_dkp_get_property (GObject *object,
+static void xfpm_power_get_property (GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec);
-static void xfpm_dkp_dbus_class_init (XfpmDkpClass * klass);
-static void xfpm_dkp_dbus_init (XfpmDkp *dkp);
+static void xfpm_power_dbus_class_init (XfpmPowerClass * klass);
+static void xfpm_power_dbus_init (XfpmPower *power);
-static void xfpm_dkp_refresh_adaptor_visible (XfpmDkp *dkp);
+static void xfpm_power_refresh_adaptor_visible (XfpmPower *power);
-#define XFPM_DKP_GET_PRIVATE(o) \
-(G_TYPE_INSTANCE_GET_PRIVATE ((o), XFPM_TYPE_DKP, XfpmDkpPrivate))
+#define XFPM_POWER_GET_PRIVATE(o) \
+(G_TYPE_INSTANCE_GET_PRIVATE ((o), XFPM_TYPE_DKP, XfpmPowerPrivate))
-struct XfpmDkpPrivate
+struct XfpmPowerPrivate
{
DBusGConnection *bus;
@@ -131,23 +131,23 @@ enum
static guint signals [LAST_SIGNAL] = { 0 };
-G_DEFINE_TYPE (XfpmDkp, xfpm_dkp, G_TYPE_OBJECT)
+G_DEFINE_TYPE (XfpmPower, xfpm_power, G_TYPE_OBJECT)
#ifdef HAVE_POLKIT
static void
-xfpm_dkp_check_polkit_auth (XfpmDkp *dkp)
+xfpm_power_check_polkit_auth (XfpmPower *power)
{
- dkp->priv->auth_suspend = xfpm_polkit_check_auth (dkp->priv->polkit,
+ power->priv->auth_suspend = xfpm_polkit_check_auth (power->priv->polkit,
"org.freedesktop.devicekit.power.suspend");
- dkp->priv->auth_hibernate = xfpm_polkit_check_auth (dkp->priv->polkit,
+ power->priv->auth_hibernate = xfpm_polkit_check_auth (power->priv->polkit,
"org.freedesktop.devicekit.power.hibernate");
}
#endif
static void
-xfpm_dkp_check_pm (XfpmDkp *dkp, GHashTable *props)
+xfpm_power_check_pm (XfpmPower *power, GHashTable *props)
{
GValue *value;
gboolean ret;
@@ -160,9 +160,9 @@ xfpm_dkp_check_pm (XfpmDkp *dkp, GHashTable *props)
}
ret = g_value_get_boolean (value);
- if (ret != dkp->priv->can_suspend)
+ if (ret != power->priv->can_suspend)
{
- dkp->priv->can_suspend = ret;
+ power->priv->can_suspend = ret;
}
value = g_hash_table_lookup (props, "CanHibernate");
@@ -174,14 +174,14 @@ xfpm_dkp_check_pm (XfpmDkp *dkp, GHashTable *props)
ret = g_value_get_boolean (value);
- if (ret != dkp->priv->can_hibernate)
+ if (ret != power->priv->can_hibernate)
{
- dkp->priv->can_hibernate = ret;
+ power->priv->can_hibernate = ret;
}
}
static void
-xfpm_dkp_check_power (XfpmDkp *dkp, GHashTable *props)
+xfpm_power_check_power (XfpmPower *power, GHashTable *props)
{
GValue *value;
gboolean on_battery;
@@ -192,13 +192,13 @@ xfpm_dkp_check_power (XfpmDkp *dkp, GHashTable *props)
{
on_battery = g_value_get_boolean (value);
- if (on_battery != dkp->priv->on_battery )
+ if (on_battery != power->priv->on_battery )
{
GList *list;
guint len, i;
- g_signal_emit (G_OBJECT (dkp), signals [ON_BATTERY_CHANGED], 0, on_battery);
- dkp->priv->on_battery = on_battery;
- list = g_hash_table_get_values (dkp->priv->hash);
+ g_signal_emit (G_OBJECT (power), signals [ON_BATTERY_CHANGED], 0, on_battery);
+ power->priv->on_battery = on_battery;
+ list = g_hash_table_get_values (power->priv->hash);
len = g_list_length (list);
for ( i = 0; i < len; i++)
{
@@ -215,7 +215,7 @@ xfpm_dkp_check_power (XfpmDkp *dkp, GHashTable *props)
}
static void
-xfpm_dkp_check_lid (XfpmDkp *dkp, GHashTable *props)
+xfpm_power_check_lid (XfpmPower *power, GHashTable *props)
{
GValue *value;
@@ -227,9 +227,9 @@ xfpm_dkp_check_lid (XfpmDkp *dkp, GHashTable *props)
return;
}
- dkp->priv->lid_is_present = g_value_get_boolean (value);
+ power->priv->lid_is_present = g_value_get_boolean (value);
- if (dkp->priv->lid_is_present)
+ if (power->priv->lid_is_present)
{
gboolean closed;
@@ -243,19 +243,19 @@ xfpm_dkp_check_lid (XfpmDkp *dkp, GHashTable *props)
closed = g_value_get_boolean (value);
- if (closed != dkp->priv->lid_is_closed )
+ if (closed != power->priv->lid_is_closed )
{
- dkp->priv->lid_is_closed = closed;
- g_signal_emit (G_OBJECT (dkp), signals [LID_CHANGED], 0, dkp->priv->lid_is_closed);
+ power->priv->lid_is_closed = closed;
+ g_signal_emit (G_OBJECT (power), signals [LID_CHANGED], 0, power->priv->lid_is_closed);
}
}
}
static void
-xfpm_dkp_check_daemon_version (XfpmDkp *dkp, GHashTable *props)
+xfpm_power_check_daemon_version (XfpmPower *power, GHashTable *props)
{
GValue *value;
- gint dkp_version;
+ gint power_version;
value = g_hash_table_lookup (props, "DaemonVersion");
@@ -274,20 +274,20 @@ xfpm_dkp_check_daemon_version (XfpmDkp *dkp, GHashTable *props)
}
}
- dkp->priv->daemon_version = g_strdup (g_value_get_string (value));
- XFPM_DEBUG ("Dkp daemon version %s", dkp->priv->daemon_version);
- dkp_version = strtol (dkp->priv->daemon_version, NULL, 10);
+ power->priv->daemon_version = g_strdup (g_value_get_string (value));
+ XFPM_DEBUG ("Dkp daemon version %s", power->priv->daemon_version);
+ power_version = strtol (power->priv->daemon_version, NULL, 10);
- if ( dkp_version < 11)
+ if ( power_version < 11)
{
XfconfChannel *channel;
gboolean show_error;
- channel = xfpm_xfconf_get_channel (dkp->priv->conf);
+ channel = xfpm_xfconf_get_channel (power->priv->conf);
- show_error = xfconf_channel_get_bool (channel, PROPERTIES_PREFIX "show-dkp-version-error", TRUE);
+ show_error = xfconf_channel_get_bool (channel, PROPERTIES_PREFIX "show-power-version-error", TRUE);
- XFPM_WARNING ("Dkp version %d is less than the required minimum version 011", dkp_version);
+ XFPM_WARNING ("Dkp version %d is less than the required minimum version 011", power_version);
if ( show_error )
@@ -297,11 +297,11 @@ xfpm_dkp_check_daemon_version (XfpmDkp *dkp, GHashTable *props)
message = g_strdup_printf ("%s %s",
_("Xfce Power Manager requires version 011 of devicekit-power "
"to work properly while the version found is"),
- dkp->priv->daemon_version);
+ power->priv->daemon_version);
g_set_error (&error, 0, 0, "%s", message);
xfce_dialog_show_error (NULL, error, "%s", _("Devicekit-power version 011 or above not found"));
- xfconf_channel_set_bool (channel, PROPERTIES_PREFIX "show-dkp-version-error", FALSE);
+ xfconf_channel_set_bool (channel, PROPERTIES_PREFIX "show-power-version-error", FALSE);
g_free (message);
g_error_free (error);
}
@@ -324,44 +324,44 @@ out:
* LidIsPresent' 'b'
*/
static void
-xfpm_dkp_get_properties (XfpmDkp *dkp)
+xfpm_power_get_properties (XfpmPower *power)
{
GHashTable *props;
- props = xfpm_power_get_interface_properties (dkp->priv->proxy_prop, DKP_IFACE);
+ props = xfpm_power_get_interface_properties (power->priv->proxy_prop, DKP_IFACE);
- xfpm_dkp_check_pm (dkp, props);
- xfpm_dkp_check_lid (dkp, props);
- xfpm_dkp_check_power (dkp, props);
+ xfpm_power_check_pm (power, props);
+ xfpm_power_check_lid (power, props);
+ xfpm_power_check_power (power, props);
- if ( dkp->priv->daemon_version == NULL )
+ if ( power->priv->daemon_version == NULL )
{
- xfpm_dkp_check_daemon_version (dkp, props);
+ xfpm_power_check_daemon_version (power, props);
}
g_hash_table_destroy (props);
}
static void
-xfpm_dkp_report_error (XfpmDkp *dkp, const gchar *error, const gchar *icon_name)
+xfpm_power_report_error (XfpmPower *power, const gchar *error, const gchar *icon_name)
{
GtkStatusIcon *battery = NULL;
guint i, len;
GList *list;
- list = g_hash_table_get_values (dkp->priv->hash);
+ list = g_hash_table_get_values (power->priv->hash);
len = g_list_length (list);
for ( i = 0; i < len; i++)
{
- XfpmDkpDeviceType type;
+ XfpmDeviceType type;
battery = g_list_nth_data (list, i);
type = xfpm_battery_get_device_type (XFPM_BATTERY (battery));
- if ( type == XFPM_DKP_DEVICE_TYPE_BATTERY ||
- type == XFPM_DKP_DEVICE_TYPE_UPS )
+ if ( type == XFPM_DEVICE_TYPE_BATTERY ||
+ type == XFPM_DEVICE_TYPE_UPS )
break;
}
- xfpm_notify_show_notification (dkp->priv->notify,
+ xfpm_notify_show_notification (power->priv->notify,
_("Xfce power manager"),
error,
icon_name,
@@ -373,12 +373,12 @@ xfpm_dkp_report_error (XfpmDkp *dkp, const gchar *error, const gchar *icon_name)
}
static void
-xfpm_dkp_sleep (XfpmDkp *dkp, const gchar *sleep, gboolean force)
+xfpm_power_sleep (XfpmPower *power, const gchar *sleep, gboolean force)
{
GError *error = NULL;
gboolean lock_screen;
- if ( dkp->priv->inhibited && force == FALSE)
+ if ( power->priv->inhibited && force == FALSE)
{
gboolean ret;
@@ -394,10 +394,10 @@ xfpm_dkp_sleep (XfpmDkp *dkp, const gchar *sleep, gboolean force)
return;
}
- g_signal_emit (G_OBJECT (dkp), signals [SLEEPING], 0);
+ g_signal_emit (G_OBJECT (power), signals [SLEEPING], 0);
xfpm_send_message_to_network_manager ("sleep");
- g_object_get (G_OBJECT (dkp->priv->conf),
+ g_object_get (G_OBJECT (power->priv->conf),
LOCK_SCREEN_ON_SLEEP, &lock_screen,
NULL);
@@ -407,7 +407,7 @@ xfpm_dkp_sleep (XfpmDkp *dkp, const gchar *sleep, gboolean force)
xfpm_lock_screen ();
}
- dbus_g_proxy_call (dkp->priv->proxy, sleep, &error,
+ dbus_g_proxy_call (power->priv->proxy, sleep, &error,
G_TYPE_INVALID,
G_TYPE_INVALID);
@@ -425,59 +425,59 @@ xfpm_dkp_sleep (XfpmDkp *dkp, const gchar *sleep, gboolean force)
else
icon_name = XFPM_SUSPEND_ICON;
- xfpm_dkp_report_error (dkp, error->message, icon_name);
+ xfpm_power_report_error (power, error->message, icon_name);
g_error_free (error);
}
}
- g_signal_emit (G_OBJECT (dkp), signals [WAKING_UP], 0);
+ g_signal_emit (G_OBJECT (power), signals [WAKING_UP], 0);
xfpm_send_message_to_network_manager ("wake");
}
static void
-xfpm_dkp_hibernate_cb (XfpmDkp *dkp)
+xfpm_power_hibernate_cb (XfpmPower *power)
{
- xfpm_dkp_sleep (dkp, "Hibernate", FALSE);
+ xfpm_power_sleep (power, "Hibernate", FALSE);
}
static void
-xfpm_dkp_suspend_cb (XfpmDkp *dkp)
+xfpm_power_suspend_cb (XfpmPower *power)
{
- xfpm_dkp_sleep (dkp, "Suspend", FALSE);
+ xfpm_power_sleep (power, "Suspend", FALSE);
}
static void
-xfpm_dkp_hibernate_clicked (XfpmDkp *dkp)
+xfpm_power_hibernate_clicked (XfpmPower *power)
{
- gtk_widget_destroy (dkp->priv->dialog );
- dkp->priv->dialog = NULL;
- xfpm_dkp_sleep (dkp, "Hibernate", TRUE);
+ gtk_widget_destroy (power->priv->dialog );
+ power->priv->dialog = NULL;
+ xfpm_power_sleep (power, "Hibernate", TRUE);
}
static void
-xfpm_dkp_suspend_clicked (XfpmDkp *dkp)
+xfpm_power_suspend_clicked (XfpmPower *power)
{
- gtk_widget_destroy (dkp->priv->dialog );
- dkp->priv->dialog = NULL;
- xfpm_dkp_sleep (dkp, "Suspend", TRUE);
+ gtk_widget_destroy (power->priv->dialog );
+ power->priv->dialog = NULL;
+ xfpm_power_sleep (power, "Suspend", TRUE);
}
static void
-xfpm_dkp_shutdown_clicked (XfpmDkp *dkp)
+xfpm_power_shutdown_clicked (XfpmPower *power)
{
- gtk_widget_destroy (dkp->priv->dialog );
- dkp->priv->dialog = NULL;
- g_signal_emit (G_OBJECT (dkp), signals [SHUTDOWN], 0);
+ gtk_widget_destroy (power->priv->dialog );
+ power->priv->dialog = NULL;
+ g_signal_emit (G_OBJECT (power), signals [SHUTDOWN], 0);
}
static void
-xfpm_dkp_power_info_cb (gpointer data)
+xfpm_power_power_info_cb (gpointer data)
{
g_spawn_command_line_async ("xfce4-power-information", NULL);
}
static void
-xfpm_dkp_tray_exit_activated_cb (gpointer data)
+xfpm_power_tray_exit_activated_cb (gpointer data)
{
gboolean ret;
@@ -494,7 +494,7 @@ xfpm_dkp_tray_exit_activated_cb (gpointer data)
}
static void
-xfpm_dkp_show_tray_menu (XfpmDkp *dkp,
+xfpm_power_show_tray_menu (XfpmPower *power,
GtkStatusIcon *icon,
guint button,
guint activate_time,
@@ -510,11 +510,11 @@ xfpm_dkp_show_tray_menu (XfpmDkp *dkp,
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mi), img);
gtk_widget_set_sensitive (mi, FALSE);
- if ( dkp->priv->can_hibernate && dkp->priv->auth_hibernate)
+ if ( power->priv->can_hibernate && power->priv->auth_hibernate)
{
gtk_widget_set_sensitive (mi, TRUE);
g_signal_connect_swapped (G_OBJECT (mi), "activate",
- G_CALLBACK (xfpm_dkp_hibernate_cb), dkp);
+ G_CALLBACK (xfpm_power_hibernate_cb), power);
}
gtk_widget_show (mi);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
@@ -526,11 +526,11 @@ xfpm_dkp_show_tray_menu (XfpmDkp *dkp,
gtk_widget_set_sensitive (mi, FALSE);
- if ( dkp->priv->can_suspend && dkp->priv->auth_hibernate)
+ if ( power->priv->can_suspend && power->priv->auth_hibernate)
{
gtk_widget_set_sensitive (mi, TRUE);
g_signal_connect_swapped (mi, "activate",
- G_CALLBACK (xfpm_dkp_suspend_cb), dkp);
+ G_CALLBACK (xfpm_power_suspend_cb), power);
}
gtk_widget_show (mi);
@@ -563,7 +563,7 @@ xfpm_dkp_show_tray_menu (XfpmDkp *dkp,
gtk_widget_set_sensitive (mi,TRUE);
g_signal_connect_swapped (mi, "activate",
- G_CALLBACK (xfpm_dkp_power_info_cb), icon);
+ G_CALLBACK (xfpm_power_power_info_cb), icon);
gtk_widget_show (mi);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
@@ -600,7 +600,7 @@ xfpm_dkp_show_tray_menu (XfpmDkp *dkp,
mi = gtk_image_menu_item_new_from_stock (GTK_STOCK_QUIT, NULL);
gtk_widget_set_sensitive (mi, TRUE);
gtk_widget_show (mi);
- g_signal_connect_swapped (mi, "activate", G_CALLBACK (xfpm_dkp_tray_exit_activated_cb), NULL);
+ g_signal_connect_swapped (mi, "activate", G_CALLBACK (xfpm_power_tray_exit_activated_cb), NULL);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
g_signal_connect (menu, "selection-done",
@@ -614,40 +614,40 @@ xfpm_dkp_show_tray_menu (XfpmDkp *dkp,
}
static void
-xfpm_dkp_show_tray_menu_battery (GtkStatusIcon *icon, guint button,
- guint activate_time, XfpmDkp *dkp)
+xfpm_power_show_tray_menu_battery (GtkStatusIcon *icon, guint button,
+ guint activate_time, XfpmPower *power)
{
- xfpm_dkp_show_tray_menu (dkp, icon, button, activate_time, TRUE);
+ xfpm_power_show_tray_menu (power, icon, button, activate_time, TRUE);
}
static void
-xfpm_dkp_show_tray_menu_adaptor (GtkStatusIcon *icon, guint button,
- guint activate_time, XfpmDkp *dkp)
+xfpm_power_show_tray_menu_adaptor (GtkStatusIcon *icon, guint button,
+ guint activate_time, XfpmPower *power)
{
- xfpm_dkp_show_tray_menu (dkp, icon, button, activate_time, FALSE);
+ xfpm_power_show_tray_menu (power, icon, button, activate_time, FALSE);
}
static XfpmBatteryCharge
-xfpm_dkp_get_current_charge_state (XfpmDkp *dkp)
+xfpm_power_get_current_charge_state (XfpmPower *power)
{
GList *list;
guint len, i;
XfpmBatteryCharge max_charge_status = XFPM_BATTERY_CHARGE_UNKNOWN;
- list = g_hash_table_get_values (dkp->priv->hash);
+ list = g_hash_table_get_values (power->priv->hash);
len = g_list_length (list);
for ( i = 0; i < len; i++)
{
XfpmBatteryCharge battery_charge;
- XfpmDkpDeviceType type;
+ XfpmDeviceType type;
g_object_get (G_OBJECT (g_list_nth_data (list, i)),
"charge-status", &battery_charge,
"device-type", &type,
NULL);
- if ( type != XFPM_DKP_DEVICE_TYPE_BATTERY &&
- type != XFPM_DKP_DEVICE_TYPE_UPS )
+ if ( type != XFPM_DEVICE_TYPE_BATTERY &&
+ type != XFPM_DEVICE_TYPE_UPS )
continue;
max_charge_status = MAX (max_charge_status, battery_charge);
@@ -657,57 +657,57 @@ xfpm_dkp_get_current_charge_state (XfpmDkp *dkp)
}
static void
-xfpm_dkp_notify_action_callback (NotifyNotification *n, gchar *action, XfpmDkp *dkp)
+xfpm_power_notify_action_callback (NotifyNotification *n, gchar *action, XfpmPower *power)
{
if ( !g_strcmp0 (action, "Shutdown") )
- g_signal_emit (G_OBJECT (dkp), signals [SHUTDOWN], 0);
+ g_signal_emit (G_OBJECT (power), signals [SHUTDOWN], 0);
else
- xfpm_dkp_sleep (dkp, action, TRUE);
+ xfpm_power_sleep (power, action, TRUE);
}
static void
-xfpm_dkp_add_actions_to_notification (XfpmDkp *dkp, NotifyNotification *n)
+xfpm_power_add_actions_to_notification (XfpmPower *power, NotifyNotification *n)
{
gboolean can_shutdown;
- g_object_get (G_OBJECT (dkp->priv->console),
+ g_object_get (G_OBJECT (power->priv->console),
"can-shutdown", &can_shutdown,
NULL);
- if ( dkp->priv->can_hibernate && dkp->priv->auth_hibernate )
+ if ( power->priv->can_hibernate && power->priv->auth_hibernate )
{
xfpm_notify_add_action_to_notification(
- dkp->priv->notify,
+ power->priv->notify,
n,
"Hibernate",
_("Hibernate the system"),
- (NotifyActionCallback)xfpm_dkp_notify_action_callback,
- dkp);
+ (NotifyActionCallback)xfpm_power_notify_action_callback,
+ power);
}
- if ( dkp->priv->can_suspend && dkp->priv->auth_suspend )
+ if ( power->priv->can_suspend && power->priv->auth_suspend )
{
xfpm_notify_add_action_to_notification(
- dkp->priv->notify,
+ power->priv->notify,
n,
"Suspend",
_("Suspend the system"),
- (NotifyActionCallback)xfpm_dkp_notify_action_callback,
- dkp);
+ (NotifyActionCallback)xfpm_power_notify_action_callback,
+ power);
}
if (can_shutdown )
xfpm_notify_add_action_to_notification(
- dkp->priv->notify,
+ power->priv->notify,
n,
"Shutdown",
_("Shutdown the system"),
- (NotifyActionCallback)xfpm_dkp_notify_action_callback,
- dkp);
+ (NotifyActionCallback)xfpm_power_notify_action_callback,
+ power);
}
static void
-xfpm_dkp_show_critical_action_notification (XfpmDkp *dkp, XfpmBattery *battery)
+xfpm_power_show_critical_action_notification (XfpmPower *power, XfpmBattery *battery)
{
const gchar *message;
NotifyNotification *n;
@@ -716,7 +716,7 @@ xfpm_dkp_show_critical_action_notification (XfpmDkp *dkp, XfpmBattery *battery)
"Save your work to avoid losing data");
n =
- xfpm_notify_new_notification (dkp->priv->notify,
+ xfpm_notify_new_notification (power->priv->notify,
_("Xfce power manager"),
message,
gtk_status_icon_get_icon_name (GTK_STATUS_ICON (battery)),
@@ -724,20 +724,20 @@ xfpm_dkp_show_critical_action_notification (XfpmDkp *dkp, XfpmBattery *battery)
XFPM_NOTIFY_CRITICAL,
GTK_STATUS_ICON (battery));
- xfpm_dkp_add_actions_to_notification (dkp, n);
- xfpm_notify_critical (dkp->priv->notify, n);
+ xfpm_power_add_actions_to_notification (power, n);
+ xfpm_notify_critical (power->priv->notify, n);
}
static void
-xfpm_dkp_close_critical_dialog (XfpmDkp *dkp)
+xfpm_power_close_critical_dialog (XfpmPower *power)
{
- gtk_widget_destroy (dkp->priv->dialog);
- dkp->priv->dialog = NULL;
+ gtk_widget_destroy (power->priv->dialog);
+ power->priv->dialog = NULL;
}
static void
-xfpm_dkp_show_critical_action_gtk (XfpmDkp *dkp)
+xfpm_power_show_critical_action_gtk (XfpmPower *power)
{
GtkWidget *dialog;
GtkWidget *content_area;
@@ -746,7 +746,7 @@ xfpm_dkp_show_critical_action_gtk (XfpmDkp *dkp)
const gchar *message;
gboolean can_shutdown;
- g_object_get (G_OBJECT (dkp->priv->console),
+ g_object_get (G_OBJECT (power->priv->console),
"can-shutdown", &can_shutdown,
NULL);
@@ -763,7 +763,7 @@ xfpm_dkp_show_critical_action_gtk (XfpmDkp *dkp)
gtk_box_pack_start_defaults (GTK_BOX (content_area), gtk_label_new (message));
- if ( dkp->priv->can_hibernate && dkp->priv->auth_hibernate )
+ if ( power->priv->can_hibernate && power->priv->auth_hibernate )
{
GtkWidget *hibernate;
hibernate = gtk_button_new_with_label (_("Hibernate"));
@@ -772,10 +772,10 @@ xfpm_dkp_show_critical_action_gtk (XfpmDkp *dkp)
gtk_dialog_add_action_widget (GTK_DIALOG (dialog), hibernate, GTK_RESPONSE_NONE);
g_signal_connect_swapped (hibernate, "clicked",
- G_CALLBACK (xfpm_dkp_hibernate_clicked), dkp);
+ G_CALLBACK (xfpm_power_hibernate_clicked), power);
}
- if ( dkp->priv->can_suspend && dkp->priv->auth_suspend )
+ if ( power->priv->can_suspend && power->priv->auth_suspend )
{
GtkWidget *suspend;
@@ -785,7 +785,7 @@ xfpm_dkp_show_critical_action_gtk (XfpmDkp *dkp)
gtk_dialog_add_action_widget (GTK_DIALOG (dialog), suspend, GTK_RESPONSE_NONE);
g_signal_connect_swapped (suspend, "clicked",
- G_CALLBACK (xfpm_dkp_suspend_clicked), dkp);
+ G_CALLBACK (xfpm_power_suspend_clicked), power);
}
if ( can_shutdown )
@@ -798,61 +798,61 @@ xfpm_dkp_show_critical_action_gtk (XfpmDkp *dkp)
gtk_dialog_add_action_widget (GTK_DIALOG (dialog), shutdown, GTK_RESPONSE_NONE);
g_signal_connect_swapped (shutdown, "clicked",
- G_CALLBACK (xfpm_dkp_shutdown_clicked), dkp);
+ G_CALLBACK (xfpm_power_shutdown_clicked), power);
}
cancel = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
gtk_dialog_add_action_widget (GTK_DIALOG (dialog), cancel, GTK_RESPONSE_NONE);
g_signal_connect_swapped (cancel, "clicked",
- G_CALLBACK (xfpm_dkp_close_critical_dialog), dkp);
+ G_CALLBACK (xfpm_power_close_critical_dialog), power);
g_signal_connect_swapped (dialog, "destroy",
- G_CALLBACK (xfpm_dkp_close_critical_dialog), dkp);
- if ( dkp->priv->dialog )
+ G_CALLBACK (xfpm_power_close_critical_dialog), power);
+ if ( power->priv->dialog )
{
- gtk_widget_destroy (dkp->priv->dialog);
- dkp->priv->dialog = NULL;
+ gtk_widget_destroy (power->priv->dialog);
+ power->priv->dialog = NULL;
}
- dkp->priv->dialog = dialog;
+ power->priv->dialog = dialog;
gtk_widget_show_all (dialog);
}
static void
-xfpm_dkp_show_critical_action (XfpmDkp *dkp, XfpmBattery *battery)
+xfpm_power_show_critical_action (XfpmPower *power, XfpmBattery *battery)
{
gboolean supports_actions;
- g_object_get (G_OBJECT (dkp->priv->notify),
+ g_object_get (G_OBJECT (power->priv->notify),
"actions", &supports_actions,
NULL);
if ( supports_actions )
- xfpm_dkp_show_critical_action_notification (dkp, battery);
+ xfpm_power_show_critical_action_notification (power, battery);
else
- xfpm_dkp_show_critical_action_gtk (dkp);
+ xfpm_power_show_critical_action_gtk (power);
}
static void
-xfpm_dkp_process_critical_action (XfpmDkp *dkp, XfpmShutdownRequest req)
+xfpm_power_process_critical_action (XfpmPower *power, XfpmShutdownRequest req)
{
if ( req == XFPM_ASK )
- g_signal_emit (G_OBJECT (dkp), signals [ASK_SHUTDOWN], 0);
+ g_signal_emit (G_OBJECT (power), signals [ASK_SHUTDOWN], 0);
else if ( req == XFPM_DO_SUSPEND )
- xfpm_dkp_sleep (dkp, "Suspend", TRUE);
+ xfpm_power_sleep (power, "Suspend", TRUE);
else if ( req == XFPM_DO_HIBERNATE )
- xfpm_dkp_sleep (dkp, "Hibernate", TRUE);
+ xfpm_power_sleep (power, "Hibernate", TRUE);
else if ( req == XFPM_DO_SHUTDOWN )
- g_signal_emit (G_OBJECT (dkp), signals [SHUTDOWN], 0);
+ g_signal_emit (G_OBJECT (power), signals [SHUTDOWN], 0);
}
static void
-xfpm_dkp_system_on_low_power (XfpmDkp *dkp, XfpmBattery *battery)
+xfpm_power_system_on_low_power (XfpmPower *power, XfpmBattery *battery)
{
XfpmShutdownRequest critical_action;
- g_object_get (G_OBJECT (dkp->priv->conf),
+ g_object_get (G_OBJECT (power->priv->conf),
CRITICAL_BATT_ACTION_CFG, &critical_action,
NULL);
@@ -861,50 +861,50 @@ xfpm_dkp_system_on_low_power (XfpmDkp *dkp, XfpmBattery *battery)
if ( critical_action == XFPM_DO_NOTHING )
{
- xfpm_dkp_show_critical_action (dkp, battery);
+ xfpm_power_show_critical_action (power, battery);
}
else
{
- xfpm_dkp_process_critical_action (dkp, critical_action);
+ xfpm_power_process_critical_action (power, critical_action);
}
}
static void
-xfpm_dkp_battery_charge_changed_cb (XfpmBattery *battery, XfpmDkp *dkp)
+xfpm_power_battery_charge_changed_cb (XfpmBattery *battery, XfpmPower *power)
{
gboolean notify;
XfpmBatteryCharge battery_charge;
XfpmBatteryCharge current_charge;
battery_charge = xfpm_battery_get_charge (battery);
- current_charge = xfpm_dkp_get_current_charge_state (dkp);
+ current_charge = xfpm_power_get_current_charge_state (power);
XFPM_DEBUG_ENUM (current_charge, XFPM_TYPE_BATTERY_CHARGE, "Current system charge status");
- if ( current_charge == XFPM_BATTERY_CHARGE_CRITICAL && dkp->priv->on_battery)
+ if ( current_charge == XFPM_BATTERY_CHARGE_CRITICAL && power->priv->on_battery)
{
- xfpm_dkp_system_on_low_power (dkp, battery);
- dkp->priv->on_low_battery = TRUE;
- g_signal_emit (G_OBJECT (dkp), signals [LOW_BATTERY_CHANGED], 0, dkp->priv->on_low_battery);
+ xfpm_power_system_on_low_power (power, battery);
+ power->priv->on_low_battery = TRUE;
+ g_signal_emit (G_OBJECT (power), signals [LOW_BATTERY_CHANGED], 0, power->priv->on_low_battery);
return;
}
- if ( dkp->priv->on_low_battery )
+ if ( power->priv->on_low_battery )
{
- dkp->priv->on_low_battery = FALSE;
- g_signal_emit (G_OBJECT (dkp), signals [LOW_BATTERY_CHANGED], 0, dkp->priv->on_low_battery);
+ power->priv->on_low_battery = FALSE;
+ g_signal_emit (G_OBJECT (power), signals [LOW_BATTERY_CHANGED], 0, power->priv->on_low_battery);
}
- g_object_get (G_OBJECT (dkp->priv->conf),
+ g_object_get (G_OBJECT (power->priv->conf),
GENERAL_NOTIFICATION_CFG, ¬ify,
NULL);
- if ( dkp->priv->on_battery )
+ if ( power->priv->on_battery )
{
if ( current_charge == XFPM_BATTERY_CHARGE_LOW )
{
if ( notify )
- xfpm_notify_show_notification (dkp->priv->notify,
+ xfpm_notify_show_notification (power->priv->notify,
_("Xfce power manager"),
_("System is running on low power"),
gtk_status_icon_get_icon_name (GTK_STATUS_ICON (battery)),
@@ -918,7 +918,7 @@ xfpm_dkp_battery_charge_changed_cb (XfpmBattery *battery, XfpmDkp *dkp)
{
if ( notify )
- xfpm_notify_show_notification (dkp->priv->notify,
+ xfpm_notify_show_notification (power->priv->notify,
_("Xfce power manager"),
_("Battery charge level is low"),
gtk_status_icon_get_icon_name (GTK_STATUS_ICON (battery)),
@@ -930,21 +930,21 @@ xfpm_dkp_battery_charge_changed_cb (XfpmBattery *battery, XfpmDkp *dkp)
}
/*Current charge is okay now, then close the dialog*/
- if ( dkp->priv->dialog )
+ if ( power->priv->dialog )
{
- gtk_widget_destroy (dkp->priv->dialog);
- dkp->priv->dialog = NULL;
+ gtk_widget_destroy (power->priv->dialog);
+ power->priv->dialog = NULL;
}
}
static void
-xfpm_dkp_add_device (XfpmDkp *dkp, const gchar *object_path)
+xfpm_power_add_device (XfpmPower *power, const gchar *object_path)
{
DBusGProxy *proxy_prop;
guint device_type;
GValue value;
- proxy_prop = dbus_g_proxy_new_for_name (dkp->priv->bus,
+ proxy_prop = dbus_g_proxy_new_for_name (power->priv->bus,
DKP_NAME,
object_path,
DBUS_INTERFACE_PROPERTIES);
@@ -959,74 +959,47 @@ xfpm_dkp_add_device (XfpmDkp *dkp, const gchar *object_path)
device_type = g_value_get_uint (&value);
- if ( device_type == XFPM_DKP_DEVICE_TYPE_BATTERY ||
- device_type == XFPM_DKP_DEVICE_TYPE_UPS ||
- device_type == XFPM_DKP_DEVICE_TYPE_MOUSE ||
- device_type == XFPM_DKP_DEVICE_TYPE_KBD ||
- device_type == XFPM_DKP_DEVICE_TYPE_PHONE)
+ if ( device_type == XFPM_DEVICE_TYPE_BATTERY ||
+ device_type == XFPM_DEVICE_TYPE_UPS ||
+ device_type == XFPM_DEVICE_TYPE_MOUSE ||
+ device_type == XFPM_DEVICE_TYPE_KBD ||
+ device_type == XFPM_DEVICE_TYPE_PHONE)
{
GtkStatusIcon *battery;
DBusGProxy *proxy;
- XFPM_DEBUG_ENUM (device_type, XFPM_TYPE_DKP_DEVICE_TYPE,
+ XFPM_DEBUG_ENUM (device_type, XFPM_TYPE_DEVICE_TYPE,
"Battery device detected at : %s", object_path);
- proxy = dbus_g_proxy_new_for_name (dkp->priv->bus,
+ proxy = dbus_g_proxy_new_for_name (power->priv->bus,
DKP_NAME,
object_path,
DKP_IFACE_DEVICE);
battery = xfpm_battery_new ();
gtk_status_icon_set_visible (battery, FALSE);
xfpm_battery_monitor_device (XFPM_BATTERY (battery), proxy, proxy_prop, device_type);
- g_hash_table_insert (dkp->priv->hash, g_strdup (object_path), battery);
+ g_hash_table_insert (power->priv->hash, g_strdup (object_path), battery);
g_signal_connect (battery, "popup-menu",
- G_CALLBACK (xfpm_dkp_show_tray_menu_battery), dkp);
+ G_CALLBACK (xfpm_power_show_tray_menu_battery), power);
g_signal_connect (battery, "battery-charge-changed",
- G_CALLBACK (xfpm_dkp_battery_charge_changed_cb), dkp);
+ G_CALLBACK (xfpm_power_battery_charge_changed_cb), power);
- xfpm_dkp_refresh_adaptor_visible (dkp);
+ xfpm_power_refresh_adaptor_visible (power);
}
- else if ( device_type != XFPM_DKP_DEVICE_TYPE_LINE_POWER )
+ else if ( device_type != XFPM_DEVICE_TYPE_LINE_POWER )
{
g_warning ("Unable to monitor unkown power device with object_path : %s", object_path);
g_object_unref (proxy_prop);
}
}
-/*
- * Get the object path of all the power devices
- * on dkp.
- */
-static GPtrArray *
-xfpm_dkp_enumerate_devices (XfpmDkp *dkp)
-{
- gboolean ret;
- GError *error = NULL;
- GPtrArray *array = NULL;
- GType g_type_array;
-
- g_type_array = dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_OBJECT_PATH);
-
- ret = dbus_g_proxy_call (dkp->priv->proxy, "EnumerateDevices", &error,
- G_TYPE_INVALID,
- g_type_array, &array,
- G_TYPE_INVALID);
- if (!ret)
- {
- g_critical ("Couldn't enumerate power devices: %s", error->message);
- g_error_free (error);
- }
-
- return array;
-}
-
static void
-xfpm_dkp_get_power_devices (XfpmDkp *dkp)
+xfpm_power_get_power_devices (XfpmPower *power)
{
GPtrArray *array = NULL;
guint i;
- array = xfpm_dkp_enumerate_devices (dkp);
+ array = xfpm_power_enumerate_devices (power->priv->proxy);
if ( array )
{
@@ -1034,7 +1007,7 @@ xfpm_dkp_get_power_devices (XfpmDkp *dkp)
{
const gchar *object_path = ( const gchar *) g_ptr_array_index (array, i);
XFPM_DEBUG ("Power device detected at : %s", object_path);
- xfpm_dkp_add_device (dkp, object_path);
+ xfpm_power_add_device (power, object_path);
}
g_ptr_array_free (array, TRUE);
}
@@ -1042,42 +1015,42 @@ xfpm_dkp_get_power_devices (XfpmDkp *dkp)
}
static void
-xfpm_dkp_remove_device (XfpmDkp *dkp, const gchar *object_path)
+xfpm_power_remove_device (XfpmPower *power, const gchar *object_path)
{
- g_hash_table_remove (dkp->priv->hash, object_path);
- xfpm_dkp_refresh_adaptor_visible (dkp);
+ g_hash_table_remove (power->priv->hash, object_path);
+ xfpm_power_refresh_adaptor_visible (power);
}
static void
-xfpm_dkp_inhibit_changed_cb (XfpmInhibit *inhibit, gboolean is_inhibit, XfpmDkp *dkp)
+xfpm_power_inhibit_changed_cb (XfpmInhibit *inhibit, gboolean is_inhibit, XfpmPower *power)
{
- dkp->priv->inhibited = is_inhibit;
+ power->priv->inhibited = is_inhibit;
}
static void
-xfpm_dkp_changed_cb (DBusGProxy *proxy, XfpmDkp *dkp)
+xfpm_power_changed_cb (DBusGProxy *proxy, XfpmPower *power)
{
- xfpm_dkp_get_properties (dkp);
+ xfpm_power_get_properties (power);
}
static void
-xfpm_dkp_device_added_cb (DBusGProxy *proxy, const gchar *object_path, XfpmDkp *dkp)
+xfpm_power_device_added_cb (DBusGProxy *proxy, const gchar *object_path, XfpmPower *power)
{
- xfpm_dkp_add_device (dkp, object_path);
+ xfpm_power_add_device (power, object_path);
}
static void
-xfpm_dkp_device_removed_cb (DBusGProxy *proxy, const gchar *object_path, XfpmDkp *dkp)
+xfpm_power_device_removed_cb (DBusGProxy *proxy, const gchar *object_path, XfpmPower *power)
{
- xfpm_dkp_remove_device (dkp, object_path);
+ xfpm_power_remove_device (power, object_path);
}
static void
-xfpm_dkp_device_changed_cb (DBusGProxy *proxy, const gchar *object_path, XfpmDkp *dkp)
+xfpm_power_device_changed_cb (DBusGProxy *proxy, const gchar *object_path, XfpmPower *power)
{
XfpmBattery *battery;
- battery = g_hash_table_lookup (dkp->priv->hash, object_path);
+ battery = g_hash_table_lookup (power->priv->hash, object_path);
if ( battery )
{
@@ -1087,48 +1060,48 @@ xfpm_dkp_device_changed_cb (DBusGProxy *proxy, const gchar *object_path, XfpmDkp
#ifdef HAVE_POLKIT
static void
-xfpm_dkp_polkit_auth_changed_cb (XfpmDkp *dkp)
+xfpm_power_polkit_auth_changed_cb (XfpmPower *power)
{
XFPM_DEBUG ("Auth configuration changed");
- xfpm_dkp_check_polkit_auth (dkp);
+ xfpm_power_check_polkit_auth (power);
}
#endif
static void
-xfpm_dkp_hide_adapter_icon (XfpmDkp *dkp)
+xfpm_power_hide_adapter_icon (XfpmPower *power)
{
XFPM_DEBUG ("Hide adaptor icon");
- if ( dkp->priv->adapter_icon )
+ if ( power->priv->adapter_icon )
{
- g_object_unref (dkp->priv->adapter_icon);
- dkp->priv->adapter_icon = NULL;
+ g_object_unref (power->priv->adapter_icon);
+ power->priv->adapter_icon = NULL;
}
}
static void
-xfpm_dkp_show_adapter_icon (XfpmDkp *dkp)
+xfpm_power_show_adapter_icon (XfpmPower *power)
{
- g_return_if_fail (dkp->priv->adapter_icon == NULL);
+ g_return_if_fail (power->priv->adapter_icon == NULL);
- dkp->priv->adapter_icon = gtk_status_icon_new ();
+ power->priv->adapter_icon = gtk_status_icon_new ();
XFPM_DEBUG ("Showing adaptor icon");
- gtk_status_icon_set_from_icon_name (dkp->priv->adapter_icon, XFPM_AC_ADAPTER_ICON);
+ gtk_status_icon_set_from_icon_name (power->priv->adapter_icon, XFPM_AC_ADAPTER_ICON);
- gtk_status_icon_set_visible (dkp->priv->adapter_icon, TRUE);
+ gtk_status_icon_set_visible (power->priv->adapter_icon, TRUE);
- g_signal_connect (dkp->priv->adapter_icon, "popup-menu",
- G_CALLBACK (xfpm_dkp_show_tray_menu_adaptor), dkp);
+ g_signal_connect (power->priv->adapter_icon, "popup-menu",
+ G_CALLBACK (xfpm_power_show_tray_menu_adaptor), power);
}
static void
-xfpm_dkp_refresh_adaptor_visible (XfpmDkp *dkp)
+xfpm_power_refresh_adaptor_visible (XfpmPower *power)
{
XfpmShowIcon show_icon;
- g_object_get (G_OBJECT (dkp->priv->conf),
+ g_object_get (G_OBJECT (power->priv->conf),
SHOW_TRAY_ICON_CFG, &show_icon,
NULL);
@@ -1136,46 +1109,46 @@ xfpm_dkp_refresh_adaptor_visible (XfpmDkp *dkp)
if ( show_icon == SHOW_ICON_ALWAYS )
{
- if ( g_hash_table_size (dkp->priv->hash) == 0 )
+ if ( g_hash_table_size (power->priv->hash) == 0 )
{
- xfpm_dkp_show_adapter_icon (dkp);
+ xfpm_power_show_adapter_icon (power);
#if GTK_CHECK_VERSION (2, 16, 0)
- gtk_status_icon_set_tooltip_text (dkp->priv->adapter_icon,
- dkp->priv->on_battery ?
+ gtk_status_icon_set_tooltip_text (power->priv->adapter_icon,
+ power->priv->on_battery ?
_("Adaptor is offline") :
_("Adaptor is online") );
#else
- gtk_status_icon_set_tooltip (dkp->priv->adapter_icon,
- dkp->priv->on_battery ?
+ gtk_status_icon_set_tooltip (power->priv->adapter_icon,
+ power->priv->on_battery ?
_("Adaptor is offline") :
_("Adaptor is online") );
#endif
}
else
{
- xfpm_dkp_hide_adapter_icon (dkp);
+ xfpm_power_hide_adapter_icon (power);
}
}
else
{
- xfpm_dkp_hide_adapter_icon (dkp);
+ xfpm_power_hide_adapter_icon (power);
}
}
static void
-xfpm_dkp_class_init (XfpmDkpClass *klass)
+xfpm_power_class_init (XfpmPowerClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
- object_class->finalize = xfpm_dkp_finalize;
+ object_class->finalize = xfpm_power_finalize;
- object_class->get_property = xfpm_dkp_get_property;
+ object_class->get_property = xfpm_power_get_property;
signals [ON_BATTERY_CHANGED] =
g_signal_new ("on-battery-changed",
XFPM_TYPE_DKP,
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(XfpmDkpClass, on_battery_changed),
+ G_STRUCT_OFFSET(XfpmPowerClass, on_battery_changed),
NULL, NULL,
g_cclosure_marshal_VOID__BOOLEAN,
G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
@@ -1184,7 +1157,7 @@ xfpm_dkp_class_init (XfpmDkpClass *klass)
g_signal_new ("low-battery-changed",
XFPM_TYPE_DKP,
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(XfpmDkpClass, low_battery_changed),
+ G_STRUCT_OFFSET(XfpmPowerClass, low_battery_changed),
NULL, NULL,
g_cclosure_marshal_VOID__BOOLEAN,
G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
@@ -1193,7 +1166,7 @@ xfpm_dkp_class_init (XfpmDkpClass *klass)
g_signal_new ("lid-changed",
XFPM_TYPE_DKP,
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(XfpmDkpClass, lid_changed),
+ G_STRUCT_OFFSET(XfpmPowerClass, lid_changed),
NULL, NULL,
g_cclosure_marshal_VOID__BOOLEAN,
G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
@@ -1202,7 +1175,7 @@ xfpm_dkp_class_init (XfpmDkpClass *klass)
g_signal_new ("waking-up",
XFPM_TYPE_DKP,
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(XfpmDkpClass, waking_up),
+ G_STRUCT_OFFSET(XfpmPowerClass, waking_up),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0, G_TYPE_NONE);
@@ -1211,7 +1184,7 @@ xfpm_dkp_class_init (XfpmDkpClass *klass)
g_signal_new ("sleeping",
XFPM_TYPE_DKP,
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(XfpmDkpClass, sleeping),
+ G_STRUCT_OFFSET(XfpmPowerClass, sleeping),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0, G_TYPE_NONE);
@@ -1220,7 +1193,7 @@ xfpm_dkp_class_init (XfpmDkpClass *klass)
g_signal_new ("ask-shutdown",
XFPM_TYPE_DKP,
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(XfpmDkpClass, ask_shutdown),
+ G_STRUCT_OFFSET(XfpmPowerClass, ask_shutdown),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0, G_TYPE_NONE);
@@ -1229,7 +1202,7 @@ xfpm_dkp_class_init (XfpmDkpClass *klass)
g_signal_new ("shutdown",
XFPM_TYPE_DKP,
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(XfpmDkpClass, shutdown),
+ G_STRUCT_OFFSET(XfpmPowerClass, shutdown),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0, G_TYPE_NONE);
@@ -1283,49 +1256,49 @@ xfpm_dkp_class_init (XfpmDkpClass *klass)
FALSE,
G_PARAM_READABLE));
- g_type_class_add_private (klass, sizeof (XfpmDkpPrivate));
+ g_type_class_add_private (klass, sizeof (XfpmPowerPrivate));
- xfpm_dkp_dbus_class_init (klass);
+ xfpm_power_dbus_class_init (klass);
}
static void
-xfpm_dkp_init (XfpmDkp *dkp)
+xfpm_power_init (XfpmPower *power)
{
GError *error = NULL;
- dkp->priv = XFPM_DKP_GET_PRIVATE (dkp);
-
- dkp->priv->hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
- dkp->priv->lid_is_present = FALSE;
- dkp->priv->lid_is_closed = FALSE;
- dkp->priv->on_battery = FALSE;
- dkp->priv->on_low_battery = FALSE;
- dkp->priv->daemon_version = NULL;
- dkp->priv->can_suspend = FALSE;
- dkp->priv->can_hibernate = FALSE;
- dkp->priv->auth_hibernate = TRUE;
- dkp->priv->auth_suspend = TRUE;
- dkp->priv->dialog = NULL;
- dkp->priv->adapter_icon = NULL;
-
- dkp->priv->inhibit = xfpm_inhibit_new ();
- dkp->priv->notify = xfpm_notify_new ();
- dkp->priv->conf = xfpm_xfconf_new ();
- dkp->priv->console = xfpm_console_kit_new ();
-
- g_signal_connect_swapped (dkp->priv->conf, "notify::" SHOW_TRAY_ICON_CFG,
- G_CALLBACK (xfpm_dkp_refresh_adaptor_visible), dkp);
+ power->priv = XFPM_POWER_GET_PRIVATE (power);
+
+ power->priv->hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
+ power->priv->lid_is_present = FALSE;
+ power->priv->lid_is_closed = FALSE;
+ power->priv->on_battery = FALSE;
+ power->priv->on_low_battery = FALSE;
+ power->priv->daemon_version = NULL;
+ power->priv->can_suspend = FALSE;
+ power->priv->can_hibernate = FALSE;
+ power->priv->auth_hibernate = TRUE;
+ power->priv->auth_suspend = TRUE;
+ power->priv->dialog = NULL;
+ power->priv->adapter_icon = NULL;
+
+ power->priv->inhibit = xfpm_inhibit_new ();
+ power->priv->notify = xfpm_notify_new ();
+ power->priv->conf = xfpm_xfconf_new ();
+ power->priv->console = xfpm_console_kit_new ();
+
+ g_signal_connect_swapped (power->priv->conf, "notify::" SHOW_TRAY_ICON_CFG,
+ G_CALLBACK (xfpm_power_refresh_adaptor_visible), power);
#ifdef HAVE_POLKIT
- dkp->priv->polkit = xfpm_polkit_get ();
- g_signal_connect_swapped (dkp->priv->polkit, "auth-changed",
- G_CALLBACK (xfpm_dkp_polkit_auth_changed_cb), dkp);
+ power->priv->polkit = xfpm_polkit_get ();
+ g_signal_connect_swapped (power->priv->polkit, "auth-changed",
+ G_CALLBACK (xfpm_power_polkit_auth_changed_cb), power);
#endif
- g_signal_connect (dkp->priv->inhibit, "has-inhibit-changed",
- G_CALLBACK (xfpm_dkp_inhibit_changed_cb), dkp);
+ g_signal_connect (power->priv->inhibit, "has-inhibit-changed",
+ G_CALLBACK (xfpm_power_inhibit_changed_cb), power);
- dkp->priv->bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
+ power->priv->bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
if ( error )
{
@@ -1334,86 +1307,86 @@ xfpm_dkp_init (XfpmDkp *dkp)
goto out;
}
- dkp->priv->proxy = dbus_g_proxy_new_for_name (dkp->priv->bus,
+ power->priv->proxy = dbus_g_proxy_new_for_name (power->priv->bus,
DKP_NAME,
DKP_PATH,
DKP_IFACE);
- if (dkp->priv->proxy == NULL)
+ if (power->priv->proxy == NULL)
{
g_critical ("Unable to create proxy for %s", DKP_NAME);
goto out;
}
- dkp->priv->proxy_prop = dbus_g_proxy_new_for_name (dkp->priv->bus,
+ power->priv->proxy_prop = dbus_g_proxy_new_for_name (power->priv->bus,
DKP_NAME,
DKP_PATH,
DBUS_INTERFACE_PROPERTIES);
- if (dkp->priv->proxy_prop == NULL)
+ if (power->priv->proxy_prop == NULL)
{
g_critical ("Unable to create proxy for %s", DKP_NAME);
goto out;
}
- xfpm_dkp_get_power_devices (dkp);
- xfpm_dkp_get_properties (dkp);
+ xfpm_power_get_power_devices (power);
+ xfpm_power_get_properties (power);
#ifdef HAVE_POLKIT
- xfpm_dkp_check_polkit_auth (dkp);
+ xfpm_power_check_polkit_auth (power);
#endif
- dbus_g_proxy_add_signal (dkp->priv->proxy, "Changed", G_TYPE_INVALID);
- dbus_g_proxy_add_signal (dkp->priv->proxy, "DeviceAdded", G_TYPE_STRING, G_TYPE_INVALID);
- dbus_g_proxy_add_signal (dkp->priv->proxy, "DeviceRemoved", G_TYPE_STRING, G_TYPE_INVALID);
- dbus_g_proxy_add_signal (dkp->priv->proxy, "DeviceChanged", G_TYPE_STRING, G_TYPE_INVALID);
-
- dbus_g_proxy_connect_signal (dkp->priv->proxy, "Changed",
- G_CALLBACK (xfpm_dkp_changed_cb), dkp, NULL);
- dbus_g_proxy_connect_signal (dkp->priv->proxy, "DeviceRemoved",
- G_CALLBACK (xfpm_dkp_device_removed_cb), dkp, NULL);
- dbus_g_proxy_connect_signal (dkp->priv->proxy, "DeviceAdded",
- G_CALLBACK (xfpm_dkp_device_added_cb), dkp, NULL);
+ dbus_g_proxy_add_signal (power->priv->proxy, "Changed", G_TYPE_INVALID);
+ dbus_g_proxy_add_signal (power->priv->proxy, "DeviceAdded", G_TYPE_STRING, G_TYPE_INVALID);
+ dbus_g_proxy_add_signal (power->priv->proxy, "DeviceRemoved", G_TYPE_STRING, G_TYPE_INVALID);
+ dbus_g_proxy_add_signal (power->priv->proxy, "DeviceChanged", G_TYPE_STRING, G_TYPE_INVALID);
+
+ dbus_g_proxy_connect_signal (power->priv->proxy, "Changed",
+ G_CALLBACK (xfpm_power_changed_cb), power, NULL);
+ dbus_g_proxy_connect_signal (power->priv->proxy, "DeviceRemoved",
+ G_CALLBACK (xfpm_power_device_removed_cb), power, NULL);
+ dbus_g_proxy_connect_signal (power->priv->proxy, "DeviceAdded",
+ G_CALLBACK (xfpm_power_device_added_cb), power, NULL);
- dbus_g_proxy_connect_signal (dkp->priv->proxy, "DeviceChanged",
- G_CALLBACK (xfpm_dkp_device_changed_cb), dkp, NULL);
+ dbus_g_proxy_connect_signal (power->priv->proxy, "DeviceChanged",
+ G_CALLBACK (xfpm_power_device_changed_cb), power, NULL);
out:
- xfpm_dkp_refresh_adaptor_visible (dkp);
+ xfpm_power_refresh_adaptor_visible (power);
- xfpm_dkp_dbus_init (dkp);
+ xfpm_power_dbus_init (power);
/*
* Emit org.freedesktop.PowerManagement session signals on startup
*/
- g_signal_emit (G_OBJECT (dkp), signals [ON_BATTERY_CHANGED], 0, dkp->priv->on_battery);
+ g_signal_emit (G_OBJECT (power), signals [ON_BATTERY_CHANGED], 0, power->priv->on_battery);
}
-static void xfpm_dkp_get_property (GObject *object,
+static void xfpm_power_get_property (GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec)
{
- XfpmDkp *dkp;
- dkp = XFPM_DKP (object);
+ XfpmPower *power;
+ power = XFPM_POWER (object);
switch (prop_id)
{
case PROP_ON_BATTERY:
- g_value_set_boolean (value, dkp->priv->on_battery);
+ g_value_set_boolean (value, power->priv->on_battery);
break;
case PROP_AUTH_HIBERNATE:
- g_value_set_boolean (value, dkp->priv->auth_hibernate);
+ g_value_set_boolean (value, power->priv->auth_hibernate);
break;
case PROP_AUTH_SUSPEND:
- g_value_set_boolean (value, dkp->priv->auth_suspend);
+ g_value_set_boolean (value, power->priv->auth_suspend);
break;
case PROP_CAN_SUSPEND:
- g_value_set_boolean (value, dkp->priv->can_suspend);
+ g_value_set_boolean (value, power->priv->can_suspend);
break;
case PROP_CAN_HIBERNATE:
- g_value_set_boolean (value, dkp->priv->can_hibernate);
+ g_value_set_boolean (value, power->priv->can_hibernate);
break;
case PROP_HAS_LID:
- g_value_set_boolean (value, dkp->priv->lid_is_present);
+ g_value_set_boolean (value, power->priv->lid_is_present);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -1422,77 +1395,77 @@ static void xfpm_dkp_get_property (GObject *object,
}
static void
-xfpm_dkp_finalize (GObject *object)
+xfpm_power_finalize (GObject *object)
{
- XfpmDkp *dkp;
+ XfpmPower *power;
- dkp = XFPM_DKP (object);
+ power = XFPM_POWER (object);
- g_free (dkp->priv->daemon_version);
+ g_free (power->priv->daemon_version);
- g_object_unref (dkp->priv->inhibit);
- g_object_unref (dkp->priv->notify);
- g_object_unref (dkp->priv->conf);
- g_object_unref (dkp->priv->console);
+ g_object_unref (power->priv->inhibit);
+ g_object_unref (power->priv->notify);
+ g_object_unref (power->priv->conf);
+ g_object_unref (power->priv->console);
- xfpm_dkp_hide_adapter_icon (dkp);
+ xfpm_power_hide_adapter_icon (power);
- dbus_g_connection_unref (dkp->priv->bus);
+ dbus_g_connection_unref (power->priv->bus);
- if ( dkp->priv->proxy )
+ if ( power->priv->proxy )
{
- dbus_g_proxy_disconnect_signal (dkp->priv->proxy, "Changed",
- G_CALLBACK (xfpm_dkp_changed_cb), dkp);
- dbus_g_proxy_disconnect_signal (dkp->priv->proxy, "DeviceRemoved",
- G_CALLBACK (xfpm_dkp_device_removed_cb), dkp);
- dbus_g_proxy_disconnect_signal (dkp->priv->proxy, "DeviceAdded",
- G_CALLBACK (xfpm_dkp_device_added_cb), dkp);
- dbus_g_proxy_disconnect_signal (dkp->priv->proxy, "DeviceChanged",
- G_CALLBACK (xfpm_dkp_device_changed_cb), dkp);
- g_object_unref (dkp->priv->proxy);
+ dbus_g_proxy_disconnect_signal (power->priv->proxy, "Changed",
+ G_CALLBACK (xfpm_power_changed_cb), power);
+ dbus_g_proxy_disconnect_signal (power->priv->proxy, "DeviceRemoved",
+ G_CALLBACK (xfpm_power_device_removed_cb), power);
+ dbus_g_proxy_disconnect_signal (power->priv->proxy, "DeviceAdded",
+ G_CALLBACK (xfpm_power_device_added_cb), power);
+ dbus_g_proxy_disconnect_signal (power->priv->proxy, "DeviceChanged",
+ G_CALLBACK (xfpm_power_device_changed_cb), power);
+ g_object_unref (power->priv->proxy);
}
- if ( dkp->priv->proxy_prop )
- g_object_unref (dkp->priv->proxy_prop);
+ if ( power->priv->proxy_prop )
+ g_object_unref (power->priv->proxy_prop);
- g_hash_table_destroy (dkp->priv->hash);
+ g_hash_table_destroy (power->priv->hash);
#ifdef HAVE_POLKIT
- g_object_unref (dkp->priv->polkit);
+ g_object_unref (power->priv->polkit);
#endif
- G_OBJECT_CLASS (xfpm_dkp_parent_class)->finalize (object);
+ G_OBJECT_CLASS (xfpm_power_parent_class)->finalize (object);
}
-XfpmDkp *
-xfpm_dkp_get (void)
+XfpmPower *
+xfpm_power_get (void)
{
- static gpointer xfpm_dkp_object = NULL;
+ static gpointer xfpm_power_object = NULL;
- if ( G_LIKELY (xfpm_dkp_object != NULL ) )
+ if ( G_LIKELY (xfpm_power_object != NULL ) )
{
- g_object_ref (xfpm_dkp_object);
+ g_object_ref (xfpm_power_object);
}
else
{
- xfpm_dkp_object = g_object_new (XFPM_TYPE_DKP, NULL);
- g_object_add_weak_pointer (xfpm_dkp_object, &xfpm_dkp_object);
+ xfpm_power_object = g_object_new (XFPM_TYPE_DKP, NULL);
+ g_object_add_weak_pointer (xfpm_power_object, &xfpm_power_object);
}
- return XFPM_DKP (xfpm_dkp_object);
+ return XFPM_POWER (xfpm_power_object);
}
-void xfpm_dkp_suspend (XfpmDkp *dkp, gboolean force)
+void xfpm_power_suspend (XfpmPower *power, gboolean force)
{
- xfpm_dkp_sleep (dkp, "Suspend", force);
+ xfpm_power_sleep (power, "Suspend", force);
}
-void xfpm_dkp_hibernate (XfpmDkp *dkp, gboolean force)
+void xfpm_power_hibernate (XfpmPower *power, gboolean force)
{
- xfpm_dkp_sleep (dkp, "Hibernate", force);
+ xfpm_power_sleep (power, "Hibernate", force);
}
-gboolean xfpm_dkp_has_battery (XfpmDkp *dkp)
+gboolean xfpm_power_has_battery (XfpmPower *power)
{
GtkStatusIcon *battery = NULL;
guint i, len;
@@ -1500,16 +1473,16 @@ gboolean xfpm_dkp_has_battery (XfpmDkp *dkp)
gboolean ret = FALSE;
- list = g_hash_table_get_values (dkp->priv->hash);
+ list = g_hash_table_get_values (power->priv->hash);
len = g_list_length (list);
for ( i = 0; i < len; i++)
{
- XfpmDkpDeviceType type;
+ XfpmDeviceType type;
battery = g_list_nth_data (list, i);
type = xfpm_battery_get_device_type (XFPM_BATTERY (battery));
- if ( type == XFPM_DKP_DEVICE_TYPE_BATTERY ||
- type == XFPM_DKP_DEVICE_TYPE_UPS )
+ if ( type == XFPM_DEVICE_TYPE_BATTERY ||
+ type == XFPM_DEVICE_TYPE_UPS )
{
ret = TRUE;
break;
@@ -1524,71 +1497,71 @@ gboolean xfpm_dkp_has_battery (XfpmDkp *dkp)
* DBus server implementation for org.freedesktop.PowerManagement
*
*/
-static gboolean xfpm_dkp_dbus_shutdown (XfpmDkp *dkp,
+static gboolean xfpm_power_dbus_shutdown (XfpmPower *power,
GError **error);
-static gboolean xfpm_dkp_dbus_reboot (XfpmDkp *dkp,
+static gboolean xfpm_power_dbus_reboot (XfpmPower *power,
GError **error);
-static gboolean xfpm_dkp_dbus_hibernate (XfpmDkp * dkp,
+static gboolean xfpm_power_dbus_hibernate (XfpmPower * power,
GError **error);
-static gboolean xfpm_dkp_dbus_suspend (XfpmDkp * dkp,
+static gboolean xfpm_power_dbus_suspend (XfpmPower * power,
GError ** error);
-static gboolean xfpm_dkp_dbus_can_reboot (XfpmDkp * dkp,
+static gboolean xfpm_power_dbus_can_reboot (XfpmPower * power,
gboolean * OUT_can_reboot,
GError ** error);
-static gboolean xfpm_dkp_dbus_can_shutdown (XfpmDkp * dkp,
+static gboolean xfpm_power_dbus_can_shutdown (XfpmPower * power,
gboolean * OUT_can_reboot,
GError ** error);
-static gboolean xfpm_dkp_dbus_can_hibernate (XfpmDkp * dkp,
+static gboolean xfpm_power_dbus_can_hibernate (XfpmPower * power,
gboolean * OUT_can_hibernate,
GError ** error);
-static gboolean xfpm_dkp_dbus_can_suspend (XfpmDkp * dkp,
+static gboolean xfpm_power_dbus_can_suspend (XfpmPower * power,
gboolean * OUT_can_suspend,
GError ** error);
-static gboolean xfpm_dkp_dbus_get_power_save_status (XfpmDkp * dkp,
+static gboolean xfpm_power_dbus_get_power_save_status (XfpmPower * power,
gboolean * OUT_save_power,
GError ** error);
-static gboolean xfpm_dkp_dbus_get_on_battery (XfpmDkp * dkp,
+static gboolean xfpm_power_dbus_get_on_battery (XfpmPower * power,
gboolean * OUT_on_battery,
GError ** error);
-static gboolean xfpm_dkp_dbus_get_low_battery (XfpmDkp * dkp,
+static gboolean xfpm_power_dbus_get_low_battery (XfpmPower * power,
gboolean * OUT_low_battery,
GError ** error);
#include "org.freedesktop.PowerManagement.h"
static void
-xfpm_dkp_dbus_class_init (XfpmDkpClass * klass)
+xfpm_power_dbus_class_init (XfpmPowerClass * klass)
{
dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (klass),
- &dbus_glib_xfpm_dkp_object_info);
+ &dbus_glib_xfpm_power_object_info);
}
static void
-xfpm_dkp_dbus_init (XfpmDkp *dkp)
+xfpm_power_dbus_init (XfpmPower *power)
{
DBusGConnection *bus = dbus_g_bus_get (DBUS_BUS_SESSION, NULL);
dbus_g_connection_register_g_object (bus,
"/org/freedesktop/PowerManagement",
- G_OBJECT (dkp));
+ G_OBJECT (power));
}
-static gboolean xfpm_dkp_dbus_shutdown (XfpmDkp *dkp,
+static gboolean xfpm_power_dbus_shutdown (XfpmPower *power,
GError **error)
{
gboolean can_reboot;
- g_object_get (G_OBJECT (dkp->priv->console),
+ g_object_get (G_OBJECT (power->priv->console),
"can-shutdown", &can_reboot,
NULL);
@@ -1599,17 +1572,17 @@ static gboolean xfpm_dkp_dbus_shutdown (XfpmDkp *dkp,
return FALSE;
}
- xfpm_console_kit_shutdown (dkp->priv->console, error);
+ xfpm_console_kit_shutdown (power->priv->console, error);
return TRUE;
}
-static gboolean xfpm_dkp_dbus_reboot (XfpmDkp *dkp,
+static gboolean xfpm_power_dbus_reboot (XfpmPower *power,
GError **error)
{
gboolean can_reboot;
- g_object_get (G_OBJECT (dkp->priv->console),
+ g_object_get (G_OBJECT (power->priv->console),
"can-restart", &can_reboot,
NULL);
@@ -1620,15 +1593,15 @@ static gboolean xfpm_dkp_dbus_reboot (XfpmDkp *dkp,
return FALSE;
}
- xfpm_console_kit_reboot (dkp->priv->console, error);
+ xfpm_console_kit_reboot (power->priv->console, error);
return TRUE;
}
-static gboolean xfpm_dkp_dbus_hibernate (XfpmDkp * dkp,
+static gboolean xfpm_power_dbus_hibernate (XfpmPower * power,
GError **error)
{
- if ( !dkp->priv->auth_suspend )
+ if ( !power->priv->auth_suspend )
{
g_set_error (error, XFPM_ERROR, XFPM_ERROR_PERMISSION_DENIED,
_("Permission denied"));
@@ -1636,22 +1609,22 @@ static gboolean xfpm_dkp_dbus_hibernate (XfpmDkp * dkp,
}
- if (!dkp->priv->can_hibernate )
+ if (!power->priv->can_hibernate )
{
g_set_error (error, XFPM_ERROR, XFPM_ERROR_NO_HARDWARE_SUPPORT,
_("Suspend not supported"));
return FALSE;
}
- xfpm_dkp_sleep (dkp, "Hibernate", FALSE);
+ xfpm_power_sleep (power, "Hibernate", FALSE);
return TRUE;
}
-static gboolean xfpm_dkp_dbus_suspend (XfpmDkp * dkp,
+static gboolean xfpm_power_dbus_suspend (XfpmPower * power,
GError ** error)
{
- if ( !dkp->priv->auth_suspend )
+ if ( !power->priv->auth_suspend )
{
g_set_error (error, XFPM_ERROR, XFPM_ERROR_PERMISSION_DENIED,
_("Permission denied"));
@@ -1659,57 +1632,57 @@ static gboolean xfpm_dkp_dbus_suspend (XfpmDkp * dkp,
}
- if (!dkp->priv->can_suspend )
+ if (!power->priv->can_suspend )
{
g_set_error (error, XFPM_ERROR, XFPM_ERROR_NO_HARDWARE_SUPPORT,
_("Suspend not supported"));
return FALSE;
}
- xfpm_dkp_sleep (dkp, "Suspend", FALSE);
+ xfpm_power_sleep (power, "Suspend", FALSE);
return TRUE;
}
-static gboolean xfpm_dkp_dbus_can_reboot (XfpmDkp * dkp,
+static gboolean xfpm_power_dbus_can_reboot (XfpmPower * power,
gboolean * OUT_can_reboot,
GError ** error)
{
- g_object_get (G_OBJECT (dkp->priv->console),
+ g_object_get (G_OBJECT (power->priv->console),
"can-reboot", OUT_can_reboot,
NULL);
return TRUE;
}
-static gboolean xfpm_dkp_dbus_can_shutdown (XfpmDkp * dkp,
+static gboolean xfpm_power_dbus_can_shutdown (XfpmPower * power,
gboolean * OUT_can_shutdown,
GError ** error)
{
- g_object_get (G_OBJECT (dkp->priv->console),
+ g_object_get (G_OBJECT (power->priv->console),
"can-shutdown", OUT_can_shutdown,
NULL);
return TRUE;
}
-static gboolean xfpm_dkp_dbus_can_hibernate (XfpmDkp * dkp,
+static gboolean xfpm_power_dbus_can_hibernate (XfpmPower * power,
gboolean * OUT_can_hibernate,
GError ** error)
{
- *OUT_can_hibernate = dkp->priv->can_hibernate;
+ *OUT_can_hibernate = power->priv->can_hibernate;
return TRUE;
}
-static gboolean xfpm_dkp_dbus_can_suspend (XfpmDkp * dkp,
+static gboolean xfpm_power_dbus_can_suspend (XfpmPower * power,
gboolean * OUT_can_suspend,
GError ** error)
{
- *OUT_can_suspend = dkp->priv->can_suspend;
+ *OUT_can_suspend = power->priv->can_suspend;
return TRUE;
}
-static gboolean xfpm_dkp_dbus_get_power_save_status (XfpmDkp * dkp,
+static gboolean xfpm_power_dbus_get_power_save_status (XfpmPower * power,
gboolean * OUT_save_power,
GError ** error)
{
@@ -1717,20 +1690,20 @@ static gboolean xfpm_dkp_dbus_get_power_save_status (XfpmDkp * dkp,
return TRUE;
}
-static gboolean xfpm_dkp_dbus_get_on_battery (XfpmDkp * dkp,
+static gboolean xfpm_power_dbus_get_on_battery (XfpmPower * power,
gboolean * OUT_on_battery,
GError ** error)
{
- *OUT_on_battery = dkp->priv->on_battery;
+ *OUT_on_battery = power->priv->on_battery;
return TRUE;
}
-static gboolean xfpm_dkp_dbus_get_low_battery (XfpmDkp * dkp,
+static gboolean xfpm_power_dbus_get_low_battery (XfpmPower * power,
gboolean * OUT_low_battery,
GError ** error)
{
- *OUT_low_battery = dkp->priv->on_low_battery;
+ *OUT_low_battery = power->priv->on_low_battery;
return TRUE;
}
diff --git a/src/xfpm-dkp.h b/src/xfpm-power.h
similarity index 56%
rename from src/xfpm-dkp.h
rename to src/xfpm-power.h
index 5af2c3967e74178b72984b5bc5d1a64a81f2f207..c92735417406cf70c24cd51f1a8587f5d847d147 100644
--- a/src/xfpm-dkp.h
+++ b/src/xfpm-power.h
@@ -18,62 +18,62 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef __XFPM_DKP_H
-#define __XFPM_DKP_H
+#ifndef __XFPM_POWER_H
+#define __XFPM_POWER_H
#include <glib-object.h>
G_BEGIN_DECLS
-#define XFPM_TYPE_DKP (xfpm_dkp_get_type () )
-#define XFPM_DKP(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), XFPM_TYPE_DKP, XfpmDkp))
+#define XFPM_TYPE_DKP (xfpm_power_get_type () )
+#define XFPM_POWER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), XFPM_TYPE_DKP, XfpmPower))
#define XFPM_IS_DKP(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), XFPM_TYPE_DKP))
-typedef struct XfpmDkpPrivate XfpmDkpPrivate;
+typedef struct XfpmPowerPrivate XfpmPowerPrivate;
typedef struct
{
GObject parent;
- XfpmDkpPrivate *priv;
+ XfpmPowerPrivate *priv;
-} XfpmDkp;
+} XfpmPower;
typedef struct
{
GObjectClass parent_class;
- void (*on_battery_changed) (XfpmDkp *dkp,
+ void (*on_battery_changed) (XfpmPower *power,
gboolean on_battery);
- void (*low_battery_changed) (XfpmDkp *dkp,
+ void (*low_battery_changed) (XfpmPower *power,
gboolean low_battery);
- void (*lid_changed) (XfpmDkp *dkp,
+ void (*lid_changed) (XfpmPower *power,
gboolean lid_is_closed);
- void (*waking_up) (XfpmDkp *dkp);
+ void (*waking_up) (XfpmPower *power);
- void (*sleeping) (XfpmDkp *dkp);
+ void (*sleeping) (XfpmPower *power);
- void (*ask_shutdown) (XfpmDkp *dkp);
+ void (*ask_shutdown) (XfpmPower *power);
- void (*shutdown) (XfpmDkp *dkp);
+ void (*shutdown) (XfpmPower *power);
-} XfpmDkpClass;
+} XfpmPowerClass;
-GType xfpm_dkp_get_type (void) G_GNUC_CONST;
+GType xfpm_power_get_type (void) G_GNUC_CONST;
-XfpmDkp *xfpm_dkp_get (void);
+XfpmPower *xfpm_power_get (void);
-void xfpm_dkp_suspend (XfpmDkp *dkp,
+void xfpm_power_suspend (XfpmPower *power,
gboolean force);
-void xfpm_dkp_hibernate (XfpmDkp *dkp,
+void xfpm_power_hibernate (XfpmPower *power,
gboolean force);
-gboolean xfpm_dkp_has_battery (XfpmDkp *dkp);
+gboolean xfpm_power_has_battery (XfpmPower *power);
G_END_DECLS
-#endif /* __XFPM_DKP_H */
+#endif /* __XFPM_POWER_H */