X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fextension%2Feffect.cpp;h=71ddf3e247216509297ae421e9d49dfdfba3dc55;hb=f6a2dd68517ddb25100f80a0b676930c5ee12aef;hp=8c7fad2c9fd0c5ea5b66847033b74d27f7fb245c;hpb=c2a5a929344e9175a06ae163b6d5cb549192eba3;p=inkscape.git

diff --git a/src/extension/effect.cpp b/src/extension/effect.cpp
index 8c7fad2c9..71ddf3e24 100644
--- a/src/extension/effect.cpp
+++ b/src/extension/effect.cpp
@@ -42,11 +42,13 @@ Effect::Effect (Inkscape::XML::Node * in_repr, Implementation::Implementation *
                         // printf("Found local effects menu in %s\n", this->get_name());
                         local_effects_menu = sp_repr_children(child_repr);
                     }
-                    if (!strcmp(child_repr->name(), "menu-name")) {
+                    if (!strcmp(child_repr->name(), "menu-name") ||
+                            !strcmp(child_repr->name(), "_menu-name")) {
                         // printf("Found local effects menu in %s\n", this->get_name());
                         _verb.set_name(sp_repr_children(child_repr)->content());
                     }
-                    if (!strcmp(child_repr->name(), "menu-tip")) {
+                    if (!strcmp(child_repr->name(), "menu-tip") ||
+                            !strcmp(child_repr->name(), "_menu-tip")) {
                         // printf("Found local effects menu in %s\n", this->get_name());
                         _verb.set_tip(sp_repr_children(child_repr)->content());
                     }
@@ -189,7 +191,7 @@ Effect::prefs (Inkscape::UI::View::View * doc)
         return true;
     }
 
-    PrefDialog * dialog = new PrefDialog(this->get_name(), controls);
+    PrefDialog * dialog = new PrefDialog(this->get_name(), this->get_help(), controls);
     int response = dialog->run();
     dialog->hide();
 
@@ -220,7 +222,8 @@ Effect::effect (Inkscape::UI::View::View * doc)
     set_last_effect(this);
     imp->effect(this, doc);
 
-    sp_document_done(doc->doc());
+    sp_document_done(doc->doc(), SP_VERB_NONE, 
+                     /* TODO: annotate */ "effect.cpp:226");
 
     return;
 }
@@ -261,6 +264,12 @@ Effect::find_effects_list (Inkscape::XML::Node * menustruct)
     return false;
 }
 
+Gtk::VBox *
+Effect::get_info_widget(void)
+{
+    return Extension::get_info_widget();
+}
+
 /** \brief  Create an action for a \c EffectVerb
     \param  view  Which view the action should be created for
     \return The built action.
@@ -296,7 +305,7 @@ Effect::EffectVerb::perform (SPAction *action, void * data, void *pdata)
  * is called.
  */
 SPActionEventVector Effect::EffectVerb::vector =
-            {{NULL},Effect::EffectVerb::perform, NULL, NULL, NULL};
+            {{NULL}, Effect::EffectVerb::perform, NULL, NULL, NULL, NULL};
 
 
 } }  /* namespace Inkscape, Extension */