Merge from trunk

(bzr r9508.1.89)

1 files changed, 14 insertions, 0 deletions

diff --git a/src/extension/extension.cpp b/src/extension/extension.cpp
index e67a4b95f..a70c79943 100644
--- a/src/extension/extension.cpp
+++ b/src/extension/extension.cpp
@@ -59,6 +59,7 @@ Parameter * get_param (const gchar * name);
 */
 Extension::Extension (Inkscape::XML::Node * in_repr, Implementation::Implementation * in_imp)
     : _help(NULL)
+    , silent(false)
     , _gui(true)
 {
     repr = in_repr;
@@ -105,6 +106,9 @@ Extension::Extension (Inkscape::XML::Node * in_repr, Implementation::Implementat
             if (!strcmp(chname, "dependency")) {
                 _deps.push_back(new Dependency(child_repr));
             } /* dependency */
+            if (!strcmp(chname, "options")) {
+                silent = !strcmp( child_repr->attribute("silent"), "true" );
+            }
             child_repr = sp_repr_next(child_repr);
         }
 
@@ -310,6 +314,16 @@ Extension::get_repr (void)
 }
 
 /**
+    \return  bool 
+    \brief   Whether this extension should hide the "working, please wait" dialog
+*/
+bool
+Extension::is_silent (void)
+{
+    return silent;
+}
+
+/**
     \return  The textual id of this extension
     \brief   Get the ID of this extension - not a copy don't delete!
 */