Merge changes from trunk

(bzr r14949.1.64)

2 files changed, 4 insertions, 115 deletions

diff --git a/src/extension/dbus/Makefile_insert b/src/extension/dbus/Makefile_insert
deleted file mode 100644
index 192651d87..000000000
--- a/src/extension/dbus/Makefile_insert
+++ /dev/null
@@ -1,111 +0,0 @@
-## Makefile.am fragment sourced by src/Makefile.am.
-
-if WITH_DBUS
-
-#############################
-# Sources for DBus interface
-#############################
-
-ink_common_sources +=	\
-	extension/dbus/dbus-init.cpp  \
-	extension/dbus/dbus-init.h  \
-	extension/dbus/application-interface.cpp  \
-	extension/dbus/application-interface.h  \
-	extension/dbus/document-interface.cpp  \
-	extension/dbus/document-interface.h  \
-	extension/dbus/org.inkscape.service.in
-
-###########################
-# Build DBus wrapper files
-###########################
-
-extension/dbus/application-server-glue.h: extension/dbus/application-interface.xml
-	dbus-binding-tool --mode=glib-server --output=$@ --prefix=application_interface $^
-
-extension/dbus/document-server-glue.h: extension/dbus/document-interface.xml
-	dbus-binding-tool --mode=glib-server --output=$@ --prefix=document_interface $^
-
-extension/dbus/document-client-glue.h: extension/dbus/document-interface.xml
-	dbus-binding-tool --mode=glib-client --output=$@ --prefix=document_interface $^
-
-BUILT_SOURCES += \
-	extension/dbus/application-server-glue.h   \
-	extension/dbus/document-server-glue.h   \
-	extension/dbus/document-client-glue.h
-
-###########################
-# Distribut DBus interface
-###########################
-
-EXTRA_DIST += \
-	extension/dbus/application-interface.xml \
-	extension/dbus/document-interface.xml
-
-###########################
-# DBus Activation Service
-###########################
-
-# Dbus service file
-servicedir = $(DBUSSERVICEDIR)
-service_in_files = extension/dbus/org.inkscape.service.in
-service_DATA = $(service_in_files:.service.in=.service)
-
-# Rule to make the service file with bindir expanded
-$(service_DATA): $(service_in_files) Makefile
-	@sed -e "s|bindir|$(prefix)|" $<> $@
-
-############################
-# DBus Interface Helper Lib
-############################
-
-lib_LTLIBRARIES = \
-	libinkdbus.la
-
-libinkdbusincludedir = $(includedir)/libinkdbus-0.48/libinkdbus
-libinkdbusinclude_HEADERS = \
-	extension/dbus/wrapper/inkscape-dbus-wrapper.h
-
-libinkdbus_la_SOURCES = \
-	extension/dbus/wrapper/inkscape-dbus-wrapper.h \
-	extension/dbus/wrapper/inkscape-dbus-wrapper.c
-
-libinkdbus_la_LDFLAGS = \
-	-version-info 0:0:0 \
-	-no-undefined \
-	-export-symbols-regex "^[^_d].*"
-
-libinkdbus_la_CFLAGS = \
-	$(DBUS_CFLAGS) \
-	$(INKSCAPE_CFLAGS) \
-	-I$(builddir)/extension/dbus \
-	-Wall
-
-libinkdbus_la_LIBADD = \
-	$(DBUS_LIBS) \
-	$(INKSCAPE_LIBS)
-
-############################
-# DBus Pkgconfig file
-############################
-
-pkgconfig_DATA = extension/dbus/wrapper/inkdbus.pc
-pkgconfigdir = $(libdir)/pkgconfig
-
-else # WITH_DBUS
-
-EXTRA_DIST += \
-	extension/dbus/dbus-init.cpp  \
-	extension/dbus/dbus-init.h  \
-	extension/dbus/application-interface.cpp  \
-	extension/dbus/application-interface.h  \
-	extension/dbus/document-interface.cpp  \
-	extension/dbus/document-interface.h \
-	extension/dbus/wrapper/inkscape-dbus-wrapper.h \
-	extension/dbus/wrapper/inkscape-dbus-wrapper.c \
-	extension/dbus/wrapper/inkdbus.pc \
-	extension/dbus/org.inkscape.service.in \
-	extension/dbus/application-interface.xml \
-	extension/dbus/document-interface.xml
-
-endif
-
diff --git a/src/extension/dbus/document-interface.cpp b/src/extension/dbus/document-interface.cpp
index d0a2e81aa..5a8fb0918 100644
--- a/src/extension/dbus/document-interface.cpp
+++ b/src/extension/dbus/document-interface.cpp
@@ -189,7 +189,7 @@ selection_get_center_y (Inkscape::Selection *sel){
 std::vector<SPObject*>
 selection_swap(Inkscape::Selection *sel, gchar *name, GError **error)
 {
-    std::vector<SPObject*> oldsel = sel->list();
+    std::vector<SPObject*> oldsel = std::vector<SPObject*>(sel->objects().begin(), sel->objects().end());
     
     sel->set(get_object_by_name(sel->layers()->getDocument(), name, error));
     return oldsel;
@@ -1087,14 +1087,14 @@ void document_interface_update(DocumentInterface *doc_interface, GError ** error
 gboolean document_interface_selection_get(DocumentInterface *doc_interface, char ***out, GError ** /*error*/)
 {
     Inkscape::Selection * sel = doc_interface->target.getSelection();
-    std::vector<SPObject*> oldsel = sel->list();
+    auto oldsel = sel->objects();
 
     int size = oldsel.size();
 
     *out = g_new0 (char *, size + 1);
 
     int i = 0;
-    for (std::vector<SPObject*>::iterator iter = oldsel.begin(), e = oldsel.end(); iter != e; ++iter) {
+    for (auto iter = oldsel.begin(); iter != oldsel.end(); ++iter) {
         (*out)[i] = g_strdup((*iter)->getId());
         i++;
     }
@@ -1252,7 +1252,7 @@ gboolean document_interface_selection_move_to(DocumentInterface *doc_interface,
     Geom::OptRect sel_bbox = sel->visualBounds();
     if (sel_bbox) {
         Geom::Point m( x - selection_get_center_x(sel) , 0 - (y - selection_get_center_y(sel)) );
-        sp_selection_move_relative(sel, m, true);
+        sp_object_set_move_relative(sel, m, true);
     }
     return TRUE;
 }