Removed Win32 only Print Direct verb, which was an exact clone of normal print

diff --git a/src/file.cpp b/src/file.cpp
index 9b5f393122908c4254e1f6f2268a9121f35b141a..355b1c50ab461dcdd215a6f8cfff3ffb8d047513 100644 (file)
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -1379,23 +1379,9 @@ sp_file_print(Gtk::Window& parentWindow)
 {
     SPDocument *doc = SP_ACTIVE_DOCUMENT;
     if (doc)
-        sp_print_document(parentWindow, doc, FALSE);
+        sp_print_document(parentWindow, doc);
 }
 
-
-/**
- *  Print the current document, if any.  Do not use
- *  the machine's print drivers.
- */
-void
-sp_file_print_direct(Gtk::Window& parentWindow)
-{
-    SPDocument *doc = SP_ACTIVE_DOCUMENT;
-    if (doc)
-        sp_print_document(parentWindow, doc, TRUE);
-}
-
-
 /**
  * Display what the drawing would look like, if
  * printed.

diff --git a/src/file.h b/src/file.h
index f3ba1576b26190ccdef965b154d27a20dfb48a35..e90e555bb11d09dcad7191c71a334ea5e0b2a980 100644 (file)
--- a/src/file.h
+++ b/src/file.h
@@ -181,11 +181,6 @@ would be useful as instance methods
  */
 void sp_file_print (Gtk::Window& parentWindow);
 
-/**
- *
- */
-void sp_file_print_direct (Gtk::Window& parentWindow);
-
 /**
  *
  */

diff --git a/src/menus-skeleton.h b/src/menus-skeleton.h
index c039dcefd838956798ead611a6275c9a4f178aef..bdbbc51de3fd7bf623de750f65581e03ddb39366 100644 (file)
--- a/src/menus-skeleton.h
+++ b/src/menus-skeleton.h
@@ -34,13 +34,6 @@ static char const menus_skeleton[] =
 "       <verb verb-id=\"FileExportToOCAL\" />\n"
 #endif
 "       <separator/>\n"
-/* These are ugly, but what needs to happen here is allowing users
-   to use the native PS support if they are using another print driver.
-   This is done through the "Print Direct" command.  Which is inserted
-   here based on if those other drivers are being built. */
-#ifdef WIN32
-"       <verb verb-id=\"FilePrintDirect\" />\n"
-#endif
 "       <verb verb-id=\"FilePrint\" />\n"
 "       <separator/>\n"
 "       <verb verb-id=\"FileVacuum\" />\n"

diff --git a/src/print.cpp b/src/print.cpp
index a24a01ff750f1e922308524a7e72f84780d01afa..cc5d8c0a1fad582db858425eea2d24b4a0a33404 100644 (file)
--- a/src/print.cpp
+++ b/src/print.cpp
@@ -123,7 +123,7 @@ sp_print_preview_document(SPDocument *doc)
 }
 
 void
-sp_print_document(Gtk::Window& parentWindow, SPDocument *doc, unsigned int /*direct*/)
+sp_print_document(Gtk::Window& parentWindow, SPDocument *doc)
 {
     sp_document_ensure_up_to_date(doc);
 

diff --git a/src/print.h b/src/print.h
index 69d4f836953aceaed8c3b25681279e18a215dc59..3109b4947e2adf47d37a413882976ce7f8ab4e1c 100644 (file)
--- a/src/print.h
+++ b/src/print.h
@@ -41,7 +41,7 @@ void sp_print_get_param(SPPrintContext *ctx, gchar *name, bool *value);
 
 /* UI */
 void sp_print_preview_document(SPDocument *doc);
-void sp_print_document(Gtk::Window& parentWindow, SPDocument *doc, unsigned int direct);
+void sp_print_document(Gtk::Window& parentWindow, SPDocument *doc);
 void sp_print_document_to_file(SPDocument *doc, gchar const *filename);
 
 

diff --git a/src/verbs.cpp b/src/verbs.cpp
index e96eca2cece341929122c91e670c60356ed9b7f4..53650a262fa2b8b43ed79da18222b6588e6d9806 100644 (file)
--- a/src/verbs.cpp
+++ b/src/verbs.cpp
@@ -784,9 +784,6 @@ FileVerb::perform(SPAction *action, void *data, void */*pdata*/)
         case SP_VERB_FILE_VACUUM:
             sp_file_vacuum();
             break;
-        case SP_VERB_FILE_PRINT_DIRECT:
-            sp_file_print_direct(*parent);
-            break;
         case SP_VERB_FILE_PRINT_PREVIEW:
             sp_file_print_preview(NULL, NULL);
             break;
@@ -2136,8 +2133,6 @@ Verb *Verb::_base_verbs[] = {
     // TRANSLATORS: "Vacuum Defs" means "Clean up defs" (so as to remove unused definitions)
     new FileVerb(SP_VERB_FILE_VACUUM, "FileVacuum", N_("Vac_uum Defs"), N_("Remove unused definitions (such as gradients or clipping paths) from the <defs> of the document"),
                  "file_vacuum" ),
-    new FileVerb(SP_VERB_FILE_PRINT_DIRECT, "FilePrintDirect", N_("Print _Direct"),
-                 N_("Print directly without prompting to a file or pipe"), NULL ),
     new FileVerb(SP_VERB_FILE_PRINT_PREVIEW, "FilePrintPreview", N_("Print Previe_w"),
                  N_("Preview document printout"), GTK_STOCK_PRINT_PREVIEW ),
     new FileVerb(SP_VERB_FILE_IMPORT, "FileImport", N_("_Import..."),

diff --git a/src/verbs.h b/src/verbs.h
index fce826c8f82c92147c34b247a1719c62aee48707..9f5cbe3c81142085712175490a93f15923cd30c2 100644 (file)
--- a/src/verbs.h
+++ b/src/verbs.h
@@ -37,7 +37,6 @@ enum {
     SP_VERB_FILE_SAVE_A_COPY,      /**< Save a copy of the current file */ 
     SP_VERB_FILE_PRINT,
     SP_VERB_FILE_VACUUM,
-    SP_VERB_FILE_PRINT_DIRECT,
     SP_VERB_FILE_PRINT_PREVIEW,
     SP_VERB_FILE_IMPORT,
     SP_VERB_FILE_EXPORT,