X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-application.c;h=c0a7ea2ba9c5eac017ff2f4949813649ca846143;hb=a61c4406e2cd4dc8f2d3a981e73dc09ae21e6ece;hp=2b4762927818627945823d599e60e067e6f4cdf3;hpb=06001de7e17bdccc2197b9f690269e6f8328e521;p=evince.git

diff --git a/shell/ev-application.c b/shell/ev-application.c
index 2b476292..c0a7ea2b 100644
--- a/shell/ev-application.c
+++ b/shell/ev-application.c
@@ -36,6 +36,7 @@
 #include <gtk/gtkstock.h>
 #include <gtk/gtkwidget.h>
 #include <gtk/gtkmain.h>
+#include <libgnomeui/gnome-client.h>
 #include <string.h>
 
 #ifdef ENABLE_DBUS
@@ -72,12 +73,22 @@ ev_application_register_service (EvApplication *application)
 						  DBUS_PATH_DBUS,
 						  DBUS_INTERFACE_DBUS);
 
+#if DBUS_VERSION >= 60	
 	if (!org_freedesktop_DBus_request_name (driver_proxy,
                                         	APPLICATION_SERVICE_NAME,
+						DBUS_NAME_FLAG_DO_NOT_QUEUE,
+						&request_name_result, &err)) {
+		g_warning ("Service registration failed.");
+		g_clear_error (&err);
+	}
+#else
+	if (!org_freedesktop_DBus_request_name (driver_proxy,
+						APPLICATION_SERVICE_NAME,
 						0, &request_name_result, &err)) {
 		g_warning ("Service registration failed.");
 		g_clear_error (&err);
 	}
+#endif	
 
 	if (request_name_result == DBUS_REQUEST_NAME_REPLY_EXISTS) {
 		return FALSE;
@@ -111,6 +122,54 @@ ev_application_get_instance (void)
 	return instance;
 }
 
+static void
+removed_from_session (GnomeClient *client, EvApplication *application)
+{
+	ev_application_shutdown (application);
+}
+
+static gint
+save_session (GnomeClient *client, gint phase, GnomeSaveStyle save_style, gint shutdown,
+	      GnomeInteractStyle interact_style, gint fast, EvApplication *application)
+{
+	GList *windows, *l;
+	char **restart_argv;
+	int argc = 0, k;
+
+	windows = ev_application_get_windows (application);
+	restart_argv = g_new (char *, g_list_length (windows) + 1);
+	restart_argv[argc++] = g_strdup ("evince");
+
+	for (l = windows; l != NULL; l = l->next) {
+		EvWindow *window = EV_WINDOW (l->data);
+		restart_argv[argc++] = g_strdup (ev_window_get_uri (window));
+	}
+
+	gnome_client_set_restart_command (client, argc, restart_argv);
+
+	for (k = 0; k < argc; k++) {
+		g_free (restart_argv[k]);
+	}
+
+	g_list_free (windows);
+	g_free (restart_argv);
+	
+	return TRUE;
+}
+
+static void
+init_session (EvApplication *application)
+{
+	GnomeClient *client;
+
+	client = gnome_master_client ();
+
+	g_signal_connect (client, "save_yourself",
+			  G_CALLBACK (save_session), application);	
+	g_signal_connect (client, "die",
+			  G_CALLBACK (removed_from_session), application);
+}
+
 gboolean
 ev_application_open_window (EvApplication  *application,
 			    guint32         timestamp,
@@ -134,17 +193,15 @@ static EvWindow *
 ev_application_get_empty_window (EvApplication *application)
 {
 	EvWindow *empty_window = NULL;
-	GList *windows = gtk_window_list_toplevels ();
+	GList *windows = ev_application_get_windows (application);
 	GList *l;
 
 	for (l = windows; l != NULL; l = l->next) {
-		if (EV_IS_WINDOW (l->data)) {
-			EvWindow *window = EV_WINDOW (l->data);
+		EvWindow *window = EV_WINDOW (l->data);
 
-			if (ev_window_is_empty (window)) {
-				empty_window = window;
-				break;
-			}
+		if (ev_window_is_empty (window)) {
+			empty_window = window;
+			break;
 		}
 	}
 
@@ -167,7 +224,7 @@ ev_application_get_uri_window (EvApplication *application, const char *uri)
 			EvWindow *window = EV_WINDOW (l->data);
 			const char *window_uri = ev_window_get_uri (window);
 
-			if (window_uri && strcmp (window_uri, uri) == 0) {
+			if (window_uri && strcmp (window_uri, uri) == 0 && !ev_window_is_empty (window)) {
 				uri_window = window;
 				break;
 			}
@@ -205,11 +262,14 @@ ev_application_open_uri (EvApplication  *application,
 
 	if (new_window == NULL) {
 		new_window = EV_WINDOW (ev_window_new ());
-		gtk_widget_show (GTK_WIDGET (new_window));
 	}
-	
+
+	/* We need to load uri before showing the window, so
+	   we can restore window size without flickering */	
 	ev_window_open_uri (new_window, uri);
 
+	gtk_widget_show (GTK_WIDGET (new_window));
+
 #ifdef HAVE_GTK_WINDOW_PRESENT_WITH_TIME
 	gtk_window_present_with_time (GTK_WINDOW (new_window),
 				      timestamp);
@@ -254,7 +314,9 @@ ev_application_shutdown (EvApplication *application)
 		application->recent_model = NULL;
 	}
 
+	g_free (application->last_chooser_uri);
 	g_object_unref (application);
+	
 	gtk_main_quit ();
 }
 
@@ -266,6 +328,8 @@ ev_application_class_init (EvApplicationClass *ev_application_class)
 static void
 ev_application_init (EvApplication *ev_application)
 {
+	init_session (ev_application);
+
 	ev_application->toolbars_model = egg_toolbars_model_new ();
 
 	ev_application->toolbars_file = g_build_filename
@@ -289,6 +353,25 @@ ev_application_init (EvApplication *ev_application)
     	    	    			    "Evince", NULL);
 }
 
+GList *
+ev_application_get_windows (EvApplication *application)
+{
+	GList *l, *toplevels;
+	GList *windows = NULL;
+
+	toplevels = gtk_window_list_toplevels ();
+
+	for (l = toplevels; l != NULL; l = l->next) {
+		if (EV_IS_WINDOW (l->data)) {
+			windows = g_list_append (windows, l->data);
+		}
+	}
+
+	g_list_free (toplevels);
+
+	return windows;
+}
+
 EggToolbarsModel *ev_application_get_toolbars_model (EvApplication *application)
 {
 	return application->toolbars_model;
@@ -305,4 +388,14 @@ void ev_application_save_toolbars_model (EvApplication *application)
 				 application->toolbars_file, "1.0");
 }
 
+void ev_application_set_chooser_uri (EvApplication *application, gchar *uri)
+{
+	g_free (application->last_chooser_uri);
+	application->last_chooser_uri = g_strdup (uri);
+}
+
+const gchar* ev_application_get_chooser_uri (EvApplication *application)
+{
+	return application->last_chooser_uri;
+}