[print] Fixes segmentation violation when format is empty

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

diff --git a/shell/ev-window.c b/shell/ev-window.c
index 7984cabb1df5c9bc7508e7d16061155e377f07a1..d822181525b83c99fa6c0c3bdcf9958a526ea397 100644 (file)
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -5,7 +5,7 @@
  *  Copyright (C) 2004 Martin Kretzschmar
  *  Copyright (C) 2004 Red Hat, Inc.
  *  Copyright (C) 2000, 2001, 2002, 2003, 2004 Marco Pesenti Gritti
  *  Copyright (C) 2004 Martin Kretzschmar
  *  Copyright (C) 2004 Red Hat, Inc.
  *  Copyright (C) 2000, 2001, 2002, 2003, 2004 Marco Pesenti Gritti

- *  Copyright (C) 2003, 2004, 2005 Christian Persch
+ *  Copyright © 2003, 2004, 2005, 2009 Christian Persch

  *
  *  Author:
  *    Martin Kretzschmar <martink@gnome.org>
  *
  *  Author:
  *    Martin Kretzschmar <martink@gnome.org>


@@ -2989,6 +2989,11 @@ ev_window_print_range (EvWindow *ev_window,
                ev_window->priv->print_queue = g_queue_new ();
 
        op = ev_print_operation_new (ev_window->priv->document);
                ev_window->priv->print_queue = g_queue_new ();
 
        op = ev_print_operation_new (ev_window->priv->document);

+       if (!op) {
+               g_warning ("%s", "Printing is not supported for document\n");
+               return;
+       }
+

        g_signal_connect (op, "begin_print",
                          G_CALLBACK (ev_window_print_operation_begin_print),
                          (gpointer)ev_window);
        g_signal_connect (op, "begin_print",
                          G_CALLBACK (ev_window_print_operation_begin_print),
                          (gpointer)ev_window);


@@ -4140,6 +4145,7 @@ ev_window_cmd_help_about (GtkAction *action, EvWindow *ev_window)
                "Bryan Clark <clarkbw@gnome.org>",
                "Carlos Garcia Campos <carlosgc@gnome.org>",
                "Wouter Bolsterlee <wbolster@gnome.org>",
                "Bryan Clark <clarkbw@gnome.org>",
                "Carlos Garcia Campos <carlosgc@gnome.org>",
                "Wouter Bolsterlee <wbolster@gnome.org>",

+                "Christian Persch <chpe" "\100" "gnome.org>",

                NULL
        };
 
                NULL
        };
 


@@ -4184,7 +4190,7 @@ ev_window_cmd_help_about (GtkAction *action, EvWindow *ev_window)
                "name", _("Evince"),
                "version", VERSION,
                "copyright",
                "name", _("Evince"),
                "version", VERSION,
                "copyright",

-               _("\xc2\xa9 1996-2007 The Evince authors"),
+               _("© 1996–2009 The Evince authors"),

                "license", license_trans,
                "website", "http://www.gnome.org/projects/evince",
                "comments", comments,
                "license", license_trans,
                "website", "http://www.gnome.org/projects/evince",
                "comments", comments,