From d8d60c60ebeeefb068d9b68bf7d96f1f1f88518a Mon Sep 17 00:00:00 2001
From: Adib Taraben <theadib@gmail.com>
Date: Sat, 1 Aug 2009 23:31:02 +0000
Subject: FIX 309856 353847: correctly advertise exception leads to error
 message dialogue

(bzr r8380)
---
 src/extension/implementation/script.h | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'src/extension/implementation/script.h')

diff --git a/src/extension/implementation/script.h b/src/extension/implementation/script.h
index 4620375f9..8e25fb351 100644
--- a/src/extension/implementation/script.h
+++ b/src/extension/implementation/script.h
@@ -135,7 +135,7 @@ private:
     /**
      *
      */
-    void checkStderr (const Glib::ustring &filename, 
+    void checkStderr (const Glib::ustring &filename,
                       Gtk::MessageType type,
                       const Glib::ustring &message);
 
@@ -146,7 +146,7 @@ private:
         Glib::RefPtr<Glib::IOChannel> _channel;
         Glib::RefPtr<Glib::MainLoop> _main_loop;
         bool _dead;
-        
+
     public:
         file_listener () : _dead(false) { };
         virtual ~file_listener () {
@@ -187,11 +187,15 @@ private:
         // Note, doing a copy here, on purpose
         Glib::ustring string (void) { return _string; };
 
-        void toFile (const Glib::ustring &name) {
+        bool toFile (const Glib::ustring &name) {
+            try {
             Glib::RefPtr<Glib::IOChannel> stdout_file = Glib::IOChannel::create_from_file(name, "w");
             stdout_file->set_encoding();
             stdout_file->write(_string);
-            return;
+            } catch (Glib::FileError &e) {
+                return false;
+            }
+            return true;
         };
     };
 
-- 
cgit v1.2.3


From feea521541c5d36d23a5fefa579eb9c8323ac30e Mon Sep 17 00:00:00 2001
From: johnce <johnce@users.sourceforge.net>
Date: Wed, 5 Aug 2009 06:21:55 +0000
Subject: SPDocument->Document

(bzr r8407)
---
 src/extension/implementation/script.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/extension/implementation/script.h')

diff --git a/src/extension/implementation/script.h b/src/extension/implementation/script.h
index 8e25fb351..0769c9a18 100644
--- a/src/extension/implementation/script.h
+++ b/src/extension/implementation/script.h
@@ -73,7 +73,7 @@ public:
     /**
      *
      */
-    virtual SPDocument *open(Inkscape::Extension::Input *module,
+    virtual Document *open(Inkscape::Extension::Input *module,
                              gchar const *filename);
 
     /**
@@ -85,7 +85,7 @@ public:
      *
      */
     virtual void save(Inkscape::Extension::Output *module,
-                      SPDocument *doc,
+                      Document *doc,
                       gchar const *filename);
 
     /**
-- 
cgit v1.2.3


From 51c2905fd3e99955db2d823b79abb763d8097028 Mon Sep 17 00:00:00 2001
From: Maximilian Albert <maximilian.albert@gmail.com>
Date: Thu, 6 Aug 2009 14:17:17 +0000
Subject: Revert recent refactoring changes by johnce because they break the
 build, which cannot be fixed easily.

(bzr r8422)
---
 src/extension/implementation/script.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/extension/implementation/script.h')

diff --git a/src/extension/implementation/script.h b/src/extension/implementation/script.h
index 0769c9a18..8e25fb351 100644
--- a/src/extension/implementation/script.h
+++ b/src/extension/implementation/script.h
@@ -73,7 +73,7 @@ public:
     /**
      *
      */
-    virtual Document *open(Inkscape::Extension::Input *module,
+    virtual SPDocument *open(Inkscape::Extension::Input *module,
                              gchar const *filename);
 
     /**
@@ -85,7 +85,7 @@ public:
      *
      */
     virtual void save(Inkscape::Extension::Output *module,
-                      Document *doc,
+                      SPDocument *doc,
                       gchar const *filename);
 
     /**
-- 
cgit v1.2.3