From 0791f39c5f919ac34dc7513d147460331c898cc5 Mon Sep 17 00:00:00 2001
From: johanengelen <johanengelen@users.sourceforge.net>
Date: Sat, 30 Sep 2006 15:08:11 +0000
Subject: [PATCH] fixed bug:  fixed two of the 'quark > 0' console errors.

---
 src/extension/extension.cpp     | 11 +++++++++--
 src/extension/paramnotebook.cpp | 20 ++++++++++----------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/extension/extension.cpp b/src/extension/extension.cpp
index 97d71c5ee..631ab43fe 100644
--- a/src/extension/extension.cpp
+++ b/src/extension/extension.cpp
@@ -131,7 +131,15 @@ Extension::~Extension (void)
     delete timer;
     timer = NULL;
     /** \todo Need to do parameters here */
-
+    
+    // delete parameters: 
+    for (GSList * list = parameters; list != NULL; list = g_slist_next(list)) {
+        Parameter * param = reinterpret_cast<Parameter *>(list->data);
+        delete param;
+    }
+    g_slist_free(parameters);
+    
+    
     for (unsigned int i = 0 ; i < _deps.size(); i++) {
         delete _deps[i];
     }
@@ -600,7 +608,6 @@ public:
         this->pack_start(*widg, true, true, 2);
         if (tooltip != NULL) {
             _tooltips.set_tip(*widg, Glib::ustring(tooltip));
-            // printf("Setting tooltip: %s\n", tooltip);
         }
         return;
     };
diff --git a/src/extension/paramnotebook.cpp b/src/extension/paramnotebook.cpp
index eb568ac45..cd8bddcaa 100644
--- a/src/extension/paramnotebook.cpp
+++ b/src/extension/paramnotebook.cpp
@@ -47,7 +47,7 @@ private:
     GSList * parameters; /**< A table to store the parameters for this page.
                               This only gets created if there are parameters on this
                               page */
-    Gtk::Tooltips _tooltips;
+    Gtk::Tooltips * _tooltips;
     
 public:
     static ParamNotebookPage * makepage (Inkscape::XML::Node * in_repr, Inkscape::Extension::Extension * in_ext);
@@ -65,19 +65,18 @@ ParamNotebookPage::ParamNotebookPage (const gchar * name, const gchar * guitext,
     Parameter(name, guitext, desc, scope, ext)
 {
     parameters = NULL;
-    
+        
     // Read XML to build page
     if (xml != NULL) {
         Inkscape::XML::Node *child_repr = sp_repr_children(xml);
         while (child_repr != NULL) {
             char const * chname = child_repr->name();
-            if (chname[0] == '_') /* Allow _ for translation of tags */
+            if (chname[0] == '_') // Allow _ for translation of tags
                 chname++;
             if (!strcmp(chname, "param") || !strcmp(chname, "_param")) {
                 Parameter * param;
                 param = Parameter::make(child_repr, ext);
-                if (param != NULL)
-                    parameters = g_slist_append(parameters, param);
+                if (param != NULL) parameters = g_slist_append(parameters, param);
             }
             child_repr = sp_repr_next(child_repr);
         }
@@ -88,6 +87,7 @@ ParamNotebookPage::ParamNotebookPage (const gchar * name, const gchar * guitext,
 
 ParamNotebookPage::~ParamNotebookPage (void)
 {
+    if (_tooltips) delete _tooltips;
     //destroy parameters
     for (GSList * list = parameters; list != NULL; list = g_slist_next(list)) {
         Parameter * param = reinterpret_cast<Parameter *>(list->data);
@@ -188,7 +188,9 @@ ParamNotebookPage::makepage (Inkscape::XML::Node * in_repr, Inkscape::Extension:
 */
 Gtk::Widget *
 ParamNotebookPage::get_widget (SPDocument * doc, Inkscape::XML::Node * node)
-{
+{                      
+    if (!_tooltips) _tooltips = new Gtk::Tooltips();
+    
     Gtk::VBox * vbox = Gtk::manage(new Gtk::VBox);
     vbox->set_border_width(5);  
     
@@ -200,8 +202,7 @@ ParamNotebookPage::get_widget (SPDocument * doc, Inkscape::XML::Node * node)
         
         vbox->pack_start(*widg, true, true, 2);
         if (tip != NULL) {
-            _tooltips.set_tip(*widg, Glib::ustring(tip));
-            // printf("Setting tooltip: %s\n", tooltip);
+            _tooltips->set_tip(*widg, Glib::ustring(tip));
         }
     }
         
@@ -224,12 +225,11 @@ ParamNotebook::ParamNotebook (const gchar * name, const gchar * guitext, const g
     pages = NULL;
     
     // Read XML tree to add pages:
-    // printf("Extension Constructor: ");
     if (xml != NULL) {
         Inkscape::XML::Node *child_repr = sp_repr_children(xml);
         while (child_repr != NULL) {
             char const * chname = child_repr->name();
-            if (chname[0] == '_') /* Allow _ for translation of tags */
+            if (chname[0] == '_') // Allow _ for translation of tags
                 chname++;
             if (!strcmp(chname, "page")) {
                 ParamNotebookPage * page;
-- 
2.30.2