Merge changes from CUPS 1.4svn-r8088, the real official 1.4b1!

[thirdparty/cups.git] / ppdc / ppdc-option.cxx

diff --git a/ppdc/ppdc-option.cxx b/ppdc/ppdc-option.cxx
index 734d406962091d34f60eb56079a4adcb18614a7e..5a33a4eb348ddc0ad25661534109f6755e07b55b 100644 (file)
--- a/ppdc/ppdc-option.cxx
+++ b/ppdc/ppdc-option.cxx
@@ -57,10 +57,10 @@ ppdcOption::ppdcOption(ppdcOptType    ot,   // I - Option type
 
 ppdcOption::ppdcOption(ppdcOption *o)          // I - Template option
 {
-  o->name->get();
-  o->text->get();
+  o->name->retain();
+  o->text->retain();
   if (o->defchoice)
-    o->defchoice->get();
+    o->defchoice->retain();
 
   type      = o->type;
   name      = o->name;
@@ -82,7 +82,7 @@ ppdcOption::~ppdcOption()
   text->release();
   if (defchoice)
     defchoice->release();
-  delete choices;
+  choices->release();
 }
 
 
@@ -115,7 +115,7 @@ ppdcOption::set_defchoice(ppdcChoice *c)    // I - Choice
     defchoice->release();
 
   if (c->name)
-    c->name->get();
+    c->name->retain();
 
   defchoice = c->name;
 }