[Goodies-commits] r7161 - in xfce4-power-manager/trunk: . libxfpm src
Ali Abdallah
aliov at xfce.org
Sat Apr 11 11:26:19 CEST 2009
Author: aliov
Date: 2009-04-11 09:26:19 +0000 (Sat, 11 Apr 2009)
New Revision: 7161
Modified:
xfce4-power-manager/trunk/ChangeLog
xfce4-power-manager/trunk/TODO
xfce4-power-manager/trunk/configure.ac.in
xfce4-power-manager/trunk/libxfpm/hal-device.c
xfce4-power-manager/trunk/libxfpm/hal-monitor.c
xfce4-power-manager/trunk/libxfpm/hal-power.c
xfce4-power-manager/trunk/libxfpm/xfpm-notify.h
xfce4-power-manager/trunk/src/xfpm-battery.c
xfce4-power-manager/trunk/src/xfpm-button-hal.c
xfce4-power-manager/trunk/src/xfpm-engine.c
xfce4-power-manager/trunk/src/xfpm-tray-icon.c
Log:
Fix notification timeouts when using xfce4-notifyd+minor clean up of some unused includes
Modified: xfce4-power-manager/trunk/ChangeLog
===================================================================
--- xfce4-power-manager/trunk/ChangeLog 2009-04-10 22:41:42 UTC (rev 7160)
+++ xfce4-power-manager/trunk/ChangeLog 2009-04-11 09:26:19 UTC (rev 7161)
@@ -1,4 +1,7 @@
+2009-04-11 11:26 Ali aliov at xfce.org
+ * : Fix notification timeouts when using xfce4-notifyd+minor clean up of some unused includes
+
2009-04-10 23:31 Ali aliov at xfce.org
* : Making the settings dialog pluggable+use the shutdown interface on the xfce4-session to shutdown
Modified: xfce4-power-manager/trunk/TODO
===================================================================
--- xfce4-power-manager/trunk/TODO 2009-04-10 22:41:42 UTC (rev 7160)
+++ xfce4-power-manager/trunk/TODO 2009-04-11 09:26:19 UTC (rev 7161)
@@ -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.
Modified: xfce4-power-manager/trunk/configure.ac.in
===================================================================
--- xfce4-power-manager/trunk/configure.ac.in 2009-04-10 22:41:42 UTC (rev 7160)
+++ xfce4-power-manager/trunk/configure.ac.in 2009-04-11 09:26:19 UTC (rev 7161)
@@ -3,7 +3,7 @@
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 at 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/])
Modified: xfce4-power-manager/trunk/libxfpm/hal-device.c
===================================================================
--- xfce4-power-manager/trunk/libxfpm/hal-device.c 2009-04-10 22:41:42 UTC (rev 7160)
+++ xfce4-power-manager/trunk/libxfpm/hal-device.c 2009-04-11 09:26:19 UTC (rev 7161)
@@ -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 at hughsie.com>
*
*/
Modified: xfce4-power-manager/trunk/libxfpm/hal-monitor.c
===================================================================
--- xfce4-power-manager/trunk/libxfpm/hal-monitor.c 2009-04-10 22:41:42 UTC (rev 7160)
+++ xfce4-power-manager/trunk/libxfpm/hal-monitor.c 2009-04-11 09:26:19 UTC (rev 7161)
@@ -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);
Modified: xfce4-power-manager/trunk/libxfpm/hal-power.c
===================================================================
--- xfce4-power-manager/trunk/libxfpm/hal-power.c 2009-04-10 22:41:42 UTC (rev 7160)
+++ xfce4-power-manager/trunk/libxfpm/hal-power.c 2009-04-11 09:26:19 UTC (rev 7161)
@@ -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);
Modified: xfce4-power-manager/trunk/libxfpm/xfpm-notify.h
===================================================================
--- xfce4-power-manager/trunk/libxfpm/xfpm-notify.h 2009-04-10 22:41:42 UTC (rev 7160)
+++ xfce4-power-manager/trunk/libxfpm/xfpm-notify.h 2009-04-11 09:26:19 UTC (rev 7161)
@@ -34,9 +34,9 @@
typedef enum
{
- XFPM_NOTIFY_LOW,
- XFPM_NOTIFY_CRITICAL,
- XFPM_NOTIFY_NORMAL
+ XFPM_NOTIFY_LOW = 0,
+ XFPM_NOTIFY_NORMAL,
+ XFPM_NOTIFY_CRITICAL
} XfpmNotifyUrgency;
Modified: xfce4-power-manager/trunk/src/xfpm-battery.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-battery.c 2009-04-10 22:41:42 UTC (rev 7160)
+++ xfce4-power-manager/trunk/src/xfpm-battery.c 2009-04-11 09:26:19 UTC (rev 7161)
@@ -109,6 +109,9 @@
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;
Modified: xfce4-power-manager/trunk/src/xfpm-button-hal.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-button-hal.c 2009-04-10 22:41:42 UTC (rev 7160)
+++ xfce4-power-manager/trunk/src/xfpm-button-hal.c 2009-04-11 09:26:19 UTC (rev 7161)
@@ -50,7 +50,7 @@
struct XfpmButtonHalPrivate
{
GPtrArray *array;
- guint keys;
+ guint8 keys;
};
enum
@@ -69,8 +69,6 @@
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 @@
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);
Modified: xfce4-power-manager/trunk/src/xfpm-engine.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-engine.c 2009-04-10 22:41:42 UTC (rev 7160)
+++ xfce4-power-manager/trunk/src/xfpm-engine.c 2009-04-11 09:26:19 UTC (rev 7161)
@@ -86,7 +86,6 @@
gboolean has_lcd_brightness;
- gboolean block;
};
enum
Modified: xfce4-power-manager/trunk/src/xfpm-tray-icon.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-tray-icon.c 2009-04-10 22:41:42 UTC (rev 7160)
+++ xfce4-power-manager/trunk/src/xfpm-tray-icon.c 2009-04-11 09:26:19 UTC (rev 7161)
@@ -228,6 +228,12 @@
}
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 @@
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,
More information about the Goodies-commits
mailing list