Author: kelnos
Date: 2008-11-28 06:14:37 +0000 (Fri, 28 Nov 2008)
New Revision: 28938
Modified:
xfce4-session/trunk/ChangeLog
xfce4-session/trunk/NEWS
xfce4-session/trunk/xfce4-session/xfsm-manager.c
Log:
* xfce4-session/xfsm-manager.c: On suspend/hibernate, ignore errors
of type DBUS_GERROR_NO_REPLY, not type _TIMEOUT (bug 4628).
Modified: xfce4-session/trunk/ChangeLog
===================================================================
--- xfce4-session/trunk/ChangeLog 2008-11-28 02:20:05 UTC (rev 28937)
+++ xfce4-session/trunk/ChangeLog 2008-11-28 06:14:37 UTC (rev 28938)
@@ -1,8 +1,13 @@
2008-11-27 Brian Tarricone <[EMAIL PROTECTED]>
+ * xfce4-session/xfsm-manager.c: On suspend/hibernate, ignore errors
+ of type DBUS_GERROR_NO_REPLY, not type _TIMEOUT (bug 4628).
+
+2008-11-27 Brian Tarricone <[EMAIL PROTECTED]>
+
* configure.in.in: Check for pwd.h and getpwuid ().
* xfce4-session/shutdown.c: Display the currently logged-in user
- in a label in the shutdown dialog.
+ in a label in the shutdown dialog (bug 3083).
2008-11-15 Brian Tarricone <[EMAIL PROTECTED]>
Modified: xfce4-session/trunk/NEWS
===================================================================
--- xfce4-session/trunk/NEWS 2008-11-28 02:20:05 UTC (rev 28937)
+++ xfce4-session/trunk/NEWS 2008-11-28 06:14:37 UTC (rev 28938)
@@ -1,11 +1,14 @@
-4.5.90.0
-========
+4.5.93 (Xfce 4.6beta3)
+======================
- Don't let autostart get run twice when using the failsafe session
(bug 4486).
+- Display username in logout dialog (bug 3083).
+- Ignore DBUS_GERROR_NO_REPLY errors on suspend/hibernate (bug 4629).
-4.5.92
-======
+4.5.92 (Xfce 4.6beta2)
+======================
+
- Hook up Help button in settings dialog.
- Implement support for the RestartImmediately restart style hint.
- Fix possible crash with uninitialised GError (bug 4202).
@@ -27,8 +30,9 @@
it wants to cancel shutdown. Also fixes a similar problem when
interaction is requested during a phase 2 save-yourself (bug 4284).
-4.5.91
-======
+4.5.91 (Xfce 4.6beta1)
+======================
+
- Start up session in parallel to greatly shorten startup time (bug 4312).
- Add a D-Bus interface for some limited amount of remote control.
- Implement support for the ShutdownCommand SM property when a
@@ -44,8 +48,9 @@
used, however.
-4.5.90
-======
+4.5.90 (Xfce 4.6alpha)
+======================
+
- Modified settings-dialogs to work with the new settings-manager
- Fix compile-issues with -Wall -Werror in mice theme-engine and
settings-dialogs
- Let xfce4-session start xfsettingsd automatically
Modified: xfce4-session/trunk/xfce4-session/xfsm-manager.c
===================================================================
--- xfce4-session/trunk/xfce4-session/xfsm-manager.c 2008-11-28 02:20:05 UTC
(rev 28937)
+++ xfce4-session/trunk/xfce4-session/xfsm-manager.c 2008-11-28 06:14:37 UTC
(rev 28938)
@@ -1104,7 +1104,7 @@
manager->shutdown_type,
&error)
&& (error->domain != DBUS_GERROR
- || error->code != DBUS_GERROR_TIMED_OUT)))
+ || error->code != DBUS_GERROR_NO_REPLY)))
{
xfce_message_dialog (NULL, _("Shutdown Failed"),
GTK_STOCK_DIALOG_ERROR,
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
