update to trunk (r13454)

(bzr r13398.1.4)

3 files changed, 5 insertions, 3 deletions

diff --git a/src/extension/internal/emf-print.cpp b/src/extension/internal/emf-print.cpp
index 9c68e40a4..0bdfd45b9 100644
--- a/src/extension/internal/emf-print.cpp
+++ b/src/extension/internal/emf-print.cpp
@@ -977,8 +977,8 @@ unsigned int PrintEmf::fill(
     using Geom::X;
     using Geom::Y;
     
-    SPItem *item = SP_ITEM(style->object);
-    SPClipPath *scp = (item->clip_ref ? item->clip_ref->getObject() : NULL);
+    //SPItem *item = SP_ITEM(style->object);
+    //SPClipPath *scp = (item->clip_ref ? item->clip_ref->getObject() : NULL);
 
     Geom::Affine tf = m_tr_stack.top();
 
diff --git a/src/extension/internal/wmf-inout.cpp b/src/extension/internal/wmf-inout.cpp
index 85060470b..2b05c6d2c 100644
--- a/src/extension/internal/wmf-inout.cpp
+++ b/src/extension/internal/wmf-inout.cpp
@@ -63,7 +63,6 @@ namespace Extension {
 namespace Internal {
 
 
-static U_RECT16 rc_old;
 static bool clipset = false;
 static uint32_t BLTmode=0;
 
diff --git a/src/extension/prefdialog.cpp b/src/extension/prefdialog.cpp
index 1b657f644..d1f83701f 100644
--- a/src/extension/prefdialog.cpp
+++ b/src/extension/prefdialog.cpp
@@ -212,6 +212,9 @@ PrefDialog::preview_toggle (void) {
 void
 PrefDialog::param_change (void) {
     if (_exEnv != NULL) {
+        if (!_effect->loaded()) {
+            _effect->set_state(Extension::STATE_LOADED);
+        }
         _timersig.disconnect();
         _timersig = Glib::signal_timeout().connect(sigc::mem_fun(this, &PrefDialog::param_timer_expire),
                                                    250, /* ms */