summaryrefslogtreecommitdiffstats
path: root/src/widgets/lpe-toolbar.cpp
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2013-10-13 18:20:26 +0000
committerJabiertxof <jtx@jtx.marker.es>2013-10-13 18:20:26 +0000
commit8e30821fa53134256a47dc977e607b1949eeec33 (patch)
treed51ef233932502ef56d563ac8497483878691628 /src/widgets/lpe-toolbar.cpp
parentUpdate to trunk (diff)
parentwe don't have nondocked dialogs, so rewrite restoring dialogs on startup via ... (diff)
downloadinkscape-8e30821fa53134256a47dc977e607b1949eeec33.tar.gz
inkscape-8e30821fa53134256a47dc977e607b1949eeec33.zip
Update to trunk
(bzr r11950.1.181)
Diffstat (limited to 'src/widgets/lpe-toolbar.cpp')
-rw-r--r--src/widgets/lpe-toolbar.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/widgets/lpe-toolbar.cpp b/src/widgets/lpe-toolbar.cpp
index 922526a9f..045d7aa78 100644
--- a/src/widgets/lpe-toolbar.cpp
+++ b/src/widgets/lpe-toolbar.cpp
@@ -198,9 +198,9 @@ static void lpetool_toggle_show_measuring_info(GtkToggleAction *act, GObject *tb
static void lpetool_unit_changed(GtkAction* /*act*/, GObject* tbl)
{
UnitTracker* tracker = reinterpret_cast<UnitTracker*>(g_object_get_data(tbl, "tracker"));
- Unit const unit = tracker->getActiveUnit();
+ Unit const *unit = tracker->getActiveUnit();
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
- prefs->setString("/tools/lpetool/unit", unit.abbr);
+ prefs->setString("/tools/lpetool/unit", unit->abbr);
SPDesktop *desktop = static_cast<SPDesktop *>(g_object_get_data( tbl, "desktop" ));
if (SP_IS_LPETOOL_CONTEXT(desktop->event_context)) {
@@ -299,10 +299,10 @@ void sp_lpetool_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GO
UnitTracker* tracker = new UnitTracker(Inkscape::Util::UNIT_TYPE_LINEAR);
tracker->setActiveUnit(sp_desktop_namedview(desktop)->doc_units);
g_object_set_data(holder, "tracker", tracker);
- Unit const unit = tracker->getActiveUnit();
+ Unit const *unit = tracker->getActiveUnit();
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
- prefs->setString("/tools/lpetool/unit", unit.abbr);
+ prefs->setString("/tools/lpetool/unit", unit->abbr);
/** Automatically create a list of LPEs that get added to the toolbar **/
{