* Remove image from the inhibit option of the tray icon.0.8.3

	* Check if the session is managed before changing the restart style.
	* Prepare 0.8.3

(Old svn revision: 7884)

7 files changed, 24 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index 3ba64429..16fc9b52 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-01: Ali aliov@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@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.
diff --git a/NEWS b/NEWS
index 18771f93..76e83352 100644
--- a/NEWS
+++ b/NEWS
@@ -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.
diff --git a/configure.ac.in b/configure.ac.in
index d3cf10a4..10a1da0a 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -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@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/])
diff --git a/src/xfpm-brightness-widget.c b/src/xfpm-brightness-widget.c
index a19762cc..dc6d49ff 100644
--- a/src/xfpm-brightness-widget.c
+++ b/src/xfpm-brightness-widget.c
@@ -284,7 +284,8 @@ void xfpm_brightness_widget_set_level (XfpmBrightnessWidget *widget, guint level
 	
 	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);
diff --git a/src/xfpm-session.c b/src/xfpm-session.c
index 167159c9..38ede11c 100644
--- a/src/xfpm-session.c
+++ b/src/xfpm-session.c
@@ -116,6 +116,7 @@ xfpm_session_init (XfpmSession *session)
     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 @@ void xfpm_session_quit (XfpmSession *session)
 {
     g_return_if_fail (XFPM_IS_SESSION (session));
     
+    if ( !session->priv->managed)
+	return;
+    
     client_session_set_restart_style (session->priv->client, SESSION_RESTART_NEVER);
 }
 
diff --git a/src/xfpm-shutdown.c b/src/xfpm-shutdown.c
index 800b434f..5479543d 100644
--- a/src/xfpm-shutdown.c
+++ b/src/xfpm-shutdown.c
@@ -415,13 +415,11 @@ void xfpm_shutdown	(XfpmShutdown *shutdown, GError **error)
     
     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 @@ void xfpm_reboot (XfpmShutdown *shutdown, GError **error)
     }
     
     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)
diff --git a/src/xfpm-tray-icon.c b/src/xfpm-tray-icon.c
index e1975b1b..4741804a 100644
--- a/src/xfpm-tray-icon.c
+++ b/src/xfpm-tray-icon.c
@@ -298,8 +298,6 @@ xfpm_tray_icon_popup_menu_cb (GtkStatusIcon *icon, guint button,
     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);