From 23c6090f0f77b6cd8b47e80e69974519e22f4ecf Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 29 Feb 2008 21:37:22 +0000 Subject: r18220@shi: ted | 2008-02-29 13:18:55 -0800 Okay, sadly I'm not keeping the version history because I'm not convenced that SVK will do it right. One mega-patch, but that's life. Reshuffle the exection-env and prefdialog code so that the state machines aren't intertwines, which fixes a whole host of bugs with them. I think the behavior is correct now. Make it so that the effects can count how many preferences they have to determine if the dialog should be shown (fix above). Once this code was written it was easy to make it show an ellipsis on the verb if there is a dialog or not. This involved removing ellipsis from those effects that had it hard coded. Make it so that the parameters know that their command line options are going into a list. They don't have to acknowledge it, but they can, and specifically notebook does and handles it differently. This should fix the notebooks on Win32, but doesn't apparently completely. Change the script extension on windows to use pythonw instead of python so that the command line doesn't appear all the time. (bzr r4908) --- src/extension/paramstring.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/extension/paramstring.cpp') diff --git a/src/extension/paramstring.cpp b/src/extension/paramstring.cpp index fe08bc500..953cb7daf 100644 --- a/src/extension/paramstring.cpp +++ b/src/extension/paramstring.cpp @@ -58,12 +58,14 @@ ParamString::set (const gchar * in, SPDocument * /*doc*/, Inkscape::XML::Node * } /** \brief Return the value as a string */ -Glib::ustring * -ParamString::string (void) +void +ParamString::string (std::string &string) { if (_value == NULL) - return new Glib::ustring(""); - return new Glib::ustring(_value); + return; + + string += _value; + return; } /** \brief Initialize the object, to do that, copy the data. */ -- cgit v1.2.3