Changeset 239 for trunk

Show
Ignore:
Timestamp:
06/14/06 14:56:19 (2 years ago)
Author:
jordi
Message:

I was storing the Color Model's value as an integer and it should be a string (see bug #39). This also explains the crashes when trying to free the option's string, so I've put back the g_free() calls.

Location:
trunk/src
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • trunk/src/JobPrint.cxx

    r233 r239  
    497497    } 
    498498    numOptions = cupsAddOption ("number-up", layout, numOptions, &options); 
     499    g_free (layout); 
    499500    numOptions = cupsAddOption ("ColorModel", job->getColorModel (), 
    500501                                numOptions, &options); 
    501     numOptions = cupsAddOption ("Resolution", job->getResolution (), 
     502    numOptions = cupsAddOption ("resolution", job->getResolution (), 
    502503                                numOptions, &options); 
    503504 

  • trunk/src/PrintPter.cxx

    r233 r239  
    113113        getPageSizeForPrinter (printerName, pageSizeName, 
    114114                               &pageWidth, &pageHeight); 
     115        g_free (pageSizeName); 
    115116        // Create the new print job. 
    116117        JobPrint *job = new JobPrint (); 
    … …  
    150151        gchar *colorModel = view.getColorModel (); 
    151152        job->setColorModel (colorModel); 
     153        g_free (colorModel); 
    152154        gchar *resolution = view.getResolution (); 
    153155        job->setResolution (resolution); 
     156        g_free (resolution); 
    154157 
    155158        IJob::enqueue (job); 

  • trunk/src/gtk/PrintView.cxx

    r233 r239  
    702702    m_ColorModel = gtk_list_store_new (printOptionNumColumn, 
    703703                                       G_TYPE_STRING,  // Label 
    704                                        G_TYPE_INT);    // Value 
     704                                       G_TYPE_STRING);    // Value 
    705705} 
    706706