gnome-settings-daemon r730 - in trunk: . plugins/xrandr

[jensg svn gnome org]

Author: jensg
Date: Sat Feb 21 01:12:47 2009
New Revision: 730
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=730&view=rev

Log:
2009-02-21  Jens Granseuer  <jensgr gmx net>

	* plugins/xrandr/gsd-xrandr-manager.c: (timeout_response_cb):
	revert the screen resolution change if the user closes the window
	or hits escape (bug #571492)


Modified:
   trunk/ChangeLog
   trunk/plugins/xrandr/gsd-xrandr-manager.c

Modified: trunk/plugins/xrandr/gsd-xrandr-manager.c
==============================================================================
--- trunk/plugins/xrandr/gsd-xrandr-manager.c	(original)
+++ trunk/plugins/xrandr/gsd-xrandr-manager.c	Sat Feb 21 01:12:47 2009
@@ -190,8 +190,8 @@
         TimeoutDialog *timeout = data;
 
         if (response_id == GTK_RESPONSE_DELETE_EVENT) {
-                /* The user closed the dialog, presumably saying, "go away, everything is fine" */
-                timeout->response_id = GTK_RESPONSE_ACCEPT;
+                /* The user closed the dialog or pressed ESC, revert */
+                timeout->response_id = GTK_RESPONSE_CANCEL;
         } else
                 timeout->response_id = response_id;