merged with trunk so I can build again...

(bzr r10092.1.36)

1 files changed, 23 insertions, 23 deletions

diff --git a/src/connector-context.cpp b/src/connector-context.cpp
index 27e052499..b2687e540 100644
--- a/src/connector-context.cpp
+++ b/src/connector-context.cpp
@@ -1,4 +1,4 @@
-/**
+/*
  * Connector creation tool
  *
  * Authors:
@@ -977,7 +977,7 @@ connector_handle_motion_notify(SPConnectorContext *const cc, GdkEventMotion cons
                 m.unSetup();
 
                 // Update the hidden path
-                Geom::Affine i2d = (cc->clickeditem)->i2d_affine();
+                Geom::Affine i2d ( (cc->clickeditem)->i2dt_affine() );
                 Geom::Affine d2i = i2d.inverse();
                 SPPath *path = SP_PATH(cc->clickeditem);
                 SPCurve *curve = path->original_curve ? path->original_curve : path->curve;
@@ -1306,12 +1306,12 @@ cc_connector_rerouting_finish(SPConnectorContext *const cc, Geom::Point *const p
 
         if (found) {
             if (cc->clickedhandle == cc->endpt_handle[0]) {
-                cc->clickeditem->setAttribute("inkscape:connection-start", shape_label, false);
-                cc->clickeditem->setAttribute("inkscape:connection-start-point", cpid, false);
+                cc->clickeditem->setAttribute("inkscape:connection-start", shape_label, NULL);
+                cc->clickeditem->setAttribute("inkscape:connection-start-point", cpid, NULL);
             }
             else {
-                cc->clickeditem->setAttribute("inkscape:connection-end", shape_label, false);
-                cc->clickeditem->setAttribute("inkscape:connection-end-point", cpid, false);
+                cc->clickeditem->setAttribute("inkscape:connection-end", shape_label, NULL);
+                cc->clickeditem->setAttribute("inkscape:connection-end-point", cpid, NULL);
             }
             g_free(shape_label);
         }
@@ -1451,23 +1451,23 @@ spcc_flush_white(SPConnectorContext *cc, SPCurve *gc)
 
         bool connection = false;
         cc->newconn->setAttribute( "inkscape:connector-type",
-                                   cc->isOrthogonal ? "orthogonal" : "polyline", false );
+                                   cc->isOrthogonal ? "orthogonal" : "polyline", NULL );
         cc->newconn->setAttribute( "inkscape:connector-curvature",
-                                   Glib::Ascii::dtostr(cc->curvature).c_str(), false );
+                                   Glib::Ascii::dtostr(cc->curvature).c_str(), NULL );
         if (cc->shref)
         {
-            cc->newconn->setAttribute( "inkscape:connection-start", cc->shref, false);
+            cc->newconn->setAttribute( "inkscape:connection-start", cc->shref, NULL);
             if (cc->scpid) {
-                cc->newconn->setAttribute( "inkscape:connection-start-point", cc->scpid, false);
+                cc->newconn->setAttribute( "inkscape:connection-start-point", cc->scpid, NULL);
             }
             connection = true;
         }
 
         if (cc->ehref)
         {
-            cc->newconn->setAttribute( "inkscape:connection-end", cc->ehref, false);
+            cc->newconn->setAttribute( "inkscape:connection-end", cc->ehref, NULL);
             if (cc->ecpid) {
-                cc->newconn->setAttribute( "inkscape:connection-end-point", cc->ecpid, false);
+                cc->newconn->setAttribute( "inkscape:connection-end-point", cc->ecpid, NULL);
             }
             connection = true;
         }
@@ -1607,7 +1607,7 @@ endpt_handler(SPKnot */*knot*/, GdkEvent *event, SPConnectorContext *cc)
 
                 // 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::Affine i2d = (cc->clickeditem)->i2d_affine();
+                Geom::Affine i2d = (cc->clickeditem)->i2dt_affine();
                 cc->red_curve->transform(i2d);
                 sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(cc->red_bpath), cc->red_curve);
 
@@ -1640,8 +1640,8 @@ static void cc_active_shape_add_knot(SPDesktop* desktop, SPItem* item, Connectio
                 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);
+        g_signal_connect(G_OBJECT(knot->item), "event",
+                G_CALLBACK(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;
@@ -1766,7 +1766,7 @@ 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::Affine i2d = item->i2d_affine();
+    Geom::Affine i2dt = item->i2dt_affine();
 
     if (cc->active_conn == item)
     {
@@ -1780,10 +1780,10 @@ cc_set_active_conn(SPConnectorContext *cc, SPItem *item)
         else
         {
             // Just adjust handle positions.
-            Geom::Point startpt = *(curve->first_point()) * i2d;
+            Geom::Point startpt = *(curve->first_point()) * i2dt;
             sp_knot_set_position(cc->endpt_handle[0], startpt, 0);
 
-            Geom::Point endpt = *(curve->last_point()) * i2d;
+            Geom::Point endpt = *(curve->last_point()) * i2dt;
             sp_knot_set_position(cc->endpt_handle[1], endpt, 0);
         }
 
@@ -1826,8 +1826,8 @@ cc_set_active_conn(SPConnectorContext *cc, SPItem *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);
+            g_signal_connect(G_OBJECT(knot->item), "event",
+                    G_CALLBACK(cc_generic_knot_handler), knot);
 
             cc->endpt_handle[i] = knot;
         }
@@ -1855,10 +1855,10 @@ cc_set_active_conn(SPConnectorContext *cc, SPItem *item)
         return;
     }
 
-    Geom::Point startpt = *(curve->first_point()) * i2d;
+    Geom::Point startpt = *(curve->first_point()) * i2dt;
     sp_knot_set_position(cc->endpt_handle[0], startpt, 0);
 
-    Geom::Point endpt = *(curve->last_point()) * i2d;
+    Geom::Point endpt = *(curve->last_point()) * i2dt;
     sp_knot_set_position(cc->endpt_handle[1], endpt, 0);
 
     sp_knot_show(cc->endpt_handle[0]);
@@ -1950,7 +1950,7 @@ void cc_selection_set_avoid(bool const set_avoid)
         char const *value = (set_avoid) ? "true" : NULL;
 
         if (cc_item_is_shape(item)) {
-            item->setAttribute("inkscape:connector-avoid", value, false);
+            item->setAttribute("inkscape:connector-avoid", value, NULL);
             item->avoidRef->handleSettingChange();
             changes++;
         }