From 3441298ed44e1a00f2c71b73a582755d7bda7cd5 Mon Sep 17 00:00:00 2001
From: Nicolas Dufour <nicoduf@yahoo.fr>
Date: Fri, 15 Feb 2013 14:12:46 +0100
Subject: Better fix for Bug #911146 (Inkscape reads .eps files from /tmp
 instead of the current directory) by Michael Karcher.

(bzr r12127)
---
 src/extension/implementation/script.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

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

diff --git a/src/extension/implementation/script.cpp b/src/extension/implementation/script.cpp
index d3aeace55..4af778e04 100644
--- a/src/extension/implementation/script.cpp
+++ b/src/extension/implementation/script.cpp
@@ -956,7 +956,14 @@ int Script::execute (const std::list<std::string> &in_command,
     // assemble the rest of argv
     std::copy(in_params.begin(), in_params.end(), std::back_inserter(argv));
     if (!filein.empty()) {
-        argv.push_back(filein);
+        if(Glib::path_is_absolute(filein))
+            argv.push_back(filein);
+        else {
+            std::vector<std::string> buildargs;
+            buildargs.push_back(Glib::get_current_dir());
+            buildargs.push_back(filein);
+            argv.push_back(Glib::build_filename(buildargs));
+        }
     }
 
     int stdout_pipe, stderr_pipe;
-- 
cgit v1.2.3


From ea952687e7b1ae64c4c30c8eb66bd875d75fec2d Mon Sep 17 00:00:00 2001
From: Alex Valavanis <valavanisalex@gmail.com>
Date: Sat, 23 Feb 2013 13:57:26 +0000
Subject: Fix missing headers for Gtk+ 3 build

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

(bzr r12145)
---
 src/extension/implementation/script.cpp | 2 ++
 1 file changed, 2 insertions(+)

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

diff --git a/src/extension/implementation/script.cpp b/src/extension/implementation/script.cpp
index 4af778e04..fa46569e2 100644
--- a/src/extension/implementation/script.cpp
+++ b/src/extension/implementation/script.cpp
@@ -23,6 +23,8 @@
 #include <gtkmm/main.h>
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/textview.h>
+#include <glibmm/miscutils.h>
+#include <glibmm/convert.h>
 #include <unistd.h>
 
 #include <errno.h>
-- 
cgit v1.2.3


From 1d3f07d09370bf8fefa7968706375ae3669dbd1c Mon Sep 17 00:00:00 2001
From: Alex Valavanis <valavanisalex@gmail.com>
Date: Fri, 8 Mar 2013 01:44:43 +0000
Subject: Drop deprecated get_vbox method in Gtk::Dialog

(bzr r12181)
---
 src/extension/implementation/script.cpp | 4 ++++
 1 file changed, 4 insertions(+)

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

diff --git a/src/extension/implementation/script.cpp b/src/extension/implementation/script.cpp
index fa46569e2..3ac1e06ab 100644
--- a/src/extension/implementation/script.cpp
+++ b/src/extension/implementation/script.cpp
@@ -854,7 +854,11 @@ void Script::checkStderr (const Glib::ustring &data,
     GtkWidget *dlg = GTK_WIDGET(warning.gobj());
     sp_transientize(dlg);
 
+#if WITH_GTKMM_3_0
+    Gtk::Box * vbox = warning.get_content_area();
+#else
     Gtk::Box * vbox = warning.get_vbox();
+#endif
 
     /* Gtk::TextView * textview = new Gtk::TextView(Gtk::TextBuffer::create()); */
     Gtk::TextView * textview = new Gtk::TextView();
-- 
cgit v1.2.3