Minor thing fixed

[evince.git] / shell / ev-application.c

diff --git a/shell/ev-application.c b/shell/ev-application.c
index 6a106fcc824164907f2211c55d98b3f6f27d5bab..1b64c3dbc7701616470dd399faca4dc64cb4fa9e 100644 (file)
--- a/shell/ev-application.c
+++ b/shell/ev-application.c
@@ -27,6 +27,7 @@
 #include "ev-application.h"
 #include "ev-utils.h"
 #include "ev-document-types.h"
 #include "ev-application.h"
 #include "ev-utils.h"
 #include "ev-document-types.h"

+#include "ev-file-helpers.h"

 
 #include <glib.h>
 #include <glib/gi18n.h>
 
 #include <glib.h>
 #include <glib/gi18n.h>


@@ -35,6 +36,7 @@
 #include <gtk/gtkstock.h>
 #include <gtk/gtkwidget.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtkstock.h>
 #include <gtk/gtkwidget.h>
 #include <gtk/gtkmain.h>

+#include <libgnomeui/gnome-client.h>

 #include <string.h>
 
 #ifdef ENABLE_DBUS
 #include <string.h>
 
 #ifdef ENABLE_DBUS


@@ -61,6 +63,9 @@ ev_application_register_service (EvApplication *application)
        connection = dbus_g_bus_get (DBUS_BUS_STARTER, &err);
        if (connection == NULL) {
                g_warning ("Service registration failed.");
        connection = dbus_g_bus_get (DBUS_BUS_STARTER, &err);
        if (connection == NULL) {
                g_warning ("Service registration failed.");

+               g_error_free (err);
+
+               return FALSE;

        }
 
        driver_proxy = dbus_g_proxy_new_for_name (connection,
        }
 
        driver_proxy = dbus_g_proxy_new_for_name (connection,


@@ -70,24 +75,33 @@ ev_application_register_service (EvApplication *application)
 
        if (!org_freedesktop_DBus_request_name (driver_proxy,
                                                APPLICATION_SERVICE_NAME,
 
        if (!org_freedesktop_DBus_request_name (driver_proxy,
                                                APPLICATION_SERVICE_NAME,

-                                               0, &request_name_result, &err))
-       {
+                                               0, &request_name_result, &err)) {

                g_warning ("Service registration failed.");
                g_warning ("Service registration failed.");

+               g_clear_error (&err);

        }
 
        if (request_name_result == DBUS_REQUEST_NAME_REPLY_EXISTS) {
                return FALSE;
        }
 
        }
 
        if (request_name_result == DBUS_REQUEST_NAME_REPLY_EXISTS) {
                return FALSE;
        }
 

+#if DBUS_VERSION == 33

        dbus_g_object_class_install_info (G_OBJECT_GET_CLASS (application),
        dbus_g_object_class_install_info (G_OBJECT_GET_CLASS (application),

-                                          &dbus_glib_ev_application_object_info);
+                                         &dbus_glib_ev_application_object_info);
+#else
+       dbus_g_object_type_install_info (EV_TYPE_APPLICATION,
+                                        &dbus_glib_ev_application_object_info);
+#endif
+#ifdef ENABLE_COMICS
+       GtkFileFilter *comics_filter;
+#endif
+

        dbus_g_connection_register_g_object (connection,
                                             "/org/gnome/evince/Evince",
                                              G_OBJECT (application));
 
        return TRUE;
 }
        dbus_g_connection_register_g_object (connection,
                                             "/org/gnome/evince/Evince",
                                              G_OBJECT (application));
 
        return TRUE;
 }

-#endif
+#endif /* ENABLE_DBUS */

 
 EvApplication *
 ev_application_get_instance (void)
 
 EvApplication *
 ev_application_get_instance (void)


@@ -101,27 +115,86 @@ ev_application_get_instance (void)
        return instance;
 }
 
        return instance;
 }
 

-void
-ev_application_open_window (EvApplication *application)
+static void
+removed_from_session (GnomeClient *client, EvApplication *application)

 {
 {

-       gtk_widget_show (ev_window_new ());
+       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,
+                           GError        **error)
+{
+       GtkWidget *new_window = ev_window_new ();
+
+       gtk_widget_show (new_window);
+       
+#ifdef HAVE_GTK_WINDOW_PRESENT_WITH_TIME
+       gtk_window_present_with_time (GTK_WINDOW (new_window),
+                                     timestamp);
+#else
+       gtk_window_present (GTK_WINDOW (new_window));
+#endif
+
+       return TRUE;

 }
 
 static EvWindow *
 ev_application_get_empty_window (EvApplication *application)
 {
        EvWindow *empty_window = NULL;
 }
 
 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) {
        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;

                }
        }
 
                }
        }
 


@@ -156,19 +229,26 @@ ev_application_get_uri_window (EvApplication *application, const char *uri)
        return uri_window;
 }
 
        return uri_window;
 }
 

-void
-ev_application_open_uri (EvApplication *application,
-                        const char    *uri,
-                        const char    *page_label)
+gboolean
+ev_application_open_uri (EvApplication  *application,
+                        const char     *uri,
+                        const char     *page_label,
+                        guint           timestamp,
+                        GError        **error)

 {
        EvWindow *new_window;
 
 {
        EvWindow *new_window;
 

-       g_return_if_fail (uri != NULL);
+       g_return_val_if_fail (uri != NULL, FALSE);

 
        new_window = ev_application_get_uri_window (application, uri);
        if (new_window != NULL) {
 
        new_window = ev_application_get_uri_window (application, uri);
        if (new_window != NULL) {

+#ifdef HAVE_GTK_WINDOW_PRESENT_WITH_TIME
+               gtk_window_present_with_time (GTK_WINDOW (new_window),
+                                             timestamp);
+#else

                gtk_window_present (GTK_WINDOW (new_window));
                gtk_window_present (GTK_WINDOW (new_window));

-               return;
+#endif 
+               return TRUE;

        }
 
        new_window = ev_application_get_empty_window (application);
        }
 
        new_window = ev_application_get_empty_window (application);


@@ -176,29 +256,57 @@ ev_application_open_uri (EvApplication *application,
        if (new_window == NULL) {
                new_window = EV_WINDOW (ev_window_new ());
        }
        if (new_window == NULL) {
                new_window = EV_WINDOW (ev_window_new ());
        }

-       
-       gtk_window_present (GTK_WINDOW (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);
 
        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);
+#else
+       gtk_window_present (GTK_WINDOW (new_window));
+#endif
+

        if (page_label != NULL) {
                ev_window_open_page_label (new_window, page_label);
        }
        if (page_label != NULL) {
                ev_window_open_page_label (new_window, page_label);
        }

+
+       return TRUE;

 }
 
 void
 }
 
 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) {
 {
        GSList *l;
 
        for (l = uri_list; l != NULL; l = l->next) {

-               ev_application_open_uri (application, (char *)l->data, NULL);
+               ev_application_open_uri (application, (char *)l->data,
+                                        NULL,
+                                        timestamp,
+                                        NULL);

        }
 }
 
 void
 ev_application_shutdown (EvApplication *application)
 {
        }
 }
 
 void
 ev_application_shutdown (EvApplication *application)
 {

+       if (application->toolbars_model) {
+               g_object_unref (application->toolbars_model);
+               g_free (application->toolbars_file);
+               application->toolbars_model = NULL;
+               application->toolbars_file = NULL;
+       }
+
+       if (application->recent_model) {
+               g_object_unref (application->recent_model);
+               application->recent_model = NULL;
+       }
+

        g_object_unref (application);
        gtk_main_quit ();
 }
        g_object_unref (application);
        gtk_main_quit ();
 }


@@ -211,5 +319,64 @@ ev_application_class_init (EvApplicationClass *ev_application_class)
 static void
 ev_application_init (EvApplication *ev_application)
 {
 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
+                       (ev_dot_dir (), "evince_toolbar.xml", NULL);
+
+       if (!egg_toolbars_model_load (ev_application->toolbars_model,
+                                     ev_application->toolbars_file)) {
+               egg_toolbars_model_load (ev_application->toolbars_model,
+                                        DATADIR"/evince-toolbar.xml");
+       }
+
+       egg_toolbars_model_set_flags (ev_application->toolbars_model, 0,
+                                     EGG_TB_MODEL_NOT_REMOVABLE); 
+                                     
+       ev_application->recent_model = egg_recent_model_new (EGG_RECENT_MODEL_SORT_MRU);
+       /* FIXME we should add a mime type filter but current eggrecent
+           has only a varargs style api which does not work well when
+          the list of mime types is dynamic */
+       egg_recent_model_set_limit (ev_application->recent_model, 5);   
+       egg_recent_model_set_filter_groups (ev_application->recent_model,
+                                           "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;
+}
+
+EggRecentModel *ev_application_get_recent_model (EvApplication *application)
+{
+       return application->recent_model;
+}
+
+void ev_application_save_toolbars_model (EvApplication *application)
+{
+        egg_toolbars_model_save (application->toolbars_model,
+                                application->toolbars_file, "1.0");
+}
+
+