Patch : fix compilation when startup-notification isn't installed



The attached patch fixes nautilus compilation when startup-notification
isn't installed on the system.

Permission to commit on HEAD and 2.10 branch ?
-- 
Frederic Crozat <fcrozat mandriva com>
Mandriva
? depcomp
? nautilus-sn.patch
? stamp-h1
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/nautilus/ChangeLog,v
retrieving revision 1.6467
diff -u -p -r1.6467 ChangeLog
--- ChangeLog	27 Apr 2005 11:52:08 -0000	1.6467
+++ ChangeLog	28 Apr 2005 15:58:12 -0000
@@ -1,3 +1,9 @@
+2005-04-28  Frederic Crozat  <fcrozat mandriva com>
+
+	* libnautilus-private/nautilus-program-choosing.c:
+	(nautilus_launch_desktop_file):
+	fix build when startup notification isn't installed.
+
 2005-04-27  Alexander Larsson  <alexl redhat com>
 
 	* src/file-manager/fm-desktop-icon-view.c:
Index: libnautilus-private/nautilus-program-choosing.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-program-choosing.c,v
retrieving revision 1.77
diff -u -p -r1.77 nautilus-program-choosing.c
--- libnautilus-private/nautilus-program-choosing.c	6 Feb 2005 15:48:08 -0000	1.77
+++ libnautilus-private/nautilus-program-choosing.c	28 Apr 2005 15:58:12 -0000
@@ -855,7 +855,9 @@ nautilus_launch_desktop_file (GdkScreen 
 	const GList *p;
 	int total, count;
 	char **envp;
+#ifdef HAVE_STARTUP_NOTIFICATION
 	Time timestamp;
+#endif
 
 	/* strip the leading command specifier */
 	if (eel_str_has_prefix (desktop_file_uri, NAUTILUS_DESKTOP_COMMAND_SPECIFIER)) {
@@ -946,8 +948,10 @@ nautilus_launch_desktop_file (GdkScreen 
 
 	error = NULL;
 
+#ifdef HAVE_STARTUP_NOTIFICATION
 	timestamp = slowly_and_stupidly_obtain_timestamp (GDK_WINDOW_XDISPLAY (GTK_WIDGET (parent_window)->window));
 	gnome_desktop_item_set_launch_time (ditem, timestamp);
+#endif
 	gnome_desktop_item_launch_with_env (ditem, (GList *) parameter_uris,
 					    flags, envp,
 					    &error);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]