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

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.

svn path=/trunk/; revision=3340

diff --git a/ChangeLog b/ChangeLog
index 0ac4a7dd18cf7a936e76716c0b277babaa7d4a60..0858172ee5129f0845ff09fddfdd9740328356fb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+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.
+       
 2009-01-16  Hib Eris  <hib@hiberis.nl>
 
        * configure.ac:

diff --git a/shell/ev-application.c b/shell/ev-application.c
index 46001f494207d7cf64d5ae126b7d4afa86a73c38..bfd3f4ecff47ef0178b1fc9d6f7f7d52f0e097c3 100644 (file)
--- a/shell/ev-application.c
+++ b/shell/ev-application.c
@@ -455,11 +455,15 @@ ev_application_open_window (EvApplication  *application,
        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 @@ ev_application_open_uri_at_dest (EvApplication  *application,
        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_application_open_uri_at_dest (EvApplication  *application,
        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 */
 }
 
 /**