From f2ee553c1bc64836b7578f8f3087086420f4c1e4 Mon Sep 17 00:00:00 2001
From: Michael Pfeiffer <michael.w.pfeiffer@gmail.com>
Date: Tue, 15 Oct 2002 15:57:45 +0000
Subject: [PATCH] Added GetDefaultSettings(). Fixed return correct error code
 in ConfigurePage().

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@1530 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/servers/print/Printer.cpp | 42 +++++++++++++++++++++++++++++++++++
 src/servers/print/Printer.h   |  1 +
 2 files changed, 43 insertions(+)

diff --git a/src/servers/print/Printer.cpp b/src/servers/print/Printer.cpp
index f96a0f890c..1ffecc1325 100644
--- a/src/servers/print/Printer.cpp
+++ b/src/servers/print/Printer.cpp
@@ -59,6 +59,7 @@
 typedef BMessage* (*config_func_t)(BNode*, const BMessage*);
 typedef BMessage* (*take_job_func_t)(BFile*, BNode*, const BMessage*);
 typedef char* (*add_printer_func_t)(const char* printer_name);
+typedef BMessage* (*default_settings_t)(BNode*);
 
 // ---------------------------------------------------------------
 BObjectList<Printer> Printer::sPrinters;
@@ -227,6 +228,9 @@ status_t Printer::ConfigurePage(BMessage& settings)
 			BMessage* new_settings = (*func)(SpoolDir(), &settings);
 			if (new_settings != NULL && new_settings->what != 'baad')
 				settings = *new_settings;
+			else
+				rc = B_ERROR;
+			delete new_settings;
 		}
 		
 		::unload_add_on(id);
@@ -286,6 +290,44 @@ void Printer::HandleSpooledJob() {
 	}
 }
  
+
+// ---------------------------------------------------------------
+// GetDefaultSettings
+//
+// Retrieve the default configuration message from printer add-on
+//
+// Parameters:
+//   settings, output paramter.
+//
+// Returns:
+//    B_OK if successful or errorcode otherwise.
+// ---------------------------------------------------------------
+status_t Printer::GetDefaultSettings(BMessage& settings) {
+	image_id id;
+	status_t rc;
+	
+	if ((rc=LoadPrinterAddon(id)) == B_OK) {
+			// Addon was loaded, so try and get the default_settings symbol
+		default_settings_t func;
+
+		if ((rc=get_image_symbol(id, "default_settings", B_SYMBOL_TYPE_TEXT, (void**)&func)) == B_OK) {
+				// call the function and check its result
+			BMessage* new_settings = (*func)(SpoolDir());
+			if (new_settings) {
+				settings = *new_settings; 
+			} else {
+				rc = B_ERROR;
+			}
+			delete new_settings;
+		}
+		
+		::unload_add_on(id);
+	}
+	
+	return rc;
+}
+ 
+ 
 void Printer::AbortPrintThread() {
 	fAbort = true;
 }
diff --git a/src/servers/print/Printer.h b/src/servers/print/Printer.h
index a260484671..f702589982 100644
--- a/src/servers/print/Printer.h
+++ b/src/servers/print/Printer.h
@@ -80,6 +80,7 @@ public:
 	status_t ConfigurePrinter();
 	status_t ConfigureJob(BMessage& ioSettings);
 	status_t ConfigurePage(BMessage& ioSettings);
+	status_t GetDefaultSettings(BMessage& configuration);
 
 		// Try to start processing of next spooled job
 	void HandleSpooledJob();