From 59bf824c3cbdb23ae5b656500451a8224f82d977 Mon Sep 17 00:00:00 2001
From: Nicolas Dufour <nicoduf@yahoo.fr>
Date: Fri, 21 Jan 2011 14:38:26 +0100
Subject: DBUS. Patch for Bug #696062, dbus builds no more.

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

(bzr r10011)
---
 src/extension/dbus/dbus-init.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/extension/dbus/dbus-init.cpp')

diff --git a/src/extension/dbus/dbus-init.cpp b/src/extension/dbus/dbus-init.cpp
index 253d6b938..2ae606940 100644
--- a/src/extension/dbus/dbus-init.cpp
+++ b/src/extension/dbus/dbus-init.cpp
@@ -106,10 +106,10 @@ init_document (void) {
         DBusGProxy *proxy;
 	SPDocument *doc;
 
-	doc = sp_document_new(NULL, 1, TRUE);
+        doc = SPDocument::createNewDoc(NULL, 1, TRUE);
 
         std::string name("/org/inkscape/");
-	name.append(doc->name);
+	name.append(doc->getName());
         std::replace(name.begin(), name.end(), ' ', '_');
 
         connection = dbus_get_connection();
-- 
cgit v1.2.3


From 7c620545cbc054aaf59605e37b50bdd3c1cb1133 Mon Sep 17 00:00:00 2001
From: Krzysztof Kosi??ski <tweenk.pl@gmail.com>
Date: Fri, 4 Feb 2011 00:13:20 +0100
Subject: Fix Linux build after 2Geom update

(bzr r10031)
---
 src/extension/dbus/dbus-init.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/extension/dbus/dbus-init.cpp')

diff --git a/src/extension/dbus/dbus-init.cpp b/src/extension/dbus/dbus-init.cpp
index 2ae606940..9c562d169 100644
--- a/src/extension/dbus/dbus-init.cpp
+++ b/src/extension/dbus/dbus-init.cpp
@@ -14,6 +14,8 @@
  */
  
 #include <dbus/dbus-glib.h>
+// this is reguired so that giomm headers won't barf
+#undef DBUS_MESSAGE_TYPE_INVALID
 #include "dbus-init.h"
 
 #include "application-interface.h"
-- 
cgit v1.2.3


From 2de761f0c46b4f3164d0dc008320da3ad0f35316 Mon Sep 17 00:00:00 2001
From: Nicolas Dufour <nicoduf@yahoo.fr>
Date: Fri, 18 Mar 2011 21:29:06 +0100
Subject: D-Bus. Merging branch lp:~joakim-verona/inkscape/dbus-fixes (Bug
 #666986, Bug #707054 and Bug #707364).

(bzr r10114)
---
 src/extension/dbus/dbus-init.cpp | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'src/extension/dbus/dbus-init.cpp')

diff --git a/src/extension/dbus/dbus-init.cpp b/src/extension/dbus/dbus-init.cpp
index 9c562d169..3e453d048 100644
--- a/src/extension/dbus/dbus-init.cpp
+++ b/src/extension/dbus/dbus-init.cpp
@@ -86,7 +86,6 @@ init (void)
         GError *error = NULL;
         DBusGConnection *connection;
         DBusGProxy *proxy;
-	    DocumentInterface *obj;
         connection = dbus_get_connection();
         proxy = dbus_get_proxy(connection);
         org_freedesktop_DBus_request_name (proxy,
@@ -102,8 +101,6 @@ init (void)
 
 gchar *
 init_document (void) {
-        guint   result;
-        GError *error = NULL;
         DBusGConnection *connection;
         DBusGProxy *proxy;
 	SPDocument *doc;
-- 
cgit v1.2.3