totem r5854 - in trunk: . src

[pwithnall svn gnome org]

Author: pwithnall
Date: Thu Dec 11 19:33:55 2008
New Revision: 5854
URL: http://svn.gnome.org/viewvc/totem?rev=5854&view=rev

Log:
2008-12-11  Philip Withnall  <philip tecnocode co uk>

	* src/eggdesktopfile.c (set_startup_notification_timeout):
	Update libegg files from trunk libegg.



Modified:
   trunk/ChangeLog
   trunk/src/eggdesktopfile.c

Modified: trunk/src/eggdesktopfile.c
==============================================================================
--- trunk/src/eggdesktopfile.c	(original)
+++ trunk/src/eggdesktopfile.c	Thu Dec 11 19:33:55 2008
@@ -987,7 +987,7 @@
 					     NULL);
 }
 
-#define EGG_DESKTOP_FILE_SN_TIMEOUT_LENGTH (30 /* seconds */ * 1000)
+#define EGG_DESKTOP_FILE_SN_TIMEOUT_LENGTH (30 /* seconds */)
 
 typedef struct {
   GdkDisplay *display;
@@ -1017,8 +1017,8 @@
   sn_data->display = g_object_ref (display);
   sn_data->startup_id = g_strdup (startup_id);
 
-  g_timeout_add (EGG_DESKTOP_FILE_SN_TIMEOUT_LENGTH,
-		 startup_notification_timeout, sn_data);
+  g_timeout_add_seconds (EGG_DESKTOP_FILE_SN_TIMEOUT_LENGTH,
+			 startup_notification_timeout, sn_data);
 }
 #endif /* GTK 2.12 */