From: Ted Gould <ted@gould.cx>
Date: Fri, 26 Mar 2010 04:34:25 +0000 (-0500)
Subject: Merge from trunk
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=76ed722031d5028acba4392554558ad9df9e26ce;p=inkscape.git

Merge from trunk
---

76ed722031d5028acba4392554558ad9df9e26ce
diff --cc configure.ac
index e6c379d48,3835f620e..0a8ad3a2c
--- a/configure.ac
+++ b/configure.ac
@@@ -30,9 -30,8 +30,9 @@@ AM_PROG_CC_STD
  AM_PROG_AS
  AC_PROG_RANLIB
  AC_PROG_INTLTOOL(0.22)
 +AC_PROG_LIBTOOL
  AC_HEADER_STDC
- INK_SVN_SNAPSHOT_BUILD
+ INK_BZR_SNAPSHOT_BUILD
  
  dnl If automake 1.11 shave the output to look nice
  m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
@@@ -957,10 -995,8 +1023,9 @@@ src/extension/implementation/makefil
  src/extension/internal/makefile
  src/extension/makefile
  src/extension/script/makefile
 +src/extension/dbus/wrapper/inkdbus.pc
  src/filters/makefile
  src/helper/makefile
- src/inkjar/makefile
  src/io/makefile
  src/libcroco/makefile
  src/libgdl/makefile
diff --cc src/Makefile.am
index 9d5177519,74bfa01d6..7cd194eea
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -149,10 -138,10 +146,10 @@@ include trace/Makefile_inser
  include 2geom/Makefile_insert
  
  # Extra files not mentioned as sources to include in the source tarball
 -EXTRA_DIST =	\
 +EXTRA_DIST +=	\
  	$(top_srcdir)/Doxyfile	\
  	sp-skeleton.cpp sp-skeleton.h	\
- 	algorithms/makefile.in	\
+ 	util/makefile.in	\
  	application/makefile.in	\
  	bind/makefile.in	\
  	debug/makefile.in	\
diff --cc src/display/sp-canvas.cpp
index e640911d6,c6778c8c5..e39fef45b
--- a/src/display/sp-canvas.cpp
+++ b/src/display/sp-canvas.cpp
@@@ -2085,11 -2111,8 +2113,11 @@@ paint (SPCanvas *canvas
  static int
  do_update (SPCanvas *canvas)
  {
-     if (!canvas->root || !canvas->pixmap_gc) // canvas may have already be destroyed by closing desktop durring interrupted display!
+     if (!canvas->root || !canvas->pixmap_gc) // canvas may have already be destroyed by closing desktop during interrupted display!
          return TRUE;
 +        
 +    if (canvas->drawing_disabled)
 +        return TRUE;
  
      /* Cause the update if necessary */
      if (canvas->need_update) {