From d960c55b5c993f9d43757a0a0b42a1fc8039c072 Mon Sep 17 00:00:00 2001
From: Nicolas Dufour <nicoduf@yahoo.fr>
Date: Wed, 18 Jun 2014 08:36:04 +0200
Subject: Extensions. Fix for Bug #433860 (Live preview doesn't work after
 updating the values many times).

Fixed bugs:
  - https://launchpad.net/bugs/433860

(bzr r13430)
---
 src/extension/prefdialog.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/extension/prefdialog.cpp')

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 */
-- 
cgit v1.2.3


From 395b34493e806b4aa2333c694d7d6e4e4d4700a4 Mon Sep 17 00:00:00 2001
From: "Liam P. White" <inkscapebrony@gmail.com>
Date: Tue, 2 Sep 2014 17:14:55 -0400
Subject: Remove misleading dialogs directory

(bzr r13341.1.192)
---
 src/extension/prefdialog.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/extension/prefdialog.cpp')

diff --git a/src/extension/prefdialog.cpp b/src/extension/prefdialog.cpp
index d1f83701f..af31f32b6 100644
--- a/src/extension/prefdialog.cpp
+++ b/src/extension/prefdialog.cpp
@@ -13,7 +13,7 @@
 #include <gtkmm/separator.h>
 #include <glibmm/i18n.h>
 
-#include "../dialogs/dialog-events.h"
+#include "ui/dialog-events.h"
 #include "xml/repr.h"
 
 // Used to get SP_ACTIVE_DESKTOP
-- 
cgit v1.2.3


From 70f0a1b307456191c5f2ce103d3edbf4ca23d514 Mon Sep 17 00:00:00 2001
From: Bryce Harrington <bryce@bryceharrington.org>
Date: Sun, 14 Sep 2014 16:03:29 -0700
Subject: Always check result of sp_repr_read_mem for NULL

In cases where undefined or invalid XML is passed to sp_repr_read_mem(),
it will indicate failure by returning NULL.  All callers must check for
this and handle the error condition accordingly.

Fixes: lp: #1170248

Fixed bugs:
  - https://launchpad.net/bugs/1170248

(bzr r13556)
---
 src/extension/prefdialog.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/extension/prefdialog.cpp')

diff --git a/src/extension/prefdialog.cpp b/src/extension/prefdialog.cpp
index d1f83701f..3a384257c 100644
--- a/src/extension/prefdialog.cpp
+++ b/src/extension/prefdialog.cpp
@@ -90,6 +90,10 @@ PrefDialog::PrefDialog (Glib::ustring name, gchar const * help, Gtk::Widget * co
     if (_effect != NULL && !_effect->no_live_preview) {
         if (_param_preview == NULL) {
             XML::Document * doc = sp_repr_read_mem(live_param_xml, strlen(live_param_xml), NULL);
+            if (doc == NULL) {
+                std::cout << "Error encountered loading live parameter XML !!!" << std::endl;
+                return;
+            }
             _param_preview = Parameter::make(doc->root(), _effect);
         }
 
-- 
cgit v1.2.3