From 8073924aacdda310fb7492750f78d5389b3186af Mon Sep 17 00:00:00 2001
From: Markus Engel <markus.engel@tum.de>
Date: Fri, 5 Apr 2013 22:45:01 +0200
Subject: Merged Item.

(bzr r11608.1.81)
---
 src/gradient-drag.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/gradient-drag.cpp')

diff --git a/src/gradient-drag.cpp b/src/gradient-drag.cpp
index 65b26937b..a1bc97888 100644
--- a/src/gradient-drag.cpp
+++ b/src/gradient-drag.cpp
@@ -1415,7 +1415,7 @@ void GrDragger::updateTip()
 
     if (g_slist_length (this->draggables) == 1) {
         GrDraggable *draggable = (GrDraggable *) this->draggables->data;
-        char *item_desc = draggable->item->description();
+        char *item_desc = draggable->item->getDetailedDescription();
         switch (draggable->point_type) {
             case POINT_LG_MID:
             case POINT_RG_MID1:
-- 
cgit v1.2.3


From 9fd15efa4ab3302f3f9d7c7473a5377af314021c Mon Sep 17 00:00:00 2001
From: Markus Engel <markus.engel@tum.de>
Date: Mon, 8 Apr 2013 21:01:11 +0200
Subject: Reactivated independent reference counting in the SPObject tree.

(bzr r11608.1.88)
---
 src/gradient-drag.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/gradient-drag.cpp')

diff --git a/src/gradient-drag.cpp b/src/gradient-drag.cpp
index a1bc97888..fb58aa508 100644
--- a/src/gradient-drag.cpp
+++ b/src/gradient-drag.cpp
@@ -709,12 +709,14 @@ GrDraggable::GrDraggable(SPItem *item, GrPointType point_type, guint point_i, In
     point_i(point_i),
     fill_or_stroke(fill_or_stroke)
 {
-    g_object_ref(G_OBJECT(item));
+    //g_object_ref(G_OBJECT(item));
+	sp_object_ref(item);
 }
 
 GrDraggable::~GrDraggable()
 {
-    g_object_unref (G_OBJECT (this->item));
+    //g_object_unref (G_OBJECT (this->item));
+	sp_object_unref(this->item);
 }
 
 
-- 
cgit v1.2.3


From 0d4a38635fc26ed09d56b46e462b373489c8a4e2 Mon Sep 17 00:00:00 2001
From: Alex Valavanis <valavanisalex@gmail.com>
Date: Sat, 21 Sep 2013 11:42:33 +0100
Subject: Fix format security errors

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

(bzr r12563)
---
 src/gradient-drag.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/gradient-drag.cpp')

diff --git a/src/gradient-drag.cpp b/src/gradient-drag.cpp
index fb58aa508..096b2b47b 100644
--- a/src/gradient-drag.cpp
+++ b/src/gradient-drag.cpp
@@ -1438,7 +1438,7 @@ void GrDragger::updateTip()
         }
         g_free(item_desc);
     } else if (g_slist_length (draggables) == 2 && isA (POINT_RG_CENTER) && isA (POINT_RG_FOCUS)) {
-        this->knot->tip = g_strdup_printf (_("Radial gradient <b>center</b> and <b>focus</b>; drag with <b>Shift</b> to separate focus"));
+        this->knot->tip = g_strdup_printf ("%s", _("Radial gradient <b>center</b> and <b>focus</b>; drag with <b>Shift</b> to separate focus"));
     } else {
         int length = g_slist_length (this->draggables);
         this->knot->tip = g_strdup_printf (ngettext("Gradient point shared by <b>%d</b> gradient; drag with <b>Shift</b> to separate",
-- 
cgit v1.2.3


From 6f65ca557f8ad953b55b9a703643bbc790eb8da5 Mon Sep 17 00:00:00 2001
From: Martin Owens <doctormo@gmail.com>
Date: Tue, 24 Sep 2013 11:09:43 -0400
Subject: change names for displayName and detailedDescription, improve char
 code and remove const.

(bzr r12584)
---
 src/gradient-drag.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/gradient-drag.cpp')

diff --git a/src/gradient-drag.cpp b/src/gradient-drag.cpp
index 096b2b47b..b3622107b 100644
--- a/src/gradient-drag.cpp
+++ b/src/gradient-drag.cpp
@@ -1417,7 +1417,7 @@ void GrDragger::updateTip()
 
     if (g_slist_length (this->draggables) == 1) {
         GrDraggable *draggable = (GrDraggable *) this->draggables->data;
-        char *item_desc = draggable->item->getDetailedDescription();
+        char *item_desc = draggable->item->detailedDescription();
         switch (draggable->point_type) {
             case POINT_LG_MID:
             case POINT_RG_MID1:
-- 
cgit v1.2.3


From af8374a9745905bde55e5b19425bf95b2fd3f935 Mon Sep 17 00:00:00 2001
From: Kris De Gussem <kris.degussem@gmail.com>
Date: Wed, 16 Oct 2013 21:47:12 +0200
Subject: static code analysis: performance

(bzr r12695)
---
 src/gradient-drag.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/gradient-drag.cpp')

diff --git a/src/gradient-drag.cpp b/src/gradient-drag.cpp
index b3622107b..0b250fe52 100644
--- a/src/gradient-drag.cpp
+++ b/src/gradient-drag.cpp
@@ -879,7 +879,7 @@ static void gr_knot_moved_handler(SPKnot *knot, Geom::Point const &ppointer, gui
         if (!bsp.getSnapped()) {
             // If we didn't truly snap to an object or to a grid, then we will still have to look for the
             // closest projection onto one of the constraints. findBestSnap() will not do this for us
-            for (std::list<Inkscape::SnappedPoint>::const_iterator i = isr.points.begin(); i != isr.points.end(); i++) {
+            for (std::list<Inkscape::SnappedPoint>::const_iterator i = isr.points.begin(); i != isr.points.end(); ++i) {
                 if (i == isr.points.begin() || (Geom::L2((*i).getPoint() - p) < Geom::L2(bsp.getPoint() - p))) {
                     bsp.setPoint((*i).getPoint());
                     bsp.setTarget(Inkscape::SNAPTARGET_CONSTRAINED_ANGLE);
-- 
cgit v1.2.3