[Goodies-commits] r7313 - in xfce4-power-manager/trunk: . libxfpm panel-plugins/brightness settings src
Ali Abdallah
aliov at xfce.org
Tue May 5 00:15:36 CEST 2009
Author: aliov
Date: 2009-05-04 22:15:36 +0000 (Mon, 04 May 2009)
New Revision: 7313
Removed:
xfce4-power-manager/trunk/libxfpm/hal-marshal.c
xfce4-power-manager/trunk/libxfpm/hal-marshal.h
Modified:
xfce4-power-manager/trunk/ChangeLog
xfce4-power-manager/trunk/libxfpm/Makefile.am
xfce4-power-manager/trunk/libxfpm/hal-battery.c
xfce4-power-manager/trunk/libxfpm/hal-device.c
xfce4-power-manager/trunk/libxfpm/hal-manager.c
xfce4-power-manager/trunk/libxfpm/hal-monitor.c
xfce4-power-manager/trunk/libxfpm/hal-power.c
xfce4-power-manager/trunk/libxfpm/hal-power.h
xfce4-power-manager/trunk/libxfpm/xfpm-dbus.c
xfce4-power-manager/trunk/libxfpm/xfpm-notify.c
xfce4-power-manager/trunk/libxfpm/xfpm-popups.c
xfce4-power-manager/trunk/panel-plugins/brightness/brightness-button.c
xfce4-power-manager/trunk/panel-plugins/brightness/brightness-proxy.c
xfce4-power-manager/trunk/settings/xfpm-settings-main.c
xfce4-power-manager/trunk/settings/xfpm-settings.c
xfce4-power-manager/trunk/src/Makefile.am
xfce4-power-manager/trunk/src/xfpm-adapter.c
xfce4-power-manager/trunk/src/xfpm-backlight.c
xfce4-power-manager/trunk/src/xfpm-battery-info.c
xfce4-power-manager/trunk/src/xfpm-battery.c
xfce4-power-manager/trunk/src/xfpm-brightness-hal.c
xfce4-power-manager/trunk/src/xfpm-brightness-widget.c
xfce4-power-manager/trunk/src/xfpm-button-hal.c
xfce4-power-manager/trunk/src/xfpm-button-xf86.c
xfce4-power-manager/trunk/src/xfpm-button.c
xfce4-power-manager/trunk/src/xfpm-cpu.c
xfce4-power-manager/trunk/src/xfpm-dbus-monitor.c
xfce4-power-manager/trunk/src/xfpm-debug.h
xfce4-power-manager/trunk/src/xfpm-dpms.c
xfce4-power-manager/trunk/src/xfpm-engine.c
xfce4-power-manager/trunk/src/xfpm-idle.c
xfce4-power-manager/trunk/src/xfpm-idle.h
xfce4-power-manager/trunk/src/xfpm-inhibit.c
xfce4-power-manager/trunk/src/xfpm-main.c
xfce4-power-manager/trunk/src/xfpm-manager.c
xfce4-power-manager/trunk/src/xfpm-network-manager.c
xfce4-power-manager/trunk/src/xfpm-screen-saver.c
xfce4-power-manager/trunk/src/xfpm-session.c
xfce4-power-manager/trunk/src/xfpm-shutdown.c
xfce4-power-manager/trunk/src/xfpm-supply.c
xfce4-power-manager/trunk/src/xfpm-tray-icon.c
xfce4-power-manager/trunk/src/xfpm-xfconf.c
Log:
Making xfpm compiles with the new compiler flags added by Brian
Modified: xfce4-power-manager/trunk/ChangeLog
===================================================================
--- xfce4-power-manager/trunk/ChangeLog 2009-05-04 14:54:59 UTC (rev 7312)
+++ xfce4-power-manager/trunk/ChangeLog 2009-05-04 22:15:36 UTC (rev 7313)
@@ -1,4 +1,7 @@
+2009-05-05 0:14 Ali aliov at xfce.org
+ * : Making xfpm compiles with the new compiler flags added by Brian
+
2009-05-02 12:55 Ali aliov at xfce.org
* : Add workaround for some strange battery change state
Modified: xfce4-power-manager/trunk/libxfpm/Makefile.am
===================================================================
--- xfce4-power-manager/trunk/libxfpm/Makefile.am 2009-05-04 14:54:59 UTC (rev 7312)
+++ xfce4-power-manager/trunk/libxfpm/Makefile.am 2009-05-04 22:15:36 UTC (rev 7313)
@@ -4,14 +4,14 @@
libxfpmcommon.la
libxfpmhal_la_SOURCES = \
- hal-marshal.c \
- hal-marshal.h \
hal-monitor.c \
hal-monitor.h \
hal-manager.c \
hal-manager.h \
hal-device.c \
- hal-device.h
+ hal-device.h \
+ hal-marshal.c \
+ hal-marshal.h
libxfpmhal_la_CFLAGS = \
$(GLIB_CFLAGS) \
@@ -53,16 +53,17 @@
hal-marshal.c \
hal-marshal.h
+hal-marshal.c: hal-marshal.list
+ echo "#include \"hal-marshal.h\"" > $@ && \
+ glib-genmarshal $< --prefix=_hal_marshal --body >> $@
+
hal-marshal.h: hal-marshal.list
- glib-genmarshal --header --prefix="_hal_marshal" \
- hal-marshal.list > tmp-marshal.h && \
- cp tmp-marshal.h $(@F) && \
- rm -f tmp-marshal.h tmp-marshal.h~
+ glib-genmarshal $< --prefix=_hal_marshal --header > $@
-hal-marshal.c: hal-marshal.h
- glib-genmarshal --body --prefix="_hal_marshal" \
- hal-marshal.list > tmp-marshal.c && \
- cp tmp-marshal.c $(@F) && \
- rm -f tmp-marshal.c tmp-marshal.c~
+endif
-endif
+EXTRA_DIST = \
+ hal-marshal.list
+
+DISTCLEANFILES = \
+ $(BUILT_SOURCES)
\ No newline at end of file
Modified: xfce4-power-manager/trunk/libxfpm/hal-battery.c
===================================================================
--- xfce4-power-manager/trunk/libxfpm/hal-battery.c 2009-05-04 14:54:59 UTC (rev 7312)
+++ xfce4-power-manager/trunk/libxfpm/hal-battery.c 2009-05-04 22:15:36 UTC (rev 7313)
@@ -33,9 +33,6 @@
#include "hal-manager.h"
#include "hal-enum.h"
-/* Init */
-static void hal_battery_class_init (HalBatteryClass *klass);
-static void hal_battery_init (HalBattery *device);
static void hal_battery_finalize (GObject *object);
static void hal_battery_get_property(GObject *object,
@@ -387,10 +384,11 @@
_get_battery_percentage (guint32 last_full, guint32 current)
{
guint val = 100;
+ float f;
if ( last_full <= current ) return val;
- float f = (float)current/last_full *100;
+ f = (float)current/last_full *100;
val = (guint)f;
return val;
Modified: xfce4-power-manager/trunk/libxfpm/hal-device.c
===================================================================
--- xfce4-power-manager/trunk/libxfpm/hal-device.c 2009-05-04 14:54:59 UTC (rev 7312)
+++ xfce4-power-manager/trunk/libxfpm/hal-device.c 2009-05-04 22:15:36 UTC (rev 7313)
@@ -37,9 +37,6 @@
#include "hal-device.h"
#include "hal-marshal.h"
-/* Init */
-static void hal_device_class_init (HalDeviceClass *klass);
-static void hal_device_init (HalDevice *device);
static void hal_device_finalize (GObject *object);
#define HAL_DEVICE_GET_PRIVATE(o) \
@@ -108,7 +105,7 @@
const gchar *key;
gboolean is_added;
gboolean is_removed;
- int i;
+ guint i;
udi = dbus_g_proxy_get_path (proxy);
@@ -187,6 +184,8 @@
static void
hal_device_init (HalDevice *device)
{
+ GError *error = NULL;
+
device->priv = HAL_DEVICE_GET_PRIVATE(device);
device->priv->proxy = NULL;
@@ -194,8 +193,6 @@
device->priv->watch_added = FALSE;
device->priv->watch_condition_added = FALSE;
- GError *error = NULL;
-
device->priv->bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
if ( error )
@@ -289,12 +286,12 @@
gboolean hal_device_get_property_bool (HalDevice *device, const gchar *property)
{
- g_return_val_if_fail (HAL_IS_DEVICE(device), FALSE);
- g_return_val_if_fail (device->priv->udi != NULL, FALSE);
-
gboolean value = FALSE;
GError *error = NULL;
+ g_return_val_if_fail (HAL_IS_DEVICE(device), FALSE);
+ g_return_val_if_fail (device->priv->udi != NULL, FALSE);
+
dbus_g_proxy_call (device->priv->proxy, "GetPropertyBoolean", &error,
G_TYPE_STRING, property,
G_TYPE_INVALID,
@@ -312,12 +309,12 @@
gint hal_device_get_property_int (HalDevice *device, const gchar *property)
{
- g_return_val_if_fail (HAL_IS_DEVICE(device), 0);
- g_return_val_if_fail (device->priv->udi != NULL, 0);
-
gint value = 0;
GError *error = NULL;
+ g_return_val_if_fail (HAL_IS_DEVICE(device), 0);
+ g_return_val_if_fail (device->priv->udi != NULL, 0);
+
dbus_g_proxy_call (device->priv->proxy, "GetPropertyInteger", &error,
G_TYPE_STRING, property,
G_TYPE_INVALID,
@@ -335,12 +332,12 @@
gchar *hal_device_get_property_string (HalDevice *device, const gchar *property)
{
- g_return_val_if_fail (HAL_IS_DEVICE(device), NULL);
- g_return_val_if_fail (device->priv->udi != NULL, NULL);
-
gchar *value = NULL;
GError *error = NULL;
+ g_return_val_if_fail (HAL_IS_DEVICE(device), NULL);
+ g_return_val_if_fail (device->priv->udi != NULL, NULL);
+
dbus_g_proxy_call (device->priv->proxy, "GetPropertyString", &error,
G_TYPE_STRING, property,
G_TYPE_INVALID,
@@ -358,12 +355,12 @@
gboolean hal_device_has_key (HalDevice *device, const gchar *key)
{
- g_return_val_if_fail (HAL_IS_DEVICE(device), FALSE);
- g_return_val_if_fail (device->priv->udi != NULL, FALSE);
-
gboolean value = FALSE;
GError *error = NULL;
+ g_return_val_if_fail (HAL_IS_DEVICE(device), FALSE);
+ g_return_val_if_fail (device->priv->udi != NULL, FALSE);
+
dbus_g_proxy_call (device->priv->proxy, "PropertyExists", &error,
G_TYPE_STRING, key,
G_TYPE_INVALID,
@@ -382,12 +379,12 @@
gboolean hal_device_has_capability (HalDevice *device, const gchar *capability)
{
- g_return_val_if_fail (HAL_IS_DEVICE(device), FALSE);
- g_return_val_if_fail (device->priv->udi != NULL, FALSE);
-
gboolean value = FALSE;
GError *error = NULL;
+ g_return_val_if_fail (HAL_IS_DEVICE(device), FALSE);
+ g_return_val_if_fail (device->priv->udi != NULL, FALSE);
+
dbus_g_proxy_call (device->priv->proxy, "QueryCapability", &error,
G_TYPE_STRING, capability,
G_TYPE_INVALID,
Modified: xfce4-power-manager/trunk/libxfpm/hal-manager.c
===================================================================
--- xfce4-power-manager/trunk/libxfpm/hal-manager.c 2009-05-04 14:54:59 UTC (rev 7312)
+++ xfce4-power-manager/trunk/libxfpm/hal-manager.c 2009-05-04 22:15:36 UTC (rev 7313)
@@ -32,9 +32,6 @@
#include "hal-manager.h"
#include "hal-device.h"
-/* Init */
-static void hal_manager_class_init (HalManagerClass *klass);
-static void hal_manager_init (HalManager *manager);
static void hal_manager_finalize (GObject *object);
#define HAL_MANAGER_GET_PRIVATE(o) \
@@ -212,12 +209,12 @@
gchar **hal_manager_find_device_by_capability (HalManager *manager, const gchar *capability)
{
+ GError *error = NULL;
+ gchar **udi = NULL;
+
g_return_val_if_fail (HAL_IS_MANAGER(manager), NULL);
g_return_val_if_fail (manager->priv->connected, NULL);
- gchar **udi = NULL;
- GError *error = NULL;
-
dbus_g_proxy_call (manager->priv->proxy, "FindDeviceByCapability", &error,
G_TYPE_STRING, capability,
G_TYPE_INVALID,
Modified: xfce4-power-manager/trunk/libxfpm/hal-monitor.c
===================================================================
--- xfce4-power-manager/trunk/libxfpm/hal-monitor.c 2009-05-04 14:54:59 UTC (rev 7312)
+++ xfce4-power-manager/trunk/libxfpm/hal-monitor.c 2009-05-04 22:15:36 UTC (rev 7313)
@@ -32,9 +32,6 @@
#include "hal-monitor.h"
-/* Init */
-static void hal_monitor_class_init (HalMonitorClass *klass);
-static void hal_monitor_init (HalMonitor *monitor);
static void hal_monitor_finalize (GObject *object);
#define HAL_MONITOR_GET_PRIVATE(o) \
Modified: xfce4-power-manager/trunk/libxfpm/hal-power.c
===================================================================
--- xfce4-power-manager/trunk/libxfpm/hal-power.c 2009-05-04 14:54:59 UTC (rev 7312)
+++ xfce4-power-manager/trunk/libxfpm/hal-power.c 2009-05-04 22:15:36 UTC (rev 7313)
@@ -32,9 +32,6 @@
#include "hal-manager.h"
#include "hal-power.h"
-/* Init */
-static void hal_power_class_init (HalPowerClass *klass);
-static void hal_power_init (HalPower *power);
static void hal_power_finalize (GObject *object);
#define HAL_POWER_GET_PRIVATE(o) \
@@ -85,9 +82,9 @@
{
GList *list = NULL;
gboolean new_device = TRUE;
- gint is_new = 0;
+ guint is_new = 0;
HalDevice *hash_device;
- int i;
+ guint i;
list = g_hash_table_get_values (power->priv->hash);
if ( !list )
@@ -151,6 +148,7 @@
hal_power_device_added_cb (HalManager *manager, const gchar *udi, HalPower *power)
{
HalDevice *device = hal_device_new ();
+ HalBattery *battery;
hal_device_set_udi (device, udi);
if ( hal_device_has_capability (device, "battery") )
@@ -161,7 +159,7 @@
if ( !hal_power_is_battery_new (power, device) )
goto out;
- HalBattery *battery = hal_power_add_battery (power, udi);
+ battery = hal_power_add_battery (power, udi);
g_signal_emit (G_OBJECT(power), signals[BATTERY_ADDED], 0, battery);
}
out:
@@ -348,15 +346,15 @@
GPtrArray *
hal_power_get_batteries (HalPower *power)
{
- g_return_val_if_fail (HAL_IS_POWER (power), NULL);
-
guint i;
GPtrArray *array;
HalBattery *battery;
-
+ GList *list = NULL;
+
+ g_return_val_if_fail (HAL_IS_POWER (power), NULL);
+
array = g_ptr_array_new ();
- GList *list = NULL;
list = g_hash_table_get_values (power->priv->hash);
if (!list)
Modified: xfce4-power-manager/trunk/libxfpm/hal-power.h
===================================================================
--- xfce4-power-manager/trunk/libxfpm/hal-power.h 2009-05-04 14:54:59 UTC (rev 7312)
+++ xfce4-power-manager/trunk/libxfpm/hal-power.h 2009-05-04 22:15:36 UTC (rev 7313)
@@ -58,8 +58,6 @@
GPtrArray *hal_power_get_batteries (HalPower *power);
-gboolean hal_power_set_power_save (HalPower *power);
-
gboolean hal_power_set_power_save (HalPower *power);
gboolean hal_power_unset_power_save(HalPower *power);
Modified: xfce4-power-manager/trunk/libxfpm/xfpm-dbus.c
===================================================================
--- xfce4-power-manager/trunk/libxfpm/xfpm-dbus.c 2009-05-04 14:54:59 UTC (rev 7312)
+++ xfce4-power-manager/trunk/libxfpm/xfpm-dbus.c 2009-05-04 22:15:36 UTC (rev 7313)
@@ -21,13 +21,15 @@
#include "xfpm-dbus.h"
gboolean
-xfpm_dbus_name_has_owner(DBusConnection *connection, const gchar *name)
+xfpm_dbus_name_has_owner (DBusConnection *connection, const gchar *name)
{
DBusError error;
- dbus_error_init(&error);
+ gboolean ret;
- gboolean ret = dbus_bus_name_has_owner(connection, name, &error);
+ dbus_error_init (&error);
+ ret = dbus_bus_name_has_owner(connection, name, &error);
+
if ( dbus_error_is_set(&error) )
{
g_warning("Failed to get name owner: %s\n",error.message);
@@ -41,10 +43,11 @@
gboolean xfpm_dbus_register_name(DBusConnection *connection, const gchar *name)
{
DBusError error;
+ int ret;
dbus_error_init(&error);
- int ret =
+ ret =
dbus_bus_request_name(connection,
name,
DBUS_NAME_FLAG_DO_NOT_QUEUE,
@@ -68,10 +71,11 @@
gboolean xfpm_dbus_release_name(DBusConnection *connection, const gchar *name)
{
DBusError error;
+ int ret;
dbus_error_init(&error);
- int ret =
+ ret =
dbus_bus_release_name(connection,
name,
&error);
Modified: xfce4-power-manager/trunk/libxfpm/xfpm-notify.c
===================================================================
--- xfce4-power-manager/trunk/libxfpm/xfpm-notify.c 2009-05-04 14:54:59 UTC (rev 7312)
+++ xfce4-power-manager/trunk/libxfpm/xfpm-notify.c 2009-05-04 22:15:36 UTC (rev 7313)
@@ -44,9 +44,6 @@
#include "xfpm-common.h"
#include "xfpm-notify.h"
-/* Init */
-static void xfpm_notify_class_init (XfpmNotifyClass *klass);
-static void xfpm_notify_init (XfpmNotify *notify);
static void xfpm_notify_finalize (GObject *object);
static NotifyNotification * xfpm_notify_new_notification_internal (XfpmNotify *notify,
@@ -185,13 +182,16 @@
gint timeout, gboolean simple,
XfpmNotifyUrgency urgency, GtkStatusIcon *icon)
{
+ NotifyNotification *n;
+
if ( !simple )
xfpm_notify_close_notification (notify);
- NotifyNotification *n = xfpm_notify_new_notification_internal (notify, title,
- text, icon_name,
- timeout, urgency,
- icon);
+ n = xfpm_notify_new_notification_internal (notify, title,
+ text, icon_name,
+ timeout, urgency,
+ icon);
+
xfpm_notify_present_notification (notify, n, simple);
}
@@ -252,9 +252,9 @@
void xfpm_notify_close_critical (XfpmNotify *notify)
{
+ NotifyNotification *n;
g_return_if_fail (XFPM_IS_NOTIFY (notify));
- NotifyNotification *n;
n = (NotifyNotification *) g_object_get_data (G_OBJECT (notify), "critical");
if ( n )
Modified: xfce4-power-manager/trunk/libxfpm/xfpm-popups.c
===================================================================
--- xfce4-power-manager/trunk/libxfpm/xfpm-popups.c 2009-05-04 14:54:59 UTC (rev 7312)
+++ xfce4-power-manager/trunk/libxfpm/xfpm-popups.c 2009-05-04 22:15:36 UTC (rev 7313)
@@ -21,6 +21,8 @@
#include <gtk/gtk.h>
#include <glib.h>
+#include "xfpm-popups.h"
+
static GtkWidget *
xfpm_message_dialog (const gchar *title, const gchar *message, GtkMessageType message_type)
{
Modified: xfce4-power-manager/trunk/panel-plugins/brightness/brightness-button.c
===================================================================
--- xfce4-power-manager/trunk/panel-plugins/brightness/brightness-button.c 2009-05-04 14:54:59 UTC (rev 7312)
+++ xfce4-power-manager/trunk/panel-plugins/brightness/brightness-button.c 2009-05-04 22:15:36 UTC (rev 7313)
@@ -35,9 +35,6 @@
#include "brightness-button.h"
#include "brightness-proxy.h"
-/* Init */
-static void brightness_button_class_init (BrightnessButtonClass *klass);
-static void brightness_button_init (BrightnessButton *button);
static void brightness_button_finalize (GObject *object);
#define BRIGHTNESS_BUTTON_GET_PRIVATE(o) \
@@ -184,7 +181,7 @@
}
static gboolean
-brightness_button_popup_win (GtkWidget *widget, GdkEvent *ev, guint32 time)
+brightness_button_popup_win (GtkWidget *widget, GdkEvent *ev, guint32 ev_time)
{
gint x, y, orientation;
gint current_level;
@@ -212,7 +209,7 @@
if (gdk_pointer_grab (button->priv->popup->window, TRUE,
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
- GDK_POINTER_MOTION_MASK, NULL, NULL, time)
+ GDK_POINTER_MOTION_MASK, NULL, NULL, ev_time)
!= GDK_GRAB_SUCCESS)
{
gtk_grab_remove (button->priv->popup);
@@ -220,9 +217,9 @@
return FALSE;
}
- if (gdk_keyboard_grab (button->priv->popup->window, TRUE, time) != GDK_GRAB_SUCCESS)
+ if (gdk_keyboard_grab (button->priv->popup->window, TRUE, ev_time) != GDK_GRAB_SUCCESS)
{
- gdk_display_pointer_ungrab (display, time);
+ gdk_display_pointer_ungrab (display, ev_time);
gtk_grab_remove (button->priv->popup);
gtk_widget_hide (button->priv->popup);
return FALSE;
Modified: xfce4-power-manager/trunk/panel-plugins/brightness/brightness-proxy.c
===================================================================
--- xfce4-power-manager/trunk/panel-plugins/brightness/brightness-proxy.c 2009-05-04 14:54:59 UTC (rev 7312)
+++ xfce4-power-manager/trunk/panel-plugins/brightness/brightness-proxy.c 2009-05-04 22:15:36 UTC (rev 7313)
@@ -37,9 +37,6 @@
#include "brightness-proxy.h"
-/* Init */
-static void brightness_proxy_class_init (BrightnessProxyClass *klass);
-static void brightness_proxy_init (BrightnessProxy *brightness_proxy);
static void brightness_proxy_finalize (GObject *object);
#define BRIGHTNESS_PROXY_GET_PRIVATE(o) \
@@ -169,12 +166,12 @@
gboolean
brightness_proxy_set_level (BrightnessProxy *brightness, guint level)
{
- g_return_val_if_fail (BRIGHTNESS_IS_PROXY (brightness), FALSE);
-
GError *error = NULL;
gboolean ret;
gint dummy;
+ g_return_val_if_fail (BRIGHTNESS_IS_PROXY (brightness), FALSE);
+
ret = dbus_g_proxy_call (brightness->priv->proxy, "SetBrightness", &error,
G_TYPE_INT, level,
G_TYPE_INVALID,
@@ -195,12 +192,12 @@
guint
brightness_proxy_get_level (BrightnessProxy *brightness)
{
- g_return_val_if_fail (BRIGHTNESS_IS_PROXY (brightness), 0);
-
GError *error = NULL;
gint level = 0;
gboolean ret;
+ g_return_val_if_fail (BRIGHTNESS_IS_PROXY (brightness), 0);
+
ret = dbus_g_proxy_call (brightness->priv->proxy, "GetBrightness", &error,
G_TYPE_INVALID,
G_TYPE_INT, &level,
Modified: xfce4-power-manager/trunk/settings/xfpm-settings-main.c
===================================================================
--- xfce4-power-manager/trunk/settings/xfpm-settings-main.c 2009-05-04 14:54:59 UTC (rev 7312)
+++ xfce4-power-manager/trunk/settings/xfpm-settings-main.c 2009-05-04 22:15:36 UTC (rev 7313)
@@ -48,8 +48,6 @@
int main(int argc, char **argv)
{
- xfce_textdomain(GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
-
GError *error = NULL;
DBusGConnection *bus;
GHashTable *config_hash;
@@ -62,6 +60,7 @@
gboolean has_sleep_button;
gboolean has_hibernate_button;
gboolean has_power_button;
+ gboolean start_xfpm_if_not_running;
GdkNativeWindow socket_id = 0;
@@ -73,6 +72,8 @@
{ "socket-id", 's', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_INT, &socket_id, N_("Settings manager socket"), N_("SOCKET ID") },
{ NULL, },
};
+
+ xfce_textdomain(GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
if( !gtk_init_with_args (&argc, &argv, "", option_entries, PACKAGE, &error))
{
@@ -173,11 +174,11 @@
{
g_print(_("Xfce power manager is not running"));
g_print("\n");
- gboolean ret =
+ start_xfpm_if_not_running =
xfce_confirm(_("Xfce4 Power Manager is not running, do you want to launch it now?"),
GTK_STOCK_YES,
_("Run"));
- if ( ret )
+ if ( start_xfpm_if_not_running )
{
g_spawn_command_line_async("xfce4-power-manager",NULL);
}
Modified: xfce4-power-manager/trunk/settings/xfpm-settings.c
===================================================================
--- xfce4-power-manager/trunk/settings/xfpm-settings.c 2009-05-04 14:54:59 UTC (rev 7312)
+++ xfce4-power-manager/trunk/settings/xfpm-settings.c 2009-05-04 22:15:36 UTC (rev 7313)
@@ -40,6 +40,7 @@
#include "xfpm-settings-glade.h"
+#include "xfpm-settings.h"
#include "xfpm-config.h"
static GladeXML *xml = NULL;
@@ -538,11 +539,24 @@
gboolean can_hibernate, gboolean has_lcd_brightness, gboolean has_lid)
{
gboolean valid;
+ gint list_value;
gint val;
+ gboolean save_power;
+ gchar *str;
GtkListStore *list_store;
GtkTreeIter iter;
- GtkWidget *battery_critical = glade_xml_get_widget (xml, "battery-critical-combox");
+ GtkWidget *power_save;
GtkWidget *inact;
+ GtkWidget *battery_critical;
+ GtkWidget *lid;
+ GtkWidget *label;
+ GtkWidget *brg;
+ GtkWidget *frame;
+#ifdef HAVE_DPMS
+ GtkWidget *dpms_frame_on_battery;
+#endif
+
+ battery_critical = glade_xml_get_widget (xml, "battery-critical-combox");
inact = glade_xml_get_widget (xml, "inactivity-on-battery");
@@ -581,7 +595,7 @@
gtk_list_store_append(list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Shutdown"), 1, 3, -1);
- gchar *str = xfconf_channel_get_string (channel, CRITICAL_BATT_ACTION_CFG, "Nothing");
+ str = xfconf_channel_get_string (channel, CRITICAL_BATT_ACTION_CFG, "Nothing");
val = xfpm_shutdown_string_to_int (str);
if ( G_UNLIKELY (val == -1 || val == 1) ) /* we don't do suspend */
@@ -594,7 +608,6 @@
valid;
valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (list_store), &iter) )
{
- gint list_value;
gtk_tree_model_get (GTK_TREE_MODEL (list_store), &iter,
1, &list_value, -1);
if ( val == list_value )
@@ -609,8 +622,8 @@
g_free(str);
- GtkWidget *power_save = glade_xml_get_widget (xml, "power-save");
- gboolean save_power = xfconf_channel_get_bool (channel, POWER_SAVE_ON_BATTERY, TRUE);
+ power_save = glade_xml_get_widget (xml, "power-save");
+ save_power = xfconf_channel_get_bool (channel, POWER_SAVE_ON_BATTERY, TRUE);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(power_save), save_power);
g_signal_connect (power_save, "toggled",
@@ -621,7 +634,7 @@
* DPMS settings when running on battery power
*/
#ifdef HAVE_DPMS
- GtkWidget *dpms_frame_on_battery = glade_xml_get_widget (xml, "dpms-on-battery-frame");
+ dpms_frame_on_battery = glade_xml_get_widget (xml, "dpms-on-battery-frame");
gtk_widget_show (GTK_WIDGET(dpms_frame_on_battery));
on_battery_dpms_sleep = glade_xml_get_widget (xml, "sleep-dpms-on-battery");
@@ -649,7 +662,7 @@
/*
* Lid switch settings on battery
*/
- GtkWidget *lid = glade_xml_get_widget (xml, "on-battery-lid");
+ lid = glade_xml_get_widget (xml, "on-battery-lid");
if ( has_lid )
{
if (!user_privilege )
@@ -694,7 +707,6 @@
valid;
valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (list_store), &iter) )
{
- gint list_value;
gtk_tree_model_get (GTK_TREE_MODEL (list_store), &iter,
1, &list_value, -1);
if ( val == list_value )
@@ -707,7 +719,7 @@
}
else
{
- GtkWidget *label = glade_xml_get_widget (xml, "on-battery-lid-label");
+ label = glade_xml_get_widget (xml, "on-battery-lid-label");
gtk_widget_hide (label);
gtk_widget_hide (lid);
}
@@ -716,7 +728,7 @@
*
* Brightness on battery power
*/
- GtkWidget *brg = glade_xml_get_widget (xml ,"brg-on-battery");
+ brg = glade_xml_get_widget (xml ,"brg-on-battery");
if ( has_lcd_brightness )
{
val = xfconf_channel_get_uint (channel, BRIGHTNESS_ON_BATTERY, 10);
@@ -731,7 +743,7 @@
}
else
{
- GtkWidget *frame = glade_xml_get_widget (xml, "on-battery-brg-frame");
+ frame = glade_xml_get_widget (xml, "on-battery-brg-frame");
gtk_widget_hide_all (frame);
}
}
@@ -741,9 +753,20 @@
gboolean can_hibernate, gboolean has_lcd_brightness, gboolean has_lid)
{
GtkWidget *inact;
- guint val;
+ GtkWidget *lid;
+ GtkWidget *frame;
+ GtkWidget *brg;
+ GtkListStore *list_store;
+ GtkTreeIter iter;
+ gchar *str;
+ gint val;
gboolean valid;
+ gint list_value;
+#ifdef HAVE_DPMS
+ GtkWidget *dpms_frame_on_ac;
+#endif
+
inact = glade_xml_get_widget (xml, "inactivity-on-ac");
if ( !can_suspend && !can_hibernate )
@@ -763,7 +786,7 @@
/*
* DPMS settings when running on AC power
*/
- GtkWidget *dpms_frame_on_ac = glade_xml_get_widget (xml, "dpms-on-ac-frame");
+ dpms_frame_on_ac = glade_xml_get_widget (xml, "dpms-on-ac-frame");
gtk_widget_show (GTK_WIDGET(dpms_frame_on_ac));
on_ac_dpms_sleep = glade_xml_get_widget (xml, "sleep-dpms-on-ac");
@@ -790,11 +813,9 @@
/*
* Lid switch settings on AC power
*/
- GtkWidget *lid = glade_xml_get_widget (xml, "on-ac-lid");
+ lid = glade_xml_get_widget (xml, "on-ac-lid");
if ( has_lid )
{
- GtkListStore *list_store;
- GtkTreeIter iter;
list_store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT);
if ( !user_privilege )
@@ -823,7 +844,7 @@
g_signal_connect (lid, "changed",
G_CALLBACK(on_ac_lid_changed_cb), channel);
- gchar *str = xfconf_channel_get_string (channel, LID_SWITCH_ON_AC_CFG, "Nothing");
+ str = xfconf_channel_get_string (channel, LID_SWITCH_ON_AC_CFG, "Nothing");
val = xfpm_shutdown_string_to_int (str);
@@ -836,7 +857,6 @@
valid;
valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (list_store), &iter) )
{
- gint list_value;
gtk_tree_model_get (GTK_TREE_MODEL (list_store), &iter,
1, &list_value, -1);
if ( val == list_value )
@@ -850,7 +870,7 @@
}
else
{
- GtkWidget *frame = glade_xml_get_widget (xml, "on-ac-actions-frame");
+ frame = glade_xml_get_widget (xml, "on-ac-actions-frame");
gtk_widget_hide_all (frame);
}
@@ -858,7 +878,7 @@
*
* Brightness on AC power
*/
- GtkWidget *brg = glade_xml_get_widget (xml ,"brg-on-ac");
+ brg = glade_xml_get_widget (xml ,"brg-on-ac");
if ( has_lcd_brightness )
{
val = xfconf_channel_get_uint (channel, BRIGHTNESS_ON_AC, 9);
@@ -873,7 +893,7 @@
}
else
{
- GtkWidget *frame = glade_xml_get_widget (xml, "on-ac-brg-frame");
+ frame = glade_xml_get_widget (xml, "on-ac-brg-frame");
gtk_widget_hide_all (frame);
}
}
@@ -884,15 +904,38 @@
gboolean has_sleep_button, gboolean has_hibernate_button,
gboolean has_power_button)
{
+ GtkWidget *tray;
+ GtkWidget *power;
+ GtkWidget *power_label;
+ GtkWidget *hibernate;
+ GtkWidget *hibernate_label;
+ GtkWidget *sleep_w;
+ GtkWidget *sleep_label;
+ GtkWidget *notify;
+
+ gchar *default_sleep_value;
+ gint sleep_val_int;
+ gchar *default_hibernate_value;
+ gint hibernate_val_int;
gboolean valid;
+ gchar *default_power_value;
+ gint power_val_int;
+ gint list_value;
+ guint show_tray;
+ gboolean val;
+
+#ifdef HAVE_DPMS
+ GtkWidget *dpms;
+#endif
/*
* Tray icon settings
*/
GtkListStore *list_store;
GtkTreeIter iter;
+
list_store = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_INT);
- GtkWidget *tray = glade_xml_get_widget (xml, "tray-combox");
+ tray = glade_xml_get_widget (xml, "tray-combox");
gtk_combo_box_set_model (GTK_COMBO_BOX(tray), GTK_TREE_MODEL(list_store));
gtk_list_store_append(list_store, &iter);
@@ -904,16 +947,15 @@
gtk_list_store_append(list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("When battery is charging or discharging"), 1, 2, -1);
- guint show_tray = xfconf_channel_get_uint (channel, SHOW_TRAY_ICON_CFG, 1);
+ show_tray = xfconf_channel_get_uint (channel, SHOW_TRAY_ICON_CFG, 1);
gtk_combo_box_set_active (GTK_COMBO_BOX(tray), show_tray);
g_signal_connect (tray, "changed",
G_CALLBACK(set_show_tray_icon_cb), channel);
- gboolean val;
#ifdef HAVE_DPMS
/*
* Global dpms settings (enable/disable)
*/
- GtkWidget *dpms = glade_xml_get_widget (xml, "enable-dpms");
+ dpms = glade_xml_get_widget (xml, "enable-dpms");
g_signal_connect (dpms, "toggled",
G_CALLBACK(dpms_toggled_cb), channel);
@@ -928,8 +970,8 @@
* Power button
*/
list_store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT);
- GtkWidget *power = glade_xml_get_widget (xml, "power-combox");
- GtkWidget *power_label = glade_xml_get_widget (xml, "power-label");
+ power = glade_xml_get_widget (xml, "power-combox");
+ power_label = glade_xml_get_widget (xml, "power-label");
if ( has_power_button )
{
@@ -959,14 +1001,14 @@
gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Shutdown"), 1, 3, -1);
- gtk_list_store_append (list_store, &iter);
+ gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Ask"), 1, 4, -1);
g_signal_connect (power, "changed",
G_CALLBACK(set_power_changed_cb), channel);
- gchar *default_power_value = xfconf_channel_get_string (channel, POWER_SWITCH_CFG, "Nothing");
- gint power_val_int = xfpm_shutdown_string_to_int (default_power_value );
+ default_power_value = xfconf_channel_get_string (channel, POWER_SWITCH_CFG, "Nothing");
+ power_val_int = xfpm_shutdown_string_to_int (default_power_value );
if ( G_UNLIKELY (power_val_int == -1) )
{
@@ -977,7 +1019,6 @@
valid;
valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (list_store), &iter) )
{
- gint list_value;
gtk_tree_model_get (GTK_TREE_MODEL (list_store), &iter,
1, &list_value, -1);
if ( power_val_int == list_value )
@@ -999,8 +1040,8 @@
* Hibernate button
*/
list_store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT);
- GtkWidget *hibernate = glade_xml_get_widget (xml, "hibernate-combox");
- GtkWidget *hibernate_label = glade_xml_get_widget (xml, "hibernate-label");
+ hibernate = glade_xml_get_widget (xml, "hibernate-combox");
+ hibernate_label = glade_xml_get_widget (xml, "hibernate-label");
if (has_hibernate_button )
{
if (!user_privilege )
@@ -1032,8 +1073,8 @@
g_signal_connect (hibernate, "changed",
G_CALLBACK(set_hibernate_changed_cb), channel);
- gchar *default_hibernate_value = xfconf_channel_get_string (channel, HIBERNATE_SWITCH_CFG, "Nothing");
- gint hibernate_val_int = xfpm_shutdown_string_to_int (default_hibernate_value );
+ default_hibernate_value = xfconf_channel_get_string (channel, HIBERNATE_SWITCH_CFG, "Nothing");
+ hibernate_val_int = xfpm_shutdown_string_to_int (default_hibernate_value );
if ( G_UNLIKELY (hibernate_val_int == -1) )
{
@@ -1044,7 +1085,6 @@
valid;
valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (list_store), &iter) )
{
- gint list_value;
gtk_tree_model_get (GTK_TREE_MODEL (list_store), &iter,
1, &list_value, -1);
if ( hibernate_val_int == list_value )
@@ -1066,17 +1106,17 @@
* Sleep button
*/
list_store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT);
- GtkWidget *sleep = glade_xml_get_widget (xml, "sleep-combox");
- GtkWidget *sleep_label = glade_xml_get_widget (xml, "sleep-label");
+ sleep_w = glade_xml_get_widget (xml, "sleep-combox");
+ sleep_label = glade_xml_get_widget (xml, "sleep-label");
if ( has_sleep_button )
{
if (!user_privilege )
{
- gtk_widget_set_sensitive (sleep, FALSE);
- gtk_widget_set_tooltip_text (sleep, _("Hibernate and suspend operations not permitted"));
+ gtk_widget_set_sensitive (sleep_w, FALSE);
+ gtk_widget_set_tooltip_text (sleep_w, _("Hibernate and suspend operations not permitted"));
}
- gtk_combo_box_set_model (GTK_COMBO_BOX(sleep), GTK_TREE_MODEL(list_store));
+ gtk_combo_box_set_model (GTK_COMBO_BOX(sleep_w), GTK_TREE_MODEL(list_store));
gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Nothing"), 1, 0, -1);
@@ -1093,14 +1133,14 @@
gtk_list_store_set (list_store, &iter, 0, _("Hibernate"), 1, 2, -1);
}
- gtk_list_store_append (list_store, &iter);
+ gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Ask"), 1, 4, -1);
g_signal_connect (sleep, "changed",
G_CALLBACK(set_sleep_changed_cb), channel);
- gchar *default_sleep_value = xfconf_channel_get_string (channel, SLEEP_SWITCH_CFG, "Nothing");
- gint sleep_val_int = xfpm_shutdown_string_to_int (default_sleep_value );
+ default_sleep_value = xfconf_channel_get_string (channel, SLEEP_SWITCH_CFG, "Nothing");
+ sleep_val_int = xfpm_shutdown_string_to_int (default_sleep_value );
if ( G_UNLIKELY (sleep_val_int == -1 || sleep_val_int == 3) )
{
g_warning ("Invalid value %s for property %s\n", default_sleep_value, SLEEP_SWITCH_CFG);
@@ -1110,7 +1150,6 @@
valid;
valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (list_store), &iter) )
{
- gint list_value;
gtk_tree_model_get (GTK_TREE_MODEL (list_store), &iter,
1, &list_value, -1);
if ( sleep_val_int == list_value )
@@ -1124,14 +1163,14 @@
}
else
{
- gtk_widget_hide (sleep);
+ gtk_widget_hide (sleep_w);
gtk_widget_hide (sleep_label);
}
/*
* Enable/Disable Notification
*/
- GtkWidget *notify = glade_xml_get_widget (xml, "notification");
+ notify = glade_xml_get_widget (xml, "notification");
val = xfconf_channel_get_bool (channel, GENERAL_NOTIFICATION_CFG, TRUE);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(notify), val);
@@ -1146,6 +1185,10 @@
{
guint val;
gchar *str;
+ GtkWidget *critical_level;
+ GtkWidget *lock;
+ GtkWidget *cpu;
+ GtkWidget *label;
GtkWidget *inact_suspend = glade_xml_get_widget (xml, "inactivity-suspend");
GtkWidget *inact_hibernate = glade_xml_get_widget (xml, "inactivity-hibernate");
@@ -1209,7 +1252,7 @@
/*
* Critical battery level
*/
- GtkWidget *critical_level = glade_xml_get_widget (xml, "critical-spin");
+ critical_level = glade_xml_get_widget (xml, "critical-spin");
if ( system_laptop )
{
gtk_widget_set_tooltip_text (critical_level,
@@ -1232,7 +1275,7 @@
}
else
{
- GtkWidget *label = glade_xml_get_widget (xml, "critical-level-label" );
+ label = glade_xml_get_widget (xml, "critical-level-label" );
gtk_widget_hide (critical_level);
gtk_widget_hide (label);
}
@@ -1240,7 +1283,7 @@
/*
* Lock screen for suspend/hibernate
*/
- GtkWidget *lock = glade_xml_get_widget (xml, "lock-screen");
+ lock = glade_xml_get_widget (xml, "lock-screen");
if ( !user_privilege )
{
@@ -1253,7 +1296,6 @@
g_signal_connect (lock, "toggled",
G_CALLBACK(lock_screen_toggled_cb), channel);
- GtkWidget *cpu;
cpu = glade_xml_get_widget (xml, "cpu-freq");
#ifdef SYSTEM_IS_LINUX
@@ -1433,6 +1475,9 @@
gboolean has_hibernate_button, gboolean has_power_button,
GdkNativeWindow id)
{
+ GtkWidget *plug;
+ GtkWidget *dialog;
+ GtkWidget *allbox;
TRACE("system_laptop=%s user_privilege=%s can_suspend=%s can_hibernate=%s has_lcd_brightness=%s has_lid=%s "\
"has_sleep_button=%s has_hibernate_button=%s has_power_button=%s",
xfpm_bool_to_string (system_laptop), xfpm_bool_to_string (user_privilege),
@@ -1441,10 +1486,6 @@
xfpm_bool_to_string (has_sleep_button), xfpm_bool_to_string (has_hibernate_button),
xfpm_bool_to_string (has_power_button) );
- GtkWidget *plug;
- GtkWidget *dialog;
- GtkWidget *allbox;
-
xml = glade_xml_new_from_buffer (xfpm_settings_glade,
xfpm_settings_glade_length,
"xfpm-settings-dialog", NULL);
Modified: xfce4-power-manager/trunk/src/Makefile.am
===================================================================
--- xfce4-power-manager/trunk/src/Makefile.am 2009-05-04 14:54:59 UTC (rev 7312)
+++ xfce4-power-manager/trunk/src/Makefile.am 2009-05-04 22:15:36 UTC (rev 7313)
@@ -139,17 +139,12 @@
&& cp xgen xfpm-enum-types.c \
&& rm -f xgen xgen~
-xfpm-marshal.h: $(srcdir)/xfpm-marshal.list
- glib-genmarshal --header --prefix="_xfpm_marshal" \
- $(srcdir)/xfpm-marshal.list > tmp-marshal.h && \
- cp tmp-marshal.h $(@F) && \
- rm -f tmp-marshal.h tmp-marshal.h~
+xfpm-marshal.c: xfpm-marshal.list
+ echo "#include \"xfpm-marshal.h\"" > $@ && \
+ glib-genmarshal $< --prefix=_xfpm_marshal --body >> $@
-xfpm-marshal.c: xfpm-marshal.h
- glib-genmarshal --body --prefix="_xfpm_marshal" \
- $(srcdir)/xfpm-marshal.list > tmp-marshal.c && \
- cp tmp-marshal.c $(@F) && \
- rm -f tmp-marshal.c tmp-marshal.c~
+xfpm-marshal.h: xfpm-marshal.list
+ glib-genmarshal $< --prefix=_xfpm_marshal --header > $@
xfce-power-manager-dbus-server.h: $(srcdir)/org.xfce.Power.Manager.xml
dbus-binding-tool --mode=glib-server --prefix=xfpm_manager $< >$@
Modified: xfce4-power-manager/trunk/src/xfpm-adapter.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-adapter.c 2009-05-04 14:54:59 UTC (rev 7312)
+++ xfce4-power-manager/trunk/src/xfpm-adapter.c 2009-05-04 22:15:36 UTC (rev 7313)
@@ -46,9 +46,6 @@
#include "xfpm-adapter.h"
-/* Init */
-static void xfpm_adapter_class_init (XfpmAdapterClass *klass);
-static void xfpm_adapter_init (XfpmAdapter *adapter);
static void xfpm_adapter_finalize (GObject *object);
#define XFPM_ADAPTER_GET_PRIVATE(o) \
Modified: xfce4-power-manager/trunk/src/xfpm-backlight.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-backlight.c 2009-05-04 14:54:59 UTC (rev 7312)
+++ xfce4-power-manager/trunk/src/xfpm-backlight.c 2009-05-04 22:15:36 UTC (rev 7313)
@@ -32,9 +32,6 @@
#include "xfpm-brightness-hal.h"
#include "xfpm-brightness-widget.h"
-/* Init */
-static void xfpm_backlight_class_init (XfpmBacklightClass *klass);
-static void xfpm_backlight_init (XfpmBacklight *bk);
static void xfpm_backlight_finalize (GObject *object);
static void xfpm_backlight_dbus_class_init (XfpmBacklightClass *klass);
Modified: xfce4-power-manager/trunk/src/xfpm-battery-info.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-battery-info.c 2009-05-04 14:54:59 UTC (rev 7312)
+++ xfce4-power-manager/trunk/src/xfpm-battery-info.c 2009-05-04 22:15:36 UTC (rev 7313)
@@ -39,6 +39,7 @@
gint i = 0;
gchar *unit = NULL;
+ gchar *str;
guint32 last_full = 0;
guint32 design_capacity = 0;
gchar *tech = NULL;
@@ -100,7 +101,7 @@
GTK_FILL, GTK_FILL,
2, 8);
- gchar *str = g_strdup_printf ("%d %s", design_capacity, unit);
+ str = g_strdup_printf ("%d %s", design_capacity, unit);
label = gtk_label_new (str);
g_free (str);
@@ -127,7 +128,7 @@
GTK_FILL, GTK_FILL,
2, 8);
- gchar *str = g_strdup_printf ("%d %s", last_full, unit);
+ str = g_strdup_printf ("%d %s", last_full, unit);
label = gtk_label_new (str);
align = gtk_alignment_new (0.0, 0.5, 0, 0);
gtk_container_add (GTK_CONTAINER(align), label);
Modified: xfce4-power-manager/trunk/src/xfpm-battery.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-battery.c 2009-05-04 14:54:59 UTC (rev 7312)
+++ xfce4-power-manager/trunk/src/xfpm-battery.c 2009-05-04 22:15:36 UTC (rev 7313)
@@ -48,9 +48,6 @@
#include "xfpm-adapter.h"
#include "xfpm-debug.h"
-/* Init */
-static void xfpm_battery_class_init (XfpmBatteryClass *klass);
-static void xfpm_battery_init (XfpmBattery *battery);
static void xfpm_battery_finalize (GObject *object);
#define XFPM_BATTERY_GET_PRIVATE(o) \
@@ -250,7 +247,7 @@
}
}
-const gchar *
+static const gchar *
_get_battery_name (HalDeviceType type)
{
if ( type == HAL_DEVICE_TYPE_UPS)
@@ -267,7 +264,7 @@
return _("Your Battery");
}
-const gchar *
+static const gchar *
xfpm_battery_get_battery_state (XfpmBatteryState *state,
gboolean is_charging,
gboolean is_discharging,
@@ -334,9 +331,11 @@
xfpm_battery_refresh_misc (XfpmBattery *battery, gboolean is_present,
gboolean is_charging, gboolean is_discharging,
guint32 last_full, guint32 current_charge,
- guint percentage, guint time)
+ guint percentage, guint time_per)
{
gchar *tip;
+ XfpmBatteryState state;
+ const gchar *str;
guint critical_level = xfpm_xfconf_get_property_int (battery->priv->conf, CRITICAL_POWER_LEVEL );
if ( !is_present )
@@ -348,10 +347,10 @@
return;
}
- XfpmBatteryState state = battery->priv->state;
- const gchar *str = xfpm_battery_get_battery_state (&state, is_charging, is_discharging,
- last_full, current_charge, percentage,
- critical_level);
+ state = battery->priv->state;
+ str = xfpm_battery_get_battery_state (&state, is_charging, is_discharging,
+ last_full, current_charge, percentage,
+ critical_level);
tip = g_strdup_printf("%i%% %s %s", percentage, _get_battery_name(battery->priv->type), str);
//FIXME: Time for misc batteries
xfpm_tray_icon_set_tooltip (battery->priv->icon, tip);
@@ -364,7 +363,7 @@
xfpm_battery_refresh_primary (XfpmBattery *battery, gboolean is_present,
gboolean is_charging, gboolean is_discharging,
guint32 last_full, guint32 current_charge,
- guint percentage, guint time)
+ guint percentage, guint time_per)
{
gchar *tip;
const gchar *str;
@@ -382,15 +381,15 @@
str = xfpm_battery_get_battery_state (&state, is_charging, is_discharging,
last_full, current_charge, percentage, critical_level);
- if ( time != 0 && time <= 28800 /* 8 hours */ &&
+ if ( time_per != 0 && time_per <= 28800 /* 8 hours */ &&
state != BATTERY_FULLY_CHARGED && state != BATTERY_NOT_FULLY_CHARGED )
{
gchar *time_str;
const gchar *est_time;
gint minutes, hours, minutes_left;
- hours = time / 3600;
- minutes = time / 60;
+ hours = time_per / 3600;
+ minutes = time_per / 60;
minutes_left = minutes % 60;
if ( state == BATTERY_IS_DISCHARGING ||
@@ -441,7 +440,7 @@
gboolean is_present, is_charging, is_discharging = FALSE;
guint percentage = 0;
guint32 last_full, current_charge = 0;
- guint time = 0;
+ guint time_per = 0;
g_object_get (G_OBJECT(battery->priv->device),
"is-present", &is_present,
@@ -450,19 +449,19 @@
"percentage", &percentage,
"last-full", &last_full,
"current-charge", ¤t_charge,
- "time", &time,
+ "time", &time_per,
NULL);
battery->priv->type == HAL_DEVICE_TYPE_PRIMARY ?
xfpm_battery_refresh_primary (battery, is_present,
is_charging, is_discharging,
last_full, current_charge,
- percentage, time)
+ percentage, time_per)
:
xfpm_battery_refresh_misc (battery, is_present,
is_charging, is_discharging,
last_full, current_charge,
- percentage, time);
+ percentage, time_per);
xfpm_battery_refresh_visible_icon (battery);
}
Modified: xfce4-power-manager/trunk/src/xfpm-brightness-hal.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-brightness-hal.c 2009-05-04 14:54:59 UTC (rev 7312)
+++ xfce4-power-manager/trunk/src/xfpm-brightness-hal.c 2009-05-04 22:15:36 UTC (rev 7313)
@@ -44,9 +44,6 @@
#include "xfpm-adapter.h"
#include "xfpm-screen-saver.h"
-/* Init */
-static void xfpm_brightness_hal_class_init (XfpmBrightnessHalClass *klass);
-static void xfpm_brightness_hal_init (XfpmBrightnessHal *brg);
static void xfpm_brightness_hal_finalize (GObject *object);
#define XFPM_BRIGHTNESS_HAL_GET_PRIVATE(o) \
@@ -116,12 +113,12 @@
static gboolean
xfpm_brightness_hal_set_level (XfpmBrightnessHal *brg, gint level)
{
- TRACE ("Setting level %d", level);
-
GError *error = NULL;
gboolean ret = FALSE;
gint dummy;
+ TRACE ("Setting level %d", level);
+
ret = dbus_g_proxy_call (brg->priv->proxy, "SetBrightness", &error,
G_TYPE_INT, level,
G_TYPE_INVALID,
@@ -267,7 +264,7 @@
static void
xfpm_brightness_hal_reset_cb (XfpmIdle *idle, XfpmBrightnessHal *brg)
{
- gint level;
+ guint level;
if (brg->priv->block)
return;
@@ -287,7 +284,7 @@
static void
xfpm_brightness_timeout_on_ac (XfpmBrightnessHal *brg)
{
- gint level;
+ guint level;
if ( brg->priv->on_battery )
return;
@@ -304,7 +301,7 @@
static void
xfpm_brightness_timeout_on_battery (XfpmBrightnessHal *brg)
{
- gint level;
+ guint level;
if ( !brg->priv->on_battery )
return;
@@ -519,7 +516,7 @@
}
XfpmBrightnessHal *
-xfpm_brightness_hal_new ()
+xfpm_brightness_hal_new (void)
{
XfpmBrightnessHal *brg = NULL;
brg = g_object_new (XFPM_TYPE_BRIGHTNESS_HAL, NULL);
Modified: xfce4-power-manager/trunk/src/xfpm-brightness-widget.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-brightness-widget.c 2009-05-04 14:54:59 UTC (rev 7312)
+++ xfce4-power-manager/trunk/src/xfpm-brightness-widget.c 2009-05-04 22:15:36 UTC (rev 7313)
@@ -38,10 +38,6 @@
#include "xfpm-brightness-widget.h"
-
-/* Init */
-static void xfpm_brightness_widget_class_init (XfpmBrightnessWidgetClass *klass);
-static void xfpm_brightness_widget_init (XfpmBrightnessWidget *widget);
static void xfpm_brightness_widget_finalize (GObject *object);
#define XFPM_BRIGHTNESS_WIDGET_GET_PRIVATE(o) \
Modified: xfce4-power-manager/trunk/src/xfpm-button-hal.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-button-hal.c 2009-05-04 14:54:59 UTC (rev 7312)
+++ xfce4-power-manager/trunk/src/xfpm-button-hal.c 2009-05-04 22:15:36 UTC (rev 7313)
@@ -39,9 +39,6 @@
#include "xfpm-enum.h"
#include "xfpm-enum-types.h"
-/* Init */
-static void xfpm_button_hal_class_init (XfpmButtonHalClass *klass);
-static void xfpm_button_hal_init (XfpmButtonHal *button);
static void xfpm_button_hal_finalize (GObject *object);
#define XFPM_BUTTON_HAL_GET_PRIVATE(o) \
@@ -255,7 +252,7 @@
xfpm_button_hal_free_device_array (XfpmButtonHal *button)
{
HalDevice *device;
- int i;
+ guint i;
for ( i = 0 ; i<button->priv->array->len; i++)
{
Modified: xfce4-power-manager/trunk/src/xfpm-button-xf86.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-button-xf86.c 2009-05-04 14:54:59 UTC (rev 7312)
+++ xfce4-power-manager/trunk/src/xfpm-button-xf86.c 2009-05-04 22:15:36 UTC (rev 7313)
@@ -48,9 +48,6 @@
#include "xfpm-enum-types.h"
#include "xfpm-debug.h"
-/* Init */
-static void xfpm_button_xf86_class_init (XfpmButtonXf86Class *klass);
-static void xfpm_button_xf86_init (XfpmButtonXf86 *button);
static void xfpm_button_xf86_finalize (GObject *object);
static gpointer xfpm_button_xf86_object = NULL;
@@ -83,14 +80,17 @@
xfpm_button_xf86_filter_x_events (GdkXEvent *xevent, GdkEvent *ev, gpointer data)
{
XfpmButtonKey key;
+ XfpmButtonXf86 *button;
+ gpointer key_hash;
+
XEvent *xev = (XEvent *) xevent;
if ( xev->type != KeyPress )
return GDK_FILTER_CONTINUE;
- XfpmButtonXf86 *button = (XfpmButtonXf86 *) data;
+ button = (XfpmButtonXf86 *) data;
- gpointer key_hash = g_hash_table_lookup (button->priv->hash, GINT_TO_POINTER(xev->xkey.keycode));
+ key_hash = g_hash_table_lookup (button->priv->hash, GINT_TO_POINTER(xev->xkey.keycode));
if ( !key_hash )
{
Modified: xfce4-power-manager/trunk/src/xfpm-button.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-button.c 2009-05-04 14:54:59 UTC (rev 7312)
+++ xfce4-power-manager/trunk/src/xfpm-button.c 2009-05-04 22:15:36 UTC (rev 7313)
@@ -35,9 +35,6 @@
#include "xfpm-enum.h"
#include "xfpm-enum-types.h"
-/* Init */
-static void xfpm_button_class_init (XfpmButtonClass *klass);
-static void xfpm_button_init (XfpmButton *button);
static void xfpm_button_finalize (GObject *object);
#define XFPM_BUTTON_GET_PRIVATE(o) \
Modified: xfce4-power-manager/trunk/src/xfpm-cpu.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-cpu.c 2009-05-04 14:54:59 UTC (rev 7312)
+++ xfce4-power-manager/trunk/src/xfpm-cpu.c 2009-05-04 22:15:36 UTC (rev 7313)
@@ -43,9 +43,6 @@
#ifdef SYSTEM_IS_LINUX /* the end if at the end of the file */
-/* Init */
-static void xfpm_cpu_class_init (XfpmCpuClass *klass);
-static void xfpm_cpu_init (XfpmCpu *cpu);
static void xfpm_cpu_finalize (GObject *object);
#define XFPM_CPU_GET_PRIVATE(o) \
Modified: xfce4-power-manager/trunk/src/xfpm-dbus-monitor.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-dbus-monitor.c 2009-05-04 14:54:59 UTC (rev 7312)
+++ xfce4-power-manager/trunk/src/xfpm-dbus-monitor.c 2009-05-04 22:15:36 UTC (rev 7313)
@@ -32,9 +32,6 @@
#include "xfpm-dbus-monitor.h"
-/* Init */
-static void xfpm_dbus_monitor_class_init (XfpmDBusMonitorClass *klass);
-static void xfpm_dbus_monitor_init (XfpmDBusMonitor *monitor);
static void xfpm_dbus_monitor_finalize (GObject *object);
#define XFPM_DBUS_MONITOR_GET_PRIVATE(o) \
@@ -62,7 +59,7 @@
static void
xfpm_dbus_monitor_unique_connection_name_lost (XfpmDBusMonitor *monitor, const gchar *name)
{
- int i = 0;
+ guint i = 0;
gchar *array_name;
for ( i = 0; i < monitor->priv->array->len; i++ )
@@ -138,7 +135,7 @@
xfpm_dbus_monitor_finalize (GObject *object)
{
XfpmDBusMonitor *monitor;
- gint i;
+ guint i;
gchar *name;
monitor = XFPM_DBUS_MONITOR (object);
@@ -177,7 +174,7 @@
gboolean xfpm_dbus_monitor_add_match (XfpmDBusMonitor *monitor, const gchar *unique_name)
{
- int i = 0;
+ guint i = 0;
gchar *name;
g_return_val_if_fail (XFPM_IS_DBUS_MONITOR (monitor), FALSE);
@@ -199,7 +196,7 @@
gboolean xfpm_dbus_monitor_remove_match (XfpmDBusMonitor *monitor, const gchar *unique_name)
{
- int i ;
+ guint i ;
gchar *name;
g_return_val_if_fail (XFPM_IS_DBUS_MONITOR (monitor), FALSE);
Modified: xfce4-power-manager/trunk/src/xfpm-debug.h
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-debug.h 2009-05-04 14:54:59 UTC (rev 7312)
+++ xfce4-power-manager/trunk/src/xfpm-debug.h 2009-05-04 22:15:36 UTC (rev 7313)
@@ -35,18 +35,18 @@
#ifdef DEBUG
+static gchar *content = NULL;
+static GValue __value__ = { 0, };
+
#define XFPM_DEBUG_ENUM(_text, _value, _type) \
- char *content; \
- GValue __value__ = { 0, }; \
g_value_init (&__value__, _type); \
g_value_set_enum (&__value__, _value); \
content = g_strdup_value_contents (&__value__); \
TRACE ("%s : %s", _text, content); \
+ g_value_unset (&__value__); \
g_free (content);
#define XFPM_DEBUG_ENUM_FULL(_value, _type, ...) \
- char *content; \
- GValue __value__ = { 0, }; \
g_value_init (&__value__, _type); \
g_value_set_enum (&__value__, _value); \
content = g_strdup_value_contents (&__value__); \
@@ -54,6 +54,7 @@
fprintf(stderr, __VA_ARGS__); \
fprintf(stderr, ": %s", content); \
fprintf(stderr, "\n"); \
+ g_value_unset (&__value__); \
g_free (content);
#else
Modified: xfce4-power-manager/trunk/src/xfpm-dpms.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-dpms.c 2009-05-04 14:54:59 UTC (rev 7312)
+++ xfce4-power-manager/trunk/src/xfpm-dpms.c 2009-05-04 22:15:36 UTC (rev 7313)
@@ -46,9 +46,6 @@
#ifdef HAVE_DPMS
-/* Init */
-static void xfpm_dpms_class_init (XfpmDpmsClass *klass);
-static void xfpm_dpms_init (XfpmDpms *xfpm_dpms);
static void xfpm_dpms_finalize (GObject *object);
#define XFPM_DPMS_GET_PRIVATE(o) \
Modified: xfce4-power-manager/trunk/src/xfpm-engine.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-engine.c 2009-05-04 14:54:59 UTC (rev 7312)
+++ xfce4-power-manager/trunk/src/xfpm-engine.c 2009-05-04 22:15:36 UTC (rev 7313)
@@ -55,9 +55,6 @@
#include "xfpm-enum-types.h"
#include "xfpm-debug.h"
-/* Init */
-static void xfpm_engine_class_init (XfpmEngineClass * klass);
-static void xfpm_engine_init (XfpmEngine * engine);
static void xfpm_engine_finalize (GObject * object);
static void xfpm_engine_dbus_class_init (XfpmEngineClass * klass);
@@ -212,6 +209,7 @@
XfpmButtonKey type, XfpmEngine * engine)
{
XfpmShutdownRequest shutdown;
+ XFPM_DEBUG_ENUM ("Received button press event", type, XFPM_TYPE_BUTTON_KEY);
if ( engine->priv->inhibited )
{
@@ -219,8 +217,6 @@
return;
}
- XFPM_DEBUG_ENUM ("Received button press event", type, XFPM_TYPE_BUTTON_KEY);
-
if ( type == BUTTON_MON_BRIGHTNESS_DOWN || type == BUTTON_MON_BRIGHTNESS_UP )
return;
@@ -365,10 +361,11 @@
static void
xfpm_engine_alarm_timeout_cb (XfpmIdle *idle, guint id, XfpmEngine *engine)
{
- TRACE ("Alarm inactivity timeout id %d", id);
gboolean sleep_mode;
gboolean saver;
+ TRACE ("Alarm inactivity timeout id %d", id);
+
if ( engine->priv->inhibited )
{
TRACE ("Power manager is currently inhibited");
@@ -635,8 +632,9 @@
static gboolean xfpm_engine_dbus_shutdown (XfpmEngine *engine,
GError **error)
{
- TRACE ("Hibernate message received");
gboolean caller_privilege, can_hibernate;
+
+ TRACE ("Hibernate message received");
g_object_get (G_OBJECT (engine->priv->shutdown),
"caller-privilege", &caller_privilege,
@@ -660,8 +658,9 @@
static gboolean
xfpm_engine_dbus_hibernate (XfpmEngine * engine, GError ** error)
{
- TRACE ("Hibernate message received");
gboolean caller_privilege, can_hibernate;
+
+ TRACE ("Hibernate message received");
g_object_get (G_OBJECT (engine->priv->shutdown),
"caller-privilege", &caller_privilege,
@@ -689,8 +688,8 @@
static gboolean
xfpm_engine_dbus_suspend (XfpmEngine * engine, GError ** error)
{
- TRACE ("Suspend message received");
gboolean caller_privilege, can_suspend;
+ TRACE ("Suspend message received");
g_object_get (G_OBJECT (engine->priv->shutdown),
"caller-privilege", &caller_privilege,
Modified: xfce4-power-manager/trunk/src/xfpm-idle.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-idle.c 2009-05-04 14:54:59 UTC (rev 7312)
+++ xfce4-power-manager/trunk/src/xfpm-idle.c 2009-05-04 22:15:36 UTC (rev 7313)
@@ -40,14 +40,15 @@
#include "xfpm-idle.h"
-/* Init */
-static void xfpm_idle_class_init (XfpmIdleClass *klass);
-static void xfpm_idle_init (XfpmIdle *idle);
static void xfpm_idle_finalize (GObject *object);
#define XFPM_IDLE_GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE((o), XFPM_TYPE_IDLE, XfpmIdlePrivate))
+#ifdef XSyncValueAdd
+#undef XSyncValueAdd
+#endif
+
struct XfpmIdlePrivate
{
int sync_event;
@@ -105,7 +106,7 @@
static IdleAlarm *
xfpm_idle_find_alarm (XfpmIdle *idle, guint id)
{
- int i;
+ guint i;
IdleAlarm *alarm;
for (i = 0; i<idle->priv->array->len; i++)
{
@@ -291,7 +292,7 @@
static void
xfpm_idle_finalize(GObject *object)
{
- int i;
+ guint i;
XfpmIdle *idle;
IdleAlarm *alarm;
@@ -318,7 +319,7 @@
}
gboolean
-xfpm_idle_set_alarm (XfpmIdle *idle, guint id, guint timeout)
+xfpm_idle_set_alarm (XfpmIdle *idle, guint id, gint timeout)
{
IdleAlarm *alarm;
Modified: xfce4-power-manager/trunk/src/xfpm-idle.h
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-idle.h 2009-05-04 14:54:59 UTC (rev 7312)
+++ xfce4-power-manager/trunk/src/xfpm-idle.h 2009-05-04 22:15:36 UTC (rev 7313)
@@ -63,7 +63,7 @@
gboolean xfpm_idle_set_alarm (XfpmIdle *idle,
guint id,
- guint timeout);
+ gint timeout);
void xfpm_idle_alarm_reset_all (XfpmIdle *idle);
Modified: xfce4-power-manager/trunk/src/xfpm-inhibit.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-inhibit.c 2009-05-04 14:54:59 UTC (rev 7312)
+++ xfce4-power-manager/trunk/src/xfpm-inhibit.c 2009-05-04 22:15:36 UTC (rev 7313)
@@ -37,9 +37,6 @@
#include "xfpm-dbus-monitor.h"
#include "xfpm-errors.h"
-/* Init */
-static void xfpm_inhibit_class_init (XfpmInhibitClass *klass);
-static void xfpm_inhibit_init (XfpmInhibit *inhibit);
static void xfpm_inhibit_finalize (GObject *object);
static void xfpm_inhibit_dbus_class_init (XfpmInhibitClass *klass);
@@ -110,7 +107,7 @@
xfpm_inhibit_get_cookie (XfpmInhibit *inhibit)
{
guint max = 0;
- gint i;
+ guint i;
Inhibitor *inhibitor;
for ( i = 0; i<inhibit->priv->array->len; i++)
@@ -143,7 +140,7 @@
static Inhibitor *
xfpm_inhibit_find_application_by_cookie (XfpmInhibit *inhibit, guint cookie)
{
- gint i;
+ guint i;
Inhibitor *inhibitor;
for ( i = 0; i < inhibit->priv->array->len; i++)
{
@@ -159,7 +156,7 @@
static Inhibitor *
xfpm_inhibit_find_application_by_unique_connection_name (XfpmInhibit *inhibit, const gchar *unique_name)
{
- gint i;
+ guint i;
Inhibitor *inhibitor;
for ( i = 0; i < inhibit->priv->array->len; i++)
{
@@ -244,7 +241,7 @@
{
XfpmInhibit *inhibit;
Inhibitor *inhibitor;
- gint i;
+ guint i;
inhibit = XFPM_INHIBIT(object);
@@ -380,7 +377,7 @@
gchar ***OUT_inhibitors,
GError **error)
{
- gint i;
+ guint i;
Inhibitor *inhibitor;
TRACE ("Get Inhibitors message received");
Modified: xfce4-power-manager/trunk/src/xfpm-main.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-main.c 2009-05-04 14:54:59 UTC (rev 7312)
+++ xfce4-power-manager/trunk/src/xfpm-main.c 2009-05-04 22:15:36 UTC (rev 7313)
@@ -48,7 +48,7 @@
static gboolean no_daemon = FALSE;
static void
-show_version()
+show_version (void)
{
g_print (_("\n"
"Xfce Power Manager %s\n\n"
@@ -68,15 +68,16 @@
static void
xfpm_start (DBusGConnection *bus)
{
+ XfpmManager *manager;
+ XfpmSession *session;
+ GError *error = NULL;
+
TRACE("Starting the power manager\n");
- GError *error = NULL;
- XfpmSession *session;
session = xfpm_session_new ();
if ( client_id != NULL )
xfpm_session_set_client_id (session, client_id);
- XfpmManager *manager;
manager = xfpm_manager_new (bus);
if ( xfce_posix_signal_handler_init (&error))
@@ -122,8 +123,6 @@
gboolean version = FALSE;
gboolean reload = FALSE;
- xfce_textdomain (GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
-
GOptionEntry option_entries[] =
{
{ "run",'r', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &run, NULL, NULL },
@@ -136,7 +135,9 @@
{ NULL, },
};
- if(!gtk_init_with_args(&argc, &argv, "", option_entries, PACKAGE, &error))
+ xfce_textdomain (GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
+
+ if (!gtk_init_with_args (&argc, &argv, "", option_entries, PACKAGE, &error))
{
if(G_LIKELY(error))
{
Modified: xfce4-power-manager/trunk/src/xfpm-manager.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-manager.c 2009-05-04 14:54:59 UTC (rev 7312)
+++ xfce4-power-manager/trunk/src/xfpm-manager.c 2009-05-04 22:15:36 UTC (rev 7313)
@@ -46,9 +46,6 @@
#include "xfpm-engine.h"
#include "xfpm-session.h"
-/* Init */
-static void xfpm_manager_class_init (XfpmManagerClass *klass);
-static void xfpm_manager_init (XfpmManager *xfpm_manager);
static void xfpm_manager_finalize (GObject *object);
static void xfpm_manager_dbus_class_init (XfpmManagerClass *klass);
Modified: xfce4-power-manager/trunk/src/xfpm-network-manager.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-network-manager.c 2009-05-04 14:54:59 UTC (rev 7312)
+++ xfce4-power-manager/trunk/src/xfpm-network-manager.c 2009-05-04 22:15:36 UTC (rev 7313)
@@ -25,6 +25,8 @@
#include <glib.h>
#include <dbus/dbus-glib.h>
+#include "xfpm-network-manager.h"
+
/*
* Inform the Network Manager when we do suspend/hibernate
* message is either "wake" or "sleep"
Modified: xfce4-power-manager/trunk/src/xfpm-screen-saver.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-screen-saver.c 2009-05-04 14:54:59 UTC (rev 7312)
+++ xfce4-power-manager/trunk/src/xfpm-screen-saver.c 2009-05-04 22:15:36 UTC (rev 7313)
@@ -40,9 +40,6 @@
#include "xfpm-inhibit.h"
#include "xfpm-dbus-monitor.h"
-/* Init */
-static void xfpm_screen_saver_class_init (XfpmScreenSaverClass *klass);
-static void xfpm_screen_saver_init (XfpmScreenSaver *srv);
static void xfpm_screen_saver_finalize (GObject *object);
#define XFPM_SCREEN_SAVER_GET_PRIVATE(o) \
Modified: xfce4-power-manager/trunk/src/xfpm-session.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-session.c 2009-05-04 14:54:59 UTC (rev 7312)
+++ xfce4-power-manager/trunk/src/xfpm-session.c 2009-05-04 22:15:36 UTC (rev 7313)
@@ -36,9 +36,6 @@
#include "xfpm-session.h"
-/* Init */
-static void xfpm_session_class_init (XfpmSessionClass *klass);
-static void xfpm_session_init (XfpmSession *session);
static void xfpm_session_finalize (GObject *object);
#define XFPM_SESSION_GET_PRIVATE(o) \
@@ -236,20 +233,20 @@
gboolean xfpm_session_shutdown (XfpmSession *session)
{
- g_return_val_if_fail (XFPM_IS_SESSION (session), FALSE);
-
gboolean allow_save = TRUE;
XfsmShutdownType type = XFSM_SHUTDOWN_HALT;
+ g_return_val_if_fail (XFPM_IS_SESSION (session), FALSE);
+
return xfpm_session_shutdown_internal (session, type, allow_save);
}
gboolean xfpm_session_ask_shutdown (XfpmSession *session)
{
- g_return_val_if_fail (XFPM_IS_SESSION (session), FALSE);
-
gboolean allow_save = TRUE;
XfsmShutdownType type = XFSM_SHUTDOWN_ASK;
+ g_return_val_if_fail (XFPM_IS_SESSION (session), FALSE);
+
return xfpm_session_shutdown_internal (session, type, allow_save);
}
Modified: xfce4-power-manager/trunk/src/xfpm-shutdown.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-shutdown.c 2009-05-04 14:54:59 UTC (rev 7312)
+++ xfce4-power-manager/trunk/src/xfpm-shutdown.c 2009-05-04 22:15:36 UTC (rev 7313)
@@ -47,9 +47,6 @@
#define DUPLICATE_SHUTDOWN_REQUEST 8.0f
-/* Init */
-static void xfpm_shutdown_class_init (XfpmShutdownClass *klass);
-static void xfpm_shutdown_init (XfpmShutdown *shutdown);
static void xfpm_shutdown_finalize (GObject *object);
static void xfpm_shutdown_get_property (GObject *object,
@@ -264,7 +261,8 @@
G_OBJECT_CLASS(xfpm_shutdown_parent_class)->finalize(object);
}
-gboolean xfpm_shutdown_internal (DBusConnection *bus, const gchar *shutdown, GError **gerror)
+static gboolean
+xfpm_shutdown_internal (DBusConnection *bus, const gchar *shutdown, GError **gerror)
{
DBusMessage *message, *reply = NULL;
DBusError error;
Modified: xfce4-power-manager/trunk/src/xfpm-supply.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-supply.c 2009-05-04 14:54:59 UTC (rev 7312)
+++ xfce4-power-manager/trunk/src/xfpm-supply.c 2009-05-04 22:15:36 UTC (rev 7313)
@@ -47,9 +47,6 @@
#include "xfpm-inhibit.h"
#include "xfpm-marshal.h"
-/* Init */
-static void xfpm_supply_class_init (XfpmSupplyClass *klass);
-static void xfpm_supply_init (XfpmSupply *xfpm_supply);
static void xfpm_supply_finalize (GObject *object);
#define XFPM_SUPPLY_GET_PRIVATE(o) \
@@ -177,12 +174,14 @@
}
}
-gboolean xfpm_supply_on_low_power (XfpmSupply *supply)
+static gboolean
+xfpm_supply_on_low_power (XfpmSupply *supply)
{
+ const HalBattery *device;
guint low_power_level;
GList *list = NULL;
- int i;
+ guint i;
gboolean low_power = FALSE;
if (supply->priv->adapter_present )
@@ -205,7 +204,7 @@
if ( !battery )
continue;
- const HalBattery *device = xfpm_battery_get_device (battery);
+ device = xfpm_battery_get_device (battery);
g_object_get (G_OBJECT(device), "type", &type, "percentage", &percentage, NULL);
if ( type != HAL_DEVICE_TYPE_PRIMARY )
continue;
@@ -368,13 +367,14 @@
static void
xfpm_supply_add_battery (XfpmSupply *supply, const HalBattery *device)
{
+ XfpmBattery *battery;
const gchar *udi;
udi = hal_device_get_udi (HAL_DEVICE(device));
TRACE("New battery found %s", udi);
- XfpmBattery *battery = xfpm_battery_new (device);
+ battery = xfpm_battery_new (device);
g_hash_table_insert (supply->priv->hash, g_strdup(udi), battery);
@@ -416,11 +416,13 @@
static gboolean
xfpm_supply_monitor_start (XfpmSupply *supply)
{
+ GPtrArray *array;
+ guint i = 0;
+
supply->priv->adapter_present = xfpm_adapter_get_present (supply->priv->adapter);
- GPtrArray *array = hal_power_get_batteries (supply->priv->power);
+ array = hal_power_get_batteries (supply->priv->power);
- int i = 0;
for ( i = 0; i<array->len; i++ )
{
HalBattery *device;
Modified: xfce4-power-manager/trunk/src/xfpm-tray-icon.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-tray-icon.c 2009-05-04 14:54:59 UTC (rev 7312)
+++ xfce4-power-manager/trunk/src/xfpm-tray-icon.c 2009-05-04 22:15:36 UTC (rev 7313)
@@ -43,9 +43,6 @@
#include "xfpm-xfconf.h"
#include "xfpm-config.h"
-/* Init */
-static void xfpm_tray_icon_class_init (XfpmTrayIconClass *klass);
-static void xfpm_tray_icon_init (XfpmTrayIcon *tray);
static void xfpm_tray_icon_finalize (GObject *object);
#define XFPM_TRAY_ICON_GET_PRIVATE(o) \
@@ -154,6 +151,7 @@
{
const gchar *message;
gboolean lock_screen;
+ gboolean ret;
message = tray->priv->inhibited ?
_("An application is currently disabling the automatic sleep,"
@@ -161,10 +159,10 @@
" are you sure you want to hibernate the system?") :
_("Are you sure you want to proceed?") ;
- gboolean ret =
- xfce_confirm (message,
- GTK_STOCK_YES,
- _("Hibernate"));
+ ret =
+ xfce_confirm (message,
+ GTK_STOCK_YES,
+ _("Hibernate"));
if ( ret )
{
@@ -184,6 +182,7 @@
{
const gchar *message;
gboolean lock_screen;
+ gboolean ret;
message = tray->priv->inhibited ?
_("An application is currently disabling the automatic sleep,"
@@ -191,10 +190,10 @@
" are you sure you want to suspend the system?") :
_("Are you sure you want to proceed?") ;
- gboolean ret =
- xfce_confirm (message,
- GTK_STOCK_YES,
- _("Suspend"));
+ ret =
+ xfce_confirm (message,
+ GTK_STOCK_YES,
+ _("Suspend"));
if ( ret )
{
@@ -246,13 +245,14 @@
{
GtkWidget *menu, *mi, *img;
- menu = gtk_menu_new();
gboolean can_suspend = FALSE;
gboolean can_hibernate = FALSE ;
gboolean caller = FALSE;
gboolean saver_inhibited;
+ menu = gtk_menu_new();
+
g_object_get (G_OBJECT (tray->priv->shutdown),
"caller-privilege", &caller,
"can-suspend", &can_suspend,
Modified: xfce4-power-manager/trunk/src/xfpm-xfconf.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-xfconf.c 2009-05-04 14:54:59 UTC (rev 7312)
+++ xfce4-power-manager/trunk/src/xfpm-xfconf.c 2009-05-04 22:15:36 UTC (rev 7313)
@@ -37,9 +37,6 @@
#include "xfpm-enum-glib.h"
#include "xfpm-enum.h"
-/* Init */
-static void xfpm_xfconf_class_init (XfpmXfconfClass *klass);
-static void xfpm_xfconf_init (XfpmXfconf *conf);
static void xfpm_xfconf_finalize (GObject *object);
#define XFPM_XFCONF_GET_PRIVATE(o) \
@@ -474,7 +471,7 @@
conf->priv->show_icon =
xfconf_channel_get_uint (conf->priv->channel, SHOW_TRAY_ICON_CFG, SHOW_ICON_WHEN_BATTERY_PRESENT);
- if ( G_UNLIKELY (conf->priv->show_icon < 0 || conf->priv->show_icon > 3) )
+ if ( G_UNLIKELY ( conf->priv->show_icon > 3) )
{
g_warning ("Invalid value %d for property %s, using default\n", conf->priv->show_icon, SHOW_TRAY_ICON_CFG);
xfconf_channel_set_uint (conf->priv->channel, CRITICAL_BATT_ACTION_CFG, SHOW_ICON_WHEN_BATTERY_PRESENT);
@@ -483,7 +480,7 @@
conf->priv->critical_level =
xfconf_channel_get_uint (conf->priv->channel, CRITICAL_POWER_LEVEL, 0);
- if ( G_UNLIKELY (conf->priv->critical_level <0 || conf->priv->critical_level > 20) )
+ if ( G_UNLIKELY ( conf->priv->critical_level > 20) )
{
g_warning ("Value %d for property %s is out of range \n", conf->priv->critical_level, CRITICAL_POWER_LEVEL);
conf->priv->critical_level = 10;
@@ -687,8 +684,10 @@
{
g_return_val_if_fail (XFPM_IS_XFCONF(conf), 0);
+ if ( xfpm_strequal (property, BRIGHTNESS_ON_AC ) )
+ return conf->priv->brightness_on_ac_timeout;
#ifdef HAVE_DPMS
- if ( xfpm_strequal (property, ON_AC_DPMS_SLEEP))
+ else if ( xfpm_strequal (property, ON_AC_DPMS_SLEEP))
return conf->priv->dpms_sleep_on_ac;
else if ( xfpm_strequal (property, ON_BATT_DPMS_SLEEP))
return conf->priv->dpms_sleep_on_battery;
@@ -697,8 +696,6 @@
else if ( xfpm_strequal (property, ON_BATT_DPMS_OFF))
return conf->priv->dpms_off_on_battery;
#endif /* HAVE_DPMS */
- else if ( xfpm_strequal (property, BRIGHTNESS_ON_AC ) )
- return conf->priv->brightness_on_ac_timeout;
else if ( xfpm_strequal (property, BRIGHTNESS_ON_BATTERY ))
return conf->priv->brightness_on_battery_timeout;
else if ( xfpm_strequal (property, CRITICAL_POWER_LEVEL) )
More information about the Goodies-commits
mailing list