gnome-power-manager r3250 - in trunk: . data src

[rhughes svn gnome org]

Author: rhughes
Date: Wed Feb 11 11:25:13 2009
New Revision: 3250
URL: http://svn.gnome.org/viewvc/gnome-power-manager?rev=3250&view=rev

Log:
2009-02-11  Richard Hughes  <richard hughsie com>

* data/Makefile.am:
Install the autostart file in the xdg directory, not the legacy
GNOME directory.

* data/gnome-power-manager.desktop.in.in:
Disable X-GNOME-AutoRestart for now as it makes debugging impossible.

* src/egg-idletime.c: (egg_idletime_init):
Remove the XSelectInput mask of XSyncAlarmNotifyMask otherwise we
filter the reparent of the notification icon and don't show an icon at
startup.


Modified:
   trunk/ChangeLog
   trunk/data/Makefile.am
   trunk/data/gnome-power-manager.desktop.in.in
   trunk/src/egg-idletime.c

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Wed Feb 11 11:25:13 2009
@@ -12,7 +12,7 @@
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
 @INTLTOOL_DESKTOP_RULE@
-autostartdir = $(datadir)/gnome/autostart
+autostartdir = $(sysconfdir)/xdg/autostart
 autostart_in_files = gnome-power-manager.desktop.in
 autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
 

Modified: trunk/data/gnome-power-manager.desktop.in.in
==============================================================================
--- trunk/data/gnome-power-manager.desktop.in.in	(original)
+++ trunk/data/gnome-power-manager.desktop.in.in	Wed Feb 11 11:25:13 2009
@@ -14,5 +14,5 @@
 X-GNOME-Bugzilla-Version= VERSION@
 X-GNOME-Bugzilla-ExtraInfoScript=gnome-power-bugreport.sh
 X-GNOME-Autostart-Phase=Panel
-X-GNOME-AutoRestart=true
+#X-GNOME-AutoRestart=true
 

Modified: trunk/src/egg-idletime.c
==============================================================================
--- trunk/src/egg-idletime.c	(original)
+++ trunk/src/egg-idletime.c	Wed Feb 11 11:25:13 2009
@@ -389,13 +389,7 @@
 
 	idletime->priv->reset_set = FALSE;
 
-	/* only match on XSyncAlarmNotifyMask */
-	gdk_error_trap_push ();
-	XSelectInput (idletime->priv->dpy, GDK_ROOT_WINDOW (), XSyncAlarmNotifyMask);
-	if (gdk_error_trap_pop ())
-		g_warning ("XSelectInput failed");
-
-	/* this is where we want events */
+	/* catch the timer alarm */
 	gdk_window_add_filter (NULL, egg_idletime_x_event_filter, idletime);
 
 	/* create a reset alarm */