Fix some build warnings under GCC 4.3.0. (#537535).

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

diff --git a/shell/ev-window.c b/shell/ev-window.c
index 1f78e875544770618170f3f72794a6a4ee18f1de..f6a525426730edf3bc855305525d18c2302511a4 100644 (file)
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -1941,7 +1941,7 @@ window_save_file_copy_ready_cb (GFile        *src,
                                         _("The file could not be saved as “%s”."),
                                         name);
        gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-                                                 error->message);
+                                                 "%s", error->message);
        g_signal_connect (dialog, "response",
                          G_CALLBACK (gtk_widget_destroy),
                          NULL);
@@ -2156,7 +2156,7 @@ ev_window_print_finished (GtkPrintJob *print_job,
                                                 GTK_BUTTONS_OK,
                                                 _("Failed to print document"));
                gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-                                                         error->message);
+                                                         "%s", error->message);
 
                gtk_dialog_run (GTK_DIALOG (dialog));
                gtk_widget_destroy (dialog);
@@ -2228,7 +2228,7 @@ ev_window_print_send (EvWindow    *window,
                GtkPrintJob *job;
                GError      *error = NULL;
        
-               job = gtk_print_job_new ("evince-print",
+               job = gtk_print_job_new (gtk_window_get_title (GTK_WINDOW (window)),
                                         window->priv->printer,
                                         settings,
                                         window->priv->print_page_setup);
@@ -2243,7 +2243,7 @@ ev_window_print_send (EvWindow    *window,
                                            window, NULL);
                } else {
                        ev_window_clear_print_job (window);
-                       g_warning (error->message);
+                       g_warning ("%s", error->message);
                        g_error_free (error);
                }
        }
@@ -2256,7 +2256,7 @@ ev_window_print_job_cb (EvJobPrint *job,
                        EvWindow   *window)
 {
        if (job->error) {
-               g_warning (job->error->message);
+               g_warning ("%s", job->error->message);
                ev_window_clear_print_job (window);
                return;
        }
@@ -3250,7 +3250,7 @@ ev_window_cmd_help_contents (GtkAction *action, EvWindow *ev_window)
        screen = gtk_widget_get_screen (GTK_WIDGET (ev_window));
        gdk_spawn_command_line_on_screen (screen, command, &error);
        if (error != NULL) {
-               g_warning (error->message);
+               g_warning ("%s", error->message);
                g_error_free (error);
        }
        g_free (command);
@@ -3306,7 +3306,7 @@ ev_window_preview_print_finished (GtkPrintJob *print_job,
                                                 GTK_BUTTONS_OK,
                                                 _("Failed to print document"));
                gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-                                                         error->message);
+                                                         "%s", error->message);
 
                gtk_dialog_run (GTK_DIALOG (dialog));
                gtk_widget_destroy (dialog);
@@ -3330,7 +3330,7 @@ ev_window_do_preview_print (EvWindow *window)
 
        page_setup = gtk_page_setup_new ();
 
-       job = gtk_print_job_new ("evince-print",
+       job = gtk_print_job_new (gtk_window_get_title (GTK_WINDOW (window)),
                                 priv->printer,
                                 priv->print_settings,
                                 page_setup);
@@ -3350,7 +3350,7 @@ ev_window_do_preview_print (EvWindow *window)
                                    (GtkPrintJobCompleteFunc)ev_window_preview_print_finished,
                                    window, NULL);
        } else {
-               g_warning (error->message);
+               g_warning ("%s", error->message);
                g_error_free (error);
        }
 
@@ -3375,7 +3375,7 @@ ev_window_cmd_preview_print (GtkAction *action, EvWindow *window)
                                                                           &error);
                        
                        if (error) {
-                               g_warning (error->message);
+                               g_warning ("%s", error->message);
                                g_error_free (error);
                                print_settings = NULL;
                        }
@@ -4193,7 +4193,7 @@ static const GtkActionEntry entries[] = {
        { "FileOpen", GTK_STOCK_OPEN, N_("_Open..."), "<control>O",
          N_("Open an existing document"),
          G_CALLBACK (ev_window_cmd_file_open) },
-       { "FileOpenCopy", NULL, N_("Op_en a Copy"), NULL,
+       { "FileOpenCopy", NULL, N_("Op_en a Copy"), "<control>N",
          N_("Open a copy of the current document in a new window"),
          G_CALLBACK (ev_window_cmd_file_open_copy) },
                { "FileSaveAs", GTK_STOCK_SAVE_AS, N_("_Save a Copy..."), "<control>S",
@@ -4797,19 +4797,14 @@ ev_view_popup_cmd_open_link_new_window (GtkAction *action, EvWindow *window)
 static void
 ev_view_popup_cmd_copy_link_address (GtkAction *action, EvWindow *window)
 {
-       GtkClipboard *clipboard;
        EvLinkAction *ev_action;
-       const gchar *uri;
 
        ev_action = ev_link_get_action (window->priv->link);
        if (!ev_action)
                return;
 
-       uri = ev_link_action_get_uri (ev_action);
-
-       clipboard = gtk_widget_get_clipboard (GTK_WIDGET (window),
-                                             GDK_SELECTION_CLIPBOARD);
-       gtk_clipboard_set_text (clipboard, uri, -1);
+       ev_view_copy_link_address (EV_VIEW (window->priv->view),
+                                  ev_action);
 }