Merge lp:~valavanisalex/ubuntu/utopic/inkscape/fix-1358863 into lp:ubuntu/utopic/inkscape

[Alex Valavanis]

Merge upstream bugfix version 0.48.5 from Debian Unstable/Testing

[Daniel Holbach (dholbach)]

Thanks. Uploaded.

review: Approve

=== removed directory '.pc/0001-Fix_Datamatrix_UI_issue.patch'
=== removed directory '.pc/0001-Fix_Datamatrix_UI_issue.patch/share'
=== removed directory '.pc/0001-Fix_Datamatrix_UI_issue.patch/share/extensions'
=== removed file '.pc/0001-Fix_Datamatrix_UI_issue.patch/share/extensions/render_barcode_datamatrix.inx'
--- .pc/0001-Fix_Datamatrix_UI_issue.patch/share/extensions/render_barcode_datamatrix.inx	2013-07-02 17:25:52 +0000
+++ .pc/0001-Fix_Datamatrix_UI_issue.patch/share/extensions/render_barcode_datamatrix.inx	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-	<_name>Barcode - Datamatrix</_name>
-	<id>il.datamatrix</id>
-	<dependency type="executable" location="extensions">render_barcode_datamatrix.py</dependency>
-	<dependency type="executable" location="extensions">inkex.py</dependency>
-	<param name="text" type="string" _gui-text="Text">Inkscape</param>
-	<param name="rows" type="int" min="8" max="144" _gui-text="Rows">10</param>
-	<param name="cols" type="int" min="10" max="144" _gui-text="Cols">10</param>
-	<param name="size" type="int" min="1" max="1000" _gui-text="Square Size / px">4</param>
-	<effect>
-		<object-type>all</object-type>
-		<effects-menu>
-			<submenu _name="Render"/>
-		</effects-menu>
-	</effect>
-	<script>
-		<command reldir="extensions" interpreter="python">render_barcode_datamatrix.py</command>
-	</script>
-</inkscape-extension>
 
=== removed file '.pc/0001-Fix_Datamatrix_UI_issue.patch/share/extensions/render_barcode_datamatrix.py'
--- .pc/0001-Fix_Datamatrix_UI_issue.patch/share/extensions/render_barcode_datamatrix.py	2013-07-02 17:25:52 +0000
+++ .pc/0001-Fix_Datamatrix_UI_issue.patch/share/extensions/render_barcode_datamatrix.py	1970-01-01 00:00:00 +0000
@@ -1,654 +0,0 @@
-#!/usr/bin/env python 
-# -*- coding: UTF-8 -*-
-'''
-Copyright (C) 2009 John Beard [e-mail]
-
-######DESCRIPTION######
-
-This extension renders a DataMatrix 2D barcode, as specified in
-BS ISO/IEC 16022:2006. Only ECC200 codes are considered, as these are the only
-ones recommended for an "open" system.
-
-The size of the DataMatrix is variable between 10x10 to 144x144
-
-The absolute size of the DataMatrix modules (the little squares) is also
-variable.
-
-If more data is given than can be contained in one DataMatrix,
-more than one DataMatrices will be produced.
-
-Text is encoded as ASCII (the standard provides for other options, but these are
-not implemented). Consecutive digits are encoded in a compressed form, halving 
-the space required to store them.
-
-The basis processing flow is;
-    * Convert input string to codewords (modified ASCII and compressed digits)
-    * Split codewords into blocks of the right size for Reed-Solomon coding
-    * Interleave the blocks if required
-    * Apply Reed-Solomon coding
-    * De-interleave the blocks if required
-    * Place the codewords into the matrix bit by bit
-    * Render the modules in the matrix as squares
-
-######LICENCE#######
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-######VERSION HISTORY#####
-    Ver.       Date                       Notes
-    
-    0.50    2009-10-25  Full functionality, up to 144x144.
-                        ASCII and compressed digit encoding only.
-'''
-
-import inkex, simplestyle
-
-import gettext
-_ = gettext.gettext
-    
-#ENCODING ROUTINES ===================================================
-#   Take an input string and convert it to a sequence (or sequences)
-#   of codewords as specified in ISO/IEC 16022:2006 (section 5.2.3)
-#=====================================================================
-    
-#create a 2d list corresponding to the 1's and 0s of the DataMatrix
-def encode(text, (nrow, ncol) ):
-    #retreive the parameters of this size of DataMatrix
-    data_nrow, data_ncol, reg_row, reg_col, nd, nc, inter = get_parameters( nrow, ncol )
-
-    if not ((nrow == 144) and (ncol == 144)):   #we have a regular datamatrix
-        size144 = False
-    else: #special handling will be required by get_codewords()
-        size144 = True
-        
-    #generate the codewords including padding and ECC
-    codewords = get_codewords( text, nd, nc, inter, size144 )
-    
-    # break up into separate arrays if more than one DataMatrix is needed
-    module_arrays = []
-    for codeword_stream in codewords:  #for each datamatrix
-        bit_array = place_bits(codeword_stream, (data_nrow*reg_row, data_ncol*reg_col)) #place the codewords' bits across the array as modules
-        module_arrays.append(add_finder_pattern( bit_array, data_nrow, data_ncol, reg_row, reg_col )) #add finder patterns around the modules
-    
-    return module_arrays
-
-#return parameters for the selected datamatrix size
-#   data_nrow   number of rows in each data region
-#   data_ncol   number of cols in each data region
-#   reg_row     number of rows of data regions
-#   reg_col     number of cols of data regions
-#   nd          number of data codewords per reed-solomon block
-#   nc          number of ECC codewords per reed-solomon block
-#   inter       number of interleaved Reed-Solomon blocks
-def get_parameters(nrow, ncol):
-
-    #SQUARE SYMBOLS
-    if ( nrow ==  10 and ncol ==  10 ):
-        return  8,  8, 1, 1, 3, 5, 1
-    elif ( nrow ==  12 and ncol ==  12 ):
-        return 10, 10, 1, 1, 5, 7, 1
-    elif ( nrow ==  14 and ncol ==  14 ):
-        return 12, 12, 1, 1, 8, 10, 1
-    elif ( nrow ==  16 and ncol ==  16 ):
-        return 14, 14, 1, 1, 12, 12, 1
-    elif ( nrow ==  18 and ncol ==  18 ):
-        return 16, 16, 1, 1, 18, 14, 1
-    elif ( nrow ==  20 and ncol ==  20 ):
-        return 18, 18, 1, 1, 22, 18, 1
-    elif ( nrow ==  22 and ncol ==  22 ):
-        return 18, 18, 1, 1, 30, 20, 1
-    elif ( nrow ==  24 and ncol ==  24 ):
-        return 22, 22, 1, 1, 36, 24, 1
-    elif ( nrow ==  26 and ncol ==  26 ):
-        return 24, 24, 1, 1, 44, 28, 1
-    elif ( nrow ==  32 and ncol ==  32 ):
-        return 14, 14, 2, 2, 62, 36, 1
-    elif ( nrow ==  36 and ncol ==  36 ):
-        return 16, 16, 2, 2, 86, 42, 1
-    elif ( nrow ==  40 and ncol ==  40):
-        return 18, 18, 2, 2, 114, 48, 1
-    elif ( nrow ==  44 and ncol ==  44):
-        return 20, 20, 2, 2, 144, 56, 1
-    elif ( nrow ==  48 and ncol ==  48 ):
-        return 22, 22, 2, 2, 174, 68, 1
-        
-    elif ( nrow ==  52 and ncol ==  52 ):
-        return 24, 24, 2, 2, 102, 42, 2
-    elif ( nrow ==  64 and ncol ==  64 ):
-        return 16, 16, 4, 4, 140, 56, 2
-        
-    elif ( nrow ==  72 and ncol ==  72 ):
-        return 16, 16, 4, 4, 92, 36, 4
-    elif ( nrow ==  80 and ncol ==  80 ):
-        return 18, 18, 4, 4, 114, 48, 4
-    elif ( nrow ==  88 and ncol ==  88 ):
-        return 20, 20, 4, 4, 144, 56, 4
-    elif ( nrow ==  96 and ncol ==  96 ):
-        return 22, 22, 4, 4, 174, 68, 4
-        
-    elif ( nrow ==  104 and ncol ==  104 ):
-        return 24, 24, 4, 4, 136, 56, 6    
-    elif ( nrow ==  120 and ncol ==  120):
-        return 18, 18, 6, 6, 175, 68, 6
-        
-    elif ( nrow ==  132 and ncol ==  132):
-        return 20, 20, 6, 6, 163, 62, 8
-        
-    elif (nrow == 144 and ncol == 144):
-        return 22, 22, 6, 6, 0, 0, 0        #there are two separate sections of the data matrix with
-                                            #different interleaving and reed-solomon parameters.
-                                            #this will be handled separately
-    
-    #RECTANGULAR SYMBOLS
-    elif ( nrow ==  8 and ncol ==  18 ):
-        return  6, 16, 1, 1, 5, 7, 1
-    elif ( nrow ==  8 and ncol ==  32 ):
-        return  6, 14, 1, 2, 10, 11, 1
-    elif ( nrow ==  12 and ncol ==  26 ):
-        return  10, 24, 1, 1, 16, 14, 1
-    elif ( nrow ==  12 and ncol ==  36 ):
-        return  10, 16, 1, 2, 22, 18, 1
-    elif ( nrow ==  16 and ncol ==  36 ):
-        return  14, 16, 1, 2, 32, 24, 1
-    elif ( nrow ==  16 and ncol ==  48 ):
-        return  14, 22, 1, 2, 49, 28, 1
-    
-    #RETURN ERROR
-    else:
-        inkex.errormsg(_('Unrecognised DataMatrix size'))
-    
-    return None
-    
-# CODEWORD STREAM GENERATION =========================================
-#take the text input and return the codewords,
-#including the Reed-Solomon error-correcting codes.
-#=====================================================================
-
-def get_codewords( text, nd, nc, inter, size144 ):
-    #convert the data to the codewords
-    data = encode_to_ascii( text )
-    
-    if not size144:    #render a "normal" datamatrix
-        data_blocks = partition_data(data, nd*inter)  #partition into data blocks of length nd*inter -> inter Reed-Solomon block
-    
-        data_blocks = interleave( data_blocks, inter)   # interleave consecutive inter blocks if required
-    
-        data_blocks = reed_solomon(data_blocks, nd, nc) #generate and append the Reed-Solomon codewords
-    
-        data_blocks = combine_interleaved(data_blocks, inter, nd, nc, False)  #concatenate Reed-Solomon blocks bound for the same datamatrix
-        
-    else: #we have a 144x144 datamatrix
-        data_blocks = partition_data(data, 1558) #partition the data into datamtrix-sized chunks (1558 =156*8 + 155*2 )
-        
-        for i in range(len(data_blocks)):  #for each datamtrix
-            
-            
-            inter = 8
-            nd = 156
-            nc = 62
-            block1 = data_blocks[i][0:156*8]
-            block1 = interleave( [block1], inter)   # interleave into 8 blocks
-            block1 = reed_solomon(block1, nd, nc) #generate and append the Reed-Solomon codewords
-            
-            inter = 2
-            nd = 155
-            nc = 62
-            block2 = data_blocks[i][156*8:]
-            block2 = interleave( [block2], inter)   # interleave into 2 blocks
-            block2 = reed_solomon(block2, nd, nc) #generate and append the Reed-Solomon codewords
-            
-            blocks = block1
-            blocks.extend(block2)
-                
-            blocks = combine_interleaved(blocks, 10, nd, nc, True)  
-            
-            data_blocks[i] = blocks[0]
-
-        
-    return data_blocks
-    
-
-#Takes a codeword stream and splits up into "inter" blocks.
-#eg interleave( [1,2,3,4,5,6], 2 ) -> [1,3,5], [2,4,6]
-def interleave( blocks, inter):
-
-    if inter == 1:       # if we don't have to interleave, just return the blocks
-        return blocks
-    else:
-        result = []
-        for block in blocks:    #for each codeword block in the stream
-            block_length = len(block)/inter    #length of each interleaved block
-            inter_blocks = [[0] * block_length for i in xrange(inter)]   #the interleaved blocks
-            
-            for i in range(block_length):   #for each element in the interleaved blocks
-                for j in range(inter):       #for each interleaved block
-                    inter_blocks[j][i] = block[ i*inter + j ]
-            
-            result.extend(inter_blocks) #add the interleaved blocks to the output
-        
-        return result
-        
-#Combine interleaved blocks into the groups for the same datamatrix
-#
-#e.g combine_interleaved( [[d1, d3, d5, e1, e3, e5], [d2, d4, d6, e2, e4, e6]], 2, 3, 3 )
-#   --> [[d1, d2, d3, d4, d5, d6, e1, e2, e3, e4, e5, e6]]
-def combine_interleaved( blocks, inter, nd, nc, size144):
-    if inter == 1:  #the blocks aren't interleaved
-        return blocks
-    else:
-        result = []
-        for i in range( len(blocks) / inter ):  #for each group of "inter" blocks -> one full datamatrix
-            data_codewords = [] #interleaved data blocks
-            
-            if size144:
-                nd_range = 1558 #1558 = 156*8 + 155*2
-                nc_range = 620   #620 = 62*8 + 62*2
-            else:
-                nd_range = nd*inter
-                nc_range = nc*inter
-            
-            for j in range(nd_range):  #for each codeword in the final list
-                data_codewords.append( blocks[i*inter + j%inter][j/inter] )
-
-            for j in range(nc_range):  #for each block, add the ecc codewords
-                data_codewords.append( blocks[i*inter + j%inter][nd + j/inter] )
-
-            result.append(data_codewords)
-        return result
-    
-#checks if an ASCII character is a digit from 0 - 9
-def is_digit( char ):
-    
-    if ord(char) >= 48 and ord(char) <= 57:
-        return True
-    else:
-        return False
-    
-def encode_to_ascii( text):
-
-    ascii = []
-    i = 0
-    while i < len(text):
-        #check for double digits
-        if is_digit( text[i] ) and ( i < len(text)-1) and is_digit( text[i+1] ):   #if the next char is also a digit
-            
-            codeword = int( text[i] + text[i+1] ) + 130
-            ascii.append( codeword )
-            i = i + 2   #move on 2 characters
-        else: #encode as a normal ascii, 
-            ascii.append( ord(text[i] ) + 1 ) #codeword is ASCII value + 1 (ISO 16022:2006 5.2.3)
-            i = i + 1   #next character
-            
-    return ascii
-
-    
-#partition data into blocks of the appropriate size to suit the
-#Reed-Solomon block being used.
-#e.g. partition_data([1,2,3,4,5], 3) -> [[1,2,3],[4,5,PAD]]
-def partition_data( data , rs_data):
-
-    PAD_VAL = 129        # PAD codeword (ISO 16022:2006 5.2.3)
-    data_blocks = []
-    i = 0
-    while i < len(data):
-        if len(data) >= i+rs_data:  #we have a whole block in our data
-            data_blocks.append( data[i:i+rs_data] )
-            i = i + rs_data
-        else:   #pad out with the pad codeword
-            data_block = data[i:len(data)] #add any remaining data
-            pad_pos = len(data)
-            padded = False
-            while len(data_block) < rs_data:#and then pad with randomised pad codewords
-                if not padded:
-                    data_block.append( PAD_VAL ) #add a normal pad codeword
-                    padded = True
-                else:
-                    data_block.append( randomise_pad_253( PAD_VAL, pad_pos) )
-                pad_pos = pad_pos + 1
-            data_blocks.append( data_block)
-            break
-            
-    return data_blocks
-    
-#Pad character randomisation, to prevent regular patterns appearing
-#in the data matrix
-def randomise_pad_253(pad_value, pad_position ):
-    pseudo_random_number = ( ( 149 * pad_position ) % 253 )+ 1 
-    randomised = pad_value + pseudo_random_number
-    if ( randomised <= 254 ):
-        return randomised
-    else:
-        return randomised - 254
-        
-# REED-SOLOMON ENCODING ROUTINES =====================================
-    
-# "prod(x,y,log,alog,gf)" returns the product "x" times "y"
-def prod(x, y, log, alog, gf):
-    
-    if ( x==0 or y==0):
-        return 0
-    else:
-        result = alog[ ( log[x] + log[y] ) % (gf - 1) ]
-        return result
-
-# generate the log & antilog lists:
-def gen_log_alog(gf, pp):
-    log = [0]*gf
-    alog = [0]*gf
-
-    log[0] = 1-gf
-    alog[0] = 1
-    
-    for i in range(1,gf):
-        alog[i] = alog[i-1] * 2
-        
-        if (alog[i] >= gf):
-            alog[i] = alog[i] ^ pp
-            
-        log[alog[i]] = i 
-        
-    return log, alog
-    
-# generate the generator polynomial coefficients:
-def gen_poly_coeffs(nc, log, alog, gf):
-    c = [0] * (nc+1)
-    c[0] = 1
-
-    for i in range(1,nc+1):
-        c[i] = c[i-1] 
-        
-        j = i-1
-        while j >= 1:
-            c[j] = c[j-1] ^ prod(c[j],alog[i],log,alog,gf)
-            j = j - 1
-        
-        c[0] = prod(c[0],alog[i],log,alog,gf)
-        
-    return c
-    
-# "ReedSolomon(wd,nd,nc)" takes "nd" data codeword values in wd[]
-# and adds on "nc" check codewords, all within GF(gf) where "gf" is a
-# power of 2 and "pp" is the value of its prime modulus polynomial */ 
-def reed_solomon(data, nd, nc):
-    #parameters of the polynomial arithmetic
-    gf = 256  #operating on 8-bit codewords -> Galois field = 2^8 = 256
-    pp = 301  #prime modulus polynomial for ECC-200 is 0b100101101 = 301 (ISO 16022:2006 5.7.1)
-    
-    log, alog = gen_log_alog(gf,pp)
-    c = gen_poly_coeffs(nc, log, alog, gf)
-
-    for block in data: #for each block of data codewords
-
-        block.extend( [0]*(nc+1) ) #extend to make space for the error codewords
-        
-        #generate "nc" checkwords in the list block
-        for i in range(0, nd):
-            k = block[nd] ^ block[i]
-            
-            for j in range(0,nc):
-                block[nd+j] = block[nd+j+1] ^ prod(k,c[nc-j-1],log, alog,gf)
-                
-        block.pop()
-
-    return data
-    
-#MODULE PLACEMENT ROUTINES===========================================
-#   These routines take a steam of codewords, and place them into the
-#   DataMatrix in accordance with Annex F of BS ISO/IEC 16022:2006
-
-# bit() returns the bit'th bit of the byte
-def bit(byte, bit):
-    #the MSB is bit 1, LSB is bit 8
-    return ( byte >> (8-bit) ) %2
-    
-# "module" places a given bit with appropriate wrapping within array
-def module(array, nrow, ncol, row, col, bit) :
-    if (row < 0) :
-        row = row + nrow
-        col = col + 4 - ((nrow+4)%8)
-        
-    if (col < 0):
-        col = col + ncol
-        row = row + 4 - ((ncol+4)%8) 
-
-    array[row][col] = bit
-
-def corner1(array, nrow, ncol, char): 
-    module(array, nrow, ncol, nrow-1, 0,      bit(char,1)); 
-    module(array, nrow, ncol, nrow-1, 1,      bit(char,2)); 
-    module(array, nrow, ncol, nrow-1, 2,      bit(char,3)); 
-    module(array, nrow, ncol, 0,      ncol-2, bit(char,4)); 
-    module(array, nrow, ncol, 0,      ncol-1, bit(char,5)); 
-    module(array, nrow, ncol, 1,      ncol-1, bit(char,6)); 
-    module(array, nrow, ncol, 2,      ncol-1, bit(char,7)); 
-    module(array, nrow, ncol, 3,      ncol-1, bit(char,8)); 
-
-def corner2(array, nrow, ncol, char):
-    module(array, nrow, ncol, nrow-3, 0,      bit(char,1)); 
-    module(array, nrow, ncol, nrow-2, 0,      bit(char,2)); 
-    module(array, nrow, ncol, nrow-1, 0,      bit(char,3)); 
-    module(array, nrow, ncol, 0,      ncol-4, bit(char,4)); 
-    module(array, nrow, ncol, 0,      ncol-3, bit(char,5)); 
-    module(array, nrow, ncol, 0,      ncol-2, bit(char,6)); 
-    module(array, nrow, ncol, 0,      ncol-1, bit(char,7)); 
-    module(array, nrow, ncol, 1,      ncol-1, bit(char,8)); 
-
-def corner3(array, nrow, ncol, char):
-    module(array, nrow, ncol, nrow-3, 0,      bit(char,1)); 
-    module(array, nrow, ncol, nrow-2, 0,      bit(char,2)); 
-    module(array, nrow, ncol, nrow-1, 0,      bit(char,3)); 
-    module(array, nrow, ncol, 0,      ncol-2, bit(char,4)); 
-    module(array, nrow, ncol, 0,      ncol-1, bit(char,5)); 
-    module(array, nrow, ncol, 1,      ncol-1, bit(char,6)); 
-    module(array, nrow, ncol, 2,      ncol-1, bit(char,7)); 
-    module(array, nrow, ncol, 3,      ncol-1, bit(char,8)); 
-
-def corner4(array, nrow, ncol, char):
-    module(array, nrow, ncol, nrow-1, 0,      bit(char,1)); 
-    module(array, nrow, ncol, nrow-1, ncol-1, bit(char,2)); 
-    module(array, nrow, ncol, 0,      ncol-3, bit(char,3)); 
-    module(array, nrow, ncol, 0,      ncol-2, bit(char,4)); 
-    module(array, nrow, ncol, 0,      ncol-1, bit(char,5)); 
-    module(array, nrow, ncol, 1,      ncol-3, bit(char,6)); 
-    module(array, nrow, ncol, 1,      ncol-2, bit(char,7)); 
-    module(array, nrow, ncol, 1,      ncol-1, bit(char,8));
-    
-#"utah" places the 8 bits of a utah-shaped symbol character in ECC200
-def utah(array, nrow, ncol, row, col, char):
-    module(array, nrow, ncol,row-2, col-2, bit(char,1))
-    module(array, nrow, ncol,row-2, col-1, bit(char,2))
-    module(array, nrow, ncol,row-1, col-2, bit(char,3))
-    module(array, nrow, ncol,row-1, col-1, bit(char,4))
-    module(array, nrow, ncol,row-1, col,   bit(char,5))
-    module(array, nrow, ncol,row,   col-2, bit(char,6))
-    module(array, nrow, ncol,row,   col-1, bit(char,7))
-    module(array, nrow, ncol,row,   col,   bit(char,8))
-
-#"place_bits" fills an nrow x ncol array with the bits from the 
-# codewords in data. 
-def place_bits(data, (nrow, ncol)): 
-# First, fill the array[] with invalid entries */ 
-    INVALID = 2
-    array = [[INVALID] * ncol for i in xrange(nrow)]   #initialise and fill with -1's (invalid value)
-# Starting in the correct location for character #1, bit 8,...
-    char = 0
-    row = 4
-    col = 0
-    while True:
-    
-    #first check for one of the special corner cases, then... 
-        if ((row == nrow) and (col == 0)):
-            corner1(array, nrow, ncol, data[char])
-            char = char + 1
-        if ((row == nrow-2) and (col == 0) and (ncol%4)) :
-            corner2(array, nrow, ncol, data[char])
-            char = char + 1
-        if ((row == nrow-2) and (col == 0) and (ncol%8 == 4)):
-            corner3(array, nrow, ncol, data[char])
-            char = char + 1
-        if ((row == nrow+4) and (col == 2) and ((ncol%8) == 0)):
-            corner4(array, nrow, ncol, data[char])
-            char = char + 1
-        
-        #sweep upward diagonally, inserting successive characters,...
-        while True:
-            if ((row < nrow) and (col >= 0) and (array[row][col] == INVALID)) :
-                utah(array, nrow, ncol,row,col,data[char])
-                char = char+1
-            row = row - 2
-            col = col + 2
-            
-            if not((row >= 0) and (col < ncol)):
-                break
-            
-        row = row + 1
-        col = col + 3 
-                
-        # & then sweep downward diagonally, inserting successive characters,...
-        while True:
-            if ((row >= 0) and (col < ncol) and (array[row][col] == INVALID)) :
-                utah(array, nrow, ncol,row,col,data[char])
-                char = char + 1
-            row = row + 2
-            col = col - 2 
-        
-            if not((row < nrow) and (col >= 0)):
-                break
-        
-        row = row + 3
-        col = col + 1
-        
-        #... until the entire array is scanned
-        if not((row < nrow) or (col < ncol)):
-            break
-
-    # Lastly, if the lower righthand corner is untouched, fill in fixed pattern */ 
-    if (array[nrow-1][ncol-1] == INVALID): 
-        array[nrow-1][ncol-2] = 0
-        array[nrow-1][ncol-1] = 1
-        array[nrow-2][ncol-1] = 0
-        array[nrow-2][ncol-2] = 1
-
-    return array    #return the array of 1's and 0's
-    
-    
-def add_finder_pattern( array, data_nrow, data_ncol, reg_row, reg_col ):
-
-    #get the total size of the datamatrix
-    nrow = (data_nrow+2) * reg_row
-    ncol = (data_ncol+2) * reg_col
-
-    datamatrix = [[0] * ncol for i in xrange(nrow)]   #initialise and fill with 0's
-    
-    for i in range( reg_col ):    #for each column of data regions
-        for j in range(nrow):
-            datamatrix[j][i*(data_ncol+2)] = 1  #vertical black bar on left
-            datamatrix[j][i*(data_ncol+2)+data_ncol+1] = (j)%2 # alternating blocks
-            
-    for i in range( reg_row):   # for each row of data regions
-        for j in range(ncol):
-            datamatrix[i*(data_nrow+2)+data_nrow+1][j] = 1  #horizontal black bar at bottom
-            datamatrix[i*(data_nrow+2)][j] = (j+1)%2 # alternating blocks
-            
-    for i in range( data_nrow*reg_row ):
-        for j in range( data_ncol* reg_col ):
-            dest_col = j + 1 + 2*(j/(data_ncol)) #offset by 1, plus two for every addition block
-            dest_row = i + 1 + 2*(i/(data_nrow))
-            
-            datamatrix[dest_row][dest_col] = array[i][j]    #transfer from the plain bit array
-            
-    return datamatrix
-    
-#RENDERING ROUTINES ==================================================
-#   Take the array of 1's and 0's and render as a series of black
-#   squares. A binary 1 is a filled square
-#=====================================================================
-
-#SVG element generation routine
-def draw_SVG_square((w,h), (x,y), parent):
-
-    style = {   'stroke'        : 'none',
-                'stroke-width'  : '1',
-                'fill'          : '#000000'
-            }
-                
-    attribs = {
-        'style'     :simplestyle.formatStyle(style),
-        'height'    : str(h),
-        'width'     : str(w),
-        'x'         : str(x),
-        'y'         : str(y)
-            }
-    circ = inkex.etree.SubElement(parent, inkex.addNS('rect','svg'), attribs )
-    
-#turn a 2D array of 1's and 0's into a set of black squares
-def render_data_matrix( module_arrays, size, spacing, parent):
-    
-    for i in range(len(module_arrays)): #for each data matrix
-    
-        height = len(module_arrays[i])
-        width  = len(module_arrays[i][0] )
-        
-        for y in range(height):     #loop over all the modules in the datamatrix
-            for x in range(width):
-                
-                if module_arrays[i][y][x] == 1: #A binary 1 is a filled square
-                    draw_SVG_square((size,size), (x*size + i*spacing,y*size), parent)
-                elif module_arrays[i][y][x] != 0: #we have an invalid bit value
-                    inkex.errormsg(_('Invalid bit value, this is a bug!'))
-    
-class DataMatrix(inkex.Effect):
-    def __init__(self):
-        inkex.Effect.__init__(self)
-        
-        #PARSE OPTIONS
-        self.OptionParser.add_option("--text",
-            action="store", type="string",
-            dest="TEXT", default='Inkscape')
-        self.OptionParser.add_option("--rows",
-            action="store", type="int",
-            dest="ROWS", default=10)
-        self.OptionParser.add_option("--cols",
-            action="store", type="int",
-            dest="COLS", default=10)
-        self.OptionParser.add_option("--size",
-            action="store", type="int",
-            dest="SIZE", default=4)
-            
-    def effect(self):
-        
-        so = self.options
-        
-        if so.TEXT == '':  #abort if converting blank text
-            inkex.errormsg(_('Please enter an input string'))
-        else:
-        
-            #INKSCAPE GROUP TO CONTAIN EVERYTHING
-            
-            centre = self.view_center   #Put in in the centre of the current view
-            grp_transform = 'translate' + str( centre )
-            grp_name = 'DataMatrix'
-            grp_attribs = {inkex.addNS('label','inkscape'):grp_name,
-                           'transform':grp_transform }
-            grp = inkex.etree.SubElement(self.current_layer, 'g', grp_attribs)#the group to put everything in
-            
-            #GENERATE THE DATAMATRIX
-            encoded = encode( so.TEXT, (so.ROWS, so.COLS) ) #get the pattern of squares
-            render_data_matrix( encoded, so.SIZE, so.COLS*so.SIZE*1.5, grp )    # generate the SVG elements
-            
-if __name__ == '__main__':
-    e = DataMatrix()
-    e.affect()
-
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
 
=== removed directory '.pc/0002-Drop_PS_and_PDF_support_in_MimeType.patch'
=== removed file '.pc/0002-Drop_PS_and_PDF_support_in_MimeType.patch/inkscape.desktop.in'
--- .pc/0002-Drop_PS_and_PDF_support_in_MimeType.patch/inkscape.desktop.in	2013-07-02 17:25:52 +0000
+++ .pc/0002-Drop_PS_and_PDF_support_in_MimeType.patch/inkscape.desktop.in	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Version=1.0
-_Name=Inkscape
-_GenericName=Vector Graphics Editor
-_X-GNOME-FullName=Inkscape Vector Graphics Editor
-_Comment=Create and edit Scalable Vector Graphics images
-Type=Application
-Categories=Graphics;VectorGraphics;GTK;
-MimeType=image/svg+xml;image/svg+xml-compressed;application/vnd.corel-draw;application/pdf;application/postscript;image/x-eps;application/illustrator;
-Exec=inkscape %F
-TryExec=inkscape
-Terminal=false
-StartupNotify=true
-Icon=inkscape
 
=== removed directory '.pc/0003-Fix_LP_-911146.patch'
=== removed directory '.pc/0003-Fix_LP_-911146.patch/src'
=== removed directory '.pc/0003-Fix_LP_-911146.patch/src/extension'
=== removed directory '.pc/0003-Fix_LP_-911146.patch/src/extension/implementation'
=== removed file '.pc/0003-Fix_LP_-911146.patch/src/extension/implementation/script.cpp'
--- .pc/0003-Fix_LP_-911146.patch/src/extension/implementation/script.cpp	2013-07-02 17:25:52 +0000
+++ .pc/0003-Fix_LP_-911146.patch/src/extension/implementation/script.cpp	1970-01-01 00:00:00 +0000
@@ -1,1034 +0,0 @@
-/** \file
- * Code for handling extensions (i.e.\ scripts).
- */
-/*
- * Authors:
- *   Bryce Harrington <[e-mail]>
- *   Ted Gould <[e-mail]>
- *   Jon A. Cruz <[e-mail]>
- *
- * Copyright (C) 2002-2005,2007 Authors
- *
- * Released under GNU GPL, read the file 'COPYING' for more information
- */
-
-#define __INKSCAPE_EXTENSION_IMPLEMENTATION_SCRIPT_C__
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <unistd.h>
-
-#include <errno.h>
-#include <glib.h>
-#include <glib/gstdio.h>
-#include <gtkmm.h>
-
-#include "ui/view/view.h"
-#include "desktop-handles.h"
-#include "desktop.h"
-#include "selection.h"
-#include "sp-namedview.h"
-#include "io/sys.h"
-#include "preferences.h"
-#include "../system.h"
-#include "extension/effect.h"
-#include "extension/output.h"
-#include "extension/input.h"
-#include "extension/db.h"
-#include "script.h"
-#include "dialogs/dialog-events.h"
-#include "application/application.h"
-#include "xml/node.h"
-#include "xml/attribute-record.h"
-
-#include "util/glib-list-iterators.h"
-#include "path-prefix.h"
-
-
-#ifdef WIN32
-#include <windows.h>
-#include <sys/stat.h>
-#include "registrytool.h"
-#endif
-
-
-
-/** This is the command buffer that gets allocated from the stack */
-#define BUFSIZE (255)
-
-
-
-/* Namespaces */
-namespace Inkscape {
-namespace Extension {
-namespace Implementation {
-
-/** \brief  Make GTK+ events continue to come through a little bit
-
-    This just keeps coming the events through so that we'll make the GUI
-    update and look pretty.
-*/
-void Script::pump_events (void) {
-    while ( Gtk::Main::events_pending() ) {
-        Gtk::Main::iteration();
-    }
-    return;
-}
-
-
-/** \brief  A table of what interpreters to call for a given language
-
-    This table is used to keep track of all the programs to execute a
-    given script.  It also tracks the preference to use to overwrite
-    the given interpreter to a custom one per user.
-*/
-Script::interpreter_t const Script::interpreterTab[] = {
-        {"perl",   "perl-interpreter",   "perl"   },
-#ifdef WIN32
-        {"python", "python-interpreter", "pythonw" },
-#else
-        {"python", "python-interpreter", "python" },
-#endif
-        {"ruby",   "ruby-interpreter",   "ruby"   },
-        {"shell",  "shell-interpreter",  "sh"     },
-        { NULL,    NULL,                  NULL    }
-};
-
-
-
-/** \brief Look up an interpreter name, and translate to something that
-    is executable
-    \param interpNameArg  The name of the interpreter that we're looking
-    for, should be an entry in interpreterTab
-*/
-std::string Script::resolveInterpreterExecutable(const Glib::ustring &interpNameArg)
-{
-    interpreter_t const *interp = 0;
-    bool foundInterp = false;
-    for (interp =  interpreterTab ; interp->identity ; interp++ ){
-        if (interpNameArg == interp->identity) {
-            foundInterp = true;
-            break;
-        }
-    }
-
-    // Do we have a supported interpreter type?
-    if (!foundInterp) {
-        return "";
-    }
-    std::string interpreter_path = Glib::filename_from_utf8(interp->defaultval);
-
-    // 1.  Check preferences for an override.
-    // Note: this must be an absolute path.
-    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-    Glib::ustring prefInterp = prefs->getString("/extensions/" + Glib::ustring(interp->prefstring));
-
-    if (!prefInterp.empty()) {
-        interpreter_path = Glib::filename_from_utf8(prefInterp);
-    }
-
-    // 2. Search the path.
-    // Do this on all systems, for consistency.
-    // PATH is set up to contain the Python and Perl binary directories
-    // on Windows, so no extra code is necessary.
-    if (!Glib::path_is_absolute(interpreter_path)) {
-        interpreter_path = Glib::find_program_in_path(interpreter_path);
-    }
-    return interpreter_path;
-}
-
-/** \brief     This function creates a script object and sets up the
-               variables.
-    \return    A script object
-
-   This function just sets the command to NULL.  It should get built
-   officially in the load function.  This allows for less allocation
-   of memory in the unloaded state.
-*/
-Script::Script() :
-    Implementation()
-{
-}
-
-/**
- *   brief     Destructor
- */
-Script::~Script()
-{
-}
-
-
-
-/**
-    \return    A string with the complete string with the relative directory expanded
-    \brief     This function takes in a Repr that contains a reldir entry
-               and returns that data with the relative directory expanded.
-               Mostly it is here so that relative directories all get used
-               the same way.
-    \param     reprin   The Inkscape::XML::Node with the reldir in it.
-
-    Basically this function looks at an attribute of the Repr, and makes
-    a decision based on that.  Currently, it is only working with the
-    'extensions' relative directory, but there will be more of them.
-    One thing to notice is that this function always returns an allocated
-    string.  This means that the caller of this function can always
-    free what they are given (and should do it too!).
-*/
-std::string
-Script::solve_reldir(Inkscape::XML::Node *reprin) {
-
-    gchar const *s = reprin->attribute("reldir");
-
-    // right now the only recognized relative directory is "extensions"
-    if (!s || Glib::ustring(s) != "extensions") {
-        Glib::ustring str = sp_repr_children(reprin)->content();
-        return str;
-    }
-
-    Glib::ustring reldir = s;
-    for (unsigned int i=0;
-        i < Inkscape::Extension::Extension::search_path.size();
-        i++) {
-
-        gchar * fname = g_build_filename(
-           Inkscape::Extension::Extension::search_path[i],
-           sp_repr_children(reprin)->content(),
-           NULL);
-        Glib::ustring filename = fname;
-        g_free(fname);
-        //printf("Filename: %s\n", filename.c_str());
-        if ( Inkscape::IO::file_test(filename.c_str(), G_FILE_TEST_EXISTS) ) {
-            return Glib::filename_from_utf8(filename);
-        }
-    }
-
-    return "";
-}
-
-
-
-/**
-    \return   Whether the command given exists, including in the path
-    \brief    This function is used to find out if something exists for
-              the check command.  It can look in the path if required.
-    \param    command   The command or file that should be looked for
-
-    The first thing that this function does is check to see if the
-    incoming file name has a directory delimiter in it.  This would
-    mean that it wants to control the directories, and should be
-    used directly.
-
-    If not, the path is used.  Each entry in the path is stepped through,
-    attached to the string, and then tested.  If the file is found
-    then a TRUE is returned.  If we get all the way through the path
-    then a FALSE is returned, the command could not be found.
-*/
-bool Script::check_existence(const std::string &command)
-{
-    // Check the simple case first
-    if (command.empty()) {
-        return false;
-    }
-
-    //Don't search when it is an absolute path. */
-    if (Glib::path_is_absolute(command)) {
-        if (Glib::file_test(command, Glib::FILE_TEST_EXISTS)) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    // First search in the current directory
-    std::string path = G_SEARCHPATH_SEPARATOR_S;
-    path.append(";");
-    // And then in the PATH environment variable.
-    path.append(Glib::getenv("PATH"));
-
-    std::string::size_type pos  = 0;
-    std::string::size_type pos2 = 0;
-    while ( pos < path.size() ) {
-
-        std::string localPath;
-
-        pos2 = path.find(G_SEARCHPATH_SEPARATOR, pos);
-        if (pos2 == path.npos) {
-            localPath = path.substr(pos);
-            pos = path.size();
-        } else {
-            localPath = path.substr(pos, pos2-pos);
-            pos = pos2+1;
-        }
-
-        //printf("### %s\n", localPath.c_str());
-        std::string candidatePath =
-                      Glib::build_filename(localPath, command);
-
-        if (Glib::file_test(candidatePath,
-                      Glib::FILE_TEST_EXISTS)) {
-            return true;
-        }
-
-    }
-
-    return false;
-}
-
-
-
-
-
-/**
-    \return   none
-    \brief    This function 'loads' an extention, basically it determines
-              the full command for the extention and stores that.
-    \param    module  The extention to be loaded.
-
-    The most difficult part about this function is finding the actual
-    command through all of the Reprs.  Basically it is hidden down a
-    couple of layers, and so the code has to move down too.  When
-    the command is actually found, it has its relative directory
-    solved.
-
-    At that point all of the loops are exited, and there is an
-    if statement to make sure they didn't exit because of not finding
-    the command.  If that's the case, the extention doesn't get loaded
-    and should error out at a higher level.
-*/
-
-bool Script::load(Inkscape::Extension::Extension *module)
-{
-    if (module->loaded()) {
-        return true;
-    }
-
-    helper_extension = "";
-
-    /* This should probably check to find the executable... */
-    Inkscape::XML::Node *child_repr = sp_repr_children(module->get_repr());
-    while (child_repr != NULL) {
-        if (!strcmp(child_repr->name(), INKSCAPE_EXTENSION_NS "script")) {
-            child_repr = sp_repr_children(child_repr);
-            while (child_repr != NULL) {
-                if (!strcmp(child_repr->name(), INKSCAPE_EXTENSION_NS "command")) {
-                    const gchar *interpretstr = child_repr->attribute("interpreter");
-                    if (interpretstr != NULL) {
-                        std::string interpString = resolveInterpreterExecutable(interpretstr);
-                        command.insert(command.end(), interpString);
-                    }
-                    command.insert(command.end(), solve_reldir(child_repr));
-                }
-                if (!strcmp(child_repr->name(), INKSCAPE_EXTENSION_NS "helper_extension")) {
-                    helper_extension = sp_repr_children(child_repr)->content();
-                }
-                child_repr = sp_repr_next(child_repr);
-            }
-
-            break;
-        }
-        child_repr = sp_repr_next(child_repr);
-    }
-
-    //g_return_val_if_fail(command.length() > 0, false);
-
-    return true;
-}
-
-
-/**
-    \return   None.
-    \brief    Unload this puppy!
-    \param    module  Extension to be unloaded.
-
-    This function just sets the module to unloaded.  It free's the
-    command if it has been allocated.
-*/
-void Script::unload(Inkscape::Extension::Extension */*module*/)
-{
-    command.clear();
-    helper_extension = "";
-}
-
-
-
-
-/**
-    \return   Whether the check passed or not
-    \brief    Check every dependency that was given to make sure we should keep this extension
-    \param    module  The Extension in question
-
-*/
-bool
-Script::check(Inkscape::Extension::Extension *module)
-{
-    int script_count = 0;
-    Inkscape::XML::Node *child_repr = sp_repr_children(module->get_repr());
-    while (child_repr != NULL) {
-        if (!strcmp(child_repr->name(), INKSCAPE_EXTENSION_NS "script")) {
-            script_count++;
-            child_repr = sp_repr_children(child_repr);
-            while (child_repr != NULL) {
-                if (!strcmp(child_repr->name(), INKSCAPE_EXTENSION_NS "check")) {
-                    std::string command_text = solve_reldir(child_repr);
-                    if (!command_text.empty()) {
-                        /* I've got the command */
-                        bool existance = check_existence(command_text);
-                        if (!existance) {
-                            return false;
-                        }
-                    } else {
-                        return false;
-                    }
-                }
-
-                if (!strcmp(child_repr->name(), INKSCAPE_EXTENSION_NS "helper_extension")) {
-                    gchar const *helper = sp_repr_children(child_repr)->content();
-                    if (Inkscape::Extension::db.get(helper) == NULL) {
-                        return false;
-                    }
-                }
-
-                child_repr = sp_repr_next(child_repr);
-            }
-
-            break;
-        }
-        child_repr = sp_repr_next(child_repr);
-    }
-
-    if (script_count == 0) {
-        return false;
-    }
-
-    return true;
-}
-
-class ScriptDocCache : public ImplementationDocumentCache {
-    friend class Script;
-protected:
-    std::string _filename;
-    int _tempfd;
-public:
-    ScriptDocCache (Inkscape::UI::View::View * view);
-    ~ScriptDocCache ( );
-};
-
-ScriptDocCache::ScriptDocCache (Inkscape::UI::View::View * view) :
-    ImplementationDocumentCache(view),
-    _filename(""),
-    _tempfd(0)
-{
-    try {
-        _tempfd = Inkscape::IO::file_open_tmp(_filename, "ink_ext_XXXXXX.svg");
-    } catch (...) {
-        /// \todo Popup dialog here
-        return;
-    }
-
-    SPDesktop *desktop = (SPDesktop *) view;
-    sp_namedview_document_from_window(desktop);
-
-    Inkscape::Extension::save(
-              Inkscape::Extension::db.get(SP_MODULE_KEY_OUTPUT_SVG_INKSCAPE),
-              view->doc(), _filename.c_str(), false, false, false, Inkscape::Extension::FILE_SAVE_METHOD_TEMPORARY);
-
-    return;
-}
-
-ScriptDocCache::~ScriptDocCache ( )
-{
-    close(_tempfd);
-    unlink(_filename.c_str());
-}
-
-ImplementationDocumentCache *Script::newDocCache( Inkscape::Extension::Extension * /*ext*/, Inkscape::UI::View::View * view ) {
-    return new ScriptDocCache(view);
-}
-
-
-/**
-    \return   A dialog for preferences
-    \brief    A stub funtion right now
-    \param    module    Module who's preferences need getting
-    \param    filename  Hey, the file you're getting might be important
-
-    This function should really do something, right now it doesn't.
-*/
-Gtk::Widget *Script::prefs_input(Inkscape::Extension::Input *module,
-                    const gchar */*filename*/)
-{
-    return module->autogui(NULL, NULL);
-}
-
-
-
-/**
-    \return   A dialog for preferences
-    \brief    A stub funtion right now
-    \param    module    Module whose preferences need getting
-
-    This function should really do something, right now it doesn't.
-*/
-Gtk::Widget *Script::prefs_output(Inkscape::Extension::Output *module)
-{
-    return module->autogui(NULL, NULL);
-}
-
-/**
-    \return  A new document that has been opened
-    \brief   This function uses a filename that is put in, and calls
-             the extension's command to create an SVG file which is
-             returned.
-    \param   module   Extension to use.
-    \param   filename File to open.
-
-    First things first, this function needs a temporary file name.  To
-    create on of those the function g_file_open_tmp is used with
-    the header of ink_ext_.
-
-    The extension is then executed using the 'execute' function
-    with the filname coming in, and the temporary filename.  After
-    That executing, the SVG should be in the temporary file.
-
-    Finally, the temporary file is opened using the SVG input module and
-    a document is returned.  That document has its filename set to
-    the incoming filename (so that it's not the temporary filename).
-    That document is then returned from this function.
-*/
-SPDocument *Script::open(Inkscape::Extension::Input *module,
-             const gchar *filenameArg)
-{
-    std::list<std::string> params;
-    module->paramListString(params);
-
-    std::string tempfilename_out;
-    int tempfd_out = 0;
-    try {
-        tempfd_out = Inkscape::IO::file_open_tmp(tempfilename_out, "ink_ext_XXXXXX.svg");
-    } catch (...) {
-        /// \todo Popup dialog here
-        return NULL;
-    }
-
-    std::string lfilename = Glib::filename_from_utf8(filenameArg);
-
-    file_listener fileout;
-    int data_read = execute(command, params, lfilename, fileout);
-    fileout.toFile(tempfilename_out);
-
-    SPDocument * mydoc = NULL;
-    if (data_read > 10) {
-        if (helper_extension.size()==0) {
-            mydoc = Inkscape::Extension::open(
-                  Inkscape::Extension::db.get(SP_MODULE_KEY_INPUT_SVG),
-                  tempfilename_out.c_str());
-        } else {
-            mydoc = Inkscape::Extension::open(
-                  Inkscape::Extension::db.get(helper_extension.c_str()),
-                  tempfilename_out.c_str());
-        }
-    } // data_read
-
-    if (mydoc != NULL) {
-        g_free(mydoc->base);
-        mydoc->base = NULL;
-        sp_document_change_uri_and_hrefs(mydoc, filenameArg);
-    }
-
-    // make sure we don't leak file descriptors from g_file_open_tmp
-    close(tempfd_out);
-
-    unlink(tempfilename_out.c_str());
-
-    return mydoc;
-} // open
-
-
-
-/**
-    \return   none
-    \brief    This function uses an extention to save a document.  It first
-              creates an SVG file of the document, and then runs it through
-              the script.
-    \param    module    Extention to be used
-    \param    doc       Document to be saved
-    \param    filename  The name to save the final file as
-    \return   false in case of any failure writing the file, otherwise true
-
-    Well, at some point people need to save - it is really what makes
-    the entire application useful.  And, it is possible that someone
-    would want to use an extetion for this, so we need a function to
-    do that eh?
-
-    First things first, the document is saved to a temporary file that
-    is an SVG file.  To get the temporary filename g_file_open_tmp is used with
-    ink_ext_ as a prefix.  Don't worry, this file gets deleted at the
-    end of the function.
-
-    After we have the SVG file, then extention_execute is called with
-    the temporary file name and the final output filename.  This should
-    put the output of the script into the final output file.  We then
-    delete the temporary file.
-*/
-void Script::save(Inkscape::Extension::Output *module,
-             SPDocument *doc,
-             const gchar *filenameArg)
-{
-    std::list<std::string> params;
-    module->paramListString(params);
-
-    std::string tempfilename_in;
-    int tempfd_in = 0;
-    try {
-        tempfd_in = Inkscape::IO::file_open_tmp(tempfilename_in, "ink_ext_XXXXXX.svg");
-    } catch (...) {
-        /// \todo Popup dialog here
-        throw Inkscape::Extension::Output::save_failed();
-    }
-
-    if (helper_extension.size() == 0) {
-        Inkscape::Extension::save(
-                   Inkscape::Extension::db.get(SP_MODULE_KEY_OUTPUT_SVG_INKSCAPE),
-                   doc, tempfilename_in.c_str(), false, false, false,
-                   Inkscape::Extension::FILE_SAVE_METHOD_TEMPORARY);
-    } else {
-        Inkscape::Extension::save(
-                   Inkscape::Extension::db.get(helper_extension.c_str()),
-                   doc, tempfilename_in.c_str(), false, false, false,
-                   Inkscape::Extension::FILE_SAVE_METHOD_TEMPORARY);
-    }
-
-
-    file_listener fileout;
-    execute(command, params, tempfilename_in, fileout);
-
-    std::string lfilename = Glib::filename_from_utf8(filenameArg);
-    bool success = fileout.toFile(lfilename);
-
-    // make sure we don't leak file descriptors from g_file_open_tmp
-    close(tempfd_in);
-    // FIXME: convert to utf8 (from "filename encoding") and unlink_utf8name
-    unlink(tempfilename_in.c_str());
-
-    if (success == false) {
-        throw Inkscape::Extension::Output::save_failed();
-    }
-
-    return;
-}
-
-
-
-/**
-    \return    none
-    \brief     This function uses an extention as a effect on a document.
-    \param     module   Extention to effect with.
-    \param     doc      Document to run through the effect.
-
-    This function is a little bit trickier than the previous two.  It
-    needs two temporary files to get it's work done.  Both of these
-    files have random names created for them using the g_file_open_temp function
-    with the ink_ext_ prefix in the temporary directory.  Like the other
-    functions, the temporary files are deleted at the end.
-
-    To save/load the two temporary documents (both are SVG) the internal
-    modules for SVG load and save are used.  They are both used through
-    the module system function by passing their keys into the functions.
-
-    The command itself is built a little bit differently than in other
-    functions because the effect support selections.  So on the command
-    line a list of all the ids that are selected is included.  Currently,
-    this only works for a single selected object, but there will be more.
-    The command string is filled with the data, and then after the execution
-    it is freed.
-
-    The execute function is used at the core of this function
-    to execute the Script on the two SVG documents (actually only one
-    exists at the time, the other is created by that script).  At that
-    point both should be full, and the second one is loaded.
-*/
-void Script::effect(Inkscape::Extension::Effect *module,
-               Inkscape::UI::View::View *doc,
-               ImplementationDocumentCache * docCache)
-{
-    if (docCache == NULL) {
-        docCache = newDocCache(module, doc);
-    }
-    ScriptDocCache * dc = dynamic_cast<ScriptDocCache *>(docCache);
-    if (dc == NULL) {
-        printf("TOO BAD TO LIVE!!!");
-        exit(1);
-    }
-
-    SPDesktop *desktop = (SPDesktop *)doc;
-    sp_namedview_document_from_window(desktop);
-
-    std::list<std::string> params;
-    module->paramListString(params);
-
-    if (module->no_doc) {
-        // this is a no-doc extension, e.g. a Help menu command;
-        // just run the command without any files, ignoring errors
-
-        Glib::ustring empty;
-        file_listener outfile;
-        execute(command, params, empty, outfile);
-
-        return;
-    }
-
-    std::string tempfilename_out;
-    int tempfd_out = 0;
-    try {
-        tempfd_out = Inkscape::IO::file_open_tmp(tempfilename_out, "ink_ext_XXXXXX.svg");
-    } catch (...) {
-        /// \todo Popup dialog here
-        return;
-    }
-
-    if (desktop != NULL) {
-        Inkscape::Util::GSListConstIterator<SPItem *> selected =
-             sp_desktop_selection(desktop)->itemList();
-        while ( selected != NULL ) {
-            Glib::ustring selected_id;
-            selected_id += "--id=";
-            selected_id += (*selected)->getId();
-            params.insert(params.begin(), selected_id);
-            ++selected;
-        }
-    }
-
-    file_listener fileout;
-    int data_read = execute(command, params, dc->_filename, fileout);
-    fileout.toFile(tempfilename_out);
-
-    pump_events();
-
-    SPDocument * mydoc = NULL;
-    if (data_read > 10) {
-        mydoc = Inkscape::Extension::open(
-              Inkscape::Extension::db.get(SP_MODULE_KEY_INPUT_SVG),
-              tempfilename_out.c_str());
-    } // data_read
-
-    pump_events();
-
-    // make sure we don't leak file descriptors from g_file_open_tmp
-    close(tempfd_out);
-
-    g_unlink(tempfilename_out.c_str());
-
-    /* Do something with mydoc.... */
-    if (mydoc) {
-        doc->doc()->emitReconstructionStart();
-        copy_doc(doc->doc()->rroot, mydoc->rroot);
-        doc->doc()->emitReconstructionFinish();
-        SPObject *layer = NULL;
-
-        // Getting the named view from the document generated by the extension
-        SPNamedView *nv = sp_document_namedview(mydoc, NULL);
-
-        //Check if it has a default layer set up
-        if ( nv != NULL){
-            if( nv->default_layer_id != 0 ) {
-                SPDocument *document = desktop->doc();
-                //If so, get that layer
-                layer = document->getObjectById(g_quark_to_string(nv->default_layer_id));
-            }
-        }
-
-        sp_namedview_update_layers_from_document(desktop);
-        //If that layer exists,
-        if (layer) {
-            //set the current layer
-            desktop->setCurrentLayer(layer);
-        }
-        mydoc->release();
-    }
-
-    return;
-}
-
-
-
-/**
-    \brief  A function to take all the svg elements from one document
-            and put them in another.
-    \param  oldroot  The root node of the document to be replaced
-    \param  newroot  The root node of the document to replace it with
-
-    This function first deletes all of the data in the old document.  It
-    does this by creating a list of what needs to be deleted, and then
-    goes through the list.  This two pass approach removes issues with
-    the list being change while parsing through it.  Lots of nasty bugs.
-
-    Then, it goes through the new document, duplicating all of the
-    elements and putting them into the old document.  The copy
-    is then complete.
-*/
-void Script::copy_doc (Inkscape::XML::Node * oldroot, Inkscape::XML::Node * newroot)
-{
-    std::vector<Inkscape::XML::Node *> delete_list;
-    Inkscape::XML::Node * oldroot_namedview = NULL;
-
-    for (Inkscape::XML::Node * child = oldroot->firstChild();
-            child != NULL;
-            child = child->next()) {
-        if (!strcmp("sodipodi:namedview", child->name())) {
-            oldroot_namedview = child;
-            for (Inkscape::XML::Node * oldroot_namedview_child = child->firstChild();
-                    oldroot_namedview_child != NULL;
-                    oldroot_namedview_child = oldroot_namedview_child->next()) {
-                delete_list.push_back(oldroot_namedview_child);
-            }
-        } else {
-            delete_list.push_back(child);
-        }
-    }
-    for (unsigned int i = 0; i < delete_list.size(); i++) {
-        sp_repr_unparent(delete_list[i]);
-    }
-
-    for (Inkscape::XML::Node * child = newroot->firstChild();
-            child != NULL;
-            child = child->next()) {
-        if (!strcmp("sodipodi:namedview", child->name())) {
-            if (oldroot_namedview != NULL) {
-                for (Inkscape::XML::Node * newroot_namedview_child = child->firstChild();
-                        newroot_namedview_child != NULL;
-                        newroot_namedview_child = newroot_namedview_child->next()) {
-                    oldroot_namedview->appendChild(newroot_namedview_child->duplicate(oldroot->document()));
-                }
-            }
-        } else {
-            oldroot->appendChild(child->duplicate(oldroot->document()));
-        }
-    }
-
-    {
-        using Inkscape::Util::List;
-        using Inkscape::XML::AttributeRecord;
-        std::vector<gchar const *> attribs;
-
-        // Make a list of all attributes of the old root node.
-        for (List<AttributeRecord const> iter = oldroot->attributeList(); iter; ++iter) {
-            attribs.push_back(g_quark_to_string(iter->key));
-        }
-
-        // Delete the attributes of the old root nodes.
-        for (std::vector<gchar const *>::const_iterator it = attribs.begin(); it != attribs.end(); it++) {
-            oldroot->setAttribute(*it, NULL);
-        }
-
-        // Set the new attributes.
-        for (List<AttributeRecord const> iter = newroot->attributeList(); iter; ++iter) {
-            gchar const *name = g_quark_to_string(iter->key);
-            oldroot->setAttribute(name, newroot->attribute(name));
-        }
-    }
-
-    /** \todo  Restore correct layer */
-    /** \todo  Restore correct selection */
-}
-
-/**  \brief  This function checks the stderr file, and if it has data,
-             shows it in a warning dialog to the user
-     \param  filename  Filename of the stderr file
-*/
-void Script::checkStderr (const Glib::ustring &data,
-                           Gtk::MessageType type,
-                     const Glib::ustring &message)
-{
-    Gtk::MessageDialog warning(message, false, type, Gtk::BUTTONS_OK, true);
-    warning.set_resizable(true);
-    GtkWidget *dlg = GTK_WIDGET(warning.gobj());
-    sp_transientize(dlg);
-
-    Gtk::VBox * vbox = warning.get_vbox();
-
-    /* Gtk::TextView * textview = new Gtk::TextView(Gtk::TextBuffer::create()); */
-    Gtk::TextView * textview = new Gtk::TextView();
-    textview->set_editable(false);
-    textview->set_wrap_mode(Gtk::WRAP_WORD);
-    textview->show();
-
-    // Remove the last character
-    char *errormsg = (char*) data.c_str();
-    while (*errormsg != '\0') errormsg++;
-    errormsg -= 1;
-    *errormsg = '\0';
-
-    textview->get_buffer()->set_text(_(data.c_str()));
-
-    Gtk::ScrolledWindow * scrollwindow = new Gtk::ScrolledWindow();
-    scrollwindow->add(*textview);
-    scrollwindow->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
-    scrollwindow->set_shadow_type(Gtk::SHADOW_IN);
-    scrollwindow->show();
-    scrollwindow->set_size_request(0, 60);
-
-    vbox->pack_start(*scrollwindow, true, true, 5 /* fix these */);
-
-    warning.run();
-
-    return;
-}
-
-bool Script::cancelProcessing (void) {
-    _canceled = true;
-    _main_loop->quit();
-    Glib::spawn_close_pid(_pid);
-
-    return true;
-}
-
-
-/** \brief    This is the core of the extension file as it actually does
-              the execution of the extension.
-    \param    in_command  The command to be executed
-    \param    filein      Filename coming in
-    \param    fileout     Filename of the out file
-    \return   Number of bytes that were read into the output file.
-
-    The first thing that this function does is build the command to be
-    executed.  This consists of the first string (in_command) and then
-    the filename for input (filein).  This file is put on the command
-    line.
-
-    The next thing is that this function does is open a pipe to the
-    command and get the file handle in the ppipe variable.  It then
-    opens the output file with the output file handle.  Both of these
-    operations are checked extensively for errors.
-
-    After both are opened, then the data is copied from the output
-    of the pipe into the file out using fread and fwrite.  These two
-    functions are used because of their primitive nature they make
-    no assumptions about the data.  A buffer is used in the transfer,
-    but the output of fread is stored so the exact number of bytes
-    is handled gracefully.
-
-    At the very end (after the data has been copied) both of the files
-    are closed, and we return to what we were doing.
-*/
-int Script::execute (const std::list<std::string> &in_command,
-                 const std::list<std::string> &in_params,
-                 const Glib::ustring &filein,
-                 file_listener &fileout)
-{
-    g_return_val_if_fail(!in_command.empty(), 0);
-    // printf("Executing\n");
-
-    std::vector<std::string> argv;
-
-    bool interpreted = (in_command.size() == 2);
-    std::string program = in_command.front();
-    std::string script = interpreted ? in_command.back() : "";
-    std::string working_directory = "";
-
-    // Use Glib::find_program_in_path instead of the equivalent
-    // Glib::spawn_* functionality, because _wspawnp is broken on Windows:
-    // it doesn't work when PATH contains Unicode directories
-    if (!Glib::path_is_absolute(program)) {
-        program = Glib::find_program_in_path(program);
-    }
-    argv.push_back(program);
-
-    if (interpreted) {
-        // On Windows, Python garbles Unicode command line parameters
-        // in an useless way. This means extensions fail when Inkscape
-        // is run from an Unicode directory.
-        // As a workaround, we set the working directory to the one
-        // containing the script.
-        working_directory = Glib::path_get_dirname(script);
-        script = Glib::path_get_basename(script);
-        #ifdef G_OS_WIN32
-        // ANNOYING: glibmm does not wrap g_win32_locale_filename_from_utf8
-        gchar *workdir_s = g_win32_locale_filename_from_utf8(working_directory.data());
-        working_directory = workdir_s;
-        g_free(workdir_s);
-        #endif
-
-        argv.push_back(script);
-    }
-
-    // assemble the rest of argv
-    std::copy(in_params.begin(), in_params.end(), std::back_inserter(argv));
-    if (!filein.empty()) {
-        argv.push_back(filein);
-    }
-
-    int stdout_pipe, stderr_pipe;
-
-    try {
-        Glib::spawn_async_with_pipes(working_directory, // working directory
-                                     argv,  // arg v
-                                     static_cast<Glib::SpawnFlags>(0), // no flags
-                                     sigc::slot<void>(),
-                                     &_pid,          // Pid
-                                     NULL,           // STDIN
-                                     &stdout_pipe,   // STDOUT
-                                     &stderr_pipe);  // STDERR
-    } catch (Glib::Error e) {
-        printf("Can't Spawn!!! spawn returns: %s\n", e.what().data());
-        return 0;
-    }
-
-    _main_loop = Glib::MainLoop::create(false);
-
-    file_listener fileerr;
-    fileout.init(stdout_pipe, _main_loop);
-    fileerr.init(stderr_pipe, _main_loop);
-
-    _canceled = false;
-    _main_loop->run();
-
-    // Ensure all the data is out of the pipe
-    while (!fileout.isDead()) {
-        fileout.read(Glib::IO_IN);
-    }
-    while (!fileerr.isDead()) {
-        fileerr.read(Glib::IO_IN);
-    }
-
-    if (_canceled) {
-        // std::cout << "Script Canceled" << std::endl;
-        return 0;
-    }
-
-    Glib::ustring stderr_data = fileerr.string();
-    if (stderr_data.length() != 0 &&
-        Inkscape::NSApplication::Application::getUseGui()
-       ) {
-        checkStderr(stderr_data, Gtk::MESSAGE_INFO,
-                                 _("Inkscape has received additional data from the script executed.  "
-                                   "The script did not return an error, but this may indicate the results will not be as expected."));
-    }
-
-    Glib::ustring stdout_data = fileout.string();
-    if (stdout_data.length() == 0) {
-        return 0;
-    }
-
-    // std::cout << "Finishing Execution." << std::endl;
-    return stdout_data.length();
-}
-
-
-
-
-}  // namespace Implementation
-}  // namespace Extension
-}  // namespace Inkscape
-
-/*
-  Local Variables:
-  mode:c++
-  c-file-style:"stroustrup"
-  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
-  indent-tabs-mode:nil
-  fill-column:99
-  End:
-*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
 
=== removed directory '.pc/0004-Fix_FTBFS_on_gcc-4.8.patch'
=== removed directory '.pc/0004-Fix_FTBFS_on_gcc-4.8.patch/src'
=== removed file '.pc/0004-Fix_FTBFS_on_gcc-4.8.patch/src/connector-context.cpp'
--- .pc/0004-Fix_FTBFS_on_gcc-4.8.patch/src/connector-context.cpp	2013-07-02 17:25:52 +0000
+++ .pc/0004-Fix_FTBFS_on_gcc-4.8.patch/src/connector-context.cpp	1970-01-01 00:00:00 +0000
@@ -1,2041 +0,0 @@
-/*
- * Connector creation tool
- *
- * Authors:
- *   Michael Wybrow <[e-mail]>
- *
- * Copyright (C) 2005-2008  Michael Wybrow
- * Copyright (C) 2009  Monash University
- *
- * Released under GNU GPL, read the file 'COPYING' for more information
- *
- * TODO:
- *  o  Show a visual indicator for objects with the 'avoid' property set.
- *  o  Allow user to change a object between a path and connector through
- *     the interface.
- *  o  Create an interface for setting markers (arrow heads).
- *  o  Better distinguish between paths and connectors to prevent problems
- *     in the node tool and paths accidentally being turned into connectors
- *     in the connector tool.  Perhaps have a way to convert between.
- *  o  Only call libavoid's updateEndPoint as required.  Currently we do it
- *     for both endpoints, even if only one is moving.
- *  o  Allow user-placeable connection points.
- *  o  Deal sanely with connectors with both endpoints attached to the
- *     same connection point, and drawing of connectors attaching
- *     overlapping shapes (currently tries to adjust connector to be
- *     outside both bounding boxes).
- *  o  Fix many special cases related to connectors updating,
- *     e.g., copying a couple of shapes and a connector that are
- *           attached to each other.
- *     e.g., detach connector when it is moved or transformed in
- *           one of the other contexts.
- *  o  Cope with shapes whose ids change when they have attached
- *     connectors.
- *  o  During dragging motion, gobble up to and use the final motion event.
- *     Gobbling away all duplicates after the current can occasionally result
- *     in the path lagging behind the mouse cursor if it is no longer being
- *     dragged.
- *  o  Fix up libavoid's representation after undo actions.  It doesn't see
- *     any transform signals and hence doesn't know shapes have moved back to
- *     there earlier positions.
- *  o  Decide whether drawing/editing mode should be an Inkscape preference
- *     or the connector tool should always start in drawing mode.
- *  o  Correct the problem with switching to the select tool when pressing
- *     space bar (there are moments when it refuses to do so).
- *
- * ----------------------------------------------------------------------------
- *
- * mjwybrow's observations on acracan's Summer of Code connector work:
- *
- *  -  GUI comments:
- *
- *      -  Buttons for adding and removing user-specified connection
- * 	points should probably have "+" and "-" symbols on them so they
- * 	are consistent with the similar buttons for the node tool.
- *      -  Controls on the connector tool be should be reordered logically,
- * 	possibly as follows:
- *
- * 	*Connector*: [Polyline-radio-button] [Orthgonal-radio-button]
- * 	  [Curvature-control] | *Shape*: [Avoid-button] [Dont-avoid-button]
- * 	  [Spacing-control] | *Connection pts*: [Edit-mode] [Add-pt] [Rm-pt]
- *
- * 	I think that the network layout controls be moved to the
- * 	Align and Distribute dialog (there is already the layout button
- * 	there, but no options are exposed).
- *
- * 	I think that the style change between polyline and orthogonal
- * 	would be much clearer with two buttons (radio behaviour -- just
- * 	one is true).
- *
- * 	The other tools show a label change from "New:" to "Change:"
- * 	depending on whether an object is selected.  We could consider
- * 	this but there may not be space.
- *
- * 	The Add-pt and Rm-pt buttons should be greyed out (inactive) if
- * 	we are not in connection point editing mode.  And probably also
- * 	if there is no shape selected, i.e. at the times they have no
- * 	effect when clicked.
- *
- * 	Likewise for the avoid/ignore shapes buttons.  These should be
- * 	inactive when a shape is not selected in the connector context.
- *
- *  -  When creating/editing connection points:
- *
- *      -  Strange things can happen if you have connectors selected, or
- * 	try rerouting connectors by dragging their endpoints when in
- * 	connection point editing mode.
- *
- *      -  Possibly the selected shape's connection points should always
- * 	be shown (i.e., have knots) when in editing mode.
- *
- *      -  It is a little strange to be able to place connection points
- * 	competely outside shapes.  Especially when you later can't draw
- * 	connectors to them since the knots are only visible when you
- * 	are over the shape.  I think that you should only be able to
- * 	place connection points inside or on the boundary of the shape
- * 	itself.
- *
- *      -  The intended ability to place a new point at the current cursor
- * 	position by pressing RETURN does not seem to work.
- *
- *      -  The Status bar tooltip should change to reflect editing mode
- * 	and tell the user about RETURN and how to use the tool.
- *
- *  -  Connection points general:
- *
- *      -  Connection points that were inside the shape can end up outside
- * 	after a rotation is applied to the shape in the select tool.
- * 	It doesn't seem like the correct transform is being applied to
- * 	these, or it is being applied at the wrong time.  I'd expect
- * 	connection points to rotate with the shape, and stay at the
- * 	same position "on the shape"
- *
- *      -  I was able to make the connectors attached to a shape fall off
- * 	the shape after scaling it.  Not sure the exact cause, but may
- * 	require more investigation/debugging.
- *
- *      -  The user-defined connection points should be either absolute
- * 	(as the current ones are) or defined as a percentage of the
- * 	shape.  These would be based on a toggle setting on the
- * 	toolbar, and they would be placed in exactly the same way by
- * 	the user.  The only difference would be that they would be
- * 	store as percentage positions in the SVG connection-points
- * 	property and that they would update/move automatically if the
- * 	object was resized or scaled.
- *
- *      -  Thinking more, I think you always want to store and think about
- * 	the positions of connection points to be pre-transform, but
- * 	obviously the shape transform is applied to them.  That way,
- * 	they will rotate and scale automatically with the shape, when
- * 	the shape transform is altered.  The Percentage version would
- * 	compute their position from the pre-transform dimensions and
- * 	then have the transform applied to them, for example.
- *
- *      -  The connection points in the test_connection_points.svg file
- * 	seem to follow the shape when it is moved, but connection
- * 	points I add to new shapes, do not follow the shape, either
- * 	when the shape is just moved or transformed.  There is
- * 	something wrong here.  What exactly should the behaviour be
- * 	currently?
- *
- *      -  I see that connection points are specified at absolute canvas
- * 	positions.  I really think that they should be specified in
- * 	shape coordinated relative to the shapes.  There may be
- * 	transforms applied to layers and the canvas which would make
- * 	specifying them quite difficult.  I'd expect a position of 0, 0
- * 	to be on the shape in question or very close to it, for example.
- *
- */
-
-
-
-#include <gdk/gdkkeysyms.h>
-#include <string>
-#include <cstring>
-
-#include "connector-context.h"
-#include "pixmaps/cursor-connector.xpm"
-#include "pixmaps/cursor-node.xpm"
-//#include "pixmaps/cursor-node-m.xpm"
-//#include "pixmaps/cursor-node-d.xpm"
-#include "xml/node-event-vector.h"
-#include "xml/repr.h"
-#include "svg/svg.h"
-#include "desktop.h"
-#include "desktop-style.h"
-#include "desktop-handles.h"
-#include "document.h"
-#include "message-context.h"
-#include "message-stack.h"
-#include "selection.h"
-#include "inkscape.h"
-#include "preferences.h"
-#include "sp-path.h"
-#include "display/canvas-bpath.h"
-#include "display/sodipodi-ctrl.h"
-#include <glibmm/i18n.h>
-#include <glibmm/stringutils.h>
-#include "snap.h"
-#include "knot.h"
-#include "sp-conn-end.h"
-#include "sp-conn-end-pair.h"
-#include "conn-avoid-ref.h"
-#include "libavoid/vertices.h"
-#include "libavoid/router.h"
-#include "context-fns.h"
-#include "sp-namedview.h"
-#include "sp-text.h"
-#include "sp-flowtext.h"
-#include "display/curve.h"
-
-static void sp_connector_context_class_init(SPConnectorContextClass *klass);
-static void sp_connector_context_init(SPConnectorContext *conn_context);
-static void sp_connector_context_dispose(GObject *object);
-
-static void sp_connector_context_setup(SPEventContext *ec);
-static void sp_connector_context_set(SPEventContext *ec, Inkscape::Preferences::Entry *val);
-static void sp_connector_context_finish(SPEventContext *ec);
-static gint sp_connector_context_root_handler(SPEventContext *ec, GdkEvent *event);
-static gint sp_connector_context_item_handler(SPEventContext *event_context, SPItem *item, GdkEvent *event);
-
-// Stuff borrowed from DrawContext
-static void spcc_connector_set_initial_point(SPConnectorContext *cc, Geom::Point const p);
-static void spcc_connector_set_subsequent_point(SPConnectorContext *cc, Geom::Point const p);
-static void spcc_connector_finish_segment(SPConnectorContext *cc, Geom::Point p);
-static void spcc_reset_colors(SPConnectorContext *cc);
-static void spcc_connector_finish(SPConnectorContext *cc);
-static void spcc_concat_colors_and_flush(SPConnectorContext *cc);
-static void spcc_flush_white(SPConnectorContext *cc, SPCurve *gc);
-
-// Context event handlers
-static gint connector_handle_button_press(SPConnectorContext *const cc, GdkEventButton const &bevent);
-static gint connector_handle_motion_notify(SPConnectorContext *const cc, GdkEventMotion const &mevent);
-static gint connector_handle_button_release(SPConnectorContext *const cc, GdkEventButton const &revent);
-static gint connector_handle_key_press(SPConnectorContext *const cc, guint const keyval);
-
-static void cc_active_shape_add_knot(SPDesktop* desktop, SPItem* item, ConnectionPointMap &cphandles, ConnectionPoint& cp);
-static void cc_set_active_shape(SPConnectorContext *cc, SPItem *item);
-static void cc_clear_active_shape(SPConnectorContext *cc);
-static void cc_set_active_conn(SPConnectorContext *cc, SPItem *item);
-static void cc_clear_active_conn(SPConnectorContext *cc);
-static bool conn_pt_handle_test(SPConnectorContext *cc, Geom::Point& p, gchar **href, gchar **cpid);
-static void cc_select_handle(SPKnot* knot);
-static void cc_deselect_handle(SPKnot* knot);
-static bool cc_item_is_shape(SPItem *item);
-static void cc_selection_changed(Inkscape::Selection *selection, gpointer data);
-static void cc_connector_rerouting_finish(SPConnectorContext *const cc,
-        Geom::Point *const p);
-
-static void shape_event_attr_deleted(Inkscape::XML::Node *repr,
-        Inkscape::XML::Node *child, Inkscape::XML::Node *ref, gpointer data);
-static void shape_event_attr_changed(Inkscape::XML::Node *repr, gchar const *name,
-        gchar const *old_value, gchar const *new_value, bool is_interactive,
-        gpointer data);
-
-
-static char* cc_knot_tips[] = { _("<b>Connection point</b>: click or drag to create a new connector"),
-                           _("<b>Connection point</b>: click to select, drag to move") };
-
-/*static Geom::Point connector_drag_origin_w(0, 0);
-static bool connector_within_tolerance = false;*/
-static SPEventContextClass *parent_class;
-
-
-static Inkscape::XML::NodeEventVector shape_repr_events = {
-    NULL, /* child_added */
-    NULL, /* child_added */
-    shape_event_attr_changed,
-    NULL, /* content_changed */
-    NULL  /* order_changed */
-};
-
-static Inkscape::XML::NodeEventVector layer_repr_events = {
-    NULL, /* child_added */
-    shape_event_attr_deleted,
-    NULL, /* child_added */
-    NULL, /* content_changed */
-    NULL  /* order_changed */
-};
-
-
-GType
-sp_connector_context_get_type(void)
-{
-    static GType type = 0;
-    if (!type) {
-        GTypeInfo info = {
-            sizeof(SPConnectorContextClass),
-            NULL, NULL,
-            (GClassInitFunc) sp_connector_context_class_init,
-            NULL, NULL,
-            sizeof(SPConnectorContext),
-            4,
-            (GInstanceInitFunc) sp_connector_context_init,
-            NULL,   /* value_table */
-        };
-        type = g_type_register_static(SP_TYPE_EVENT_CONTEXT, "SPConnectorContext", &info, (GTypeFlags)0);
-    }
-    return type;
-}
-
-static void
-sp_connector_context_class_init(SPConnectorContextClass *klass)
-{
-    GObjectClass *object_class;
-    SPEventContextClass *event_context_class;
-
-    object_class = (GObjectClass *) klass;
-    event_context_class = (SPEventContextClass *) klass;
-
-    parent_class = (SPEventContextClass*)g_type_class_peek_parent(klass);
-
-    object_class->dispose = sp_connector_context_dispose;
-
-    event_context_class->setup = sp_connector_context_setup;
-    event_context_class->set = sp_connector_context_set;
-    event_context_class->finish = sp_connector_context_finish;
-    event_context_class->root_handler = sp_connector_context_root_handler;
-    event_context_class->item_handler = sp_connector_context_item_handler;
-}
-
-
-static void
-sp_connector_context_init(SPConnectorContext *cc)
-{
-    SPEventContext *ec = SP_EVENT_CONTEXT(cc);
-
-    ec->cursor_shape = cursor_connector_xpm;
-    ec->hot_x = 1;
-    ec->hot_y = 1;
-    ec->xp = 0;
-    ec->yp = 0;
-
-    cc->mode = SP_CONNECTOR_CONTEXT_DRAWING_MODE;
-    cc->knot_tip = 0;
-
-    cc->red_color = 0xff00007f;
-
-    cc->newconn = NULL;
-    cc->newConnRef = NULL;
-    cc->curvature = 0.0;
-
-    cc->sel_changed_connection = sigc::connection();
-
-    cc->active_shape = NULL;
-    cc->active_shape_repr = NULL;
-    cc->active_shape_layer_repr = NULL;
-
-    cc->active_conn = NULL;
-    cc->active_conn_repr = NULL;
-
-    cc->active_handle = NULL;
-
-    cc->selected_handle = NULL;
-
-    cc->clickeditem = NULL;
-    cc->clickedhandle = NULL;
-
-    new (&cc->connpthandles) ConnectionPointMap();
-
-    for (int i = 0; i < 2; ++i) {
-        cc->endpt_handle[i] = NULL;
-        cc->endpt_handler_id[i] = 0;
-    }
-    cc->shref = NULL;
-    cc->scpid = NULL;
-    cc->ehref = NULL;
-    cc->ecpid = NULL;
-    cc->npoints = 0;
-    cc->state = SP_CONNECTOR_CONTEXT_IDLE;
-}
-
-
-static void
-sp_connector_context_dispose(GObject *object)
-{
-    SPConnectorContext *cc = SP_CONNECTOR_CONTEXT(object);
-
-    cc->sel_changed_connection.disconnect();
-
-    if (!cc->connpthandles.empty()) {
-        for (ConnectionPointMap::iterator it = cc->connpthandles.begin();
-                it != cc->connpthandles.end(); ++it) {
-            g_object_unref(it->first);
-        }
-        cc->connpthandles.clear();
-    }
-    cc->connpthandles.~ConnectionPointMap();
-    for (int i = 0; i < 2; ++i) {
-        if (cc->endpt_handle[1]) {
-            g_object_unref(cc->endpt_handle[i]);
-            cc->endpt_handle[i] = NULL;
-        }
-    }
-    if (cc->shref) {
-        g_free(cc->shref);
-        cc->shref = NULL;
-    }
-    if (cc->scpid) {
-        g_free(cc->scpid);
-        cc->scpid = NULL;
-    }
-    if (cc->ehref) {
-        g_free(cc->shref);
-        cc->shref = NULL;
-    }
-    if (cc->ecpid) {
-        g_free(cc->scpid);
-        cc->scpid = NULL;
-    }
-    g_assert( cc->newConnRef == NULL );
-
-    G_OBJECT_CLASS(parent_class)->dispose(object);
-}
-
-
-static void
-sp_connector_context_setup(SPEventContext *ec)
-{
-    SPConnectorContext *cc = SP_CONNECTOR_CONTEXT(ec);
-    SPDesktop *dt = ec->desktop;
-
-    if (((SPEventContextClass *) parent_class)->setup) {
-        ((SPEventContextClass *) parent_class)->setup(ec);
-    }
-
-    cc->selection = sp_desktop_selection(dt);
-
-    cc->sel_changed_connection.disconnect();
-    cc->sel_changed_connection = cc->selection->connectChanged(
-            sigc::bind(sigc::ptr_fun(&cc_selection_changed),
-            (gpointer) cc));
-
-    /* Create red bpath */
-    cc->red_bpath = sp_canvas_bpath_new(sp_desktop_sketch(ec->desktop), NULL);
-    sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(cc->red_bpath), cc->red_color,
-            1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT);
-    sp_canvas_bpath_set_fill(SP_CANVAS_BPATH(cc->red_bpath), 0x00000000,
-            SP_WIND_RULE_NONZERO);
-    /* Create red curve */
-    cc->red_curve = new SPCurve();
-
-    /* Create green curve */
-    cc->green_curve = new SPCurve();
-
-    // Notice the initial selection.
-    cc_selection_changed(cc->selection, (gpointer) cc);
-
-    cc->within_tolerance = false;
-
-    sp_event_context_read(ec, "curvature");
-    sp_event_context_read(ec, "orthogonal");
-    sp_event_context_read(ec, "mode");
-    cc->knot_tip = cc->mode == SP_CONNECTOR_CONTEXT_DRAWING_MODE ? cc_knot_tips[0] : cc_knot_tips[1];
-    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-    if (prefs->getBool("/tools/connector/selcue", 0)) {
-        ec->enableSelectionCue();
-    }
-
-    // Make sure we see all enter events for canvas items,
-    // even if a mouse button is depressed.
-    dt->canvas->gen_all_enter_events = true;
-}
-
-
-static void
-sp_connector_context_set(SPEventContext *ec, Inkscape::Preferences::Entry *val)
-{
-    SPConnectorContext *cc = SP_CONNECTOR_CONTEXT(ec);
-
-    /* fixme: Proper error handling for non-numeric data.  Use a locale-independent function like
-     * g_ascii_strtod (or a thin wrapper that does the right thing for invalid values inf/nan). */
-    Glib::ustring name = val->getEntryName();
-    if ( name == "curvature" ) {
-        cc->curvature = val->getDoubleLimited(); // prevents NaN and +/-Inf from messing up
-    }
-    else if ( name == "orthogonal" ) {
-        cc->isOrthogonal = val->getBool();
-    }
-    else if ( name == "mode")
-    {
-        sp_connector_context_switch_mode(ec, val->getBool() ? SP_CONNECTOR_CONTEXT_EDITING_MODE : SP_CONNECTOR_CONTEXT_DRAWING_MODE);
-    }
-}
-
-void sp_connector_context_switch_mode(SPEventContext* ec, unsigned int newMode)
-{
-    SPConnectorContext *cc = SP_CONNECTOR_CONTEXT(ec);
-
-    cc->mode = newMode;
-    if ( cc->mode == SP_CONNECTOR_CONTEXT_DRAWING_MODE )
-    {
-        ec->cursor_shape = cursor_connector_xpm;
-        cc->knot_tip = cc_knot_tips[0];
-        if (cc->selected_handle)
-            cc_deselect_handle( cc->selected_handle );
-        cc->selected_handle = NULL;
-        // Show all default connection points
-
-    }
-    else if ( cc->mode == SP_CONNECTOR_CONTEXT_EDITING_MODE )
-    {
-        ec->cursor_shape = cursor_node_xpm;
-        cc->knot_tip = cc_knot_tips[1];
-/*            if (cc->active_shape)
-        {
-            cc->selection->set( SP_OBJECT( cc->active_shape ) );
-        }
-        else
-        {
-            SPItem* item = cc->selection->singleItem();
-            if ( item )
-            {
-                cc_set_active_shape(cc, item);
-                cc->selection->set( SP_OBJECT( item ) );
-            }
-        }*/
-    }
-    sp_event_context_update_cursor(ec);
-
-}
-
-
-static void
-sp_connector_context_finish(SPEventContext *ec)
-{
-    SPConnectorContext *cc = SP_CONNECTOR_CONTEXT(ec);
-
-    spcc_connector_finish(cc);
-    cc->state = SP_CONNECTOR_CONTEXT_IDLE;
-
-    if (((SPEventContextClass *) parent_class)->finish) {
-        ((SPEventContextClass *) parent_class)->finish(ec);
-    }
-
-    if (cc->selection) {
-        cc->selection = NULL;
-    }
-    cc_clear_active_shape(cc);
-    cc_clear_active_conn(cc);
-
-    // Restore the default event generating behaviour.
-    SPDesktop *desktop = SP_EVENT_CONTEXT_DESKTOP(ec);
-    desktop->canvas->gen_all_enter_events = false;
-}
-
-
-//-----------------------------------------------------------------------------
-
-
-static void
-cc_clear_active_shape(SPConnectorContext *cc)
-{
-    if (cc->active_shape == NULL) {
-        return;
-    }
-    g_assert( cc->active_shape_repr );
-    g_assert( cc->active_shape_layer_repr );
-
-    cc->active_shape = NULL;
-
-    if (cc->active_shape_repr) {
-        sp_repr_remove_listener_by_data(cc->active_shape_repr, cc);
-        Inkscape::GC::release(cc->active_shape_repr);
-        cc->active_shape_repr = NULL;
-
-        sp_repr_remove_listener_by_data(cc->active_shape_layer_repr, cc);
-        Inkscape::GC::release(cc->active_shape_layer_repr);
-        cc->active_shape_layer_repr = NULL;
-    }
-
-    // Hide the connection points if they exist.
-    if (cc->connpthandles.size()) {
-        for (ConnectionPointMap::iterator it = cc->connpthandles.begin();
-                it != cc->connpthandles.end(); ++it) {
-            sp_knot_hide(it->first);
-        }
-    }
-}
-
-
-static void
-cc_clear_active_conn(SPConnectorContext *cc)
-{
-    if (cc->active_conn == NULL) {
-        return;
-    }
-    g_assert( cc->active_conn_repr );
-
-    cc->active_conn = NULL;
-
-    if (cc->active_conn_repr) {
-        sp_repr_remove_listener_by_data(cc->active_conn_repr, cc);
-        Inkscape::GC::release(cc->active_conn_repr);
-        cc->active_conn_repr = NULL;
-    }
-
-    // Hide the endpoint handles.
-    for (int i = 0; i < 2; ++i) {
-        if (cc->endpt_handle[i]) {
-            sp_knot_hide(cc->endpt_handle[i]);
-        }
-    }
-}
-
-
-static bool
-conn_pt_handle_test(SPConnectorContext *cc, Geom::Point& p, gchar **href, gchar **cpid)
-{
-    // TODO: this will need to change when there are more connection
-    //       points available for each shape.
-
-    if (cc->active_handle && (cc->connpthandles.find(cc->active_handle) != cc->connpthandles.end()))
-    {
-        p = cc->active_handle->pos;
-        const ConnectionPoint& cp = cc->connpthandles[cc->active_handle];
-        *href = g_strdup_printf("#%s", cc->active_shape->getId());
-        *cpid = g_strdup_printf("%c%d", cp.type == ConnPointDefault ? 'd' : 'u' , cp.id);
-        return true;
-    }
-    *href = NULL;
-    *cpid = NULL;
-    return false;
-}
-
-static void
-cc_select_handle(SPKnot* knot)
-{
-    knot->setShape(SP_KNOT_SHAPE_SQUARE);
-    knot->setSize(10);
-    knot->setAnchor(GTK_ANCHOR_CENTER);
-    knot->setFill(0x0000ffff, 0x0000ffff, 0x0000ffff);
-    sp_knot_update_ctrl(knot);
-}
-
-static void
-cc_deselect_handle(SPKnot* knot)
-{
-    knot->setShape(SP_KNOT_SHAPE_SQUARE);
-    knot->setSize(8);
-    knot->setAnchor(GTK_ANCHOR_CENTER);
-    knot->setFill(0xffffff00, 0xff0000ff, 0xff0000ff);
-    sp_knot_update_ctrl(knot);
-}
-
-static gint
-sp_connector_context_item_handler(SPEventContext *event_context, SPItem *item, GdkEvent *event)
-{
-    gint ret = FALSE;
-
-    SPDesktop *desktop = event_context->desktop;
-
-    SPConnectorContext *cc = SP_CONNECTOR_CONTEXT(event_context);
-
-    Geom::Point p(event->button.x, event->button.y);
-
-    switch (event->type) {
-        case GDK_BUTTON_RELEASE:
-            if (event->button.button == 1 && !event_context->space_panning) {
-                if ((cc->state == SP_CONNECTOR_CONTEXT_DRAGGING) &&
-                        (event_context->within_tolerance))
-                {
-                    spcc_reset_colors(cc);
-                    cc->state = SP_CONNECTOR_CONTEXT_IDLE;
-                }
-                if (cc->state != SP_CONNECTOR_CONTEXT_IDLE) {
-                    // Doing something else like rerouting.
-                    break;
-                }
-                // find out clicked item, honoring Alt
-                SPItem *item = sp_event_context_find_item(desktop,
-                        p, event->button.state & GDK_MOD1_MASK, FALSE);
-
-                if (event->button.state & GDK_SHIFT_MASK) {
-                    cc->selection->toggle(item);
-                } else {
-                    cc->selection->set(item);
-                    if ( cc->mode == SP_CONNECTOR_CONTEXT_EDITING_MODE && cc->selected_handle )
-                    {
-                        cc_deselect_handle( cc->selected_handle );
-                        cc->selected_handle = NULL;
-                    }
-                    /* When selecting a new item,
-                       do not allow showing connection points
-                       on connectors. (yet?)
-                    */
-                    if ( item != cc->active_shape && !cc_item_is_connector( item ) )
-                        cc_set_active_shape( cc, item );
-                }
-                ret = TRUE;
-
-            }
-            break;
-        case GDK_ENTER_NOTIFY:
-        {
-            if (cc->mode == SP_CONNECTOR_CONTEXT_DRAWING_MODE || (cc->mode == SP_CONNECTOR_CONTEXT_EDITING_MODE && !cc->selected_handle))
-            {
-                if (cc_item_is_shape(item)) {
-
-                    // I don't really understand what the above does,
-                    // so I commented it.
-                    // This is a shape, so show connection point(s).
-    /*                if (!(cc->active_shape)
-                            // Don't show handle for another handle.
-    //                         || (cc->connpthandles.find((SPKnot*) item) != cc->connpthandles.end())
-                        )
-                    {
-                        cc_set_active_shape(cc, item);
-                    }*/
-                    cc_set_active_shape(cc, item);
-                }
-                ret = TRUE;
-            }
-            break;
-        }
-        default:
-            break;
-    }
-
-    return ret;
-}
-
-
-gint
-sp_connector_context_root_handler(SPEventContext *ec, GdkEvent *event)
-{
-    SPConnectorContext *const cc = SP_CONNECTOR_CONTEXT(ec);
-
-    gint ret = FALSE;
-
-    switch (event->type) {
-        case GDK_BUTTON_PRESS:
-            ret = connector_handle_button_press(cc, event->button);
-            break;
-
-        case GDK_MOTION_NOTIFY:
-            ret = connector_handle_motion_notify(cc, event->motion);
-            break;
-
-        case GDK_BUTTON_RELEASE:
-            ret = connector_handle_button_release(cc, event->button);
-            break;
-        case GDK_KEY_PRESS:
-            ret = connector_handle_key_press(cc, get_group0_keyval (&event->key));
-            break;
-
-        default:
-            break;
-    }
-
-    if (!ret) {
-        gint (*const parent_root_handler)(SPEventContext *, GdkEvent *)
-            = ((SPEventContextClass *) parent_class)->root_handler;
-        if (parent_root_handler) {
-            ret = parent_root_handler(ec, event);
-        }
-    }
-
-    return ret;
-}
-
-
-static gint
-connector_handle_button_press(SPConnectorContext *const cc, GdkEventButton const &bevent)
-{
-    Geom::Point const event_w(bevent.x, bevent.y);
-    /* Find desktop coordinates */
-    Geom::Point p = cc->desktop->w2d(event_w);
-    SPEventContext *event_context = SP_EVENT_CONTEXT(cc);
-
-    gint ret = FALSE;
-    if ( cc->mode == SP_CONNECTOR_CONTEXT_DRAWING_MODE )
-    {
-        if ( bevent.button == 1 && !event_context->space_panning ) {
-
-            SPDesktop *desktop = SP_EVENT_CONTEXT_DESKTOP(cc);
-
-            if (Inkscape::have_viable_layer(desktop, cc->_message_context) == false) {
-                return TRUE;
-            }
-
-            Geom::Point const event_w(bevent.x,
-                                    bevent.y);
-//             connector_drag_origin_w = event_w;
-            cc->xp = bevent.x;
-            cc->yp = bevent.y;
-            cc->within_tolerance = true;
-
-            Geom::Point const event_dt = cc->desktop->w2d(event_w);
-
-            SnapManager &m = cc->desktop->namedview->snap_manager;
-            m.setup(cc->desktop);
-
-            switch (cc->state) {
-                case SP_CONNECTOR_CONTEXT_STOP:
-                    /* This is allowed, if we just canceled curve */
-                case SP_CONNECTOR_CONTEXT_IDLE:
-                {
-                    if ( cc->npoints == 0 ) {
-                        cc_clear_active_conn(cc);
-
-                        SP_EVENT_CONTEXT_DESKTOP(cc)->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Creating new connector"));
-
-                        /* Set start anchor */
-                        /* Create green anchor */
-                        Geom::Point p = event_dt;
-
-                        // Test whether we clicked on a connection point
-                        bool found = conn_pt_handle_test(cc, p, &cc->shref, &cc->scpid);
-
-                        if (!found) {
-                            // This is the first point, so just snap it to the grid
-                            // as there's no other points to go off.
-                            m.freeSnapReturnByRef(p, Inkscape::SNAPSOURCE_OTHER_HANDLE);
-                        }
-                        spcc_connector_set_initial_point(cc, p);
-
-                    }
-                    cc->state = SP_CONNECTOR_CONTEXT_DRAGGING;
-                    ret = TRUE;
-                    break;
-                }
-                case SP_CONNECTOR_CONTEXT_DRAGGING:
-                {
-                    // This is the second click of a connector creation.
-                    m.freeSnapReturnByRef(p, Inkscape::SNAPSOURCE_OTHER_HANDLE);
-
-                    spcc_connector_set_subsequent_point(cc, p);
-                    spcc_connector_finish_segment(cc, p);
-                    // Test whether we clicked on a connection point
-                    /*bool found = */conn_pt_handle_test(cc, p, &cc->ehref, &cc->ecpid);
-                    if (cc->npoints != 0) {
-                        spcc_connector_finish(cc);
-                    }
-                    cc_set_active_conn(cc, cc->newconn);
-                    cc->state = SP_CONNECTOR_CONTEXT_IDLE;
-                    ret = TRUE;
-                    break;
-                }
-                case SP_CONNECTOR_CONTEXT_CLOSE:
-                {
-                    g_warning("Button down in CLOSE state");
-                    break;
-                }
-                default:
-                    break;
-            }
-        } else if (bevent.button == 3) {
-            if (cc->state == SP_CONNECTOR_CONTEXT_REROUTING) {
-                // A context menu is going to be triggered here,
-                // so end the rerouting operation.
-                cc_connector_rerouting_finish(cc, &p);
-
-                cc->state = SP_CONNECTOR_CONTEXT_IDLE;
-
-                // Don't set ret to TRUE, so we drop through to the
-                // parent handler which will open the context menu.
-            }
-            else if (cc->npoints != 0) {
-                spcc_connector_finish(cc);
-                cc->state = SP_CONNECTOR_CONTEXT_IDLE;
-                ret = TRUE;
-            }
-        }
-    }
-    else if ( cc->mode == SP_CONNECTOR_CONTEXT_EDITING_MODE )
-    {
-        if ( bevent.button == 1 && !event_context->space_panning )
-        {
-            // Initialize variables in case of dragging
-
-            SPDesktop *desktop = SP_EVENT_CONTEXT_DESKTOP(cc);
-
-            if (Inkscape::have_viable_layer(desktop, cc->_message_context) == false) {
-                return TRUE;
-            }
-
-            cc->xp = bevent.x;
-            cc->yp = bevent.y;
-            cc->within_tolerance = true;
-
-            ConnectionPointMap::iterator const& active_knot_it = cc->connpthandles.find( cc->active_handle );
-
-            switch (cc->state)
-            {
-                case SP_CONNECTOR_CONTEXT_IDLE:
-                    if ( active_knot_it != cc->connpthandles.end() )
-                    {
-                        // We do not allow selecting and, thereby, moving default knots
-                        if ( active_knot_it->second.type != ConnPointDefault)
-                        {
-                            if (cc->selected_handle != cc->active_handle)
-                            {
-                                if ( cc->selected_handle )
-                                    cc_deselect_handle( cc->selected_handle );
-                                cc->selected_handle = cc->active_handle;
-                                cc_select_handle( cc->selected_handle );
-                            }
-                        }
-                        else
-                            // Just ignore the default connection point
-                            return FALSE;
-                    }
-                    else
-                        if ( cc->selected_handle )
-                        {
-                            cc_deselect_handle( cc->selected_handle );
-                            cc->selected_handle = NULL;
-                        }
-
-                    if ( cc->selected_handle )
-                    {
-                        cc->state = SP_CONNECTOR_CONTEXT_DRAGGING;
-                        cc->selection->set( SP_OBJECT( cc->active_shape ) );
-                    }
-
-                    ret = TRUE;
-                    break;
-                // Dragging valid because of the way we create
-                // new connection points.
-                case SP_CONNECTOR_CONTEXT_DRAGGING:
-                    // Do nothing.
-                    ret = TRUE;
-                    break;
-            }
-        }
-    }
-    return ret;
-}
-
-
-static gint
-connector_handle_motion_notify(SPConnectorContext *const cc, GdkEventMotion const &mevent)
-{
-    gint ret = FALSE;
-    SPEventContext *event_context = SP_EVENT_CONTEXT(cc);
-    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-
-    if (event_context->space_panning || mevent.state & GDK_BUTTON2_MASK || mevent.state & GDK_BUTTON3_MASK) {
-        // allow middle-button scrolling
-        return FALSE;
-    }
-
-    Geom::Point const event_w(mevent.x, mevent.y);
-
-    if (cc->within_tolerance) {
-        cc->tolerance = prefs->getIntLimited("/options/dragtolerance/value", 0, 0, 100);
-        if ( ( abs( (gint) mevent.x - cc->xp ) < cc->tolerance ) &&
-             ( abs( (gint) mevent.y - cc->yp ) < cc->tolerance ) ) {
-            return FALSE;   // Do not drag if we're within tolerance from origin.
-        }
-    }
-    // Once the user has moved farther than tolerance from the original location
-    // (indicating they intend to move the object, not click), then always process
-    // the motion notify coordinates as given (no snapping back to origin)
-    cc->within_tolerance = false;
-
-    SPDesktop *const dt = cc->desktop;
-
-    /* Find desktop coordinates */
-    Geom::Point p = dt->w2d(event_w);
-
-    if ( cc->mode == SP_CONNECTOR_CONTEXT_DRAWING_MODE )
-    {
-        SnapManager &m = dt->namedview->snap_manager;
-        m.setup(dt);
-
-        switch (cc->state) {
-            case SP_CONNECTOR_CONTEXT_DRAGGING:
-            {
-                gobble_motion_events(mevent.state);
-                // This is movement during a connector creation.
-                if ( cc->npoints > 0 ) {
-                    m.freeSnapReturnByRef(p, Inkscape::SNAPSOURCE_OTHER_HANDLE);
-                    cc->selection->clear();
-                    spcc_connector_set_subsequent_point(cc, p);
-                    ret = TRUE;
-                }
-                break;
-            }
-            case SP_CONNECTOR_CONTEXT_REROUTING:
-            {
-                gobble_motion_events(GDK_BUTTON1_MASK);
-                g_assert( SP_IS_PATH(cc->clickeditem));
-
-                m.freeSnapReturnByRef(p, Inkscape::SNAPSOURCE_OTHER_HANDLE);
-
-                // Update the hidden path
-                Geom::Matrix i2d = sp_item_i2d_affine(cc->clickeditem);
-                Geom::Matrix d2i = i2d.inverse();
-                SPPath *path = SP_PATH(cc->clickeditem);
-                SPCurve *curve = path->original_curve ? path->original_curve : path->curve;
-                if (cc->clickedhandle == cc->endpt_handle[0]) {
-                    Geom::Point o = cc->endpt_handle[1]->pos;
-                    curve->stretch_endpoints(p * d2i, o * d2i);
-                }
-                else {
-                    Geom::Point o = cc->endpt_handle[0]->pos;
-                    curve->stretch_endpoints(o * d2i, p * d2i);
-                }
-                sp_conn_reroute_path_immediate(path);
-
-                // Copy this to the temporary visible path
-                cc->red_curve = path->original_curve ?
-                        path->original_curve->copy() : path->curve->copy();
-                cc->red_curve->transform(i2d);
-
-                sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(cc->red_bpath), cc->red_curve);
-                ret = TRUE;
-                break;
-            }
-            case SP_CONNECTOR_CONTEXT_STOP:
-                /* This is perfectly valid */
-                break;
-            default:
-                if (!sp_event_context_knot_mouseover(cc)) {
-                    m.preSnap(Inkscape::SnapCandidatePoint(p, Inkscape::SNAPSOURCE_OTHER_HANDLE));
-                }
-                break;
-        }
-    }
-    else if ( cc->mode == SP_CONNECTOR_CONTEXT_EDITING_MODE )
-    {
-        switch ( cc->state )
-        {
-            case SP_CONNECTOR_CONTEXT_DRAGGING:
-                sp_knot_set_position(cc->selected_handle, p, 0);
-                ret = TRUE;
-                break;
-            case SP_CONNECTOR_CONTEXT_NEWCONNPOINT:
-                sp_knot_set_position(cc->selected_handle, p, 0);
-                ret = TRUE;
-                break;
-        }
-    }
-
-    return ret;
-}
-
-
-static gint
-connector_handle_button_release(SPConnectorContext *const cc, GdkEventButton const &revent)
-{
-    gint ret = FALSE;
-    SPEventContext *event_context = SP_EVENT_CONTEXT(cc);
-    if ( revent.button == 1 && !event_context->space_panning ) {
-
-        SPDesktop *desktop = SP_EVENT_CONTEXT_DESKTOP(cc);
-        SPDocument *doc = sp_desktop_document(desktop);
-
-        SnapManager &m = desktop->namedview->snap_manager;
-        m.setup(desktop);
-
-        Geom::Point const event_w(revent.x, revent.y);
-
-        /* Find desktop coordinates */
-        Geom::Point p = cc->desktop->w2d(event_w);
-        if ( cc->mode == SP_CONNECTOR_CONTEXT_DRAWING_MODE )
-        {
-            switch (cc->state) {
-                //case SP_CONNECTOR_CONTEXT_POINT:
-                case SP_CONNECTOR_CONTEXT_DRAGGING:
-                {
-                    m.freeSnapReturnByRef(p, Inkscape::SNAPSOURCE_OTHER_HANDLE);
-
-                    if (cc->within_tolerance)
-                    {
-                        spcc_connector_finish_segment(cc, p);
-                        return TRUE;
-                    }
-                    // Connector has been created via a drag, end it now.
-                    spcc_connector_set_subsequent_point(cc, p);
-                    spcc_connector_finish_segment(cc, p);
-                    // Test whether we clicked on a connection point
-                    /*bool found = */conn_pt_handle_test(cc, p, &cc->ehref, &cc->ecpid);
-                    if (cc->npoints != 0) {
-                        spcc_connector_finish(cc);
-                    }
-                    cc_set_active_conn(cc, cc->newconn);
-                    cc->state = SP_CONNECTOR_CONTEXT_IDLE;
-                    break;
-                }
-                case SP_CONNECTOR_CONTEXT_REROUTING:
-                {
-                    m.freeSnapReturnByRef(p, Inkscape::SNAPSOURCE_OTHER_HANDLE);
-                    cc_connector_rerouting_finish(cc, &p);
-
-                    sp_document_ensure_up_to_date(doc);
-                    cc->state = SP_CONNECTOR_CONTEXT_IDLE;
-                    return TRUE;
-                    break;
-                }
-                case SP_CONNECTOR_CONTEXT_STOP:
-                    /* This is allowed, if we just cancelled curve */
-                    break;
-                default:
-                    break;
-            }
-            ret = TRUE;
-        }
-        else if ( cc->mode == SP_CONNECTOR_CONTEXT_EDITING_MODE )
-        {
-            switch ( cc->state )
-            {
-                case SP_CONNECTOR_CONTEXT_DRAGGING:
-
-                    if (!cc->within_tolerance)
-                    {
-                        m.freeSnapReturnByRef(p, Inkscape::SNAPSOURCE_OTHER_HANDLE);
-                        sp_knot_set_position(cc->selected_handle, p, 0);
-                        ConnectionPoint& cp = cc->connpthandles[cc->selected_handle];
-                        cp.pos = p * sp_item_dt2i_affine(cc->active_shape);
-                        cc->active_shape->avoidRef->updateConnectionPoint(cp);
-                    }
-
-                    cc->state = SP_CONNECTOR_CONTEXT_IDLE;
-                    ret = TRUE;
-                    break;
-
-
-                case SP_CONNECTOR_CONTEXT_NEWCONNPOINT:
-                    m.freeSnapReturnByRef(p, Inkscape::SNAPSOURCE_OTHER_HANDLE);
-
-                    sp_knot_set_position(cc->selected_handle, p, 0);
-
-                    ConnectionPoint cp;
-                    cp.type = ConnPointUserDefined;
-                    cp.pos = p * sp_item_dt2i_affine(cc->active_shape);
-                    cp.dir = Avoid::ConnDirAll;
-                    g_object_unref(cc->selected_handle);
-                    cc->active_shape->avoidRef->addConnectionPoint(cp);
-                    sp_document_ensure_up_to_date(doc);
-                    for (ConnectionPointMap::iterator it = cc->connpthandles.begin(); it != cc->connpthandles.end(); ++it)
-                        if (it->second.type == ConnPointUserDefined && it->second.id == cp.id)
-                        {
-                            cc->selected_handle = it->first;
-                            break;
-                        }
-                    cc_select_handle( cc->selected_handle );
-                    cc->state = SP_CONNECTOR_CONTEXT_IDLE;
-                    ret = TRUE;
-                    break;
-            }
-        }
-    }
-
-
-    return ret;
-}
-
-
-static gint
-connector_handle_key_press(SPConnectorContext *const cc, guint const keyval)
-{
-    gint ret = FALSE;
-    /* fixme: */
-    if ( cc->mode == SP_CONNECTOR_CONTEXT_DRAWING_MODE )
-    {
-        switch (keyval) {
-            case GDK_Return:
-            case GDK_KP_Enter:
-                if (cc->npoints != 0) {
-                    spcc_connector_finish(cc);
-                    cc->state = SP_CONNECTOR_CONTEXT_IDLE;
-                    ret = TRUE;
-                }
-                break;
-            case GDK_Escape:
-                if (cc->state == SP_CONNECTOR_CONTEXT_REROUTING) {
-
-                    SPDesktop *desktop = SP_EVENT_CONTEXT_DESKTOP(cc);
-                    SPDocument *doc = sp_desktop_document(desktop);
-
-                    cc_connector_rerouting_finish(cc, NULL);
-
-                    sp_document_undo(doc);
-
-                    cc->state = SP_CONNECTOR_CONTEXT_IDLE;
-                    desktop->messageStack()->flash( Inkscape::NORMAL_MESSAGE,
-                            _("Connector endpoint drag cancelled."));
-                    ret = TRUE;
-                }
-                else if (cc->npoints != 0) {
-                    // if drawing, cancel, otherwise pass it up for deselecting
-                    cc->state = SP_CONNECTOR_CONTEXT_STOP;
-                    spcc_reset_colors(cc);
-                    ret = TRUE;
-                }
-                break;
-            default:
-                break;
-        }
-    }
-    else if ( cc->mode == SP_CONNECTOR_CONTEXT_EDITING_MODE )
-    {
-        switch ( cc->state )
-        {
-            case SP_CONNECTOR_CONTEXT_DRAGGING:
-                if ( keyval == GDK_Escape )
-                {
-                    // Cancel connection point dragging
-
-                    // Obtain original position
-                    ConnectionPoint const& cp = cc->connpthandles[cc->selected_handle];
-                    SPDesktop *desktop = SP_EVENT_CONTEXT_DESKTOP(cc);
-                    const Geom::Matrix& i2doc = sp_item_i2doc_affine(cc->active_shape);
-                    sp_knot_set_position(cc->selected_handle, cp.pos * i2doc * desktop->doc2dt(), 0);
-                    cc->state = SP_CONNECTOR_CONTEXT_IDLE;
-                    desktop->messageStack()->flash( Inkscape::NORMAL_MESSAGE,
-                        _("Connection point drag cancelled."));
-                    ret = TRUE;
-                }
-                else if ( keyval == GDK_Return || keyval == GDK_KP_Enter )
-                {
-                    // Put connection point at current position
-
-                    SPDesktop *desktop = SP_EVENT_CONTEXT_DESKTOP(cc);
-                    SnapManager &m = desktop->namedview->snap_manager;
-                    m.setup(desktop);
-                    Geom::Point p = cc->selected_handle->pos;
-//                     SPEventContext* event_context = SP_EVENT_CONTEXT( cc );
-
-                    if (!cc->within_tolerance)
-                    {
-                        m.freeSnapReturnByRef(p, Inkscape::SNAPSOURCE_OTHER_HANDLE);
-                        sp_knot_set_position(cc->selected_handle, p, 0);
-                        ConnectionPoint& cp = cc->connpthandles[cc->selected_handle];
-                        cp.pos = p * sp_item_dt2i_affine(cc->active_shape);
-                        cc->active_shape->avoidRef->updateConnectionPoint(cp);
-                    }
-
-                    cc->state = SP_CONNECTOR_CONTEXT_IDLE;
-                    ret = TRUE;
-                }
-                break;
-            case SP_CONNECTOR_CONTEXT_NEWCONNPOINT:
-                if ( keyval == GDK_Escape )
-                {
-                    // Just destroy the knot
-                    g_object_unref( cc->selected_handle );
-                    cc->selected_handle = NULL;
-                    cc->state = SP_CONNECTOR_CONTEXT_IDLE;
-                    ret = TRUE;
-                }
-                else if ( keyval == GDK_Return || keyval == GDK_KP_Enter )
-                {
-                    SPDesktop *desktop = SP_EVENT_CONTEXT_DESKTOP(cc);
-                    SPDocument *doc = sp_desktop_document(desktop);
-                    SnapManager &m = desktop->namedview->snap_manager;
-                    m.setup(desktop);
-                    Geom::Point p = cc->selected_handle->pos;
-
-                    m.freeSnapReturnByRef(p, Inkscape::SNAPSOURCE_OTHER_HANDLE);
-
-                    sp_knot_set_position(cc->selected_handle, p, 0);
-
-                    ConnectionPoint cp;
-                    cp.type = ConnPointUserDefined;
-                    cp.pos = p * sp_item_dt2i_affine(cc->active_shape);
-                    cp.dir = Avoid::ConnDirAll;
-                    g_object_unref(cc->selected_handle);
-                    cc->active_shape->avoidRef->addConnectionPoint(cp);
-                    sp_document_ensure_up_to_date(doc);
-                    for (ConnectionPointMap::iterator it = cc->connpthandles.begin(); it != cc->connpthandles.end(); ++it)
-                        if (it->second.type == ConnPointUserDefined && it->second.id == cp.id)
-                        {
-                            cc->selected_handle = it->first;
-                            break;
-                        }
-                    cc_select_handle( cc->selected_handle );
-                    cc->state = SP_CONNECTOR_CONTEXT_IDLE;
-                    ret = TRUE;
-                }
-
-                break;
-            case SP_CONNECTOR_CONTEXT_IDLE:
-                if ( keyval == GDK_Delete && cc->selected_handle )
-                {
-                    cc->active_shape->avoidRef->deleteConnectionPoint(cc->connpthandles[cc->selected_handle]);
-                    cc->selected_handle = NULL;
-                    ret = TRUE;
-                }
-
-                break;
-        }
-    }
-
-    return ret;
-}
-
-
-static void
-cc_connector_rerouting_finish(SPConnectorContext *const cc, Geom::Point *const p)
-{
-    SPDesktop *desktop = SP_EVENT_CONTEXT_DESKTOP(cc);
-    SPDocument *doc = sp_desktop_document(desktop);
-
-    // Clear the temporary path:
-    cc->red_curve->reset();
-    sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(cc->red_bpath), NULL);
-
-    if (p != NULL)
-    {
-        // Test whether we clicked on a connection point
-        gchar *shape_label, *cpid;
-        bool found = conn_pt_handle_test(cc, *p, &shape_label, &cpid);
-
-        if (found) {
-            if (cc->clickedhandle == cc->endpt_handle[0]) {
-                sp_object_setAttribute(cc->clickeditem,
-                        "inkscape:connection-start", shape_label, false);
-                sp_object_setAttribute(cc->clickeditem,
-                        "inkscape:connection-start-point", cpid, false);
-            }
-            else {
-                sp_object_setAttribute(cc->clickeditem,
-                        "inkscape:connection-end", shape_label, false);
-                sp_object_setAttribute(cc->clickeditem,
-                        "inkscape:connection-end-point", cpid, false);
-            }
-            g_free(shape_label);
-        }
-    }
-    cc->clickeditem->setHidden(false);
-    sp_conn_reroute_path_immediate(SP_PATH(cc->clickeditem));
-    cc->clickeditem->updateRepr();
-    sp_document_done(doc, SP_VERB_CONTEXT_CONNECTOR,
-                     _("Reroute connector"));
-    cc_set_active_conn(cc, cc->clickeditem);
-}
-
-
-static void
-spcc_reset_colors(SPConnectorContext *cc)
-{
-    /* Red */
-    cc->red_curve->reset();
-    sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(cc->red_bpath), NULL);
-
-    cc->green_curve->reset();
-    cc->npoints = 0;
-}
-
-
-static void
-spcc_connector_set_initial_point(SPConnectorContext *const cc, Geom::Point const p)
-{
-    g_assert( cc->npoints == 0 );
-
-    cc->p[0] = p;
-    cc->p[1] = p;
-    cc->npoints = 2;
-    sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(cc->red_bpath), NULL);
-}
-
-
-static void
-spcc_connector_set_subsequent_point(SPConnectorContext *const cc, Geom::Point const p)
-{
-    g_assert( cc->npoints != 0 );
-
-    SPDesktop *dt = cc->desktop;
-    Geom::Point o = dt->dt2doc(cc->p[0]);
-    Geom::Point d = dt->dt2doc(p);
-    Avoid::Point src(o[Geom::X], o[Geom::Y]);
-    Avoid::Point dst(d[Geom::X], d[Geom::Y]);
-
-    if (!cc->newConnRef) {
-        Avoid::Router *router = sp_desktop_document(dt)->router;
-        cc->newConnRef = new Avoid::ConnRef(router);
-        cc->newConnRef->setEndpoint(Avoid::VertID::src, src);
-        if (cc->isOrthogonal)
-            cc->newConnRef->setRoutingType(Avoid::ConnType_Orthogonal);
-        else
-            cc->newConnRef->setRoutingType(Avoid::ConnType_PolyLine);
-    }
-    // Set new endpoint.
-    cc->newConnRef->setEndpoint(Avoid::VertID::tar, dst);
-    // Immediately generate new routes for connector.
-    cc->newConnRef->makePathInvalid();
-    cc->newConnRef->router()->processTransaction();
-    // Recreate curve from libavoid route.
-    recreateCurve( cc->red_curve, cc->newConnRef, cc->curvature );
-    cc->red_curve->transform(dt->doc2dt());
-    sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(cc->red_bpath), cc->red_curve);
-}
-
-
-/**
- * Concats red, blue and green.
- * If any anchors are defined, process these, optionally removing curves from white list
- * Invoke _flush_white to write result back to object.
- */
-static void
-spcc_concat_colors_and_flush(SPConnectorContext *cc)
-{
-    SPCurve *c = cc->green_curve;
-    cc->green_curve = new SPCurve();
-
-    cc->red_curve->reset();
-    sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(cc->red_bpath), NULL);
-
-    if (c->is_empty()) {
-        c->unref();
-        return;
-    }
-
-    spcc_flush_white(cc, c);
-
-    c->unref();
-}
-
-
-/*
- * Flushes white curve(s) and additional curve into object
- *
- * No cleaning of colored curves - this has to be done by caller
- * No rereading of white data, so if you cannot rely on ::modified, do it in caller
- *
- */
-
-static void
-spcc_flush_white(SPConnectorContext *cc, SPCurve *gc)
-{
-    SPCurve *c;
-
-    if (gc) {
-        c = gc;
-        c->ref();
-    } else {
-        return;
-    }
-
-    /* Now we have to go back to item coordinates at last */
-    c->transform(SP_EVENT_CONTEXT_DESKTOP(cc)->dt2doc());
-
-    SPDesktop *desktop = SP_EVENT_CONTEXT_DESKTOP(cc);
-    SPDocument *doc = sp_desktop_document(desktop);
-    Inkscape::XML::Document *xml_doc = sp_document_repr_doc(doc);
-
-    if ( c && !c->is_empty() ) {
-        /* We actually have something to write */
-
-        Inkscape::XML::Node *repr = xml_doc->createElement("svg:path");
-        /* Set style */
-        sp_desktop_apply_style_tool(desktop, repr, "/tools/connector", false);
-
-        gchar *str = sp_svg_write_path( c->get_pathvector() );
-        g_assert( str != NULL );
-        repr->setAttribute("d", str);
-        g_free(str);
-
-        /* Attach repr */
-        cc->newconn = SP_ITEM(desktop->currentLayer()->appendChildRepr(repr));
-        cc->newconn->transform = sp_item_i2doc_affine(SP_ITEM(desktop->currentLayer())).inverse();
-
-        bool connection = false;
-        sp_object_setAttribute(cc->newconn, "inkscape:connector-type",
-                cc->isOrthogonal ? "orthogonal" : "polyline", false);
-        sp_object_setAttribute(cc->newconn, "inkscape:connector-curvature",
-                Glib::Ascii::dtostr(cc->curvature).c_str(), false);
-        if (cc->shref)
-        {
-            sp_object_setAttribute(cc->newconn, "inkscape:connection-start",
-                    cc->shref, false);
-            if (cc->scpid)
-                sp_object_setAttribute(cc->newconn, "inkscape:connection-start-point",
-                        cc->scpid, false);
-            connection = true;
-        }
-
-        if (cc->ehref)
-        {
-            sp_object_setAttribute(cc->newconn, "inkscape:connection-end",
-                    cc->ehref, false);
-            if (cc->ecpid)
-                sp_object_setAttribute(cc->newconn, "inkscape:connection-end-point",
-                        cc->ecpid, false);
-            connection = true;
-        }
-        // Process pending updates.
-        cc->newconn->updateRepr();
-        sp_document_ensure_up_to_date(doc);
-
-        if (connection) {
-            // Adjust endpoints to shape edge.
-            sp_conn_reroute_path_immediate(SP_PATH(cc->newconn));
-            cc->newconn->updateRepr();
-        }
-
-        // Only set the selection after we are finished with creating the attributes of
-        // the connector.  Otherwise, the selection change may alter the defaults for
-        // values like curvature in the connector context, preventing subsequent lookup
-        // of their original values.
-        cc->selection->set(repr);
-        Inkscape::GC::release(repr);
-    }
-
-    c->unref();
-
-    sp_document_done(doc, SP_VERB_CONTEXT_CONNECTOR, _("Create connector"));
-}
-
-
-static void
-spcc_connector_finish_segment(SPConnectorContext *const cc, Geom::Point const /*p*/)
-{
-    if (!cc->red_curve->is_empty()) {
-        cc->green_curve->append_continuous(cc->red_curve, 0.0625);
-
-        cc->p[0] = cc->p[3];
-        cc->p[1] = cc->p[4];
-        cc->npoints = 2;
-
-        cc->red_curve->reset();
-    }
-}
-
-
-static void
-spcc_connector_finish(SPConnectorContext *const cc)
-{
-    SPDesktop *const desktop = cc->desktop;
-    desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Finishing connector"));
-
-    cc->red_curve->reset();
-    spcc_concat_colors_and_flush(cc);
-
-    cc->npoints = 0;
-
-    if (cc->newConnRef) {
-        cc->newConnRef->removeFromGraph();
-        delete cc->newConnRef;
-        cc->newConnRef = NULL;
-    }
-}
-
-
-static gboolean
-cc_generic_knot_handler(SPCanvasItem *, GdkEvent *event, SPKnot *knot)
-{
-    g_assert (knot != NULL);
-
-    g_object_ref(knot);
-
-    SPConnectorContext *cc = SP_CONNECTOR_CONTEXT(
-            knot->desktop->event_context);
-
-    gboolean consumed = FALSE;
-
-    gchar* knot_tip = knot->tip ? knot->tip : cc->knot_tip;
-    switch (event->type) {
-        case GDK_ENTER_NOTIFY:
-            sp_knot_set_flag(knot, SP_KNOT_MOUSEOVER, TRUE);
-
-            cc->active_handle = knot;
-            if (knot_tip)
-            {
-                knot->desktop->event_context->defaultMessageContext()->set(
-                        Inkscape::NORMAL_MESSAGE, knot_tip);
-            }
-
-            consumed = TRUE;
-            break;
-        case GDK_LEAVE_NOTIFY:
-            sp_knot_set_flag(knot, SP_KNOT_MOUSEOVER, FALSE);
-
-            cc->active_handle = NULL;
-
-            if (knot_tip) {
-                knot->desktop->event_context->defaultMessageContext()->clear();
-            }
-
-            consumed = TRUE;
-            break;
-        default:
-            break;
-    }
-
-    g_object_unref(knot);
-
-    return consumed;
-}
-
-
-static gboolean
-endpt_handler(SPKnot */*knot*/, GdkEvent *event, SPConnectorContext *cc)
-{
-    g_assert( SP_IS_CONNECTOR_CONTEXT(cc) );
-
-    gboolean consumed = FALSE;
-
-    switch (event->type) {
-        case GDK_BUTTON_PRESS:
-            g_assert( (cc->active_handle == cc->endpt_handle[0]) ||
-                      (cc->active_handle == cc->endpt_handle[1]) );
-            if (cc->state == SP_CONNECTOR_CONTEXT_IDLE) {
-                cc->clickeditem = cc->active_conn;
-                cc->clickedhandle = cc->active_handle;
-                cc_clear_active_conn(cc);
-                cc->state = SP_CONNECTOR_CONTEXT_REROUTING;
-
-                // Disconnect from attached shape
-                unsigned ind = (cc->active_handle == cc->endpt_handle[0]) ? 0 : 1;
-                sp_conn_end_detach(cc->clickeditem, ind);
-
-                Geom::Point origin;
-                if (cc->clickedhandle == cc->endpt_handle[0]) {
-                    origin = cc->endpt_handle[1]->pos;
-                }
-                else {
-                    origin = cc->endpt_handle[0]->pos;
-                }
-
-                // Show the red path for dragging.
-                cc->red_curve = SP_PATH(cc->clickeditem)->original_curve ? SP_PATH(cc->clickeditem)->original_curve->copy() : SP_PATH(cc->clickeditem)->curve->copy();
-                Geom::Matrix i2d = sp_item_i2d_affine(cc->clickeditem);
-                cc->red_curve->transform(i2d);
-                sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(cc->red_bpath), cc->red_curve);
-
-                cc->clickeditem->setHidden(true);
-
-                // The rest of the interaction rerouting the connector is
-                // handled by the context root handler.
-                consumed = TRUE;
-            }
-            break;
-        default:
-            break;
-    }
-
-    return consumed;
-}
-
-static void cc_active_shape_add_knot(SPDesktop* desktop, SPItem* item, ConnectionPointMap &cphandles, ConnectionPoint& cp)
-{
-        SPKnot *knot = sp_knot_new(desktop, 0);
-
-        knot->setShape(SP_KNOT_SHAPE_SQUARE);
-        knot->setSize(8);
-        knot->setAnchor(GTK_ANCHOR_CENTER);
-        knot->setFill(0xffffff00, 0xff0000ff, 0xff0000ff);
-        sp_knot_update_ctrl(knot);
-
-        // We don't want to use the standard knot handler.
-        g_signal_handler_disconnect(G_OBJECT(knot->item),
-                knot->_event_handler_id);
-        knot->_event_handler_id = 0;
-
-        gtk_signal_connect(GTK_OBJECT(knot->item), "event",
-                GTK_SIGNAL_FUNC(cc_generic_knot_handler), knot);
-        sp_knot_set_position(knot, item->avoidRef->getConnectionPointPos(cp.type, cp.id) * desktop->doc2dt(), 0);
-        sp_knot_show(knot);
-        cphandles[knot] = cp;
-}
-
-static void cc_set_active_shape(SPConnectorContext *cc, SPItem *item)
-{
-    g_assert(item != NULL );
-
-    std::map<int, ConnectionPoint>* connpts = &item->avoidRef->connection_points;
-
-    if (cc->active_shape != item)
-    {
-        // The active shape has changed
-        // Rebuild everything
-        cc->active_shape = item;
-        // Remove existing active shape listeners
-        if (cc->active_shape_repr) {
-            sp_repr_remove_listener_by_data(cc->active_shape_repr, cc);
-            Inkscape::GC::release(cc->active_shape_repr);
-
-            sp_repr_remove_listener_by_data(cc->active_shape_layer_repr, cc);
-            Inkscape::GC::release(cc->active_shape_layer_repr);
-        }
-
-        // Listen in case the active shape changes
-        cc->active_shape_repr = SP_OBJECT_REPR(item);
-        if (cc->active_shape_repr) {
-            Inkscape::GC::anchor(cc->active_shape_repr);
-            sp_repr_add_listener(cc->active_shape_repr, &shape_repr_events, cc);
-
-            cc->active_shape_layer_repr = cc->active_shape_repr->parent();
-            Inkscape::GC::anchor(cc->active_shape_layer_repr);
-            sp_repr_add_listener(cc->active_shape_layer_repr, &layer_repr_events, cc);
-        }
-
-
-        // Set the connection points.
-        if ( cc->connpthandles.size() )
-            // destroy the old list
-            while (! cc->connpthandles.empty() )
-            {
-                g_object_unref(cc->connpthandles.begin()->first);
-                cc->connpthandles.erase(cc->connpthandles.begin());
-            }
-        // build the new one
-        if ( connpts->size() )
-        for (std::map<int, ConnectionPoint>::iterator it = connpts->begin(); it != connpts->end(); ++it)
-            cc_active_shape_add_knot(cc->desktop, item, cc->connpthandles, it->second);
-
-        // Also add default connection points
-        // For now, only centre default connection point will
-        // be available
-        ConnectionPoint centre;
-        centre.type = ConnPointDefault;
-        centre.id = ConnPointPosCC;
-        cc_active_shape_add_knot(cc->desktop, item, cc->connpthandles, centre);
-    }
-    else
-    {
-        // The active shape didn't change
-        // Update only the connection point knots
-
-        // Ensure the item's connection_points map
-        // has been updated
-        sp_document_ensure_up_to_date(SP_OBJECT_DOCUMENT(item));
-
-        std::set<int> seen;
-        for  ( ConnectionPointMap::iterator it = cc->connpthandles.begin(); it != cc->connpthandles.end() ;)
-        {
-            bool removed = false;
-            if ( it->second.type == ConnPointUserDefined )
-            {
-                std::map<int, ConnectionPoint>::iterator p = connpts->find(it->second.id);
-                if (p != connpts->end())
-                {
-                    if ( it->second != p->second )
-                        // Connection point position has changed
-                        // Update knot position
-                        sp_knot_set_position(it->first,
-                                             item->avoidRef->getConnectionPointPos(it->second.type, it->second.id) * cc->desktop->doc2dt(), 0);
-                    seen.insert(it->second.id);
-                    sp_knot_show(it->first);
-                }
-                else
-                {
-                    // This connection point does no longer exist,
-                    // remove the knot
-                    ConnectionPointMap::iterator curr = it;
-                    ++it;
-                    g_object_unref( curr->first );
-                    cc->connpthandles.erase(curr);
-                    removed = true;
-                }
-            }
-            else
-            {
-                // It's a default connection point
-                // Just make sure it's position is correct
-                sp_knot_set_position(it->first,
-                                     item->avoidRef->getConnectionPointPos(it->second.type, it->second.id) * cc->desktop->doc2dt(), 0);
-                sp_knot_show(it->first);
-
-            }
-            if ( !removed )
-                ++it;
-        }
-        // Add knots for new connection points.
-        if (connpts->size())
-            for ( std::map<int, ConnectionPoint>::iterator it = connpts->begin(); it != connpts->end(); ++it )
-                if ( seen.find(it->first) == seen.end() )
-                    // A new connection point has been added
-                    // to the shape. Add a knot for it.
-                    cc_active_shape_add_knot(cc->desktop, item, cc->connpthandles, it->second);
-    }
-}
-
-
-static void
-cc_set_active_conn(SPConnectorContext *cc, SPItem *item)
-{
-    g_assert( SP_IS_PATH(item) );
-
-    SPCurve *curve = SP_PATH(item)->original_curve ? SP_PATH(item)->original_curve : SP_PATH(item)->curve;
-    Geom::Matrix i2d = sp_item_i2d_affine(item);
-
-    if (cc->active_conn == item)
-    {
-        if (curve->is_empty())
-        {
-            // Connector is invisible because it is clipped to the boundary of
-            // two overlpapping shapes.
-            sp_knot_hide(cc->endpt_handle[0]);
-            sp_knot_hide(cc->endpt_handle[1]);
-        }
-        else
-        {
-            // Just adjust handle positions.
-            Geom::Point startpt = *(curve->first_point()) * i2d;
-            sp_knot_set_position(cc->endpt_handle[0], startpt, 0);
-
-            Geom::Point endpt = *(curve->last_point()) * i2d;
-            sp_knot_set_position(cc->endpt_handle[1], endpt, 0);
-        }
-
-        return;
-    }
-
-    cc->active_conn = item;
-
-    // Remove existing active conn listeners
-    if (cc->active_conn_repr) {
-        sp_repr_remove_listener_by_data(cc->active_conn_repr, cc);
-        Inkscape::GC::release(cc->active_conn_repr);
-        cc->active_conn_repr = NULL;
-    }
-
-    // Listen in case the active conn changes
-    cc->active_conn_repr = SP_OBJECT_REPR(item);
-    if (cc->active_conn_repr) {
-        Inkscape::GC::anchor(cc->active_conn_repr);
-        sp_repr_add_listener(cc->active_conn_repr, &shape_repr_events, cc);
-    }
-
-    for (int i = 0; i < 2; ++i) {
-
-        // Create the handle if it doesn't exist
-        if ( cc->endpt_handle[i] == NULL ) {
-            SPKnot *knot = sp_knot_new(cc->desktop,
-                    _("<b>Connector endpoint</b>: drag to reroute or connect to new shapes"));
-
-            knot->setShape(SP_KNOT_SHAPE_SQUARE);
-            knot->setSize(7);
-            knot->setAnchor(GTK_ANCHOR_CENTER);
-            knot->setFill(0xffffff00, 0xff0000ff, 0xff0000ff);
-            knot->setStroke(0x000000ff, 0x000000ff, 0x000000ff);
-            sp_knot_update_ctrl(knot);
-
-            // We don't want to use the standard knot handler,
-            // since we don't want this knot to be draggable.
-            g_signal_handler_disconnect(G_OBJECT(knot->item),
-                    knot->_event_handler_id);
-            knot->_event_handler_id = 0;
-
-            gtk_signal_connect(GTK_OBJECT(knot->item), "event",
-                    GTK_SIGNAL_FUNC(cc_generic_knot_handler), knot);
-
-            cc->endpt_handle[i] = knot;
-        }
-
-        // Remove any existing handlers
-        if (cc->endpt_handler_id[i]) {
-            g_signal_handlers_disconnect_by_func(
-                    G_OBJECT(cc->endpt_handle[i]->item),
-                    (void*)G_CALLBACK(endpt_handler), (gpointer) cc );
-            cc->endpt_handler_id[i] = 0;
-        }
-
-        // Setup handlers for connector endpoints, this is
-        // is as 'after' so that cc_generic_knot_handler is
-        // triggered first for any endpoint.
-        cc->endpt_handler_id[i] = g_signal_connect_after(
-                G_OBJECT(cc->endpt_handle[i]->item), "event",
-                G_CALLBACK(endpt_handler), cc);
-    }
-
-    if (curve->is_empty())
-    {
-        // Connector is invisible because it is clipped to the boundary 
-        // of two overlpapping shapes.  So, it doesn't need endpoints.
-        return;
-    }
-
-    Geom::Point startpt = *(curve->first_point()) * i2d;
-    sp_knot_set_position(cc->endpt_handle[0], startpt, 0);
-
-    Geom::Point endpt = *(curve->last_point()) * i2d;
-    sp_knot_set_position(cc->endpt_handle[1], endpt, 0);
-
-    sp_knot_show(cc->endpt_handle[0]);
-    sp_knot_show(cc->endpt_handle[1]);
-}
-
-void cc_create_connection_point(SPConnectorContext* cc)
-{
-    if (cc->active_shape && cc->state == SP_CONNECTOR_CONTEXT_IDLE)
-    {
-        if (cc->selected_handle)
-        {
-            cc_deselect_handle( cc->selected_handle );
-        }
-        SPKnot *knot = sp_knot_new(cc->desktop, 0);
-        // We do not process events on this knot.
-        g_signal_handler_disconnect(G_OBJECT(knot->item),
-                                    knot->_event_handler_id);
-        knot->_event_handler_id = 0;
-
-        cc_select_handle( knot );
-        cc->selected_handle = knot;
-        sp_knot_show(cc->selected_handle);
-        cc->state = SP_CONNECTOR_CONTEXT_NEWCONNPOINT;
-    }
-}
-
-void cc_remove_connection_point(SPConnectorContext* cc)
-{
-    if (cc->selected_handle && cc->state == SP_CONNECTOR_CONTEXT_IDLE )
-    {
-        cc->active_shape->avoidRef->deleteConnectionPoint(cc->connpthandles[cc->selected_handle]);
-        cc->selected_handle = NULL;
-    }
-}
-
-static bool cc_item_is_shape(SPItem *item)
-{
-    if (SP_IS_PATH(item)) {
-        SPCurve *curve = (SP_SHAPE(item))->curve;
-        if ( curve && !(curve->is_closed()) ) {
-            // Open paths are connectors.
-            return false;
-        }
-    }
-    else if (SP_IS_TEXT(item) || SP_IS_FLOWTEXT(item)) {
-        Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-        if (prefs->getBool("/tools/connector/ignoretext", true)) {
-            // Don't count text as a shape we can connect connector to.
-            return false;
-        }
-    }
-    return true;
-}
-
-
-bool cc_item_is_connector(SPItem *item)
-{
-    if (SP_IS_PATH(item)) {
-        bool closed = SP_PATH(item)->original_curve ? SP_PATH(item)->original_curve->is_closed() : SP_PATH(item)->curve->is_closed();
-        if (SP_PATH(item)->connEndPair.isAutoRoutingConn() && !closed) {
-            // To be considered a connector, an object must be a non-closed 
-            // path that is marked with a "inkscape:connector-type" attribute.
-            return true;
-        }
-    }
-    return false;
-}
-
-
-void cc_selection_set_avoid(bool const set_avoid)
-{
-    SPDesktop *desktop = inkscape_active_desktop();
-    if (desktop == NULL) {
-        return;
-    }
-
-    SPDocument *document = sp_desktop_document(desktop);
-
-    Inkscape::Selection *selection = sp_desktop_selection(desktop);
-
-    GSList *l = (GSList *) selection->itemList();
-
-    int changes = 0;
-
-    while (l) {
-        SPItem *item = (SPItem *) l->data;
-
-        char const *value = (set_avoid) ? "true" : NULL;
-
-        if (cc_item_is_shape(item)) {
-            sp_object_setAttribute(item, "inkscape:connector-avoid",
-                    value, false);
-            item->avoidRef->handleSettingChange();
-            changes++;
-        }
-
-        l = l->next;
-    }
-
-    if (changes == 0) {
-        desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE,
-                _("Select <b>at least one non-connector object</b>."));
-        return;
-    }
-
-    char *event_desc = (set_avoid) ?
-            _("Make connectors avoid selected objects") :
-            _("Make connectors ignore selected objects");
-    sp_document_done(document, SP_VERB_CONTEXT_CONNECTOR, event_desc);
-}
-
-
-static void
-cc_selection_changed(Inkscape::Selection *selection, gpointer data)
-{
-    SPConnectorContext *cc = SP_CONNECTOR_CONTEXT(data);
-    //SPEventContext *ec = SP_EVENT_CONTEXT(cc);
-
-    SPItem *item = selection->singleItem();
-
-    if (cc->active_conn == item)
-    {
-        // Nothing to change.
-        return;
-    }
-    if (item == NULL)
-    {
-        cc_clear_active_conn(cc);
-        return;
-    }
-
-    if (cc_item_is_connector(item)) {
-        cc_set_active_conn(cc, item);
-    }
-}
-
-
-static void
-shape_event_attr_deleted(Inkscape::XML::Node */*repr*/, Inkscape::XML::Node *child,
-                         Inkscape::XML::Node */*ref*/, gpointer data)
-{
-    g_assert(data);
-    SPConnectorContext *cc = SP_CONNECTOR_CONTEXT(data);
-
-    if (child == cc->active_shape_repr) {
-        // The active shape has been deleted.  Clear active shape.
-        cc_clear_active_shape(cc);
-    }
-}
-
-
-static void
-shape_event_attr_changed(Inkscape::XML::Node *repr, gchar const *name,
-                         gchar const */*old_value*/, gchar const */*new_value*/,
-                         bool /*is_interactive*/, gpointer data)
-{
-    g_assert(data);
-    SPConnectorContext *cc = SP_CONNECTOR_CONTEXT(data);
-
-    // Look for changes that result in onscreen movement.
-    if (!strcmp(name, "d") || !strcmp(name, "x") || !strcmp(name, "y") ||
-            !strcmp(name, "width") || !strcmp(name, "height") ||
-            !strcmp(name, "transform"))
-    {
-        if (repr == cc->active_shape_repr) {
-            // Active shape has moved. Clear active shape.
-            cc_clear_active_shape(cc);
-        }
-        else if (repr == cc->active_conn_repr) {
-            // The active conn has been moved.
-            // Set it again, which just sets new handle positions.
-            cc_set_active_conn(cc, cc->active_conn);
-        }
-    }
-    else
-        if ( !strcmp(name, "inkscape:connection-points") )
-            if (repr == cc->active_shape_repr)
-                // The connection points of the active shape
-                // have changed. Update them.
-                cc_set_active_shape(cc, cc->active_shape);
-}
-
-
-/*
-  Local Variables:
-  mode:c++
-  c-file-style:"stroustrup"
-  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
-  indent-tabs-mode:nil
-  fill-column:99
-  End:
-*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
 
=== removed directory '.pc/0004-Fix_FTBFS_on_gcc-4.8.patch/src/extension'
=== removed file '.pc/0004-Fix_FTBFS_on_gcc-4.8.patch/src/extension/effect.cpp'
--- .pc/0004-Fix_FTBFS_on_gcc-4.8.patch/src/extension/effect.cpp	2013-07-02 17:25:52 +0000
+++ .pc/0004-Fix_FTBFS_on_gcc-4.8.patch/src/extension/effect.cpp	1970-01-01 00:00:00 +0000
@@ -1,409 +0,0 @@
-/*
- * Authors:
- *   Ted Gould <[e-mail]>
- *
- * Copyright (C) 2002-2007 Authors
- *
- * Released under GNU GPL, read the file 'COPYING' for more information
- */
-
-#include "inkscape-private.h"
-#include "helper/action.h"
-#include "ui/view/view.h"
-#include "desktop-handles.h"
-#include "selection.h"
-#include "sp-namedview.h"
-#include "desktop.h"
-#include "implementation/implementation.h"
-#include "effect.h"
-#include "execution-env.h"
-#include "timer.h"
-
-
-
-/* Inkscape::Extension::Effect */
-
-namespace Inkscape {
-namespace Extension {
-
-Effect * Effect::_last_effect = NULL;
-Inkscape::XML::Node * Effect::_effects_list = NULL;
-Inkscape::XML::Node * Effect::_filters_list = NULL;
-
-#define  EFFECTS_LIST  "effects-list"
-#define  FILTERS_LIST  "filters-list"
-
-Effect::Effect (Inkscape::XML::Node * in_repr, Implementation::Implementation * in_imp)
-    : Extension(in_repr, in_imp),
-      _id_noprefs(Glib::ustring(get_id()) + ".noprefs"),
-      _name_noprefs(Glib::ustring(get_name()) + _(" (No preferences)")),
-      _verb(get_id(), get_name(), NULL, NULL, this, true),
-      _verb_nopref(_id_noprefs.c_str(), _name_noprefs.c_str(), NULL, NULL, this, false),
-      _menu_node(NULL), _workingDialog(true),
-      _prefDialog(NULL)
-{
-    Inkscape::XML::Node * local_effects_menu = NULL;
-
-    // This is a weird hack
-    if (!strcmp(this->get_id(), "org.inkscape.filter.dropshadow"))
-        return;
-
-    bool hidden = false;
-
-    no_doc = false;
-    no_live_preview = false;
-
-    if (repr != NULL) {
-
-        for (Inkscape::XML::Node *child = sp_repr_children(repr); child != NULL; child = child->next()) {
-            if (!strcmp(child->name(), INKSCAPE_EXTENSION_NS "effect")) {
-                if (child->attribute("needs-document") && !strcmp(child->attribute("needs-document"), "false")) {
-                  no_doc = true;
-                }
-                if (child->attribute("needs-live-preview") && !strcmp(child->attribute("needs-live-preview"), "false")) {
-                  no_live_preview = true;
-                }
-                for (Inkscape::XML::Node *effect_child = sp_repr_children(child); effect_child != NULL; effect_child = effect_child->next()) {
-                    if (!strcmp(effect_child->name(), INKSCAPE_EXTENSION_NS "effects-menu")) {
-                        // printf("Found local effects menu in %s\n", this->get_name());
-                        local_effects_menu = sp_repr_children(effect_child);
-                        if (effect_child->attribute("hidden") && !strcmp(effect_child->attribute("hidden"), "true")) {
-                            hidden = true;
-                        }
-                    }
-                    if (!strcmp(effect_child->name(), INKSCAPE_EXTENSION_NS "menu-name") ||
-                            !strcmp(effect_child->name(), INKSCAPE_EXTENSION_NS "_menu-name")) {
-                        // printf("Found local effects menu in %s\n", this->get_name());
-                        _verb.set_name(sp_repr_children(effect_child)->content());
-                    }
-                    if (!strcmp(effect_child->name(), INKSCAPE_EXTENSION_NS "menu-tip") ||
-                            !strcmp(effect_child->name(), INKSCAPE_EXTENSION_NS "_menu-tip")) {
-                        // printf("Found local effects menu in %s\n", this->get_name());
-                        _verb.set_tip(sp_repr_children(effect_child)->content());
-                    }
-                } // children of "effect"
-                break; // there can only be one effect
-            } // find "effect"
-        } // children of "inkscape-extension"
-    } // if we have an XML file
-
-    if (INKSCAPE != NULL) {
-        if (_effects_list == NULL)
-            _effects_list = find_menu(inkscape_get_menus(INKSCAPE), EFFECTS_LIST);
-        if (_filters_list == NULL)
-            _filters_list = find_menu(inkscape_get_menus(INKSCAPE), FILTERS_LIST);
-    }
-
-    if ((_effects_list != NULL || _filters_list != NULL)) {
-        Inkscape::XML::Document *xml_doc;
-        xml_doc = _effects_list->document();
-        _menu_node = xml_doc->createElement("verb");
-        _menu_node->setAttribute("verb-id", this->get_id(), false);
-
-        if (!hidden) {
-            if (_filters_list &&
-                local_effects_menu && 
-                local_effects_menu->attribute("name") && 
-                !strcmp(local_effects_menu->attribute("name"), ("Filters"))) {
-                merge_menu(_filters_list->parent(), _filters_list, sp_repr_children(local_effects_menu), _menu_node);
-            } else if (_effects_list) {
-                merge_menu(_effects_list->parent(), _effects_list, local_effects_menu, _menu_node);
-            }
-        }
-    }
-
-    return;
-}
-
-void
-Effect::merge_menu (Inkscape::XML::Node * base,
-                    Inkscape::XML::Node * start,
-                    Inkscape::XML::Node * patern,
-                    Inkscape::XML::Node * mergee) {
-    Glib::ustring mergename;
-    Inkscape::XML::Node * tomerge = NULL;
-    Inkscape::XML::Node * submenu = NULL;
-
-    /* printf("Merge menu with '%s' '%s' '%s'\n",
-            base != NULL ? base->name() : "NULL",
-            patern != NULL ? patern->name() : "NULL",
-            mergee != NULL ? mergee->name() : "NULL"); */
-
-    if (patern == NULL) {
-        // Merge the verb name
-        tomerge = mergee;
-        mergename = _(this->get_name());
-    } else {
-        gchar const * menuname = patern->attribute("name");
-        if (menuname == NULL) menuname = patern->attribute("_name");
-        if (menuname == NULL) return;
-        
-        Inkscape::XML::Document *xml_doc;
-        xml_doc = base->document();
-        tomerge = xml_doc->createElement("submenu");
-        tomerge->setAttribute("name", menuname, false);
-
-        mergename = _(menuname);
-    }
-
-    int position = -1;
-
-    if (start != NULL) {
-        Inkscape::XML::Node * menupass;
-        for (menupass = start; menupass != NULL && strcmp(menupass->name(), "separator"); menupass = menupass->next()) {
-            gchar const * compare_char = NULL;
-            if (!strcmp(menupass->name(), "verb")) {
-                gchar const * verbid = menupass->attribute("verb-id");
-                Inkscape::Verb * verb = Inkscape::Verb::getbyid(verbid);
-                if (verb == NULL) {
-					g_warning("Unable to find verb '%s' which is referred to in the menus.", verbid);
-                    continue;
-                }
-                compare_char = verb->get_name();
-            } else if (!strcmp(menupass->name(), "submenu")) {
-                compare_char = menupass->attribute("name");
-                if (compare_char == NULL)
-                    compare_char = menupass->attribute("_name");
-            }
-
-            position = menupass->position() + 1;
-
-            /* This will cause us to skip tags we don't understand */
-            if (compare_char == NULL) {
-                continue;
-            }
-
-            Glib::ustring compare(_(compare_char));
-
-            if (mergename == compare) {
-                Inkscape::GC::release(tomerge);
-                tomerge = NULL;
-                submenu = menupass;
-                break;
-            }
-
-            if (mergename < compare) {
-                position = menupass->position();
-                break;
-            }
-        } // for menu items
-    } // start != NULL
-
-    if (tomerge != NULL) {
-        base->appendChild(tomerge);
-        Inkscape::GC::release(tomerge);
-        if (position != -1)
-            tomerge->setPosition(position);
-    }
-
-    if (patern != NULL) {
-        if (submenu == NULL)
-            submenu = tomerge;
-        merge_menu(submenu, submenu->firstChild(), patern->firstChild(), mergee);
-    }
-
-    return;
-}
-
-Effect::~Effect (void)
-{
-    if (get_last_effect() == this)
-        set_last_effect(NULL);
-    if (_menu_node)
-        Inkscape::GC::release(_menu_node);
-    return;
-}
-
-bool
-Effect::check (void)
-{
-    if (!Extension::check()) {
-        /** \todo  Check to see if parent has this as its only child,
-                   if so, delete it too */
-        if (_menu_node != NULL)
-            sp_repr_unparent(_menu_node);
-        _menu_node = NULL;
-        return false;
-    }
-    return true;
-}
-
-bool
-Effect::prefs (Inkscape::UI::View::View * doc)
-{
-    if (_prefDialog != NULL) {
-        _prefDialog->raise();
-        return true;
-    }
-
-    if (param_visible_count() == 0) {
-        effect(doc);
-        return true;
-    }
-
-    if (!loaded())
-        set_state(Extension::STATE_LOADED);
-    if (!loaded()) return false;
-
-    _prefDialog = new PrefDialog(this->get_name(), this->get_help(), NULL, this);
-    _prefDialog->show();
-
-    return true;
-}
-
-/**
-    \brief  The function that 'does' the effect itself
-    \param  doc  The Inkscape::UI::View::View to do the effect on
-
-    This function first insures that the extension is loaded, and if not,
-    loads it.  It then calls the implemention to do the actual work.  It
-    also resets the last effect pointer to be this effect.  Finally, it
-    executes a \c sp_document_done to commit the changes to the undo
-    stack.
-*/
-void
-Effect::effect (Inkscape::UI::View::View * doc)
-{
-    //printf("Execute effect\n");
-    if (!loaded())
-        set_state(Extension::STATE_LOADED);
-    if (!loaded()) return;
-
-
-    ExecutionEnv executionEnv(this, doc);
-    timer->lock();
-    executionEnv.run();
-    if (executionEnv.wait()) {
-        executionEnv.commit();
-    } else {
-        executionEnv.cancel();
-    }
-    timer->unlock();
-
-    return;
-}
-
-/** \brief  Sets which effect was called last
-    \param in_effect  The effect that has been called
-    
-    This function sets the static variable \c _last_effect and it
-    ensures that the last effect verb is sensitive.
-
-    If the \c in_effect variable is \c NULL then the last effect
-    verb is made insesitive.
-*/
-void
-Effect::set_last_effect (Effect * in_effect)
-{
-    gchar const * verb_id = in_effect->get_verb()->get_id();
-    gchar const * help_id_prefix = "org.inkscape.help.";
-
-    // We don't want these "effects" to register as the last effect,
-    // this wouldn't be helpful to the user who selects a real effect,
-    // then goes to the help file (implemented as an effect), then goes
-    // back to the effect, only to see it written over by the help file
-    // selection.
-
-    // This snippet should fix this bug:
-    // https://bugs.launchpad.net/inkscape/+bug/600671
-    if (strncmp(verb_id, help_id_prefix, strlen(help_id_prefix)) == 0) return;
-
-    if (in_effect == NULL) {
-        Inkscape::Verb::get(SP_VERB_EFFECT_LAST)->sensitive(NULL, false);
-        Inkscape::Verb::get(SP_VERB_EFFECT_LAST_PREF)->sensitive(NULL, false);
-    } else if (_last_effect == NULL) {
-        Inkscape::Verb::get(SP_VERB_EFFECT_LAST)->sensitive(NULL, true);
-        Inkscape::Verb::get(SP_VERB_EFFECT_LAST_PREF)->sensitive(NULL, true);
-    }
-
-    _last_effect = in_effect;
-    return;
-}
-
-Inkscape::XML::Node *
-Effect::find_menu (Inkscape::XML::Node * menustruct, const gchar *name)
-{
-    if (menustruct == NULL) return false;
-    for (Inkscape::XML::Node * child = menustruct;
-            child != NULL;
-            child = child->next()) {
-        if (!strcmp(child->name(), name)) {
-            return child;
-        }
-        Inkscape::XML::Node * firstchild = child->firstChild();
-        if (firstchild != NULL) {
-            Inkscape::XML::Node *found = find_menu (firstchild, name);
-            if (found)
-                return found;
-        }
-    }
-    return NULL;
-}
-
-
-Gtk::VBox *
-Effect::get_info_widget(void)
-{
-    return Extension::get_info_widget();
-}
-
-void
-Effect::set_pref_dialog (PrefDialog * prefdialog)
-{
-    _prefDialog = prefdialog;
-    return;
-}
-
-/** \brief  Create an action for a \c EffectVerb
-    \param  view  Which view the action should be created for
-    \return The built action.
-
-    Calls \c make_action_helper with the \c vector.
-*/
-SPAction *
-Effect::EffectVerb::make_action (Inkscape::UI::View::View * view)
-{
-    return make_action_helper(view, &vector, static_cast<void *>(this));
-}
-
-/** \brief  Decode the verb code and take appropriate action */
-void
-Effect::EffectVerb::perform( SPAction *action, void * data, void */*pdata*/ )
-{
-    Inkscape::UI::View::View * current_view = sp_action_get_view(action);
-//  SPDocument * current_document = current_view->doc;
-    Effect::EffectVerb * ev = reinterpret_cast<Effect::EffectVerb *>(data);
-    Effect * effect = ev->_effect;
-
-    if (effect == NULL) return;
-    if (current_view == NULL) return;
-
-    if (ev->_showPrefs) {
-        effect->prefs(current_view);
-    } else {
-        effect->effect(current_view);
-    }
-
-    return;
-}
-
-/**
- * Action vector to define functions called if a staticly defined file verb
- * is called.
- */
-SPActionEventVector Effect::EffectVerb::vector =
-            {{NULL}, Effect::EffectVerb::perform, NULL, NULL, NULL, NULL};
-
-
-} }  /* namespace Inkscape, Extension */
-
-/*
-  Local Variables:
-  mode:c++
-  c-file-style:"stroustrup"
-  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
-  indent-tabs-mode:nil
-  fill-column:99
-  End:
-*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 :
 
=== removed file '.pc/0004-Fix_FTBFS_on_gcc-4.8.patch/src/gradient-drag.cpp'
--- .pc/0004-Fix_FTBFS_on_gcc-4.8.patch/src/gradient-drag.cpp	2013-07-02 17:25:52 +0000
+++ .pc/0004-Fix_FTBFS_on_gcc-4.8.patch/src/gradient-drag.cpp	1970-01-01 00:00:00 +0000
@@ -1,2216 +0,0 @@
-/*
- * On-canvas gradient dragging
- *
- * Authors:
- *   bulia byak <[e-mail]>
- *   Johan Engelen <[e-mail]>
- *   Jon A. Cruz <[e-mail]>
- *
- * Copyright (C) 2007 Johan Engelen
- * Copyright (C) 2005,2010 Authors
- *
- * Released under GNU GPL, read the file 'COPYING' for more information
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <glibmm/i18n.h>
-#include <cstring>
-#include <string>
-
-#include "desktop-handles.h"
-#include "selection.h"
-#include "desktop.h"
-#include "desktop-style.h"
-#include "document.h"
-#include "display/sp-ctrlline.h"
-#include "display/sp-canvas-util.h"
-#include "xml/repr.h"
-#include "svg/css-ostringstream.h"
-#include "svg/svg.h"
-#include "libnr/nr-point-fns.h"
-#include "preferences.h"
-#include "sp-item.h"
-#include "style.h"
-#include "knot.h"
-#include "sp-linear-gradient.h"
-#include "sp-radial-gradient.h"
-#include "gradient-chemistry.h"
-#include "gradient-drag.h"
-#include "sp-stop.h"
-#include "snap.h"
-#include "sp-namedview.h"
-#include "selection-chemistry.h"
-
-#define GR_KNOT_COLOR_NORMAL 0xffffff00
-#define GR_KNOT_COLOR_MOUSEOVER 0xff000000
-#define GR_KNOT_COLOR_SELECTED 0x0000ff00
-
-#define GR_LINE_COLOR_FILL 0x0000ff7f
-#define GR_LINE_COLOR_STROKE 0x9999007f
-
-// screen pixels between knots when they snap:
-#define SNAP_DIST 5
-
-// absolute distance between gradient points for them to become a single dragger when the drag is created:
-#define MERGE_DIST 0.1
-
-// knot shapes corresponding to GrPointType enum
-SPKnotShapeType gr_knot_shapes [] = {
-        SP_KNOT_SHAPE_SQUARE, //POINT_LG_BEGIN
-        SP_KNOT_SHAPE_CIRCLE,  //POINT_LG_END
-        SP_KNOT_SHAPE_DIAMOND, //POINT_LG_MID
-        SP_KNOT_SHAPE_SQUARE,  // POINT_RG_CENTER
-        SP_KNOT_SHAPE_CIRCLE,  // POINT_RG_R1
-        SP_KNOT_SHAPE_CIRCLE,  // POINT_RG_R2
-        SP_KNOT_SHAPE_CROSS, // POINT_RG_FOCUS
-        SP_KNOT_SHAPE_DIAMOND, //POINT_RG_MID1
-        SP_KNOT_SHAPE_DIAMOND //POINT_RG_MID2
-};
-
-const gchar *gr_knot_descr [] = {
-    N_("Linear gradient <b>start</b>"), //POINT_LG_BEGIN
-    N_("Linear gradient <b>end</b>"),
-    N_("Linear gradient <b>mid stop</b>"),
-    N_("Radial gradient <b>center</b>"),
-    N_("Radial gradient <b>radius</b>"),
-    N_("Radial gradient <b>radius</b>"),
-    N_("Radial gradient <b>focus</b>"), // POINT_RG_FOCUS
-    N_("Radial gradient <b>mid stop</b>"),
-    N_("Radial gradient <b>mid stop</b>")
-};
-
-static void
-gr_drag_sel_changed(Inkscape::Selection */*selection*/, gpointer data)
-{
-    GrDrag *drag = (GrDrag *) data;
-    drag->updateDraggers ();
-    drag->updateLines ();
-    drag->updateLevels ();
-}
-
-static void
-gr_drag_sel_modified (Inkscape::Selection */*selection*/, guint /*flags*/, gpointer data)
-{
-    GrDrag *drag = (GrDrag *) data;
-    if (drag->local_change) {
-        drag->local_change = false;
-    } else {
-        drag->updateDraggers ();
-    }
-    drag->updateLines ();
-    drag->updateLevels ();
-}
-
-/**
-When a _query_style_signal is received, check that \a property requests fill/stroke/opacity (otherwise
-skip), and fill the \a style with the averaged color of all draggables of the selected dragger, if
-any.
-*/
-int
-gr_drag_style_query (SPStyle *style, int property, gpointer data)
-{
-    GrDrag *drag = (GrDrag *) data;
-
-    if (property != QUERY_STYLE_PROPERTY_FILL && property != QUERY_STYLE_PROPERTY_STROKE && property != QUERY_STYLE_PROPERTY_MASTEROPACITY) {
-        return QUERY_STYLE_NOTHING;
-    }
-
-    if (!drag->selected) {
-        return QUERY_STYLE_NOTHING;
-    } else {
-        int ret = QUERY_STYLE_NOTHING;
-
-        float cf[4];
-        cf[0] = cf[1] = cf[2] = cf[3] = 0;
-
-        int count = 0;
-
-        for (GList *i = drag->selected; i != NULL; i = i->next) { // for all selected draggers
-            GrDragger *d = (GrDragger *) i->data;
-            for (GSList const* j = d->draggables; j != NULL; j = j->next) { // for all draggables of dragger
-                GrDraggable *draggable = (GrDraggable *) j->data;
-
-                if (ret == QUERY_STYLE_NOTHING) {
-                    ret = QUERY_STYLE_SINGLE;
-                } else if (ret == QUERY_STYLE_SINGLE) {
-                    ret = QUERY_STYLE_MULTIPLE_AVERAGED;
-                }
-
-                guint32 c = sp_item_gradient_stop_query_style (draggable->item, draggable->point_type, draggable->point_i, draggable->fill_or_stroke);
-                cf[0] += SP_RGBA32_R_F (c);
-                cf[1] += SP_RGBA32_G_F (c);
-                cf[2] += SP_RGBA32_B_F (c);
-                cf[3] += SP_RGBA32_A_F (c);
-
-                count ++;
-            }
-        }
-
-        if (count) {
-            cf[0] /= count;
-            cf[1] /= count;
-            cf[2] /= count;
-            cf[3] /= count;
-
-            // set both fill and stroke with our stop-color and stop-opacity
-            style->fill.clear();
-            style->fill.setColor( cf[0], cf[1], cf[2] );
-            style->fill.set = TRUE;
-            style->stroke.clear();
-            style->stroke.setColor( cf[0], cf[1], cf[2] );
-            style->stroke.set = TRUE;
-
-            style->fill_opacity.value = SP_SCALE24_FROM_FLOAT (1.0);
-            style->fill_opacity.set = TRUE;
-            style->stroke_opacity.value = SP_SCALE24_FROM_FLOAT (1.0);
-            style->stroke_opacity.set = TRUE;
-
-            style->opacity.value = SP_SCALE24_FROM_FLOAT (cf[3]);
-            style->opacity.set = TRUE;
-        }
-
-        return ret;
-    }
-}
-
-Glib::ustring GrDrag::makeStopSafeColor( gchar const *str, bool &isNull )
-{
-    Glib::ustring colorStr;
-    if ( str ) {
-        isNull = false;
-        colorStr = str;
-        Glib::ustring::size_type pos = colorStr.find("url(#");
-        if ( pos != Glib::ustring::npos ) {
-            Glib::ustring targetName = colorStr.substr(pos + 5, colorStr.length() - 6);
-            const GSList *gradients = sp_document_get_resource_list(desktop->doc(), "gradient");
-            for (const GSList *item = gradients; item; item = item->next) {
-                SPGradient* grad = SP_GRADIENT(item->data);
-                if ( targetName == grad->getId() ) {
-                    SPGradient *vect = grad->getVector();
-                    SPStop *firstStop = (vect) ? vect->getFirstStop() : grad->getFirstStop();
-                    if (firstStop) {
-                        Glib::ustring stopColorStr;
-                        if (firstStop->currentColor) {
-                            stopColorStr = sp_object_get_style_property(firstStop, "color", NULL);
-                        } else {
-                            stopColorStr = firstStop->specified_color.toString();
-                        }
-                        if ( !stopColorStr.empty() ) {
-                            colorStr = stopColorStr;
-                        }
-                    }
-                    break;
-                }
-            }
-        }
-    } else {
-        isNull = true;
-    }
-
-    return colorStr;
-}
-
-bool GrDrag::styleSet( const SPCSSAttr *css )
-{
-    if (!selected) {
-        return false;
-    }
-
-    SPCSSAttr *stop = sp_repr_css_attr_new();
-
-    // See if the css contains interesting properties, and if so, translate them into the format
-    // acceptable for gradient stops
-
-    // any of color properties, in order of increasing priority:
-    if (css->attribute("flood-color")) {
-        sp_repr_css_set_property (stop, "stop-color", css->attribute("flood-color"));
-    }
-
-    if (css->attribute("lighting-color")) {
-        sp_repr_css_set_property (stop, "stop-color", css->attribute("lighting-color"));
-    }
-
-    if (css->attribute("color")) {
-        sp_repr_css_set_property (stop, "stop-color", css->attribute("color"));
-    }
-
-    if (css->attribute("stroke") && strcmp(css->attribute("stroke"), "none")) {
-        sp_repr_css_set_property (stop, "stop-color", css->attribute("stroke"));
-    }
-
-    if (css->attribute("fill") && strcmp(css->attribute("fill"), "none")) {
-        sp_repr_css_set_property (stop, "stop-color", css->attribute("fill"));
-    }
-
-    if (css->attribute("stop-color")) {
-        sp_repr_css_set_property (stop, "stop-color", css->attribute("stop-color"));
-    }
-
-    // Make sure the style is allowed for gradient stops.
-    if ( !sp_repr_css_property_is_unset( stop, "stop-color") ) {
-        bool stopIsNull = false;
-        Glib::ustring tmp = makeStopSafeColor( sp_repr_css_property( stop, "stop-color", "" ), stopIsNull );
-        if ( !stopIsNull && !tmp.empty() ) {
-            sp_repr_css_set_property( stop, "stop-color", tmp.c_str() );
-        }
-    }
-
-
-    if (css->attribute("stop-opacity")) { // direct setting of stop-opacity has priority
-        sp_repr_css_set_property(stop, "stop-opacity", css->attribute("stop-opacity"));
-    } else {  // multiply all opacity properties:
-        gdouble accumulated = 1.0;
-        accumulated *= sp_svg_read_percentage(css->attribute("flood-opacity"), 1.0);
-        accumulated *= sp_svg_read_percentage(css->attribute("opacity"), 1.0);
-        accumulated *= sp_svg_read_percentage(css->attribute("stroke-opacity"), 1.0);
-        accumulated *= sp_svg_read_percentage(css->attribute("fill-opacity"), 1.0);
-
-        Inkscape::CSSOStringStream os;
-        os << accumulated;
-        sp_repr_css_set_property(stop, "stop-opacity", os.str().c_str());
-
-        if ((css->attribute("fill") && !css->attribute("stroke") && !strcmp(css->attribute("fill"), "none")) ||
-            (css->attribute("stroke") && !css->attribute("fill") && !strcmp(css->attribute("stroke"), "none"))) {
-            sp_repr_css_set_property(stop, "stop-opacity", "0"); // if a single fill/stroke property is set to none, don't change color, set opacity to 0
-        }
-    }
-
-    if (!stop->attributeList()) { // nothing for us here, pass it on
-        sp_repr_css_attr_unref(stop);
-        return false;
-    }
-
-    for (GList const* sel = selected; sel != NULL; sel = sel->next) { // for all selected draggers
-        GrDragger* dragger = reinterpret_cast<GrDragger*>(sel->data);
-        for (GSList const* i = dragger->draggables; i != NULL; i = i->next) { // for all draggables of dragger
-            GrDraggable *draggable = reinterpret_cast<GrDraggable *>(i->data);
-
-            local_change = true;
-            sp_item_gradient_stop_set_style(draggable->item, draggable->point_type, draggable->point_i, draggable->fill_or_stroke, stop);
-        }
-    }
-
-    //sp_repr_css_print(stop);
-    sp_repr_css_attr_unref(stop);
-    return true;
-}
-
-guint32 GrDrag::getColor()
-{
-    if (!selected) return 0;
-
-    float cf[4];
-    cf[0] = cf[1] = cf[2] = cf[3] = 0;
-
-    int count = 0;
-
-    for (GList *i = selected; i != NULL; i = i->next) { // for all selected draggers
-        GrDragger *d = (GrDragger *) i->data;
-        for (GSList const* j = d->draggables; j != NULL; j = j->next) { // for all draggables of dragger
-            GrDraggable *draggable = (GrDraggable *) j->data;
-
-            guint32 c = sp_item_gradient_stop_query_style (draggable->item, draggable->point_type, draggable->point_i, draggable->fill_or_stroke);
-            cf[0] += SP_RGBA32_R_F (c);
-            cf[1] += SP_RGBA32_G_F (c);
-            cf[2] += SP_RGBA32_B_F (c);
-            cf[3] += SP_RGBA32_A_F (c);
-
-            count ++;
-        }
-    }
-
-    if (count) {
-        cf[0] /= count;
-        cf[1] /= count;
-        cf[2] /= count;
-        cf[3] /= count;
-    }
-
-    return SP_RGBA32_F_COMPOSE(cf[0], cf[1], cf[2], cf[3]);
-}
-
-SPStop *
-GrDrag::addStopNearPoint (SPItem *item, Geom::Point mouse_p, double tolerance)
-{
-    gfloat offset; // type of SPStop.offset = gfloat
-    SPGradient *gradient;
-    bool fill_or_stroke = true;
-    bool r1_knot = false;
-
-    bool addknot = false;
-    do {
-        gradient = sp_item_gradient (item, fill_or_stroke);
-        if (SP_IS_LINEARGRADIENT(gradient)) {
-            Geom::Point begin   = sp_item_gradient_get_coords(item, POINT_LG_BEGIN, 0, fill_or_stroke);
-            Geom::Point end     = sp_item_gradient_get_coords(item, POINT_LG_END, 0, fill_or_stroke);
-
-            Geom::Point nearest = snap_vector_midpoint (mouse_p, begin, end, 0);
-            double dist_screen = Geom::L2 (mouse_p - nearest);
-            if ( dist_screen < tolerance ) {
-                // add the knot
-                offset = get_offset_between_points(nearest, begin, end);
-                addknot = true;
-                break; // break out of the while loop: add only one knot
-            }
-        } else if (SP_IS_RADIALGRADIENT(gradient)) {
-            Geom::Point begin = sp_item_gradient_get_coords(item, POINT_RG_CENTER, 0, fill_or_stroke);
-            Geom::Point end   = sp_item_gradient_get_coords(item, POINT_RG_R1, 0, fill_or_stroke);
-            Geom::Point nearest = snap_vector_midpoint (mouse_p, begin, end, 0);
-            double dist_screen = Geom::L2 (mouse_p - nearest);
-            if ( dist_screen < tolerance ) {
-                offset = get_offset_between_points(nearest, begin, end);
-                addknot = true;
-                r1_knot = true;
-                break; // break out of the while loop: add only one knot
-            }
-
-            end    = sp_item_gradient_get_coords(item, POINT_RG_R2, 0, fill_or_stroke);
-            nearest = snap_vector_midpoint (mouse_p, begin, end, 0);
-            dist_screen = Geom::L2 (mouse_p - nearest);
-            if ( dist_screen < tolerance ) {
-                offset = get_offset_between_points(nearest, begin, end);
-                addknot = true;
-                r1_knot = false;
-                break; // break out of the while loop: add only one knot
-            }
-        }
-        fill_or_stroke = !fill_or_stroke;
-    } while (!fill_or_stroke && !addknot) ;
-
-    if (addknot) {
-        SPGradient *vector = sp_gradient_get_forked_vector_if_necessary (gradient, false);
-        SPStop* prev_stop = vector->getFirstStop();
-        SPStop* next_stop = prev_stop->getNextStop();
-        guint i = 1;
-        while ( (next_stop) && (next_stop->offset < offset) ) {
-            prev_stop = next_stop;
-            next_stop = next_stop->getNextStop();
-            i++;
-        }
-        if (!next_stop) {
-            // logical error: the endstop should have offset 1 and should always be more than this offset here
-            return NULL;
-        }
-
-
-        SPStop *newstop = sp_vector_add_stop (vector, prev_stop, next_stop, offset);
-        gradient->ensureVector();
-        updateDraggers();
-
-        return newstop;
-    }
-
-    return NULL;
-}
-
-
-bool
-GrDrag::dropColor(SPItem */*item*/, gchar const *c, Geom::Point p)
-{
-    // Note: not sure if a null pointer can come in for the style, but handle that just in case
-    bool stopIsNull = false;
-    Glib::ustring toUse = makeStopSafeColor( c, stopIsNull );
-
-    // first, see if we can drop onto one of the existing draggers
-    for (GList *i = draggers; i != NULL; i = i->next) { // for all draggables of dragger
-        GrDragger *d = (GrDragger *) i->data;
-
-        if (Geom::L2(p - d->point)*desktop->current_zoom() < 5) {
-           SPCSSAttr *stop = sp_repr_css_attr_new ();
-           sp_repr_css_set_property( stop, "stop-color", stopIsNull ? 0 : toUse.c_str() );
-           sp_repr_css_set_property( stop, "stop-opacity", "1" );
-           for (GSList *j = d->draggables; j != NULL; j = j->next) { // for all draggables of dragger
-               GrDraggable *draggable = (GrDraggable *) j->data;
-               local_change = true;
-               sp_item_gradient_stop_set_style (draggable->item, draggable->point_type, draggable->point_i, draggable->fill_or_stroke, stop);
-           }
-           sp_repr_css_attr_unref(stop);
-           return true;
-        }
-    }
-
-    // now see if we're over line and create a new stop
-    bool over_line = false;
-    SPCtrlLine *line = NULL;
-    if (lines) {
-        for (GSList *l = lines; (l != NULL) && (!over_line); l = l->next) {
-            line = (SPCtrlLine*) l->data;
-            Geom::Point nearest = snap_vector_midpoint (p, line->s, line->e, 0);
-            double dist_screen = Geom::L2 (p - nearest) * desktop->current_zoom();
-            if (line->item && dist_screen < 5) {
-                SPStop *stop = addStopNearPoint (line->item, p, 5/desktop->current_zoom());
-                if (stop) {
-                    SPCSSAttr *css = sp_repr_css_attr_new ();
-                    sp_repr_css_set_property( css, "stop-color", stopIsNull ? 0 : toUse.c_str() );
-                    sp_repr_css_set_property( css, "stop-opacity", "1" );
-                    sp_repr_css_change (SP_OBJECT_REPR (stop), css, "style");
-                    return true;
-                }
-            }
-        }
-    }
-
-    return false;
-}
-
-
-GrDrag::GrDrag(SPDesktop *desktop) :
-    selected(0),
-    keep_selection(false),
-    local_change(false),
-    desktop(desktop),
-    hor_levels(),
-    vert_levels(),
-    draggers(0),
-    lines(0),
-    selection(sp_desktop_selection(desktop)),
-    sel_changed_connection(),
-    sel_modified_connection(),
-    style_set_connection(),
-    style_query_connection()
-{
-    sel_changed_connection = selection->connectChanged(
-        sigc::bind(
-            sigc::ptr_fun(&gr_drag_sel_changed),
-            (gpointer)this )
-
-        );
-    sel_modified_connection = selection->connectModified(
-        sigc::bind(
-            sigc::ptr_fun(&gr_drag_sel_modified),
-            (gpointer)this )
-        );
-
-    style_set_connection = desktop->connectSetStyle( sigc::mem_fun(*this, &GrDrag::styleSet) );
-
-    style_query_connection = desktop->connectQueryStyle(
-        sigc::bind(
-            sigc::ptr_fun(&gr_drag_style_query),
-            (gpointer)this )
-        );
-
-    updateDraggers();
-    updateLines();
-    updateLevels();
-
-    if (desktop->gr_item) {
-        setSelected(getDraggerFor(desktop->gr_item, desktop->gr_point_type, desktop->gr_point_i, desktop->gr_fill_or_stroke));
-    }
-}
-
-GrDrag::~GrDrag()
-{
-    this->sel_changed_connection.disconnect();
-    this->sel_modified_connection.disconnect();
-    this->style_set_connection.disconnect();
-    this->style_query_connection.disconnect();
-
-    if (this->selected) {
-        GrDraggable *draggable = (GrDraggable *)   ((GrDragger*)this->selected->data)->draggables->data;
-        desktop->gr_item = draggable->item;
-        desktop->gr_point_type = draggable->point_type;
-        desktop->gr_point_i = draggable->point_i;
-        desktop->gr_fill_or_stroke = draggable->fill_or_stroke;
-    } else {
-        desktop->gr_item = NULL;
-        desktop->gr_point_type = 0;
-        desktop->gr_point_i = 0;
-        desktop->gr_fill_or_stroke = true;
-    }
-
-    deselect_all();
-    for (GList *l = this->draggers; l != NULL; l = l->next) {
-        delete ((GrDragger *) l->data);
-    }
-    g_list_free (this->draggers);
-    this->draggers = NULL;
-    this->selected = NULL;
-
-    for (GSList *l = this->lines; l != NULL; l = l->next) {
-        gtk_object_destroy( GTK_OBJECT (l->data));
-    }
-    g_slist_free (this->lines);
-    this->lines = NULL;
-}
-
-GrDraggable::GrDraggable (SPItem *item, guint point_type, guint point_i, bool fill_or_stroke)
-{
-    this->item = item;
-    this->point_type = point_type;
-    this->point_i = point_i;
-    this->fill_or_stroke = fill_or_stroke;
-
-    g_object_ref (G_OBJECT (this->item));
-}
-
-GrDraggable::~GrDraggable ()
-{
-    g_object_unref (G_OBJECT (this->item));
-}
-
-
-SPObject *GrDraggable::getServer()
-{
-    if (!item) {
-        return NULL;
-    }
-
-    SPObject *server = NULL;
-    if (fill_or_stroke) {
-        server = item->style->getFillPaintServer();
-    }else {
-        server = item->style->getStrokePaintServer();
-    }
-
-    return server;
-}
-
-static
-boost::optional<Geom::Point>
-get_snap_vector (Geom::Point p, Geom::Point o, double snap, double initial)
-{
-    double r = L2 (p - o);
-    if (r < 1e-3) {
-        return boost::optional<Geom::Point>();
-    }
-
-    double angle = atan2 (p - o);
-    // snap angle to snaps increments, starting from initial:
-    double a_snapped = initial + floor((angle - initial)/snap + 0.5) * snap;
-    // calculate the new position and subtract p to get the vector:
-    return (o + r * Geom::Point(cos(a_snapped), sin(a_snapped)) - p);
-}
-
-static void
-gr_knot_moved_handler(SPKnot *knot, Geom::Point const &ppointer, guint state, gpointer data)
-{
-    GrDragger *dragger = (GrDragger *) data;
-    GrDrag *drag = dragger->parent;
-
-    Geom::Point p = ppointer;
-
-    SPDesktop *desktop = dragger->parent->desktop;
-    SnapManager &m = desktop->namedview->snap_manager;
-    double snap_dist = m.snapprefs.getObjectTolerance() / dragger->parent->desktop->current_zoom();
-
-    if (state & GDK_SHIFT_MASK) {
-        // with Shift; unsnap if we carry more than one draggable
-        if (dragger->draggables && dragger->draggables->next) {
-            // create a new dragger
-            GrDragger *dr_new = new GrDragger (dragger->parent, dragger->point, NULL);
-            dragger->parent->draggers = g_list_prepend (dragger->parent->draggers, dr_new);
-            // relink to it all but the first draggable in the list
-            for (GSList const* i = dragger->draggables->next; i != NULL; i = i->next) {
-                GrDraggable *draggable = (GrDraggable *) i->data;
-                dr_new->addDraggable (draggable);
-            }
-            dr_new->updateKnotShape();
-            g_slist_free (dragger->draggables->next);
-            dragger->draggables->next = NULL;
-            dragger->updateKnotShape();
-            dragger->updateTip();
-        }
-    } else if (!(state & GDK_CONTROL_MASK)) {
-        // without Shift or Ctrl; see if we need to snap to another dragger
-        for (GList *di = dragger->parent->draggers; di != NULL; di = di->next) {
-            GrDragger *d_new = (GrDragger *) di->data;
-            if (dragger->mayMerge(d_new) && Geom::L2 (d_new->point - p) < snap_dist) {
-
-                // Merge draggers:
-                for (GSList const* i = dragger->draggables; i != NULL; i = i->next) { // for all draggables of dragger
-                    GrDraggable *draggable = (GrDraggable *) i->data;
-                    // copy draggable to d_new:
-                    GrDraggable *da_new = new GrDraggable (draggable->item, draggable->point_type, draggable->point_i, draggable->fill_or_stroke);
-                    d_new->addDraggable (da_new);
-                }
-
-                // unlink and delete this dragger
-                dragger->parent->draggers = g_list_remove (dragger->parent->draggers, dragger);
-                delete dragger;
-
-                // update the new merged dragger
-                d_new->fireDraggables(true, false, true);
-                d_new->parent->updateLines();
-                d_new->parent->setSelected (d_new);
-                d_new->updateKnotShape ();
-                d_new->updateTip ();
-                d_new->updateDependencies(true);
-                sp_document_done (sp_desktop_document (d_new->parent->desktop), SP_VERB_CONTEXT_GRADIENT,
-                                  _("Merge gradient handles"));
-                return;
-            }
-        }
-    }
-
-    m.setup(desktop);
-    if (!((state & GDK_SHIFT_MASK) || (state & GDK_CONTROL_MASK))) {
-        Inkscape::SnappedPoint s = m.freeSnap(Inkscape::SnapCandidatePoint(p, Inkscape::SNAPSOURCE_OTHER_HANDLE));
-        if (s.getSnapped()) {
-            p = s.getPoint();
-            sp_knot_moveto (knot, p);
-        }
-    } else if (state & GDK_CONTROL_MASK) {
-        SnappedConstraints sc;
-        Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-        unsigned snaps = abs(prefs->getInt("/options/rotationsnapsperpi/value", 12));
-        /* 0 means no snapping. */
-
-        for (GSList const* i = dragger->draggables; i != NULL; i = i->next) {
-            GrDraggable *draggable = (GrDraggable *) i->data;
-
-            Geom::Point dr_snap(Geom::infinity(), Geom::infinity());
-
-            if (draggable->point_type == POINT_LG_BEGIN || draggable->point_type == POINT_LG_END) {
-                for (GList *di = dragger->parent->draggers; di != NULL; di = di->next) {
-                    GrDragger *d_new = (GrDragger *) di->data;
-                    if (d_new == dragger)
-                        continue;
-                    if (d_new->isA (draggable->item,
-                                    draggable->point_type == POINT_LG_BEGIN? POINT_LG_END : POINT_LG_BEGIN,
-                                    draggable->fill_or_stroke)) {
-                        // found the other end of the linear gradient;
-                        if (state & GDK_SHIFT_MASK) {
-                            // moving linear around center
-                            Geom::Point center = Geom::Point (0.5*(d_new->point + dragger->point));
-                            dr_snap = center;
-                        } else {
-                            // moving linear around the other end
-                            dr_snap = d_new->point;
-                        }
-                    }
-                }
-            } else if (draggable->point_type == POINT_RG_R1 || draggable->point_type == POINT_RG_R2 || draggable->point_type == POINT_RG_FOCUS) {
-                for (GList *di = dragger->parent->draggers; di != NULL; di = di->next) {
-                    GrDragger *d_new = (GrDragger *) di->data;
-                    if (d_new == dragger)
-                        continue;
-                    if (d_new->isA (draggable->item,
-                                    POINT_RG_CENTER,
-                                    draggable->fill_or_stroke)) {
-                        // found the center of the radial gradient;
-                        dr_snap = d_new->point;
-                    }
-                }
-            } else if (draggable->point_type == POINT_RG_CENTER) {
-                // radial center snaps to hor/vert relative to its original position
-                dr_snap = dragger->point_original;
-            }
-
-            boost::optional<Geom::Point> snap_vector;
-            if (dr_snap.isFinite()) {
-                if (state & GDK_MOD1_MASK) {
-                    // with Alt, snap to the original angle and its perpendiculars
-                    snap_vector = get_snap_vector (p, dr_snap, M_PI/2, Geom::atan2 (dragger->point_original - dr_snap));
-                } else {
-                    // with Ctrl, snap to M_PI/snaps
-                    snap_vector = get_snap_vector (p, dr_snap, M_PI/snaps, 0);
-                }
-                if (snap_vector) {
-                    Inkscape::Snapper::ConstraintLine cl(dr_snap, p + *snap_vector - dr_snap);
-                    Inkscape::SnappedPoint s = m.constrainedSnap(Inkscape::SnapCandidatePoint(p + *snap_vector, Inkscape::SNAPSOURCE_OTHER_HANDLE), cl);
-                    if (s.getSnapped()) {
-                        s.setTransformation(s.getPoint() - p);
-                        sc.points.push_back(s);
-                    } else {
-                        Inkscape::SnappedPoint dummy(p + *snap_vector, Inkscape::SNAPSOURCE_OTHER_HANDLE, 0, Inkscape::SNAPTARGET_CONSTRAINED_ANGLE, Geom::L2(*snap_vector), 10000, true, true, false);
-                        dummy.setTransformation(*snap_vector);
-                        sc.points.push_back(dummy);
-                    }
-                }
-            }
-        }
-
-        Inkscape::SnappedPoint bsp = m.findBestSnap(Inkscape::SnapCandidatePoint(p, Inkscape::SNAPSOURCE_OTHER_HANDLE), sc, true); // snap indicator will be displayed if needed
-
-        if (bsp.getSnapped()) {
-            p += bsp.getTransformation();
-            sp_knot_moveto (knot, p);
-        }
-    }
-
-    drag->keep_selection = (bool) g_list_find(drag->selected, dragger);
-    bool scale_radial = (state & GDK_CONTROL_MASK) && (state & GDK_SHIFT_MASK);
-
-    if (drag->keep_selection) {
-        Geom::Point diff = p - dragger->point;
-        drag->selected_move_nowrite (diff[Geom::X], diff[Geom::Y], scale_radial);
-    } else {
-        dragger->point = p;
-        dragger->fireDraggables (false, scale_radial);
-        dragger->updateDependencies(false);
-    }
-
-}
-
-
-static void
-gr_midpoint_limits(GrDragger *dragger, SPObject *server, Geom::Point *begin, Geom::Point *end, Geom::Point *low_lim, Geom::Point *high_lim, GSList **moving)
-{
-
-    GrDrag *drag = dragger->parent;
-    // a midpoint dragger can (logically) only contain one GrDraggable
-    GrDraggable *draggable = (GrDraggable *) dragger->draggables->data;
-
-    // get begin and end points between which dragging is allowed:
-    // the draglimits are between knot(lowest_i - 1) and knot(highest_i + 1)
-    *moving = g_slist_append(*moving, dragger);
-
-    guint lowest_i = draggable->point_i;
-    guint highest_i = draggable->point_i;
-    GrDragger *lowest_dragger = dragger;
-    GrDragger *highest_dragger = dragger;
-    if (dragger->isSelected()) {
-        GrDragger* d_add;
-        while ( true )
-        {
-            d_add = drag->getDraggerFor(draggable->item, draggable->point_type, lowest_i - 1, draggable->fill_or_stroke);
-            if ( d_add && g_list_find(drag->selected, d_add) ) {
-                lowest_i = lowest_i - 1;
-                *moving = g_slist_prepend(*moving, d_add);
-                lowest_dragger = d_add;
-            } else {
-                break;
-            }
-        }
-
-        while ( true )
-        {
-            d_add = drag->getDraggerFor(draggable->item, draggable->point_type, highest_i + 1, draggable->fill_or_stroke);
-            if ( d_add && g_list_find(drag->selected, d_add) ) {
-                highest_i = highest_i + 1;