diff --git a/ChangeLog b/ChangeLog
index ed89b7dc20a72d6744853d200d58fbdfdbdfd5ff..76bc54921b2aebcff1ad8ebf77868382aa696c27 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
+2009-04-11 11:26 Ali aliov@xfce.org
+ * : Fix notification timeouts when using xfce4-notifyd+minor clean up of some unused includes
+
2009-04-10 23:31 Ali aliov@xfce.org
* : Making the settings dialog pluggable+use the shutdown interface on the xfce4-session to shutdown
diff --git a/TODO b/TODO
index 19b87f486afce84c99d1aa174e7eae465f2731b0..600ea53d5a637671300064bd44148e3c1bf0cddd 100644
--- a/TODO
+++ b/TODO
@@ -1,13 +1,9 @@
-* : Should we inhibit the power manager when a screensaver is inhibited by a movie player?
-
* : Option to sleep when system is idle for a long time (does anybody needs this?).
-* : OnBattery and OnLowBattery DBus signals.
+* : OnLowBattery DBus signals (currently there is only OnBattery DBus signal).
-* : Support Suspend Hybrid! ( DeviceKit power will not support this ).
+* : Support Suspend Hybrid! ( DeviceKit power will not support this! ).
-* : Use the session logout when we do shutdown, probably use the shutdown session interface anyway.
-
* : Translations need to be updated.
* : Updating the documentations.
diff --git a/configure.ac.in b/configure.ac.in
index a95628c43a86f0ae08afa578fc7f5ef75e7d2860..0e68fc9ab0e78d814a32896b186dae4a0cdc764d 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -3,7 +3,7 @@ m4_define([xfpm_version_major], [0])
m4_define([xfpm_version_minor], [8])
m4_define([xfpm_version_micro], [0])
m4_define([xfpm_version_build], [])
-m4_define([xfpm_version_tag],[beta1])
+m4_define([xfpm_version_tag],[r@REVISION@])
m4_define([xfpm_version], [xfpm_version_major().xfpm_version_minor().xfpm_version_micro()ifelse(xfpm_version_tag(), [svn], [xfpm_version_tag().xfpm_version_build()], [xfpm_version_tag()])])
AC_INIT([xfce4-power-manager], [xfpm_version], [http://bugzilla.xfce.org/])
diff --git a/libxfpm/hal-device.c b/libxfpm/hal-device.c
index 49da3bb1af683827d47fcd4226956022d51c8275..fb0848724ee354dd5b77522ba605060bc871478f 100644
--- a/libxfpm/hal-device.c
+++ b/libxfpm/hal-device.c
@@ -19,7 +19,7 @@
*/
/*
- * Based on code from gpm-button (gnome power manager)
+ * Based on code from gnome power manager
* Copyright (C) 2006-2007 Richard Hughes <richard@hughsie.com>
*
*/
diff --git a/libxfpm/hal-monitor.c b/libxfpm/hal-monitor.c
index a1595ce6f72cf6721e41b795fbf83fa0cf74481b..3509a1f9093ef028a1921ecbd3bd03ced531ca13 100644
--- a/libxfpm/hal-monitor.c
+++ b/libxfpm/hal-monitor.c
@@ -31,7 +31,6 @@
#include <dbus/dbus-glib.h>
#include "hal-monitor.h"
-#include "xfpm-string.h"
/* Init */
static void hal_monitor_class_init (HalMonitorClass *klass);
diff --git a/libxfpm/hal-power.c b/libxfpm/hal-power.c
index ca818f7407de472957b0b8eeb00e06734e45843e..aa153bdc677b8a3d43e6a7bbff7c2349acb8fed9 100644
--- a/libxfpm/hal-power.c
+++ b/libxfpm/hal-power.c
@@ -30,7 +30,6 @@
#include "hal-manager.h"
#include "hal-power.h"
-#include "xfpm-string.h"
/* Init */
static void hal_power_class_init (HalPowerClass *klass);
diff --git a/libxfpm/xfpm-notify.h b/libxfpm/xfpm-notify.h
index d9293becf0b7094fa59ede009c8c40d21198421e..84b21fed54c9992e75941fa7c33f3e25a78f12ec 100644
--- a/libxfpm/xfpm-notify.h
+++ b/libxfpm/xfpm-notify.h
@@ -34,9 +34,9 @@ G_BEGIN_DECLS
typedef enum
{
- XFPM_NOTIFY_LOW,
- XFPM_NOTIFY_CRITICAL,
- XFPM_NOTIFY_NORMAL
+ XFPM_NOTIFY_LOW = 0,
+ XFPM_NOTIFY_NORMAL,
+ XFPM_NOTIFY_CRITICAL
} XfpmNotifyUrgency;
diff --git a/src/xfpm-battery.c b/src/xfpm-battery.c
index 4778819db6177187cb93d94c9a8e54e99cd2aa61..17c6dd5971d6737ece5fca1669af9715bcc28b1b 100644
--- a/src/xfpm-battery.c
+++ b/src/xfpm-battery.c
@@ -109,6 +109,9 @@ xfpm_battery_get_message_from_battery_state (XfpmBatteryState state, gboolean ad
case BATTERY_FULLY_CHARGED:
return _("Your battery is fully charged");
break;
+ case BATTERY_NOT_FULLY_CHARGED:
+ return _("Your battery is charging");
+ break;
case BATTERY_IS_CHARGING:
return _("Battery is charging");
break;
diff --git a/src/xfpm-button-hal.c b/src/xfpm-button-hal.c
index e631e13ae863e7bc12ef4349f79646a31ca77629..e13e14d1968d0d3565a6d828dcbbae8db23b5c3a 100644
--- a/src/xfpm-button-hal.c
+++ b/src/xfpm-button-hal.c
@@ -50,7 +50,7 @@ static void xfpm_button_hal_finalize (GObject *object);
struct XfpmButtonHalPrivate
{
GPtrArray *array;
- guint keys;
+ guint8 keys;
};
enum
@@ -69,8 +69,6 @@ xfpm_button_hal_emit_signals (XfpmButtonHal *bt, const gchar *condition, const g
if ( !xfpm_strequal (condition, "ButtonPressed") )
return;
- TRACE ("Emitting signal button press condition %s detail %s", condition, detail);
-
if ( xfpm_strequal (detail, "power") && !bt->priv->keys & POWER_KEY )
{
TRACE ("Emitting signal button press condition %s detail %s", condition, detail);
@@ -194,11 +192,11 @@ xfpm_button_hal_get_buttons (XfpmButtonHal *bt, gboolean lid_only)
udi = hal_manager_find_device_by_capability (manager, "button");
+ g_object_unref (manager);
+
if ( udi == NULL || udi[0] == NULL )
return;
- g_object_unref (manager);
-
for ( i = 0; udi[i]; i++)
{
xfpm_button_hal_add_button (bt, udi[i], lid_only);
diff --git a/src/xfpm-engine.c b/src/xfpm-engine.c
index 0a0e026cf26776c281082c2dc8f27d5d1ab15bcd..d9e2690143d52702db3bc2986be6f79b52df0fd7 100644
--- a/src/xfpm-engine.c
+++ b/src/xfpm-engine.c
@@ -86,7 +86,6 @@ struct XfpmEnginePrivate
gboolean has_lcd_brightness;
- gboolean block;
};
enum
diff --git a/src/xfpm-tray-icon.c b/src/xfpm-tray-icon.c
index 500695f6fa2a3921032af3d4f0b598feae96600f..5a5d94bec2fd658839e00168f1a9b01e004f8aa4 100644
--- a/src/xfpm-tray-icon.c
+++ b/src/xfpm-tray-icon.c
@@ -227,6 +227,12 @@ xfpm_tray_icon_exit_activated_cb (GtkWidget *w, gpointer data)
}
}
+static void
+xfpm_tray_icon_menu_selection_done (GtkMenuShell *menu, gpointer data)
+{
+ gtk_widget_destroy (GTK_WIDGET (menu));
+}
+
static void
xfpm_tray_icon_popup_menu_cb (GtkStatusIcon *icon, guint button,
guint activate_time, XfpmTrayIcon *tray)
@@ -332,6 +338,9 @@ xfpm_tray_icon_popup_menu_cb (GtkStatusIcon *icon, guint button,
g_signal_connect (mi, "activate", G_CALLBACK (xfpm_tray_icon_exit_activated_cb), NULL);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
+ g_signal_connect (menu, "selection-done",
+ G_CALLBACK (xfpm_tray_icon_menu_selection_done), NULL);
+
// Popup the menu
gtk_menu_popup(GTK_MENU(menu), NULL, NULL,
gtk_status_icon_position_menu,