[Goodies-commits] r7884 - in xfce4-power-manager/trunk: . src
Ali Abdallah
aliov at xfce.org
Sat Aug 1 12:29:05 CEST 2009
Author: aliov
Date: 2009-08-01 10:29:05 +0000 (Sat, 01 Aug 2009)
New Revision: 7884
Modified:
xfce4-power-manager/trunk/ChangeLog
xfce4-power-manager/trunk/NEWS
xfce4-power-manager/trunk/configure.ac.in
xfce4-power-manager/trunk/src/xfpm-brightness-widget.c
xfce4-power-manager/trunk/src/xfpm-session.c
xfce4-power-manager/trunk/src/xfpm-shutdown.c
xfce4-power-manager/trunk/src/xfpm-tray-icon.c
Log:
* Remove image from the inhibit option of the tray icon.
* Check if the session is managed before changing the restart style.
* Prepare 0.8.3
Modified: xfce4-power-manager/trunk/ChangeLog
===================================================================
--- xfce4-power-manager/trunk/ChangeLog 2009-08-01 08:36:05 UTC (rev 7883)
+++ xfce4-power-manager/trunk/ChangeLog 2009-08-01 10:29:05 UTC (rev 7884)
@@ -1,3 +1,8 @@
+2009-08-01: Ali aliov at xfce.org
+ * Remove image from the inhibit option of the tray icon.
+ * Check if the session is managed before changing the restart style.
+ * Prepare 0.8.3
+
2009-07-31: Ali aliov at xfce.org
* Get rid of the cairo OSD and use a gtk based one instead
as the old one seems to be problematic on some hardware.
Modified: xfce4-power-manager/trunk/NEWS
===================================================================
--- xfce4-power-manager/trunk/NEWS 2009-08-01 08:36:05 UTC (rev 7883)
+++ xfce4-power-manager/trunk/NEWS 2009-08-01 10:29:05 UTC (rev 7884)
@@ -1,5 +1,9 @@
-Current
+0.8.3
=======
+- Provides more standard org.fd.PowerManagement DBus methods and signal (bug #5569).
- Make it possible to compile without network manager support.
- Add never show icon to the system tray configuration (bug #5613).
- Fix a typo that prevents from getting the correct critical configuration (bug #5619).
+- Use Gtk as a popup indicator to show the brightness level as the cairo seems to be
+ problematic on some hardware. (bug #5544 #5632).
+- Better alignement in the interface file, worked by Josef Havran.
Modified: xfce4-power-manager/trunk/configure.ac.in
===================================================================
--- xfce4-power-manager/trunk/configure.ac.in 2009-08-01 08:36:05 UTC (rev 7883)
+++ xfce4-power-manager/trunk/configure.ac.in 2009-08-01 10:29:05 UTC (rev 7884)
@@ -1,9 +1,9 @@
m4_define([intltool_minimum_version], [0.31])
m4_define([xfpm_version_major], [0])
m4_define([xfpm_version_minor], [8])
-m4_define([xfpm_version_micro], [2])
+m4_define([xfpm_version_micro], [3])
m4_define([xfpm_version_build], [])
-m4_define([xfpm_version_tag],[r at REVISION@])
+m4_define([xfpm_version_tag],[])
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/src/xfpm-brightness-widget.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-brightness-widget.c 2009-08-01 08:36:05 UTC (rev 7883)
+++ xfce4-power-manager/trunk/src/xfpm-brightness-widget.c 2009-08-01 10:29:05 UTC (rev 7884)
@@ -284,7 +284,8 @@
gtk_adjustment_set_value (adj, level);
- gtk_window_present (GTK_WINDOW (widget->priv->window));
+ if ( !GTK_WIDGET_VISIBLE (widget->priv->window))
+ gtk_window_present (GTK_WINDOW (widget->priv->window));
if ( widget->priv->timeout_id != 0 )
g_source_remove (widget->priv->timeout_id);
Modified: xfce4-power-manager/trunk/src/xfpm-session.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-session.c 2009-08-01 08:36:05 UTC (rev 7883)
+++ xfce4-power-manager/trunk/src/xfpm-session.c 2009-08-01 10:29:05 UTC (rev 7884)
@@ -116,6 +116,7 @@
session->priv = XFPM_SESSION_GET_PRIVATE (session);
session->priv->client = NULL;
+ session->priv->managed = FALSE;
restart_command = g_new (gchar *, 3);
restart_command[0] = g_strdup ("xfce4-power-manager");
@@ -232,6 +233,9 @@
{
g_return_if_fail (XFPM_IS_SESSION (session));
+ if ( !session->priv->managed)
+ return;
+
client_session_set_restart_style (session->priv->client, SESSION_RESTART_NEVER);
}
Modified: xfce4-power-manager/trunk/src/xfpm-shutdown.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-shutdown.c 2009-08-01 08:36:05 UTC (rev 7883)
+++ xfce4-power-manager/trunk/src/xfpm-shutdown.c 2009-08-01 10:29:05 UTC (rev 7884)
@@ -415,13 +415,11 @@
xfpm_send_message_to_network_manager ("sleep");
- if ( !xfpm_session_shutdown (shutdown->priv->session) )
+ if ( !xfpm_shutdown_internal (dbus_g_connection_get_connection(shutdown->priv->bus), "Shutdown", NULL))
{
- if ( !xfpm_shutdown_internal (dbus_g_connection_get_connection(shutdown->priv->bus), "Shutdown", NULL))
- xfpm_send_message_to_network_manager ("wake");
+ xfpm_send_message_to_network_manager ("wake");
+ shutdown->priv->block_shutdown = FALSE;
}
-
- shutdown->priv->block_shutdown = FALSE;
}
void xfpm_reboot (XfpmShutdown *shutdown, GError **error)
@@ -438,13 +436,11 @@
}
xfpm_send_message_to_network_manager ("sleep");
-// if ( !xfpm_session_reboot (shutdown->priv->session) )
+ if ( !xfpm_shutdown_internal (dbus_g_connection_get_connection(shutdown->priv->bus), "Reboot", NULL))
{
- if ( !xfpm_shutdown_internal (dbus_g_connection_get_connection(shutdown->priv->bus), "Reboot", NULL))
- xfpm_send_message_to_network_manager ("wake");
+ xfpm_send_message_to_network_manager ("wake");
+ shutdown->priv->block_shutdown = FALSE;
}
-
- shutdown->priv->block_shutdown = FALSE;
}
void xfpm_hibernate (XfpmShutdown *shutdown, GError **error)
Modified: xfce4-power-manager/trunk/src/xfpm-tray-icon.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-tray-icon.c 2009-08-01 08:36:05 UTC (rev 7883)
+++ xfce4-power-manager/trunk/src/xfpm-tray-icon.c 2009-08-01 10:29:05 UTC (rev 7884)
@@ -298,8 +298,6 @@
gtk_widget_set_tooltip_text (mi, _("Disable or enable automatic sleep, setting this will tell the power manager "\
"to disable backlight sleep, for example you could active the inhibit if you are watching a movie."));
- img = gtk_image_new_from_stock (saver_inhibited ? GTK_STOCK_CANCEL : GTK_STOCK_APPLY, GTK_ICON_SIZE_MENU);
- gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(mi),img);
g_signal_connect (G_OBJECT (mi), "activate",
G_CALLBACK (xfpm_tray_icon_inhibit_active_cb), tray);
gtk_widget_set_sensitive (mi, TRUE);
More information about the Goodies-commits
mailing list