summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlex Valavanis <valavanisalex@gmail.com>2012-10-14 18:23:13 +0000
committerAlex Valavanis <valavanisalex@gmail.com>2012-10-14 18:23:13 +0000
commit9779ceaf104e71b3e72057025a5e820ae89fd422 (patch)
tree8b6bd6bcc31bc1a2b4078fabc7541328cd7353be /src
parentFix "shift disables snapping" for LPEs and for editing objects (diff)
downloadinkscape-9779ceaf104e71b3e72057025a5e820ae89fd422.tar.gz
inkscape-9779ceaf104e71b3e72057025a5e820ae89fd422.zip
Stop using private GdlDockObject->master (broken in GDL 3.6)
(bzr r11801)
Diffstat (limited to 'src')
-rw-r--r--src/ui/widget/dock.cpp12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/ui/widget/dock.cpp b/src/ui/widget/dock.cpp
index a7dabef1c..a38a93fb1 100644
--- a/src/ui/widget/dock.cpp
+++ b/src/ui/widget/dock.cpp
@@ -81,9 +81,15 @@ Dock::Dock(Gtk::Orientation orientation)
static_cast<GdlSwitcherStyle>(prefs->getIntLimited("/options/dock/switcherstyle",
GDL_SWITCHER_STYLE_BOTH, 0, 4));
- g_object_set (GDL_DOCK_OBJECT(_gdl_dock)->master,
- "switcher-style", gdl_switcher_style,
- NULL);
+ GdlDockMaster* master = NULL;
+
+ g_object_get(GDL_DOCK_OBJECT(_gdl_dock),
+ "master", &master,
+ NULL);
+
+ g_object_set(master,
+ "switcher-style", gdl_switcher_style,
+ NULL);
GdlDockBarStyle gdl_dock_bar_style =
static_cast<GdlDockBarStyle>(prefs->getIntLimited("/options/dock/dockbarstyle",