evince r3340 - in trunk: . shell

[carlosgc svn gnome org]

Author: carlosgc
Date: Fri Jan 16 09:56:17 2009
New Revision: 3340
URL: http://svn.gnome.org/viewvc/evince?rev=3340&view=rev

Log:
2009-01-16  Carlos Garcia Campos  <carlosgc gnome org>

	* shell/ev-application.c: (ev_application_open_window),
	(ev_application_open_uri_at_dest):

	Do no use gdk_x11_* when not available. Based on patch by Hib
	Eris, see bug #339172.

Modified:
   trunk/ChangeLog
   trunk/shell/ev-application.c

Modified: trunk/shell/ev-application.c
==============================================================================
--- trunk/shell/ev-application.c	(original)
+++ trunk/shell/ev-application.c	Fri Jan 16 09:56:17 2009
@@ -455,11 +455,15 @@
 	if (!GTK_WIDGET_REALIZED (new_window))
 		gtk_widget_realize (new_window);
 	
+#ifdef GDK_WINDOWING_X11
 	if (timestamp <= 0)
 		timestamp = gdk_x11_get_server_time (GTK_WIDGET (new_window)->window);
 	gdk_x11_window_set_user_time (GTK_WIDGET (new_window)->window, timestamp);
 	
 	gtk_window_present (GTK_WINDOW (new_window));
+#else
+	gtk_window_present_with_time (GTK_WINDOW (new_window), timestamp);
+#endif /* GDK_WINDOWING_X11 */
 
 	return TRUE;
 }
@@ -614,6 +618,7 @@
 	if (!GTK_WIDGET_REALIZED (GTK_WIDGET (new_window)))
 		gtk_widget_realize (GTK_WIDGET (new_window));
 
+#ifdef GDK_WINDOWING_X11
 	if (timestamp <= 0)
 		timestamp = gdk_x11_get_server_time (GTK_WIDGET (new_window)->window);
 	gdk_x11_window_set_user_time (GTK_WIDGET (new_window)->window, timestamp);
@@ -621,6 +626,11 @@
 	ev_document_fc_mutex_lock ();
 	gtk_window_present (GTK_WINDOW (new_window));
 	ev_document_fc_mutex_unlock ();
+#else
+	ev_document_fc_mutex_lock ();
+	gtk_window_present_with_time (GTK_WINDOW (new_window), timestamp);
+	ev_document_fc_mutex_unlock ();
+#endif /* GDK_WINDOWING_X11 */
 }
 
 /**