From a714c688d60a3a62114591984f57f26cd41dbed9 Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Fri, 18 Mar 2016 11:23:29 +0100
Subject: Reverting 14701.

(bzr r14716.1.2)
---
 src/ui/widget/unit-tracker.cpp | 10 ----------
 src/ui/widget/unit-tracker.h   |  1 -
 2 files changed, 11 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/widget/unit-tracker.cpp b/src/ui/widget/unit-tracker.cpp
index a1501c229..c6318db25 100644
--- a/src/ui/widget/unit-tracker.cpp
+++ b/src/ui/widget/unit-tracker.cpp
@@ -12,7 +12,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "style-internal.h"
 #include "unit-tracker.h"
 #include "widgets/ege-select-one-action.h"
 
@@ -122,15 +121,6 @@ void UnitTracker::addUnit(Inkscape::Util::Unit const *u)
     gtk_list_store_set(_store, &iter, COLUMN_STRING, u ? u->abbr.c_str() : "NULL", -1);
 }
 
-void UnitTracker::prependUnit(Inkscape::Util::Unit const *u)
-{
-    GtkTreeIter iter;
-    gtk_list_store_prepend(_store, &iter);
-    gtk_list_store_set(_store, &iter, COLUMN_STRING, u ? u->abbr.c_str() : "NULL", -1);
-    /* Re-shuffle our default selection here (_active gets out of sync) */
-    setActiveUnit(_activeUnit);
-}
-
 void UnitTracker::setFullVal(GtkAdjustment *adj, gdouble val)
 {
     _priorValues[adj] = val;
diff --git a/src/ui/widget/unit-tracker.h b/src/ui/widget/unit-tracker.h
index 0fe5bda80..06245930e 100644
--- a/src/ui/widget/unit-tracker.h
+++ b/src/ui/widget/unit-tracker.h
@@ -42,7 +42,6 @@ public:
     Inkscape::Util::Unit const * getActiveUnit() const;
 
     void addUnit(Inkscape::Util::Unit const *u);
-    void prependUnit(Inkscape::Util::Unit const *u);
     void addAdjustment(GtkAdjustment *adj);
     void setFullVal(GtkAdjustment *adj, gdouble val);
 
-- 
cgit v1.2.3


From 4cce40a79ab973a3609cd5ee7666673bc2337fef Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Tue, 22 Mar 2016 14:56:36 +0100
Subject: Add line-height unit selector to text toolbar. Remove 'm' and 'ft'
 non-CSS lengths.

(bzr r14716.1.3)
---
 src/ui/widget/preferences-widget.cpp | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/widget/preferences-widget.cpp b/src/ui/widget/preferences-widget.cpp
index e906762e3..d56506d62 100644
--- a/src/ui/widget/preferences-widget.cpp
+++ b/src/ui/widget/preferences-widget.cpp
@@ -468,12 +468,8 @@ ZoomCorrRuler::on_draw(const Cairo::RefPtr<Cairo::Context>& cr) {
     Glib::ustring abbr = prefs->getString("/options/zoomcorrection/unit");
     if (abbr == "cm") {
         draw_marks(cr, 0.1, 10);
-    } else if (abbr == "ft") {
-        draw_marks(cr, 1/12.0, 12);
     } else if (abbr == "in") {
         draw_marks(cr, 0.25, 4);
-    } else if (abbr == "m") {
-        draw_marks(cr, 1/10.0, 10);
     } else if (abbr == "mm") {
         draw_marks(cr, 10, 10);
     } else if (abbr == "pc") {
-- 
cgit v1.2.3