Changeset 243

Timestamp:

06/18/06 09:31:40 (2 years ago)

Author:

jordi

Message:

Printer names now include also the instance name separated by an slash and the options are correct for each instance.

Files:

• trunk/src/PrintPter.cxx (modified) (7 diffs)

trunk/src/PrintPter.cxx

@@ -105 +105 @@
     IPrintView &view = getView ();
     // Get the printer's name.
-    char *printerName = view.getSelectedPrinterName ();
-    if ( NULL != printerName )
-    {
+    char *printerAndInstanceNames = view.getSelectedPrinterName ();
+    if ( NULL != printerAndInstanceNames )
+    {
+        gchar *slashPosition = g_strrstr (printerAndInstanceNames, "/");
+        *slashPosition = '\0';
+        gchar *printerName = g_strdup (printerAndInstanceNames);
+        *slashPosition = '/';
+ 
         float pageWidth;
         float pageHeight;
@@ -158 +163 @@
         IJob::enqueue (job);
 
+        g_free (printerAndInstanceNames);
         g_free (printerName);
     }
@@ -169 +175 @@
     IPrintView &view = getView ();
 
-    gchar *printerName = view.getSelectedPrinterName ();
-
-    if ( NULL != printerName )
+    gchar *printerAndInstanceNames = view.getSelectedPrinterName ();
+
+    if ( NULL != printerAndInstanceNames )
     {
         cups_dest_t *destinations;
@@ -177 +183 @@
         if ( NULL == destinations )
         {
-            g_free (printerName);
+            g_free (printerAndInstanceNames);
             return;
         }
-        cups_dest_t *destination = cupsGetDest (printerName, NULL,
+        gchar *slashPosition = g_strrstr (printerAndInstanceNames, "/");
+        gchar *printerName = NULL;
+        gchar *instanceName = NULL;
+        if ( slashPosition != NULL )
+        {
+            *slashPosition = '\0';
+            printerName = g_strdup (printerAndInstanceNames);
+            instanceName = g_strdup (slashPosition + 1);
+            *slashPosition = '/';
+        }
+        else
+        {
+            printerName = g_strdup (printerAndInstanceNames);
+        }
+        cups_dest_t *destination = cupsGetDest (printerName, instanceName,
                                                 numDestinations, destinations);
         if ( NULL == destinations )
@@ -273 +293 @@
         cupsFreeDests (numDestinations, destinations);
         g_free (printerName);
+        g_free (instanceName);
+        g_free (printerAndInstanceNames);
     }
 }
@@ -411 +433 @@
           ++currentDestination )
     {
-        // Get the printer name.
+        // Get the printer name and the local instance, if it has any.
         gchar *printerName = destinations[currentDestination].name;
+        gchar *printerAndInstanceNames = NULL;
+        if ( NULL != destinations[currentDestination].instance )
+        {
+            printerAndInstanceNames = g_strdup_printf ("%s/%s",
+                    destinations[currentDestination].name,
+                    destinations[currentDestination].instance );
+        }
+        else
+        {
+            printerAndInstanceNames =
+                g_strdup (destinations[currentDestination].name);
+        }
         // Get the number of jobs the printer currently has.
         cups_job_t *destinationJobs;
@@ -420 +454 @@
         printerAttributes *attributes = getPrinterAttributes (printerName);
         // Set all this data to the view.
-        view.addPrinter (printerName, numJobs,
+        view.addPrinter (printerAndInstanceNames, numJobs,
                                attributes->state, attributes->location);
+        g_free (printerAndInstanceNames);
         g_free (attributes->location);
         g_free (attributes->state);