From 2eecd9167f17b9b0506675a9dc05dff487779afa Mon Sep 17 00:00:00 2001
From: Ryan Lortie <desrt@desrt.ca>
Date: Fri, 26 Aug 2005 02:34:30 +0000
Subject: Add 'timestamp' argument to ev_application_open_window and

2005-08-25  Ryan Lortie  <desrt@desrt.ca>

        * shell/ev-application-service.xml: Add 'timestamp' argument to
          ev_application_open_window and ev_application_open_uri methods.

        * shell/ev-application.h: Add 'timestamp' argument to
          ev_application_open_window, ev_application_open_uri,
          and ev_application_open_uri_list functions.

        * shell/ev-application.c (ev_application_open_window,
          ev_application_open_uri, ev_application_open_uri_list): Change
          functions that show/present windows to use a timestamp if one
          is passed in.

        * shell/ev-window.c (ev_window_cmd_file_open,
          ev_window_cmd_recent_file_activate, drag_data_received_cb):
        * shell/main.c (load_files): Modify calls to ev_application to
          include GDK_CURRENT_TIME as timestamp.

        * shell/main.c (load_files_remote): Obtain timestamp for client
          instance from GDK and pass to server instance so new windows are
          focused properly.  Fix dbus_g_proxy_call() calls by including second
          G_TYPE_INVALID.

        Closes bug #314475.
---
(limited to 'shell/ev-application.c')

diff --git a/shell/ev-application.c b/shell/ev-application.c
index 6cbb149..ea66f65 100644
--- a/shell/ev-application.c
+++ b/shell/ev-application.c
@@ -113,9 +113,14 @@ ev_application_get_instance (void)
 
 gboolean
 ev_application_open_window (EvApplication  *application,
+			    guint32         timestamp,
 			    GError        **error)
 {
-	gtk_widget_show (ev_window_new ());
+	GtkWidget *new_window = ev_window_new ();
+
+	gtk_widget_show (new_window);
+	gtk_window_present_with_time (GTK_WINDOW (new_window),
+				      timestamp);
 
 	return TRUE;
 }
@@ -173,6 +178,7 @@ gboolean
 ev_application_open_uri (EvApplication  *application,
 			 const char     *uri,
 			 const char     *page_label,
+			 guint           timestamp,
 			 GError        **error)
 {
 	EvWindow *new_window;
@@ -181,7 +187,8 @@ ev_application_open_uri (EvApplication  *application,
 
 	new_window = ev_application_get_uri_window (application, uri);
 	if (new_window != NULL) {
-		gtk_window_present (GTK_WINDOW (new_window));
+		gtk_window_present_with_time (GTK_WINDOW (new_window),
+					      timestamp);
 		
 		return TRUE;
 	}
@@ -190,11 +197,12 @@ ev_application_open_uri (EvApplication  *application,
 
 	if (new_window == NULL) {
 		new_window = EV_WINDOW (ev_window_new ());
+		gtk_widget_show (GTK_WIDGET (new_window));
 	}
 	
 	ev_window_open_uri (new_window, uri);
 
-	gtk_window_present (GTK_WINDOW (new_window));
+	gtk_window_present_with_time (GTK_WINDOW (new_window), timestamp);
 
 	if (page_label != NULL) {
 		ev_window_open_page_label (new_window, page_label);
@@ -204,12 +212,17 @@ ev_application_open_uri (EvApplication  *application,
 }
 
 void
-ev_application_open_uri_list (EvApplication *application, GSList *uri_list)
+ev_application_open_uri_list (EvApplication *application,
+			      GSList        *uri_list,
+			      guint          timestamp)
 {
 	GSList *l;
 
 	for (l = uri_list; l != NULL; l = l->next) {
-		ev_application_open_uri (application, (char *)l->data, NULL, NULL);
+		ev_application_open_uri (application, (char *)l->data,
+					 NULL,
+					 timestamp,
+					 NULL);
 	}
 }
 
--
cgit v0.9.1