From fdb68963cec5ddbd3eef111f4c95b7e049aa839c Mon Sep 17 00:00:00 2001
From: Slagvi Public <JandotDarowskiattgmaildottcom>
Date: Tue, 2 Jul 2013 17:37:42 +0200
Subject: Adding NewFromTemplate to the Inkscape menu

(bzr r12379.2.5)
---
 src/verbs.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/verbs.cpp')

diff --git a/src/verbs.cpp b/src/verbs.cpp
index 6f83b3dfb..a3d8b07a2 100644
--- a/src/verbs.cpp
+++ b/src/verbs.cpp
@@ -79,6 +79,7 @@
 #include "ui/dialog/inkscape-preferences.h"
 #include "ui/dialog/layer-properties.h"
 #include "ui/dialog/layers.h"
+#include "ui/dialog/new-from-template.h"
 #include "ui/dialog/object-properties.h"
 #include "ui/dialog/swatches.h"
 #include "ui/dialog/symbols.h"
@@ -860,6 +861,9 @@ void FileVerb::perform(SPAction *action, void *data)
         case SP_VERB_FILE_QUIT:
             sp_file_exit();
             break;
+        case SP_VERB_FILE_TEMPLATES:
+            sp_file_new_from_templatee();
+            break;
         default:
             break;
     }
@@ -2323,6 +2327,8 @@ Verb *Verb::_base_verbs[] = {
     new FileVerb(SP_VERB_FILE_CLOSE_VIEW, "FileClose", N_("_Close"),
                  N_("Close this document window"), GTK_STOCK_CLOSE),
     new FileVerb(SP_VERB_FILE_QUIT, "FileQuit", N_("_Quit"), N_("Quit Inkscape"), GTK_STOCK_QUIT),
+    new FileVerb(SP_VERB_FILE_TEMPLATES, "FileTemplates", N_("_Templates..."),
+                N_("Create new project from template"), INKSCAPE_ICON("dialog-templates")),
 
     // Edit
     new EditVerb(SP_VERB_EDIT_UNDO, "EditUndo", N_("_Undo"), N_("Undo last action"),
-- 
cgit v1.2.3


From 46211dc227f62c2e71b3edfa1ffb508c9fe8e0ac Mon Sep 17 00:00:00 2001
From: Slagvi Public <JandotDarowskiattgmaildottcom>
Date: Thu, 4 Jul 2013 16:19:38 +0200
Subject: Added loading templates into NewFromTemplate dialog.

(bzr r12379.2.7)
---
 src/verbs.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/verbs.cpp')

diff --git a/src/verbs.cpp b/src/verbs.cpp
index a3d8b07a2..8b8a7e6af 100644
--- a/src/verbs.cpp
+++ b/src/verbs.cpp
@@ -862,7 +862,7 @@ void FileVerb::perform(SPAction *action, void *data)
             sp_file_exit();
             break;
         case SP_VERB_FILE_TEMPLATES:
-            sp_file_new_from_templatee();
+            Inkscape::UI::NewFromTemplate::load_new_from_template();
             break;
         default:
             break;
-- 
cgit v1.2.3


From 05f008356889de30ff55df1f73030003ed7cc312 Mon Sep 17 00:00:00 2001
From: Eric Greveson <eric@greveson.co.uk>
Date: Mon, 12 Aug 2013 16:39:48 +0100
Subject: Allow Object to Path verb from non-GUI (DBus) interface

(bzr r12473.1.1)
---
 src/verbs.cpp | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

(limited to 'src/verbs.cpp')

diff --git a/src/verbs.cpp b/src/verbs.cpp
index 06e59be38..baac07d60 100644
--- a/src/verbs.cpp
+++ b/src/verbs.cpp
@@ -1446,12 +1446,26 @@ void LayerVerb::perform(SPAction *action, void *data)
  */
 void ObjectVerb::perform( SPAction *action, void *data)
 {
-    g_return_if_fail(ensure_desktop_valid(action));
     SPDesktop *dt = sp_action_get_desktop(action);
+    Inkscape::Selection *sel = sp_action_get_selection(action);
 
-    SPEventContext *ec = dt->event_context;
+    // We can perform some actions without a desktop
+    bool handled = true;
+    switch (reinterpret_cast<std::size_t>(data)) {
+        case SP_VERB_OBJECT_TO_CURVE:
+            sp_selected_path_to_curves(sel, dt);
+            break;
+        default:
+            handled = false;
+            break;
+    }
+    if (handled) {
+        return;
+    }
 
-    Inkscape::Selection *sel = sp_desktop_selection(dt);
+    g_return_if_fail(ensure_desktop_valid(action));
+
+    SPEventContext *ec = dt->event_context;
 
     if (sel->isEmpty())
         return;
@@ -1478,9 +1492,6 @@ void ObjectVerb::perform( SPAction *action, void *data)
         case SP_VERB_OBJECT_FLATTEN:
             sp_selection_remove_transform(dt);
             break;
-        case SP_VERB_OBJECT_TO_CURVE:
-            sp_selected_path_to_curves(dt);
-            break;
         case SP_VERB_OBJECT_FLOW_TEXT:
             text_flow_into_shape();
             break;
-- 
cgit v1.2.3