*** empty log message ***

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

diff --git a/shell/ev-window.c b/shell/ev-window.c
index d1fa8a2219e51795ff92969e5f8227fc38253670..a3a4457d8e8ed7b0488b19aa93fcb3e68f56c469 100644 (file)
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -107,38 +107,40 @@ struct _EvWindowPrivate {
        GtkWidget *sidebar_thumbs;
        GtkWidget *sidebar_links;
 
        GtkWidget *sidebar_thumbs;
        GtkWidget *sidebar_links;
 

-       EvWindowTitle *title;
-

        /* Dialogs */
        GtkWidget *properties;
        /* Dialogs */
        GtkWidget *properties;

+       GtkWidget *print_dialog;
+       GtkWidget *password_dialog;

 
        /* UI Builders */
        GtkActionGroup *action_group;
 
        /* UI Builders */
        GtkActionGroup *action_group;

-       GtkUIManager *ui_manager;
+       GtkActionGroup *popups_action_group;
+       GtkUIManager   *ui_manager;

 
        /* Fullscreen mode */
        GtkWidget *fullscreen_toolbar;
        GtkWidget *fullscreen_popup;
        GSource   *fullscreen_timeout_source;
 
        /* Fullscreen mode */
        GtkWidget *fullscreen_toolbar;
        GtkWidget *fullscreen_popup;
        GSource   *fullscreen_timeout_source;

+       
+       /* Popup link */
+       GtkWidget *popup;
+       EvLink    *link;

 
        /* Document */
        char *uri;
        char *local_uri;
 
        /* Document */
        char *uri;
        char *local_uri;

+       

        EvDocument *document;
        EvDocument *document;

+       EvDocument *password_document;

        EvPageCache *page_cache;
        EvPageCache *page_cache;

-

        EvWindowPageMode page_mode;
        EvWindowPageMode page_mode;

-
-       /* These members are used temporarily when in PAGE_MODE_PASSWORD */
-       EvDocument *password_document;
-       GtkWidget *password_dialog;
-       char *password_uri;
+       EvWindowTitle *title;
+       EggRecentViewUIManager *recent_view;

 
        /* Job used to load document */
        EvJob *xfer_job;
        EvJob *load_job;
 
        /* Job used to load document */
        EvJob *xfer_job;
        EvJob *load_job;

-
-       EggRecentViewUIManager *recent_view;
+       GnomePrintJob *print_job;

 };
 
 static const GtkTargetEntry ev_drop_types[] = {
 };
 
 static const GtkTargetEntry ev_drop_types[] = {


@@ -152,7 +154,6 @@ static const GtkTargetEntry ev_drop_types[] = {
 #define PAGE_SELECTOR_ACTION   "PageSelector"
 #define ZOOM_CONTROL_ACTION    "ViewZoom"
 
 #define PAGE_SELECTOR_ACTION   "PageSelector"
 #define ZOOM_CONTROL_ACTION    "ViewZoom"
 

-#define GCONF_CHROME_TOOLBAR        "/apps/evince/show_toolbar"

 #define GCONF_OVERRIDE_RESTRICTIONS "/apps/evince/override_restrictions"
 #define GCONF_LOCKDOWN_SAVE         "/desktop/gnome/lockdown/disable_save_to_disk"
 #define GCONF_LOCKDOWN_PRINT        "/desktop/gnome/lockdown/disable_printing"
 #define GCONF_OVERRIDE_RESTRICTIONS "/apps/evince/override_restrictions"
 #define GCONF_LOCKDOWN_SAVE         "/desktop/gnome/lockdown/disable_save_to_disk"
 #define GCONF_LOCKDOWN_PRINT        "/desktop/gnome/lockdown/disable_printing"


@@ -163,8 +164,6 @@ static const GtkTargetEntry ev_drop_types[] = {
 #define LINKS_SIDEBAR_ID "links"
 #define THUMBNAILS_SIDEBAR_ID "thumbnails"
 
 #define LINKS_SIDEBAR_ID "links"
 #define THUMBNAILS_SIDEBAR_ID "thumbnails"
 

-#define PRINT_CONFIG_FILENAME  "ev-print-config.xml"
-

 static void     ev_window_update_fullscreen_popup       (EvWindow         *window);
 static void     ev_window_sidebar_visibility_changed_cb (EvSidebar        *ev_sidebar,
                                                         GParamSpec       *pspec,
 static void     ev_window_update_fullscreen_popup       (EvWindow         *window);
 static void     ev_window_sidebar_visibility_changed_cb (EvSidebar        *ev_sidebar,
                                                         GParamSpec       *pspec,


@@ -192,7 +191,14 @@ static void     ev_window_stop_presentation             (EvWindow         *windo
 static void     ev_window_cmd_view_presentation         (GtkAction        *action,
                                                         EvWindow         *window);
 static void     show_fullscreen_popup                   (EvWindow         *window);
 static void     ev_window_cmd_view_presentation         (GtkAction        *action,
                                                         EvWindow         *window);
 static void     show_fullscreen_popup                   (EvWindow         *window);

-
+static void     ev_popup_cmd_open_link                  (GtkAction        *action,
+                                                        EvWindow         *window);
+static void     ev_popup_cmd_copy_link_address          (GtkAction        *action,
+                                                        EvWindow         *window);
+static void    ev_window_cmd_view_best_fit             (GtkAction        *action, 
+                                                        EvWindow         *ev_window);
+static void    ev_window_cmd_view_page_width           (GtkAction        *action, 
+                                                        EvWindow         *ev_window);

 
 G_DEFINE_TYPE (EvWindow, ev_window, GTK_TYPE_WINDOW)
 
 
 G_DEFINE_TYPE (EvWindow, ev_window, GTK_TYPE_WINDOW)
 


@@ -382,25 +388,72 @@ update_chrome_visibility (EvWindow *window)
 }
 
 static void
 }
 
 static void

-update_chrome_flag (EvWindow *window, EvChrome flag, const char *pref, gboolean active)
+update_chrome_flag (EvWindow *window, EvChrome flag, gboolean active)

 {
        EvWindowPrivate *priv = window->priv;
 {
        EvWindowPrivate *priv = window->priv;

-       GConfClient *client;

        
        if (active) {
                priv->chrome |= flag;
        
        if (active) {
                priv->chrome |= flag;

-       }
-       else {
+       } else {

                priv->chrome &= ~flag;
        }
 
                priv->chrome &= ~flag;
        }
 

-       if (pref != NULL) {
-               client = gconf_client_get_default ();
-               gconf_client_set_bool (client, pref, active, NULL);
-               g_object_unref (client);
+       update_chrome_visibility (window);
+}
+
+static void
+update_sizing_buttons (EvWindow *window)
+{
+       GtkActionGroup *action_group = window->priv->action_group;
+       GtkAction *action;
+       gboolean best_fit, page_width;
+       EvSizingMode sizing_mode;
+
+       if (window->priv->view == NULL)
+               return;
+
+       g_object_get (window->priv->view,
+                     "sizing_mode", &sizing_mode,
+                     NULL);
+
+       switch (sizing_mode) {
+       case EV_SIZING_BEST_FIT:
+               best_fit = TRUE;
+               page_width = FALSE;
+               break;
+       case EV_SIZING_FIT_WIDTH:
+               best_fit = FALSE;
+               page_width = TRUE;
+               break;
+
+       default:
+               best_fit = page_width = FALSE;
+               break;

        }
 
        }
 

-       update_chrome_visibility (window);
+       action = gtk_action_group_get_action (action_group, "ViewBestFit");
+       g_signal_handlers_block_by_func
+               (action, G_CALLBACK (ev_window_cmd_view_best_fit), window);
+       gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), best_fit);
+       g_signal_handlers_unblock_by_func
+               (action, G_CALLBACK (ev_window_cmd_view_best_fit), window);
+
+       action = gtk_action_group_get_action (action_group, "ViewPageWidth");   
+       g_signal_handlers_block_by_func
+               (action, G_CALLBACK (ev_window_cmd_view_page_width), window);
+       gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), page_width);
+       g_signal_handlers_unblock_by_func
+               (action, G_CALLBACK (ev_window_cmd_view_page_width), window);
+
+       action = gtk_action_group_get_action (window->priv->action_group, 
+                                             ZOOM_CONTROL_ACTION);     
+       if (best_fit) {
+               ephy_zoom_action_set_zoom_level (EPHY_ZOOM_ACTION (action), 
+                                                EPHY_ZOOM_BEST_FIT);
+       } else if (page_width) {
+               ephy_zoom_action_set_zoom_level (EPHY_ZOOM_ACTION (action), 
+                                                EPHY_ZOOM_FIT_WIDTH);
+       }

 }
 
 static void
 }
 
 static void


@@ -408,7 +461,7 @@ ev_window_cmd_focus_page_selector (GtkAction *act, EvWindow *window)
 {
        GtkAction *action;
        
 {
        GtkAction *action;
        

-       update_chrome_flag (window, EV_CHROME_RAISE_TOOLBAR, NULL, TRUE);
+       update_chrome_flag (window, EV_CHROME_RAISE_TOOLBAR, TRUE);

        set_action_sensitive (window, "ViewToolbar", FALSE);
        
        action = gtk_action_group_get_action (window->priv->action_group,
        set_action_sensitive (window, "ViewToolbar", FALSE);
        
        action = gtk_action_group_get_action (window->priv->action_group,


@@ -480,60 +533,6 @@ ev_window_cmd_view_page_width (GtkAction *action, EvWindow *ev_window)
        update_action_sensitivity (ev_window);
 }
 
        update_action_sensitivity (ev_window);
 }
 

-static void
-update_sizing_buttons (EvWindow *window)
-{
-       GtkActionGroup *action_group = window->priv->action_group;
-       GtkAction *action;
-       gboolean best_fit, page_width;
-       EvSizingMode sizing_mode;
-
-       if (window->priv->view == NULL)
-               return;
-
-       g_object_get (window->priv->view,
-                     "sizing_mode", &sizing_mode,
-                     NULL);
-
-       switch (sizing_mode) {
-       case EV_SIZING_BEST_FIT:
-               best_fit = TRUE;
-               page_width = FALSE;
-               break;
-       case EV_SIZING_FIT_WIDTH:
-               best_fit = FALSE;
-               page_width = TRUE;
-               break;
-
-       default:
-               best_fit = page_width = FALSE;
-               break;
-       }
-
-       action = gtk_action_group_get_action (action_group, "ViewBestFit");
-       g_signal_handlers_block_by_func
-               (action, G_CALLBACK (ev_window_cmd_view_best_fit), window);
-       gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), best_fit);
-       g_signal_handlers_unblock_by_func
-               (action, G_CALLBACK (ev_window_cmd_view_best_fit), window);
-
-       action = gtk_action_group_get_action (action_group, "ViewPageWidth");   
-       g_signal_handlers_block_by_func
-               (action, G_CALLBACK (ev_window_cmd_view_page_width), window);
-       gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), page_width);
-       g_signal_handlers_unblock_by_func
-               (action, G_CALLBACK (ev_window_cmd_view_page_width), window);
-
-       action = gtk_action_group_get_action (window->priv->action_group, 
-                                             ZOOM_CONTROL_ACTION);     
-       if (best_fit) {
-               ephy_zoom_action_set_zoom_level (EPHY_ZOOM_ACTION (action), 
-                                                EPHY_ZOOM_BEST_FIT);
-       } else if (page_width) {
-               ephy_zoom_action_set_zoom_level (EPHY_ZOOM_ACTION (action), 
-                                                EPHY_ZOOM_FIT_WIDTH);
-       }
-}

 
 void
 ev_window_open_page_label (EvWindow   *ev_window, 
 
 void
 ev_window_open_page_label (EvWindow   *ev_window, 


@@ -594,10 +593,8 @@ page_changed_cb (EvPageCache *page_cache,
                 EvWindow    *ev_window)
 {
        update_action_sensitivity (ev_window);
                 EvWindow    *ev_window)
 {
        update_action_sensitivity (ev_window);

-
-       if (ev_window->priv->uri) {
+       if (!ev_window_is_empty (ev_window))

                ev_metadata_manager_set_int (ev_window->priv->uri, "page", page);
                ev_metadata_manager_set_int (ev_window->priv->uri, "page", page);

-       }

 }
 
 static void
 }
 
 static void


@@ -617,7 +614,7 @@ update_sidebar_visibility (EvWindow *window)
        char *uri = window->priv->uri;
        GValue sidebar_visibility = { 0, };
 
        char *uri = window->priv->uri;
        GValue sidebar_visibility = { 0, };
 

-       if (uri && ev_metadata_manager_get (uri, "sidebar_visibility", &sidebar_visibility)) {
+       if (ev_metadata_manager_get (uri, "sidebar_visibility", &sidebar_visibility, FALSE)) {

                set_widget_visibility (window->priv->sidebar,
                                       g_value_get_boolean (&sidebar_visibility));
        }
                set_widget_visibility (window->priv->sidebar,
                                       g_value_get_boolean (&sidebar_visibility));
        }


@@ -628,14 +625,29 @@ setup_document_from_metadata (EvWindow *window)
 {
        char *uri = window->priv->uri;
        GValue page = { 0, };
 {
        char *uri = window->priv->uri;
        GValue page = { 0, };

+       gint new_page;

 
 

-       /* Page */
-       if (uri && ev_metadata_manager_get (uri, "page", &page)) {
+       if (uri && ev_metadata_manager_get (uri, "page", &page, TRUE)) {
+               new_page = CLAMP (g_value_get_int (&page), 0, ev_page_cache_get_n_pages (window->priv->page_cache) - 1);

                ev_page_cache_set_current_page (window->priv->page_cache,
                ev_page_cache_set_current_page (window->priv->page_cache,

-                                               g_value_get_int (&page));
+                                               new_page);
+       }
+}
+
+static void
+setup_chrome_from_metadata (EvWindow *window)
+{
+       EvChrome chrome = EV_CHROME_NORMAL;
+       GValue show_toolbar = { 0, };
+
+       if (ev_metadata_manager_get (NULL, "show_toolbar", &show_toolbar, FALSE)) {
+               if (!g_value_get_boolean (&show_toolbar))
+                       chrome &= ~EV_CHROME_TOOLBAR;

        }
        }

+       window->priv->chrome = chrome;

 }
 
 }
 

+

 static void
 setup_sidebar_from_metadata (EvWindow *window, EvDocument *document)
 {
 static void
 setup_sidebar_from_metadata (EvWindow *window, EvDocument *document)
 {


@@ -646,30 +658,131 @@ setup_sidebar_from_metadata (EvWindow *window, EvDocument *document)
        GValue sidebar_size = { 0, };
        GValue sidebar_page = { 0, };
 
        GValue sidebar_size = { 0, };
        GValue sidebar_page = { 0, };
 

-       if (ev_metadata_manager_get (uri, "sidebar_size", &sidebar_size)) {
+       if (ev_metadata_manager_get (uri, "sidebar_size", &sidebar_size, FALSE)) {

                gtk_paned_set_position (GTK_PANED (window->priv->hpaned),
                                        g_value_get_int (&sidebar_size));
        }
 
                gtk_paned_set_position (GTK_PANED (window->priv->hpaned),
                                        g_value_get_int (&sidebar_size));
        }
 

-       if (ev_metadata_manager_get (uri, "sidebar_page", &sidebar_page)) {
+       if (ev_metadata_manager_get (uri, "sidebar_page", &sidebar_page, FALSE)) {

                const char *page_id = g_value_get_string (&sidebar_page);
 
                const char *page_id = g_value_get_string (&sidebar_page);
 

-               if (strcmp (page_id, "links") == 0) {
+               if (strcmp (page_id, "links") == 0 && ev_sidebar_page_support_document (EV_SIDEBAR_PAGE (links), document)) {

                        ev_sidebar_set_page (EV_SIDEBAR (sidebar), links);
                        ev_sidebar_set_page (EV_SIDEBAR (sidebar), links);

-               } else if (strcmp (page_id, "thumbnails")) {
+               } else if (strcmp (page_id, "thumbnails") && ev_sidebar_page_support_document (EV_SIDEBAR_PAGE (thumbs), document)) {

                        ev_sidebar_set_page (EV_SIDEBAR (sidebar), thumbs);
                }
        } else {
                if (ev_sidebar_page_support_document (EV_SIDEBAR_PAGE (links), document)) {
                        ev_sidebar_set_page (EV_SIDEBAR (sidebar), links);
                        ev_sidebar_set_page (EV_SIDEBAR (sidebar), thumbs);
                }
        } else {
                if (ev_sidebar_page_support_document (EV_SIDEBAR_PAGE (links), document)) {
                        ev_sidebar_set_page (EV_SIDEBAR (sidebar), links);

-               } else if (ev_sidebar_page_support_document (EV_SIDEBAR_PAGE (thumbs), document)) {
-                       ev_sidebar_set_page (EV_SIDEBAR (sidebar), thumbs);

                }
        }
 
        update_sidebar_visibility (window);
 }
 
                }
        }
 
        update_sidebar_visibility (window);
 }
 

+static void
+setup_view_from_metadata (EvWindow *window)
+{
+       EvView *view = EV_VIEW (window->priv->view);
+       char *uri = window->priv->uri;
+       GEnumValue *enum_value;
+       GValue width = { 0, };
+       GValue height = { 0, };
+       GValue maximized = { 0, };
+       GValue x = { 0, };
+       GValue y = { 0, };
+       GValue sizing_mode = { 0, };
+       GValue zoom = { 0, };
+       GValue continuous = { 0, };
+       GValue dual_page = { 0, };
+       GValue presentation = { 0, };
+       GValue fullscreen = { 0, };
+       GValue rotation = { 0, };
+       gboolean restore_size = TRUE;
+
+       /* Window size */
+
+       if (ev_metadata_manager_get (uri, "window_maximized", &maximized, FALSE)) {
+               if (g_value_get_boolean (&maximized)) {
+                       gtk_window_maximize (GTK_WINDOW (window));
+                       restore_size = FALSE;
+               } else {
+                       gtk_window_unmaximize (GTK_WINDOW (window));
+               }
+       }
+
+       if (restore_size &&
+           ev_metadata_manager_get (uri, "window_width", &width, TRUE) &&
+            ev_metadata_manager_get (uri, "window_height", &height, TRUE)) {
+               gtk_window_resize (GTK_WINDOW (window),
+                                  g_value_get_int (&width),
+                                  g_value_get_int (&height));
+       }
+       if (restore_size &&
+           ev_metadata_manager_get (uri, "window_x", &x, TRUE) &&
+           ev_metadata_manager_get (uri, "window_y", &y, TRUE)) {
+               gtk_window_move (GTK_WINDOW (window), g_value_get_int (&x),
+                                g_value_get_int (&y));
+       }
+
+       /* Sizing mode */
+       if (ev_metadata_manager_get (uri, "sizing_mode", &sizing_mode, FALSE)) {
+               enum_value = g_enum_get_value_by_nick
+                       (EV_SIZING_MODE_CLASS, g_value_get_string (&sizing_mode));
+               g_value_unset (&sizing_mode);
+               ev_view_set_sizing_mode (view, enum_value->value);
+       }
+
+       /* Zoom */
+       if (ev_metadata_manager_get (uri, "zoom", &zoom, FALSE) &&
+           ev_view_get_sizing_mode (view) == EV_SIZING_FREE) {
+               ev_view_set_zoom (view, g_value_get_double (&zoom), FALSE);
+       }
+
+       /* Continuous */
+       if (ev_metadata_manager_get (uri, "continuous", &continuous, FALSE)) {
+               ev_view_set_continuous (view, g_value_get_boolean (&continuous));
+       }
+
+       /* Dual page */
+       if (ev_metadata_manager_get (uri, "dual-page", &dual_page, FALSE)) {
+               ev_view_set_dual_page (view, g_value_get_boolean (&dual_page));
+       }
+
+       /* Presentation */
+       if (ev_metadata_manager_get (uri, "presentation", &presentation, FALSE)) {
+               if (g_value_get_boolean (&presentation) && uri) {
+                       ev_window_run_presentation (window);
+               }
+       }
+
+       /* Fullscreen */
+       if (ev_metadata_manager_get (uri, "fullscreen", &fullscreen, FALSE)) {
+               if (g_value_get_boolean (&fullscreen) && uri) {
+                       ev_window_run_fullscreen (window);
+               }
+       }
+
+       /* Rotation */
+       if (ev_metadata_manager_get (uri, "rotation", &rotation, TRUE)) {
+               if (g_value_get_int (&rotation)) {
+                       switch (g_value_get_int (&rotation)) {
+                       case 90:
+                               ev_view_set_rotation (view, 90);
+                               break;
+                       case 180:
+                               ev_view_set_rotation (view, 180);
+                               break;
+                       case 270:
+                               ev_view_set_rotation (view, 270);
+                               break;
+                       default:
+                               break;
+                       }
+               }
+       }
+}
+

 static void
 ev_window_setup_document (EvWindow *ev_window)
 {
 static void
 ev_window_setup_document (EvWindow *ev_window)
 {


@@ -690,30 +803,30 @@ ev_window_setup_document (EvWindow *ev_window)
                                         ev_window, 0);
        }
 
                                         ev_window, 0);
        }
 

-       ev_window_set_page_mode (ev_window, PAGE_MODE_DOCUMENT);
-

        ev_sidebar_set_document (sidebar, document);
 
        if (ev_page_cache_get_n_pages (ev_window->priv->page_cache) > 0) {
                ev_view_set_document (view, document);
        }
        ev_sidebar_set_document (sidebar, document);
 
        if (ev_page_cache_get_n_pages (ev_window->priv->page_cache) > 0) {
                ev_view_set_document (view, document);
        }

+       ev_window_set_page_mode (ev_window, PAGE_MODE_DOCUMENT);

 
        ev_window_title_set_document (ev_window->priv->title, document);
        ev_window_title_set_uri (ev_window->priv->title, ev_window->priv->uri);
 
        ev_window_title_set_document (ev_window->priv->title, document);
        ev_window_title_set_uri (ev_window->priv->title, ev_window->priv->uri);

+

        action = gtk_action_group_get_action (ev_window->priv->action_group, PAGE_SELECTOR_ACTION);
        ev_page_action_set_document (EV_PAGE_ACTION (action), document);
        update_action_sensitivity (ev_window);
 
        action = gtk_action_group_get_action (ev_window->priv->action_group, PAGE_SELECTOR_ACTION);
        ev_page_action_set_document (EV_PAGE_ACTION (action), document);
        update_action_sensitivity (ev_window);
 

-       info = ev_page_cache_get_info (ev_window->priv->page_cache);
-       update_document_mode (ev_window, info->mode);
-

        if (ev_window->priv->properties) {
                ev_properties_dialog_set_document (EV_PROPERTIES_DIALOG (ev_window->priv->properties),
                                                   ev_window->priv->document);
        }
        if (ev_window->priv->properties) {
                ev_properties_dialog_set_document (EV_PROPERTIES_DIALOG (ev_window->priv->properties),
                                                   ev_window->priv->document);
        }

-
+       

        setup_document_from_metadata (ev_window);
        setup_sidebar_from_metadata (ev_window, document);
        setup_document_from_metadata (ev_window);
        setup_sidebar_from_metadata (ev_window, document);

+
+       info = ev_page_cache_get_info (ev_window->priv->page_cache);
+       update_document_mode (ev_window, info->mode);

 }
 
 static void
 }
 
 static void


@@ -724,8 +837,6 @@ password_dialog_response (GtkWidget *password_dialog,
        char *password;
        
        if (response_id == GTK_RESPONSE_OK) {
        char *password;
        
        if (response_id == GTK_RESPONSE_OK) {

-               EvDocument *document;
-               gchar *uri;

 
                password = ev_password_dialog_get_password (EV_PASSWORD_DIALOG (password_dialog));
                if (password) {
 
                password = ev_password_dialog_get_password (EV_PASSWORD_DIALOG (password_dialog));
                if (password) {


@@ -738,21 +849,14 @@ password_dialog_response (GtkWidget *password_dialog,
 
                ev_password_dialog_save_password (EV_PASSWORD_DIALOG (password_dialog));
 
 
                ev_password_dialog_save_password (EV_PASSWORD_DIALOG (password_dialog));
 

-               document = ev_window->priv->password_document;
-               uri = ev_window->priv->password_uri;
-
+               g_object_unref (ev_window->priv->password_document);

                ev_window->priv->password_document = NULL;
                ev_window->priv->password_document = NULL;

-               ev_window->priv->password_uri = NULL;

 
                ev_window_title_set_type (ev_window->priv->title, EV_WINDOW_TITLE_DOCUMENT);
 
                ev_window_title_set_type (ev_window->priv->title, EV_WINDOW_TITLE_DOCUMENT);

-

                ev_job_queue_add_job (ev_window->priv->load_job, EV_JOB_PRIORITY_HIGH);
                
                gtk_widget_destroy (password_dialog);
                        
                ev_job_queue_add_job (ev_window->priv->load_job, EV_JOB_PRIORITY_HIGH);
                
                gtk_widget_destroy (password_dialog);
                        

-               g_object_unref (document);
-               g_free (uri);
-

                return;
        }
 
                return;
        }
 


@@ -768,16 +872,15 @@ static void
 ev_window_popup_password_dialog (EvWindow *ev_window)
 {
        g_assert (ev_window->priv->password_document);
 ev_window_popup_password_dialog (EvWindow *ev_window)
 {
        g_assert (ev_window->priv->password_document);

-       g_assert (ev_window->priv->password_uri);

 
        gtk_widget_set_sensitive (ev_window->priv->password_view, FALSE);
 
 
        gtk_widget_set_sensitive (ev_window->priv->password_view, FALSE);
 

-       ev_window_title_set_uri (ev_window->priv->title, ev_window->priv->password_uri);
+       ev_window_title_set_uri (ev_window->priv->title, ev_window->priv->uri);

        ev_window_title_set_type (ev_window->priv->title, EV_WINDOW_TITLE_PASSWORD);
 
        if (ev_window->priv->password_dialog == NULL) {
                ev_window->priv->password_dialog =
        ev_window_title_set_type (ev_window->priv->title, EV_WINDOW_TITLE_PASSWORD);
 
        if (ev_window->priv->password_dialog == NULL) {
                ev_window->priv->password_dialog =

-                       g_object_new (EV_TYPE_PASSWORD_DIALOG, "uri", ev_window->priv->password_uri, NULL);
+                       g_object_new (EV_TYPE_PASSWORD_DIALOG, "uri", ev_window->priv->uri, NULL);

                gtk_window_set_transient_for (GTK_WINDOW (ev_window->priv->password_dialog), GTK_WINDOW (ev_window));
 
                g_object_add_weak_pointer (G_OBJECT (ev_window->priv->password_dialog),
                gtk_window_set_transient_for (GTK_WINDOW (ev_window->priv->password_dialog), GTK_WINDOW (ev_window));
 
                g_object_add_weak_pointer (G_OBJECT (ev_window->priv->password_dialog),


@@ -856,19 +959,16 @@ ev_window_load_job_cb  (EvJobLoad *job,
                g_object_unref (ev_window->priv->password_document);
                ev_window->priv->password_document = NULL;
        }
                g_object_unref (ev_window->priv->password_document);
                ev_window->priv->password_document = NULL;
        }

-       if (ev_window->priv->password_uri) {
-               g_free (ev_window->priv->password_uri);
-               ev_window->priv->password_uri = NULL;
-       }

 
        /* Success! */
        if (job->error == NULL) {
 
        /* Success! */
        if (job->error == NULL) {

+               

                if (ev_window->priv->document)
                        g_object_unref (ev_window->priv->document);
                ev_window->priv->document = g_object_ref (document);
                if (ev_window->priv->document)
                        g_object_unref (ev_window->priv->document);
                ev_window->priv->document = g_object_ref (document);

-               ev_window_setup_document (ev_window);

                
                

-               ev_window_add_recent (ev_window, ev_window->priv->uri);
+               ev_window_setup_document (ev_window);
+               ev_window_add_recent (ev_window, ev_window->priv->uri);         

                ev_window_clear_jobs (ev_window);
                
                return;
                ev_window_clear_jobs (ev_window);
                
                return;


@@ -879,7 +979,6 @@ ev_window_load_job_cb  (EvJobLoad *job,
                gchar *base_name, *file_name;
 
                ev_window->priv->password_document = g_object_ref (document);
                gchar *base_name, *file_name;
 
                ev_window->priv->password_document = g_object_ref (document);

-               ev_window->priv->password_uri = g_strdup (job->uri);

 
                file_name = gnome_vfs_format_uri_for_display (job->uri);
                base_name = g_path_get_basename (file_name);
 
                file_name = gnome_vfs_format_uri_for_display (job->uri);
                base_name = g_path_get_basename (file_name);


@@ -933,122 +1032,41 @@ ev_window_xfer_job_cb  (EvJobXfer *job,
        }               
 }
 
        }               
 }
 

-static void
-setup_view_from_metadata (EvWindow *window)
+const char *
+ev_window_get_uri (EvWindow *ev_window)

 {
 {

-       EvView *view = EV_VIEW (window->priv->view);
-       char *uri = window->priv->uri;
-       GEnumValue *enum_value;
-       GValue width = { 0, };
-       GValue height = { 0, };
-       GValue maximized = { 0, };
-       GValue x = { 0, };
-       GValue y = { 0, };
-       GValue sizing_mode = { 0, };
-       GValue zoom = { 0, };
-       GValue continuous = { 0, };
-       GValue dual_page = { 0, };
-       GValue presentation = { 0, };
-       GValue fullscreen = { 0, };
-       GValue rotation = { 0, };
-
-       if (window->priv->uri == NULL) {
-               return;
-       }
-
-       /* Window size */
-       if (!GTK_WIDGET_VISIBLE (window)) {
-               gboolean restore_size = TRUE;
-
-               if (ev_metadata_manager_get (uri, "window_maximized", &maximized)) {
-                       if (g_value_get_boolean (&maximized)) {
-                               gtk_window_maximize (GTK_WINDOW (window));
-                               restore_size = FALSE;
-                       }
-               }
-
-               if (restore_size &&
-                   ev_metadata_manager_get (uri, "window_x", &x) &&
-                   ev_metadata_manager_get (uri, "window_y", &y) &&
-                   ev_metadata_manager_get (uri, "window_width", &width) &&
-                   ev_metadata_manager_get (uri, "window_height", &height)) {
-                       gtk_window_set_default_size (GTK_WINDOW (window),
-                                                    g_value_get_int (&width),
-                                                    g_value_get_int (&height));
-                       gtk_window_move (GTK_WINDOW (window), g_value_get_int (&x),
-                                        g_value_get_int (&y));
-               }
-       }
-
-       /* Sizing mode */
-       if (ev_metadata_manager_get (uri, "sizing_mode", &sizing_mode)) {
-               enum_value = g_enum_get_value_by_nick
-                       (EV_SIZING_MODE_CLASS, g_value_get_string (&sizing_mode));
-               g_value_unset (&sizing_mode);
-               ev_view_set_sizing_mode (view, enum_value->value);
-       }
-
-       /* Zoom */
-       if (ev_metadata_manager_get (uri, "zoom", &zoom) &&
-           ev_view_get_sizing_mode (view) == EV_SIZING_FREE) {
-               ev_view_set_zoom (view, g_value_get_double (&zoom), FALSE);
-       }
-
-       /* Continuous */
-       if (ev_metadata_manager_get (uri, "continuous", &continuous)) {
-               ev_view_set_continuous (view, g_value_get_boolean (&continuous));
-       }
-
-       /* Dual page */
-       if (ev_metadata_manager_get (uri, "dual-page", &dual_page)) {
-               ev_view_set_dual_page (view, g_value_get_boolean (&dual_page));
-       }
+       return ev_window->priv->uri;
+}

 
 

-       /* Presentation */
-       if (ev_metadata_manager_get (uri, "presentation", &presentation)) {
-               if (g_value_get_boolean (&presentation)) {
-                       ev_window_run_presentation (window);
-               }
-       }
+static void
+ev_window_close_dialogs (EvWindow *ev_window)
+{
+       if (ev_window->priv->password_dialog)
+               gtk_widget_destroy (ev_window->priv->password_dialog);
+       ev_window->priv->password_dialog = NULL;

 
 

-       /* Fullscreen */
-       if (ev_metadata_manager_get (uri, "fullscreen", &fullscreen)) {
-               if (g_value_get_boolean (&fullscreen)) {
-                       ev_window_run_fullscreen (window);
-               }
+       if (ev_window->priv->print_dialog) {
+               gtk_widget_destroy (ev_window->priv->print_dialog);
+               g_object_unref (ev_window->priv->print_job);

        }
        }

+       ev_window->priv->print_dialog = NULL;
+       ev_window->priv->print_job = NULL;

 
 

-       /* Rotation */
-       if (ev_metadata_manager_get (uri, "rotation", &rotation)) {
-               if (g_value_get_int (&rotation)) {
-                       switch (g_value_get_int (&rotation)) {
-                       case 90:
-                               ev_view_set_rotation (view, 90);
-                               break;
-                       case 180:
-                               ev_view_set_rotation (view, 180);
-                               break;
-                       case 270:
-                               ev_view_set_rotation (view, 270);
-                               break;
-                       default:
-                               break;
-                       }
-               }
-       }
+       if (ev_window->priv->properties)
+               gtk_widget_destroy (ev_window->priv->properties);
+       ev_window->priv->properties = NULL;

 }
 
 void
 ev_window_open_uri (EvWindow *ev_window, const char *uri)
 {
 }
 
 void
 ev_window_open_uri (EvWindow *ev_window, const char *uri)
 {

-       if (ev_window->priv->password_dialog)
-               gtk_widget_destroy (ev_window->priv->password_dialog);

 
        g_free (ev_window->priv->uri);
        ev_window->priv->uri = g_strdup (uri);
 
        setup_view_from_metadata (ev_window);
        
 
        g_free (ev_window->priv->uri);
        ev_window->priv->uri = g_strdup (uri);
 
        setup_view_from_metadata (ev_window);
        

+       ev_window_close_dialogs (ev_window);

        ev_window_clear_jobs (ev_window);
        ev_window_clear_local_uri (ev_window);
        
        ev_window_clear_jobs (ev_window);
        ev_window_clear_local_uri (ev_window);
        


@@ -1075,6 +1093,8 @@ file_open_dialog_response_cb (GtkWidget *chooser,
                g_slist_foreach (uris, (GFunc)g_free, NULL);    
                g_slist_free (uris);
        }
                g_slist_foreach (uris, (GFunc)g_free, NULL);    
                g_slist_free (uris);
        }

+       ev_application_set_chooser_uri (EV_APP, 
+                                       gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (chooser)));

 
        gtk_widget_destroy (chooser);
 }
 
        gtk_widget_destroy (chooser);
 }


@@ -1095,7 +1115,10 @@ ev_window_cmd_file_open (GtkAction *action, EvWindow *window)
        ev_document_types_add_filters (chooser, NULL);
        gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (chooser), TRUE);
        gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (chooser), FALSE);
        ev_document_types_add_filters (chooser, NULL);
        gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (chooser), TRUE);
        gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (chooser), FALSE);

-
+       if (ev_application_get_chooser_uri (EV_APP) != NULL)
+               gtk_file_chooser_set_uri (GTK_FILE_CHOOSER (chooser),
+                                         ev_application_get_chooser_uri (EV_APP));
+       

        g_signal_connect (chooser, "response",
                          G_CALLBACK (file_open_dialog_response_cb),
                          window);
        g_signal_connect (chooser, "response",
                          G_CALLBACK (file_open_dialog_response_cb),
                          window);


@@ -1150,50 +1173,6 @@ ev_window_setup_recent (EvWindow *ev_window)
                        G_CALLBACK (ev_window_cmd_recent_file_activate), ev_window);
 }
 
                        G_CALLBACK (ev_window_cmd_recent_file_activate), ev_window);
 }
 

-/* FIXME
-static gboolean
-overwrite_existing_file (GtkWindow *window, const gchar *file_name)
-{
-       GtkWidget *msgbox;
-       gchar *utf8_file_name;
-       AtkObject *obj;
-       gint ret;
-
-       utf8_file_name = g_filename_to_utf8 (file_name, -1, NULL, NULL, NULL);
-       msgbox = gtk_message_dialog_new (
-               window,
-               (GtkDialogFlags)GTK_DIALOG_DESTROY_WITH_PARENT,
-               GTK_MESSAGE_QUESTION,
-               GTK_BUTTONS_NONE,
-               _("A file named \"%s\" already exists."),
-               utf8_file_name);
-       g_free (utf8_file_name);
-
-       gtk_message_dialog_format_secondary_text (
-               GTK_MESSAGE_DIALOG (msgbox),
-               _("Do you want to replace it with the one you are saving?"));
-
-       gtk_dialog_add_button (GTK_DIALOG (msgbox),
-                              GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
-
-       gtk_dialog_add_button (GTK_DIALOG (msgbox),
-                              _("_Replace"), GTK_RESPONSE_YES);
-
-       gtk_dialog_set_default_response (GTK_DIALOG (msgbox),
-                                        GTK_RESPONSE_CANCEL);
-
-       obj = gtk_widget_get_accessible (msgbox);
-
-       if (GTK_IS_ACCESSIBLE (obj))
-               atk_object_set_name (obj, _("Question"));
-
-       ret = gtk_dialog_run (GTK_DIALOG (msgbox));
-       gtk_widget_destroy (msgbox);
-
-       return (ret == GTK_RESPONSE_YES);
-}
-*/
-

 static void
 save_error_dialog (GtkWindow *window, const gchar *file_name)
 {
 static void
 save_error_dialog (GtkWindow *window, const gchar *file_name)
 {


@@ -1270,214 +1249,123 @@ ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window)
        gtk_widget_show (fc);
 }
 
        gtk_widget_show (fc);
 }
 

-static gboolean
-using_pdf_printer (GnomePrintConfig *config)
-{
-       const guchar *driver;
-
-       driver = gnome_print_config_get (
-               config, (const guchar *)"Settings.Engine.Backend.Driver");
-
-       if (driver) {
-               if (!strcmp ((const gchar *)driver, "gnome-print-pdf"))
-                       return TRUE;
-               else
-                       return FALSE;
-       }
-
-       return FALSE;
-}
-
-static gboolean
-using_postscript_printer (GnomePrintConfig *config)
+static void
+ev_window_print (EvWindow *window)

 {
 {

-       const guchar *driver;
-       const guchar *transport;
-
-       driver = gnome_print_config_get (
-               config, (const guchar *)"Settings.Engine.Backend.Driver");
-
-       transport = gnome_print_config_get (
-               config, (const guchar *)"Settings.Transport.Backend");
+       EvPageCache *page_cache;
+       int last_page;

 
 

-       if (driver) {
-               if (!strcmp ((const gchar *)driver, "gnome-print-ps"))
-                       return TRUE;
-               else
-                       return FALSE;
-       } else  if (transport) { /* these transports default to PostScript */
-               if (!strcmp ((const gchar *)transport, "CUPS"))
-                       return TRUE;
-               else if (!strcmp ((const gchar *)transport, "LPD"))
-                       return TRUE;
-       }
+       page_cache = ev_page_cache_get (window->priv->document);
+       last_page = ev_page_cache_get_n_pages (page_cache);

 
 

-       return FALSE;
+       ev_window_print_range (window, 1, last_page);

 }
 
 }
 

-static GnomePrintConfig *
-load_print_config_from_file (void)
-{
-       GnomePrintConfig *print_config = NULL;
-       char *file_name, *contents = NULL;
-
-       file_name = g_build_filename (ev_dot_dir (), PRINT_CONFIG_FILENAME,
-                                     NULL);
-
-       if (g_file_get_contents (file_name, &contents, NULL, NULL)) {
-               print_config = gnome_print_config_from_string (contents, 0);
-               g_free (contents);
-       }
-
-       if (print_config == NULL) {
-               print_config = gnome_print_config_default ();
-       }
-
-       g_free (file_name);
-
-       return print_config;
-}

 
 

-static void
-save_print_config_to_file (GnomePrintConfig *config)
+static gboolean
+ev_window_print_dialog_response_cb (GtkDialog *print_dialog, gint response, gpointer data)

 {
 {

-       char *file_name, *str;
-
-       g_return_if_fail (config != NULL);
-
-       str = gnome_print_config_to_string (config, 0);
-       if (str == NULL) return;
-
-       file_name = g_build_filename (ev_dot_dir (),
-                                     PRINT_CONFIG_FILENAME,
-                                     NULL);
+    EvWindow *ev_window = EV_WINDOW (data);
+    EvPrintJob *print_job;
+    GnomePrintConfig *config;
+    
+    if (response != GNOME_PRINT_DIALOG_RESPONSE_PRINT) {
+           gtk_widget_destroy (GTK_WIDGET (print_dialog));
+           ev_window->priv->print_dialog = NULL;
+           g_object_unref (ev_window->priv->print_job);
+           ev_window->priv->print_job = NULL;
+           return FALSE;
+    }

 
 

-#ifdef HAVE_G_FILE_SET_CONTENTS
-       g_file_set_contents (file_name, str, -1, NULL);
-#else
-       ev_file_set_contents (file_name, str, -1, NULL);
-#endif
+    config = gnome_print_dialog_get_config (GNOME_PRINT_DIALOG (print_dialog));
+
+    /* FIXME: Change this when we have the first backend
+     * that can print more than postscript
+     */
+    if (using_pdf_printer (config)) {
+           GtkWidget *dialog;
+           dialog = gtk_message_dialog_new (GTK_WINDOW (print_dialog), GTK_DIALOG_MODAL,
+                                            GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
+                                           _("Generating PDF is not supported"));
+           gtk_dialog_run (GTK_DIALOG (dialog));
+           gtk_widget_destroy (dialog);
+           return FALSE;
+    } else if (!using_postscript_printer (config)) {
+           GtkWidget *dialog;
+
+           dialog = gtk_message_dialog_new (GTK_WINDOW (print_dialog), GTK_DIALOG_MODAL,
+                                            GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
+                                            _("Printing is not supported on this printer."));
+                                            gtk_message_dialog_format_secondary_text (
+                                                       GTK_MESSAGE_DIALOG (dialog),
+                                                       _("You were trying to print to a printer using the \"%s\" driver. This program requires a PostScript printer driver."),
+                                                       gnome_print_config_get (config, (guchar *)"Settings.Engine.Backend.Driver"));
+           gtk_dialog_run (GTK_DIALOG (dialog));
+           gtk_widget_destroy (dialog);
+           return FALSE;
+    }

 
 

-       g_free (file_name);
-       g_free (str);
-}
+    save_print_config_to_file (config);
+    
+    print_job = g_object_new (EV_TYPE_PRINT_JOB,
+                             "gnome_print_job", ev_window->priv->print_job,
+                             "document", ev_window->priv->document,
+                             "print_dialog", print_dialog,
+                              NULL);

 
 

-static void
-ev_window_print (EvWindow *window)
-{
-       EvPageCache *page_cache;
-       int last_page;
+    if (print_job != NULL) {
+       ev_print_job_print (print_job, GTK_WINDOW (ev_window));
+       g_object_unref (print_job);
+    }

 
 

-       page_cache = ev_page_cache_get (window->priv->document);
-       last_page = ev_page_cache_get_n_pages (page_cache);
+    g_object_unref (config);

 
 

-       ev_window_print_range (window, 1, -1);
-}
+    gtk_widget_destroy (GTK_WIDGET (print_dialog));
+    ev_window->priv->print_dialog = NULL;
+    g_object_unref (ev_window->priv->print_job);
+    ev_window->priv->print_job = NULL;

 
 

-const char *
-ev_window_get_uri (EvWindow *ev_window)
-{
-       return ev_window->priv->uri;
+    return FALSE;

 }
 
 void
 ev_window_print_range (EvWindow *ev_window, int first_page, int last_page)
 {
        GnomePrintConfig *config;
 }
 
 void
 ev_window_print_range (EvWindow *ev_window, int first_page, int last_page)
 {
        GnomePrintConfig *config;

-       GnomePrintJob *job;
-       GtkWidget *print_dialog;

        gchar *pages_label;
        gchar *pages_label;

-       EvPrintJob *print_job = NULL;
-       EvPageCache *page_cache;

 
         g_return_if_fail (EV_IS_WINDOW (ev_window));
        g_return_if_fail (ev_window->priv->document != NULL);
 
 
         g_return_if_fail (EV_IS_WINDOW (ev_window));
        g_return_if_fail (ev_window->priv->document != NULL);
 

-       page_cache = ev_page_cache_get (ev_window->priv->document);
-       if (last_page == -1) {
-               last_page = ev_page_cache_get_n_pages (page_cache);
-       }
-

        config = load_print_config_from_file ();
        config = load_print_config_from_file ();

-       job = gnome_print_job_new (config);

 
 

-       print_dialog = gnome_print_dialog_new (job, (guchar *) _("Print"),
-                                              (GNOME_PRINT_DIALOG_RANGE |
-                                               GNOME_PRINT_DIALOG_COPIES));
+       if (ev_window->priv->print_job == NULL)
+               ev_window->priv->print_job = gnome_print_job_new (config);
+       
+       if (ev_window->priv->print_dialog == NULL)
+               ev_window->priv->print_dialog = gnome_print_dialog_new (ev_window->priv->print_job, (guchar *) _("Print"),
+                                                                      (GNOME_PRINT_DIALOG_RANGE |
+                                                                       GNOME_PRINT_DIALOG_COPIES));
+       gtk_window_set_transient_for (GTK_WINDOW (ev_window->priv->print_dialog), GTK_WINDOW (ev_window));                                                              
+       g_object_unref (config);                                                                

 
        pages_label = g_strconcat (_("Pages"), " ", NULL);
 
        pages_label = g_strconcat (_("Pages"), " ", NULL);

-       gnome_print_dialog_construct_range_page (GNOME_PRINT_DIALOG (print_dialog),
+       gnome_print_dialog_construct_range_page (GNOME_PRINT_DIALOG (ev_window->priv->print_dialog),

                                                 GNOME_PRINT_RANGE_ALL |
                                                 GNOME_PRINT_RANGE_RANGE,
                                                 first_page, last_page,
                                                 NULL, (const guchar *)pages_label);
        g_free (pages_label);
                                                 
                                                 GNOME_PRINT_RANGE_ALL |
                                                 GNOME_PRINT_RANGE_RANGE,
                                                 first_page, last_page,
                                                 NULL, (const guchar *)pages_label);
        g_free (pages_label);
                                                 

-       gtk_dialog_set_response_sensitive (GTK_DIALOG (print_dialog),
+       gtk_dialog_set_response_sensitive (GTK_DIALOG (ev_window->priv->print_dialog),

                                           GNOME_PRINT_DIALOG_RESPONSE_PREVIEW,
                                           FALSE);
 
                                           GNOME_PRINT_DIALOG_RESPONSE_PREVIEW,
                                           FALSE);
 

-       while (TRUE) {
-               int response;
-               response = gtk_dialog_run (GTK_DIALOG (print_dialog));
-
-               if (response != GNOME_PRINT_DIALOG_RESPONSE_PRINT)
-                       break;
-
-               /* FIXME: Change this when we have the first backend
-                * that can print more than postscript
-                */
-               if (using_pdf_printer (config)) {
-                       GtkWidget *dialog;
-
-                       dialog = gtk_message_dialog_new (
-                               GTK_WINDOW (print_dialog), GTK_DIALOG_MODAL,
-                               GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
-                               _("Generating PDF is not supported"));
-                       gtk_dialog_run (GTK_DIALOG (dialog));
-                       gtk_widget_destroy (dialog);
-                       
-                       continue;
-               } else if (!using_postscript_printer (config)) {
-                       GtkWidget *dialog;
-
-                       dialog = gtk_message_dialog_new (
-                               GTK_WINDOW (print_dialog), GTK_DIALOG_MODAL,
-                               GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
-                               _("Printing is not supported on this printer."));
-                       gtk_message_dialog_format_secondary_text (
-                               GTK_MESSAGE_DIALOG (dialog),
-                               _("You were trying to print to a printer using the \"%s\" driver. This program requires a PostScript printer driver."),
-                               gnome_print_config_get (
-                                       config, (guchar *)"Settings.Engine.Backend.Driver"));
-                       gtk_dialog_run (GTK_DIALOG (dialog));
-                       gtk_widget_destroy (dialog);
-
-                       continue;
-               }
-
-               save_print_config_to_file (config);
-
-               print_job = g_object_new (EV_TYPE_PRINT_JOB,
-                                         "gnome_print_job", job,
-                                         "document", ev_window->priv->document,
-                                         "print_dialog", print_dialog,
-                                         NULL);
-               break;
-       }
-
-       g_object_unref (job);
-
-       gtk_widget_destroy (print_dialog);
-
-       if (print_job != NULL) {
-               ev_print_job_print (print_job, GTK_WINDOW (ev_window));
-               g_object_unref (print_job);
-       }
-
-       g_object_unref (config);
+       g_signal_connect (G_OBJECT (ev_window->priv->print_dialog), "response", G_CALLBACK (ev_window_print_dialog_response_cb), ev_window);
+       gtk_widget_show (ev_window->priv->print_dialog);
+       return;

 }
 }

-
+       

 static void
 ev_window_cmd_file_print (GtkAction *action, EvWindow *ev_window)
 {
 static void
 ev_window_cmd_file_print (GtkAction *action, EvWindow *ev_window)
 {


@@ -1546,7 +1434,7 @@ ev_window_cmd_edit_find (GtkAction *action, EvWindow *ev_window)
        } else if (!EV_IS_DOCUMENT_FIND (ev_window->priv->document)) {
                find_not_supported_dialog (ev_window);
        } else {
        } else if (!EV_IS_DOCUMENT_FIND (ev_window->priv->document)) {
                find_not_supported_dialog (ev_window);
        } else {

-               update_chrome_flag (ev_window, EV_CHROME_FINDBAR, NULL, TRUE);
+               update_chrome_flag (ev_window, EV_CHROME_FINDBAR, TRUE);

 
                gtk_widget_grab_focus (ev_window->priv->find_bar);
        }
 
                gtk_widget_grab_focus (ev_window->priv->find_bar);
        }


@@ -1626,10 +1514,9 @@ static void
 ev_window_sidebar_position_change_cb (GObject *object, GParamSpec *pspec,
                                      EvWindow *ev_window)
 {
 ev_window_sidebar_position_change_cb (GObject *object, GParamSpec *pspec,
                                      EvWindow *ev_window)
 {

-       if (ev_window->priv->uri) {
+       if (!ev_window_is_empty (ev_window))

                ev_metadata_manager_set_int (ev_window->priv->uri, "sidebar_size",
                                             gtk_paned_get_position (GTK_PANED (object)));
                ev_metadata_manager_set_int (ev_window->priv->uri, "sidebar_size",
                                             gtk_paned_get_position (GTK_PANED (object)));

-       }

 }
 
 static void
 }
 
 static void


@@ -1846,9 +1733,8 @@ ev_window_run_fullscreen (EvWindow *window)
        gtk_window_fullscreen (GTK_WINDOW (window));
        ev_window_update_fullscreen_popup (window);
 
        gtk_window_fullscreen (GTK_WINDOW (window));
        ev_window_update_fullscreen_popup (window);
 

-       if (window->priv->uri) {
+       if (!ev_window_is_empty (window))

                ev_metadata_manager_set_boolean (window->priv->uri, "fullscreen", TRUE);
                ev_metadata_manager_set_boolean (window->priv->uri, "fullscreen", TRUE);

-       }

 }
 
 static void
 }
 
 static void


@@ -1877,9 +1763,8 @@ ev_window_stop_fullscreen (EvWindow *window)
        update_chrome_visibility (window);
        update_sidebar_visibility (window);
 
        update_chrome_visibility (window);
        update_sidebar_visibility (window);
 

-       if (window->priv->uri) {
+       if (!ev_window_is_empty (window))

                ev_metadata_manager_set_boolean (window->priv->uri, "fullscreen", FALSE);
                ev_metadata_manager_set_boolean (window->priv->uri, "fullscreen", FALSE);

-       }

 }
 
 static void
 }
 
 static void


@@ -1926,9 +1811,8 @@ ev_window_run_presentation (EvWindow *window)
        update_chrome_visibility (window);
        gtk_widget_hide (window->priv->sidebar);
 
        update_chrome_visibility (window);
        gtk_widget_hide (window->priv->sidebar);
 

-       if (window->priv->uri) {
+       if (!ev_window_is_empty (window))

                ev_metadata_manager_set_boolean (window->priv->uri, "presentation", TRUE);
                ev_metadata_manager_set_boolean (window->priv->uri, "presentation", TRUE);

-       }

 }
 
 static void
 }
 
 static void


@@ -1946,9 +1830,8 @@ ev_window_stop_presentation (EvWindow *window)
        update_chrome_visibility (window);
        update_sidebar_visibility (window);
 
        update_chrome_visibility (window);
        update_sidebar_visibility (window);
 

-       if (window->priv->uri) {
+       if (!ev_window_is_empty (window))

                ev_metadata_manager_set_boolean (window->priv->uri, "presentation", FALSE);
                ev_metadata_manager_set_boolean (window->priv->uri, "presentation", FALSE);

-       }

 }
 
 static void
 }
 
 static void


@@ -2212,7 +2095,7 @@ ev_window_cmd_view_reload (GtkAction *action, EvWindow *ev_window)
        ev_window_open_uri (ev_window, uri);
 
        /* In case the number of pages in the document has changed. */
        ev_window_open_uri (ev_window, uri);
 
        /* In case the number of pages in the document has changed. */

-       page = CLAMP (page, 0, ev_page_cache_get_n_pages (ev_window->priv->page_cache));
+       page = CLAMP (page, 0, ev_page_cache_get_n_pages (ev_window->priv->page_cache) - 1);

 
        ev_page_cache_set_current_page (ev_window->priv->page_cache, page);
 
 
        ev_page_cache_set_current_page (ev_window->priv->page_cache, page);
 


@@ -2247,7 +2130,7 @@ ev_window_cmd_escape (GtkAction *action, EvWindow *window)
 
        widget = gtk_window_get_focus (GTK_WINDOW (window));
        if (widget && gtk_widget_get_ancestor (widget, EGG_TYPE_FIND_BAR)) {
 
        widget = gtk_window_get_focus (GTK_WINDOW (window));
        if (widget && gtk_widget_get_ancestor (widget, EGG_TYPE_FIND_BAR)) {

-               update_chrome_flag (window, EV_CHROME_FINDBAR, NULL, FALSE);
+               update_chrome_flag (window, EV_CHROME_FINDBAR, FALSE);

                gtk_widget_grab_focus (window->priv->view);
        } else {
                gboolean fullscreen;
                gtk_widget_grab_focus (window->priv->view);
        } else {
                gboolean fullscreen;


@@ -2306,13 +2189,12 @@ save_sizing_mode (EvWindow *window)
        EvSizingMode mode;
        GEnumValue *enum_value;
 
        EvSizingMode mode;
        GEnumValue *enum_value;
 

-       if (window->priv->uri) {
-               mode = ev_view_get_sizing_mode (EV_VIEW (window->priv->view));
-               enum_value = g_enum_get_value (EV_SIZING_MODE_CLASS, mode);
+       mode = ev_view_get_sizing_mode (EV_VIEW (window->priv->view));
+       enum_value = g_enum_get_value (EV_SIZING_MODE_CLASS, mode);

 
 

+       if (!ev_window_is_empty (window))

                ev_metadata_manager_set_string (window->priv->uri, "sizing_mode",
                                                enum_value->value_nick);
                ev_metadata_manager_set_string (window->priv->uri, "sizing_mode",
                                                enum_value->value_nick);

-       }

 }
 
 static void     
 }
 
 static void     


@@ -2369,7 +2251,7 @@ ev_window_zoom_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *ev_window)
 {
         update_action_sensitivity (ev_window);
 
 {
         update_action_sensitivity (ev_window);
 

-       if (ev_view_get_sizing_mode (view) == EV_SIZING_FREE) {
+       if (ev_view_get_sizing_mode (view) == EV_SIZING_FREE && !ev_window_is_empty (ev_window)) {

                ev_metadata_manager_set_double (ev_window->priv->uri, "zoom",
                                                ev_view_get_zoom (view));
        }
                ev_metadata_manager_set_double (ev_window->priv->uri, "zoom",
                                                ev_view_get_zoom (view));
        }


@@ -2408,10 +2290,9 @@ ev_window_continuous_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *ev_w
 {
        ev_window_update_continuous_action (ev_window);
 
 {
        ev_window_update_continuous_action (ev_window);
 

-       if (ev_window->priv->uri) {
+       if (!ev_window_is_empty (ev_window))

                ev_metadata_manager_set_boolean (ev_window->priv->uri, "continuous",
                                                 ev_view_get_continuous (EV_VIEW (ev_window->priv->view)));
                ev_metadata_manager_set_boolean (ev_window->priv->uri, "continuous",
                                                 ev_view_get_continuous (EV_VIEW (ev_window->priv->view)));

-       }

 }
 
 static void     
 }
 
 static void     


@@ -2421,10 +2302,9 @@ ev_window_rotation_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *window
 
        rotation = ev_view_get_rotation (EV_VIEW (window->priv->view));
 
 
        rotation = ev_view_get_rotation (EV_VIEW (window->priv->view));
 

-       if (window->priv->uri) {
+       if (!ev_window_is_empty (window))

                ev_metadata_manager_set_int (window->priv->uri, "rotation",
                                             rotation);
                ev_metadata_manager_set_int (window->priv->uri, "rotation",
                                             rotation);

-       }

 
        ev_sidebar_thumbnails_refresh (EV_SIDEBAR_THUMBNAILS (window->priv->sidebar_thumbs),
                                       rotation);
 
        ev_sidebar_thumbnails_refresh (EV_SIDEBAR_THUMBNAILS (window->priv->sidebar_thumbs),
                                       rotation);


@@ -2441,10 +2321,9 @@ ev_window_dual_mode_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *ev_wi
 {
        ev_window_update_dual_page_action (ev_window);
 
 {
        ev_window_update_dual_page_action (ev_window);
 

-       if (ev_window->priv->uri) {
+       if (!ev_window_is_empty (ev_window))

                ev_metadata_manager_set_boolean (ev_window->priv->uri, "dual-page",
                                                 ev_view_get_dual_page (EV_VIEW (ev_window->priv->view)));
                ev_metadata_manager_set_boolean (ev_window->priv->uri, "dual-page",
                                                 ev_view_get_dual_page (EV_VIEW (ev_window->priv->view)));

-       }

 }
 
 static char *
 }
 
 static char *


@@ -2542,9 +2421,11 @@ ev_window_cmd_help_about (GtkAction *action, EvWindow *ev_window)
 static void
 ev_window_view_toolbar_cb (GtkAction *action, EvWindow *ev_window)
 {
 static void
 ev_window_view_toolbar_cb (GtkAction *action, EvWindow *ev_window)
 {

-       update_chrome_flag (ev_window, EV_CHROME_TOOLBAR,
-                           GCONF_CHROME_TOOLBAR,
-                           gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)));
+       gboolean active;
+       
+       active = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
+       update_chrome_flag (ev_window, EV_CHROME_TOOLBAR, active);
+       ev_metadata_manager_set_boolean (NULL, "show_toolbar", active);

 }
 
 static void
 }
 
 static void


@@ -2574,9 +2455,8 @@ ev_window_sidebar_current_page_changed_cb (EvSidebar  *ev_sidebar,
 
        g_object_unref (current_page);
 
 
        g_object_unref (current_page);
 

-       if (ev_window->priv->uri) {
+       if (!ev_window_is_empty (ev_window))

                ev_metadata_manager_set_string (ev_window->priv->uri, "sidebar_page", id);
                ev_metadata_manager_set_string (ev_window->priv->uri, "sidebar_page", id);

-       }

 }
 
 static void
 }
 
 static void


@@ -2595,12 +2475,72 @@ ev_window_sidebar_visibility_changed_cb (EvSidebar *ev_sidebar, GParamSpec *pspe
        g_signal_handlers_unblock_by_func
                (action, G_CALLBACK (ev_window_view_sidebar_cb), ev_window);
 
        g_signal_handlers_unblock_by_func
                (action, G_CALLBACK (ev_window_view_sidebar_cb), ev_window);
 

-       if (!ev_view_get_presentation (view) && !ev_view_get_fullscreen (view)) {
+       if (!ev_view_get_presentation (view) && 
+           !ev_view_get_fullscreen (view) &&
+           !ev_window_is_empty (ev_window)) {

                ev_metadata_manager_set_boolean (ev_window->priv->uri, "sidebar_visibility",
                                                 GTK_WIDGET_VISIBLE (ev_sidebar));
        }
 }
 
                ev_metadata_manager_set_boolean (ev_window->priv->uri, "sidebar_visibility",
                                                 GTK_WIDGET_VISIBLE (ev_sidebar));
        }
 }
 

+static gboolean
+view_menu_popup_cb (EvView         *view,
+                   EvLink         *link,
+                   EvWindow       *ev_window)
+{
+       GtkWidget *popup;
+       gboolean   show_external = FALSE;
+       gboolean   show_internal = FALSE;
+       GtkAction *action;
+
+       if (ev_view_get_presentation (EV_VIEW (ev_window->priv->view)))
+               return FALSE;
+       
+       if (ev_window->priv->link)
+               g_object_unref (ev_window->priv->link);
+       if (link)
+               ev_window->priv->link = g_object_ref (link);
+       else    
+               ev_window->priv->link = NULL;
+
+       popup = ev_window->priv->popup;
+
+       if (ev_window->priv->link) 
+               switch (ev_link_get_link_type (ev_window->priv->link)) {
+                       case EV_LINK_TYPE_PAGE:
+                       case EV_LINK_TYPE_PAGE_FIT:
+                       case EV_LINK_TYPE_PAGE_FITH:
+                       case EV_LINK_TYPE_PAGE_FITV:
+                       case EV_LINK_TYPE_PAGE_FITR:
+                       case EV_LINK_TYPE_PAGE_XYZ:
+                               show_internal = TRUE;
+                               break;
+                       case EV_LINK_TYPE_EXTERNAL_URI:
+                       case EV_LINK_TYPE_LAUNCH:       
+                               show_external = TRUE;
+                               break;
+                       default:
+                               break;
+               }
+       
+       action = gtk_action_group_get_action (ev_window->priv->popups_action_group,
+                                             "OpenLink");
+       gtk_action_set_visible (action, show_external);
+
+       action = gtk_action_group_get_action (ev_window->priv->popups_action_group,
+                                             "CopyLinkAddress");
+       gtk_action_set_visible (action, show_external);
+
+       action = gtk_action_group_get_action (ev_window->priv->popups_action_group,
+                                             "GoLink");
+       gtk_action_set_visible (action, show_internal);
+
+       gtk_menu_popup (GTK_MENU (popup), NULL, NULL,
+                       NULL, NULL,
+                       3, gtk_get_current_event_time ());
+       return FALSE;
+}
+

 static void
 view_find_status_changed_cb (EvView     *view,
                             GParamSpec *pspec,
 static void
 view_find_status_changed_cb (EvView     *view,
                             GParamSpec *pspec,


@@ -2631,7 +2571,7 @@ static void
 find_bar_close_cb (EggFindBar *find_bar,
                   EvWindow   *ev_window)
 {
 find_bar_close_cb (EggFindBar *find_bar,
                   EvWindow   *ev_window)
 {

-       update_chrome_flag (ev_window, EV_CHROME_FINDBAR, NULL, FALSE);
+       update_chrome_flag (ev_window, EV_CHROME_FINDBAR, FALSE);

 }
 
 static void
 }
 
 static void


@@ -2716,7 +2656,6 @@ ev_window_finalize (GObject *object)
                g_list_free (windows);
        }
        
                g_list_free (windows);
        }
        

-       g_list_free (windows);

        G_OBJECT_CLASS (ev_window_parent_class)->finalize (object);
 }
 
        G_OBJECT_CLASS (ev_window_parent_class)->finalize (object);
 }
 


@@ -2746,6 +2685,11 @@ ev_window_dispose (GObject *object)
                priv->action_group = NULL;
        }
 
                priv->action_group = NULL;
        }
 

+       if (priv->popups_action_group) {
+               g_object_unref (priv->popups_action_group);
+               priv->popups_action_group = NULL;
+       }
+

        if (priv->page_cache) {
                g_signal_handlers_disconnect_by_func (priv->page_cache, page_changed_cb, window);
                priv->page_cache = NULL;
        if (priv->page_cache) {
                g_signal_handlers_disconnect_by_func (priv->page_cache, page_changed_cb, window);
                priv->page_cache = NULL;


@@ -2779,13 +2723,11 @@ ev_window_dispose (GObject *object)
                priv->password_document = NULL;
        }
        
                priv->password_document = NULL;
        }
        

-       if (priv->password_uri) {
-               g_free (priv->password_uri);
-               priv->password_uri = NULL;
-       }
+       ev_window_close_dialogs (window);

 
 

-       if (priv->password_dialog) {
-               gtk_widget_destroy (priv->password_dialog);
+       if (priv->link) {
+               g_object_unref (priv->link);
+               priv->link = NULL;

        }
 
        if (priv->find_bar) {
        }
 
        if (priv->find_bar) {


@@ -2839,7 +2781,8 @@ static const GtkActionEntry entries[] = {
        { "FileOpen", GTK_STOCK_OPEN, N_("_Open..."), "<control>O",
          N_("Open an existing document"),
          G_CALLBACK (ev_window_cmd_file_open) },
        { "FileOpen", GTK_STOCK_OPEN, N_("_Open..."), "<control>O",
          N_("Open an existing document"),
          G_CALLBACK (ev_window_cmd_file_open) },

-               { "FileSaveAs", GTK_STOCK_SAVE_AS, N_("_Save a Copy..."), NULL, NULL,
+               { "FileSaveAs", GTK_STOCK_SAVE_AS, N_("_Save a Copy..."), "<control>S",
+         N_("Save a copy of the current document"),

          G_CALLBACK (ev_window_cmd_save_as) },
        { "FilePrint", GTK_STOCK_PRINT, N_("_Print..."), "<control>P",
          N_("Print this document"),
          G_CALLBACK (ev_window_cmd_save_as) },
        { "FilePrint", GTK_STOCK_PRINT, N_("_Print..."), "<control>P",
          N_("Print this document"),


@@ -2920,6 +2863,10 @@ static const GtkActionEntry entries[] = {
           G_CALLBACK (ev_window_cmd_scroll_backward) },
         { "ShiftBackSpace", NULL, "", "<shift>BackSpace", NULL,
           G_CALLBACK (ev_window_cmd_scroll_forward) },
           G_CALLBACK (ev_window_cmd_scroll_backward) },
         { "ShiftBackSpace", NULL, "", "<shift>BackSpace", NULL,
           G_CALLBACK (ev_window_cmd_scroll_forward) },

+        { "Return", NULL, "", "Return", NULL,
+          G_CALLBACK (ev_window_cmd_scroll_forward) },
+        { "ShiftReturn", NULL, "", "<shift>Return", NULL,
+          G_CALLBACK (ev_window_cmd_scroll_backward) },

         { "Plus", GTK_STOCK_ZOOM_IN, NULL, "plus", NULL,
           G_CALLBACK (ev_window_cmd_view_zoom_in) },
         { "CtrlEqual", GTK_STOCK_ZOOM_IN, NULL, "<control>equal", NULL,
         { "Plus", GTK_STOCK_ZOOM_IN, NULL, "plus", NULL,
           G_CALLBACK (ev_window_cmd_view_zoom_in) },
         { "CtrlEqual", GTK_STOCK_ZOOM_IN, NULL, "<control>equal", NULL,


@@ -2973,6 +2920,18 @@ static const GtkToggleActionEntry toggle_entries[] = {
           G_CALLBACK (ev_window_cmd_view_page_width) },
 };
 
           G_CALLBACK (ev_window_cmd_view_page_width) },
 };
 

+/* Popups specific items */
+static const GtkActionEntry popups_entries [] = {
+       /* Links */
+       { "OpenLink", GTK_STOCK_OPEN, N_("_Open Link"), NULL,
+         NULL, G_CALLBACK (ev_popup_cmd_open_link) },
+       { "GoLink", GTK_STOCK_GO_FORWARD, N_("_Go To"), NULL,
+         NULL, G_CALLBACK (ev_popup_cmd_open_link) },
+       { "CopyLinkAddress", NULL, N_("_Copy Link Address"), NULL,
+         NULL,
+         G_CALLBACK (ev_popup_cmd_copy_link_address) },
+};
+

 static void
 drag_data_received_cb (GtkWidget *widget, GdkDragContext *context,
                       gint x, gint y, GtkSelectionData *selection_data,
 static void
 drag_data_received_cb (GtkWidget *widget, GdkDragContext *context,
                       gint x, gint y, GtkSelectionData *selection_data,


@@ -3107,28 +3066,6 @@ set_chrome_actions (EvWindow *window)
                (action, G_CALLBACK (ev_window_view_toolbar_cb), window);
 }
 
                (action, G_CALLBACK (ev_window_view_toolbar_cb), window);
 }
 

-static EvChrome
-load_chrome (void)
-{
-       EvChrome chrome = EV_CHROME_NORMAL;
-       GConfClient *client;
-       GConfValue *value;
-
-       client = gconf_client_get_default ();
-
-       value = gconf_client_get (client, GCONF_CHROME_TOOLBAR, NULL);
-       if (value != NULL) {
-               if (value->type == GCONF_VALUE_BOOL && !gconf_value_get_bool (value)) {
-                       chrome &= ~EV_CHROME_TOOLBAR;
-               }
-               gconf_value_free (value);
-       }
-
-       g_object_unref (client);
-
-       return chrome;
-}
-

 static void
 sidebar_widget_model_set (EvSidebarLinks *ev_sidebar_links,
                          GParamSpec     *pspec,
 static void
 sidebar_widget_model_set (EvSidebarLinks *ev_sidebar_links,
                          GParamSpec     *pspec,


@@ -3157,6 +3094,8 @@ ev_window_set_view_accels_sensitivity (EvWindow *window, gboolean sensitive)
                set_action_sensitive (window, "ShiftSpace", sensitive);
                set_action_sensitive (window, "BackSpace", sensitive);
                set_action_sensitive (window, "ShiftBackSpace", sensitive);
                set_action_sensitive (window, "ShiftSpace", sensitive);
                set_action_sensitive (window, "BackSpace", sensitive);
                set_action_sensitive (window, "ShiftBackSpace", sensitive);

+               set_action_sensitive (window, "Return", sensitive);
+               set_action_sensitive (window, "ShiftReturn", sensitive);

                set_action_sensitive (window, "Slash", sensitive);
                set_action_sensitive (window, "Plus", sensitive);
                set_action_sensitive (window, "Minus", sensitive);
                set_action_sensitive (window, "Slash", sensitive);
                set_action_sensitive (window, "Plus", sensitive);
                set_action_sensitive (window, "Minus", sensitive);


@@ -3169,7 +3108,7 @@ ev_window_set_view_accels_sensitivity (EvWindow *window, gboolean sensitive)
 static gboolean
 view_actions_focus_in_cb (GtkWidget *widget, GdkEventFocus *event, EvWindow *window)
 {
 static gboolean
 view_actions_focus_in_cb (GtkWidget *widget, GdkEventFocus *event, EvWindow *window)
 {

-       update_chrome_flag (window, EV_CHROME_RAISE_TOOLBAR, NULL, FALSE);
+       update_chrome_flag (window, EV_CHROME_RAISE_TOOLBAR, FALSE);

        set_action_sensitive (window, "ViewToolbar", TRUE);
 
        ev_window_set_view_accels_sensitivity (window, TRUE);
        set_action_sensitive (window, "ViewToolbar", TRUE);
 
        ev_window_set_view_accels_sensitivity (window, TRUE);


@@ -3208,13 +3147,12 @@ sidebar_page_main_widget_update_cb (GObject *ev_sidebar_page,
 static gboolean
 window_state_event_cb (EvWindow *window, GdkEventWindowState *event, gpointer dummy)
 {
 static gboolean
 window_state_event_cb (EvWindow *window, GdkEventWindowState *event, gpointer dummy)
 {

-       char *uri = window->priv->uri;
-
-       if (uri && !(event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN)) {
+       if (!(event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN)) {

                gboolean maximized;
 
                maximized = event->new_window_state & GDK_WINDOW_STATE_MAXIMIZED;
                gboolean maximized;
 
                maximized = event->new_window_state & GDK_WINDOW_STATE_MAXIMIZED;

-               ev_metadata_manager_set_boolean (uri, "window_maximized", maximized);
+               if (!ev_window_is_empty (window))
+                       ev_metadata_manager_set_boolean (window->priv->uri, "window_maximized", maximized);

        }
 
        return FALSE;
        }
 
        return FALSE;


@@ -3229,14 +3167,16 @@ window_configure_event_cb (EvWindow *window, GdkEventConfigure *event, gpointer
 
        state = gdk_window_get_state (GTK_WIDGET (window)->window);
 
 
        state = gdk_window_get_state (GTK_WIDGET (window)->window);
 

-       if (uri && !(state & GDK_WINDOW_STATE_FULLSCREEN)) {
+       if (!(state & GDK_WINDOW_STATE_FULLSCREEN)) {

                gtk_window_get_position (GTK_WINDOW (window), &x, &y);
                gtk_window_get_size (GTK_WINDOW (window), &width, &height);
 
                gtk_window_get_position (GTK_WINDOW (window), &x, &y);
                gtk_window_get_size (GTK_WINDOW (window), &width, &height);
 

-               ev_metadata_manager_set_int (uri, "window_x", x);
-               ev_metadata_manager_set_int (uri, "window_y", y);
-               ev_metadata_manager_set_int (uri, "window_width", width);
-               ev_metadata_manager_set_int (uri, "window_height", height);
+               if (!ev_window_is_empty (window)) {
+                       ev_metadata_manager_set_int (uri, "window_x", x);
+                       ev_metadata_manager_set_int (uri, "window_y", y);
+                       ev_metadata_manager_set_int (uri, "window_width", width);
+                       ev_metadata_manager_set_int (uri, "window_height", height);
+               }

        }
 
        return FALSE;
        }
 
        return FALSE;


@@ -3310,6 +3250,25 @@ view_external_link_cb (EvView *view, EvLink *link, EvWindow *window)
        }
 }
 
        }
 }
 

+static void
+ev_popup_cmd_open_link (GtkAction *action, EvWindow *window)
+{
+       ev_view_goto_link (EV_VIEW (window->priv->view), window->priv->link);
+}
+
+static void
+ev_popup_cmd_copy_link_address (GtkAction *action, EvWindow *window)
+{
+       GtkClipboard *clipboard;
+       const gchar *uri;
+
+       uri = ev_link_get_uri (window->priv->link);
+
+       clipboard = gtk_widget_get_clipboard (GTK_WIDGET (window),
+                                             GDK_SELECTION_CLIPBOARD);
+       gtk_clipboard_set_text (clipboard, uri, -1);
+}
+

 static void
 ev_window_init (EvWindow *ev_window)
 {
 static void
 ev_window_init (EvWindow *ev_window)
 {


@@ -3353,6 +3312,14 @@ ev_window_init (EvWindow *ev_window)
 
        ev_window_set_view_accels_sensitivity (ev_window, FALSE);
 
 
        ev_window_set_view_accels_sensitivity (ev_window, FALSE);
 

+       action_group = gtk_action_group_new ("PopupsActions");
+       ev_window->priv->popups_action_group = action_group;
+       gtk_action_group_set_translation_domain (action_group, NULL);
+       gtk_action_group_add_actions (action_group, popups_entries,
+                                     G_N_ELEMENTS (popups_entries), ev_window);
+       gtk_ui_manager_insert_action_group (ev_window->priv->ui_manager,
+                                           action_group, 0);
+

        if (!gtk_ui_manager_add_ui_from_file (ev_window->priv->ui_manager,
                                              DATADIR"/evince-ui.xml",
                                              &error)) {
        if (!gtk_ui_manager_add_ui_from_file (ev_window->priv->ui_manager,
                                              DATADIR"/evince-ui.xml",
                                              &error)) {


@@ -3453,9 +3420,17 @@ ev_window_init (EvWindow *ev_window)
        g_signal_connect_object (ev_window->priv->view, "external-link",
                                 G_CALLBACK (view_external_link_cb),
                                 ev_window, 0);
        g_signal_connect_object (ev_window->priv->view, "external-link",
                                 G_CALLBACK (view_external_link_cb),
                                 ev_window, 0);

+       g_signal_connect_object (ev_window->priv->view,
+                                "popup",
+                                G_CALLBACK (view_menu_popup_cb),
+                                ev_window, 0);

        gtk_widget_show (ev_window->priv->view);
        gtk_widget_show (ev_window->priv->password_view);
 
        gtk_widget_show (ev_window->priv->view);
        gtk_widget_show (ev_window->priv->password_view);
 

+       ev_window->priv->find_bar = egg_find_bar_new ();
+       gtk_box_pack_end (GTK_BOX (ev_window->priv->main_box),
+                         ev_window->priv->find_bar,
+                         FALSE, TRUE, 0);

 
        /* We own a ref on these widgets, as we can swap them in and out */
        g_object_ref (ev_window->priv->view);
 
        /* We own a ref on these widgets, as we can swap them in and out */
        g_object_ref (ev_window->priv->view);


@@ -3494,17 +3469,7 @@ ev_window_init (EvWindow *ev_window)
                          G_CALLBACK (ev_window_has_selection_changed_cb),
                          ev_window);
 
                          G_CALLBACK (ev_window_has_selection_changed_cb),
                          ev_window);
 

-       ev_window->priv->find_bar = egg_find_bar_new ();
-       gtk_box_pack_end (GTK_BOX (ev_window->priv->main_box),
-                         ev_window->priv->find_bar,
-                         FALSE, TRUE, 0);
-
-       ev_window_setup_recent (ev_window);
-       ev_window->priv->chrome = load_chrome ();
-       set_chrome_actions (ev_window);
-       update_chrome_visibility (ev_window);
-
-       /* Connect sidebar signals */
+       /* Connect sidebar signals */

        g_signal_connect (ev_window->priv->sidebar,
                          "notify::visible",
                          G_CALLBACK (ev_window_sidebar_visibility_changed_cb),
        g_signal_connect (ev_window->priv->sidebar,
                          "notify::visible",
                          G_CALLBACK (ev_window_sidebar_visibility_changed_cb),


@@ -3540,6 +3505,11 @@ ev_window_init (EvWindow *ev_window)
                          G_CALLBACK (find_bar_search_changed_cb),
                          ev_window);
 
                          G_CALLBACK (find_bar_search_changed_cb),
                          ev_window);
 

+       /* Popups */
+       ev_window->priv->popup = gtk_ui_manager_get_widget (ev_window->priv->ui_manager,
+                                                          "/DocumentPopup");
+       ev_window->priv->link = NULL;
+

        /* Give focus to the document view */
        gtk_widget_grab_focus (ev_window->priv->view);
 
        /* Give focus to the document view */
        gtk_widget_grab_focus (ev_window->priv->view);
 


@@ -3551,7 +3521,17 @@ ev_window_init (EvWindow *ev_window)
        g_signal_connect (G_OBJECT (ev_window), "drag_data_received",
                          G_CALLBACK (drag_data_received_cb), NULL);
 
        g_signal_connect (G_OBJECT (ev_window), "drag_data_received",
                          G_CALLBACK (drag_data_received_cb), NULL);
 

-       /* Set it to something random to force a change */
+       /* Set it user interface params */
+
+       ev_window_setup_recent (ev_window);
+       setup_chrome_from_metadata (ev_window);
+       set_chrome_actions (ev_window);
+       update_chrome_visibility (ev_window);
+       update_sidebar_visibility (ev_window);
+
+       gtk_window_set_default_size (GTK_WINDOW (ev_window),
+                                    600, 600);
+       setup_view_from_metadata (ev_window);

 
         ev_window_sizing_mode_changed_cb (EV_VIEW (ev_window->priv->view), NULL, ev_window);
        update_action_sensitivity (ev_window);
 
         ev_window_sizing_mode_changed_cb (EV_VIEW (ev_window->priv->view), NULL, ev_window);
        update_action_sensitivity (ev_window);


@@ -3564,8 +3544,6 @@ ev_window_new (void)
 
        ev_window = GTK_WIDGET (g_object_new (EV_TYPE_WINDOW,
                                              "type", GTK_WINDOW_TOPLEVEL,
 
        ev_window = GTK_WIDGET (g_object_new (EV_TYPE_WINDOW,
                                              "type", GTK_WINDOW_TOPLEVEL,

-                                             "default-width", 600,
-                                             "default-height", 600,

                                              NULL));
 
        return ev_window;
                                              NULL));
 
        return ev_window;