Merge from trunk to pull in fix for LP #806105

(bzr r10347.1.13)

11 files changed, 42 insertions, 432 deletions

diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index 9bbdd861e..1a662f3be 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -159,7 +159,6 @@ set(ui_SRC
 	dialog/print-colors-preview-dialog.h
 	dialog/print.h
 	dialog/scriptdialog.h
-	dialog/session-player.h
 	dialog/svg-fonts-dialog.h
 	dialog/swatches.h
 	dialog/tile.h
diff --git a/src/ui/cache/svg_preview_cache.cpp b/src/ui/cache/svg_preview_cache.cpp
index c631631fb..cd1d65ba7 100644
--- a/src/ui/cache/svg_preview_cache.cpp
+++ b/src/ui/cache/svg_preview_cache.cpp
@@ -80,8 +80,7 @@ GdkPixbuf* render_pixbuf(NRArenaItem* root, double scale_factor, const Geom::Rec
                                       GDK_COLORSPACE_RGB,
                                       TRUE,
                                       8, psize, psize, cairo_image_surface_get_stride(s),
-                                      (GdkPixbufDestroyNotify)cairo_surface_destroy,
-                                      NULL);
+                                      ink_cairo_pixbuf_cleanup, s);
     convert_pixbuf_argb32_to_normal(pixbuf);
 
     return pixbuf;
diff --git a/src/ui/dialog/color-item.cpp b/src/ui/dialog/color-item.cpp
index 89245575c..598827da9 100644
--- a/src/ui/dialog/color-item.cpp
+++ b/src/ui/dialog/color-item.cpp
@@ -225,7 +225,7 @@ static void colorItemDragBegin( GtkWidget */*widget*/, GdkDragContext* dc, gpoin
                 pixbuf = gdk_pixbuf_new_from_data(cairo_image_surface_get_data(s),
                                                   GDK_COLORSPACE_RGB, TRUE, 8,
                                                   width, height, cairo_image_surface_get_stride(s),
-                                                  (GdkPixbufDestroyNotify) cairo_surface_destroy, NULL);
+                                                  ink_cairo_pixbuf_cleanup, s);
                 convert_pixbuf_argb32_to_normal(pixbuf);
             } else {
                 Glib::RefPtr<Gdk::Pixbuf> thumb = Gdk::Pixbuf::create( Gdk::COLORSPACE_RGB, false, 8, width, height );
@@ -517,11 +517,13 @@ void ColorItem::_regenPreview(EekPreview * preview)
                                (def.getG() << 8) | def.getG(),
                                (def.getB() << 8) | def.getB() );
     } else {
-        double w;
-        cairo_pattern_get_linear_points(_pattern, NULL, NULL, &w, NULL);
-        int width = ceil(w);
+        // These correspond to PREVIEW_PIXBUF_WIDTH and VBLOCK from swatches.cpp
+        // TODO: the pattern to draw should be in the widget that draws the preview,
+        //       so the preview can be scalable
+        int w = 128;
+        int h = 16;
 
-        cairo_surface_t *s = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, 1);
+        cairo_surface_t *s = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, w, h);
         cairo_t *ct = cairo_create(s);
         cairo_set_source(ct, _pattern);
         cairo_paint(ct);
@@ -530,8 +532,8 @@ void ColorItem::_regenPreview(EekPreview * preview)
 
         GdkPixbuf* pixbuf = gdk_pixbuf_new_from_data( cairo_image_surface_get_data(s),
                                                       GDK_COLORSPACE_RGB, TRUE, 8,
-                                                      width, 1, cairo_image_surface_get_stride(s),
-                                                      (GdkPixbufDestroyNotify) cairo_surface_destroy, NULL);
+                                                      w, h, cairo_image_surface_get_stride(s),
+                                                      ink_cairo_pixbuf_cleanup, s);
         convert_pixbuf_argb32_to_normal(pixbuf);
         eek_preview_set_pixbuf( preview, pixbuf );
     }
diff --git a/src/ui/dialog/dock-behavior.h b/src/ui/dialog/dock-behavior.h
index b865af545..98c111719 100644
--- a/src/ui/dialog/dock-behavior.h
+++ b/src/ui/dialog/dock-behavior.h
@@ -21,7 +21,7 @@
 
 #include "ui/widget/dock-item.h"
 
-#include "libgdl/libgdl.h"
+#include "libgdl/gdl.h"
 
 #include "behavior.h"
 
diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp
index 569dd2311..5d32839cb 100644
--- a/src/ui/dialog/document-properties.cpp
+++ b/src/ui/dialog/document-properties.cpp
@@ -43,8 +43,6 @@
 #include "xml/repr.h"
 
 #if ENABLE_LCMS
-#include <lcms.h>
-//#include "color-profile-fns.h"
 #include "color-profile.h"
 #endif // ENABLE_LCMS
 
@@ -309,53 +307,29 @@ DocumentProperties::build_snap()
  }
 
 #if ENABLE_LCMS
-static void
-lcms_profile_get_name (cmsHPROFILE   profile, const gchar **name)
-{
-  if (profile)
-    {
-      *name = cmsTakeProductDesc (profile);
-
-      if (! *name)
-        *name = cmsTakeProductName (profile);
-
-      if (*name && ! g_utf8_validate (*name, -1, NULL))
-        *name = _("(invalid UTF-8 string)");
-    }
-  else
-    {
-      *name = _("None");
-    }
-}
-
-void
-DocumentProperties::populate_available_profiles(){
+void DocumentProperties::populate_available_profiles(){
     Glib::ListHandle<Gtk::Widget*> children = _menu.get_children();
     for ( Glib::ListHandle<Gtk::Widget*>::iterator it2 = children.begin(); it2 != children.end(); ++it2 ) {
         _menu.remove(**it2);
         delete(*it2);
     }
 
-    std::list<Glib::ustring> files = ColorProfile::getProfileFiles();
-    for ( std::list<Glib::ustring>::const_iterator it = files.begin(); it != files.end(); ++it ) {
-        cmsHPROFILE hProfile = cmsOpenProfileFromFile(it->c_str(), "r");
-        if ( hProfile ){
-            const gchar* name = 0;
-            lcms_profile_get_name(hProfile, &name);
-            Gtk::MenuItem* mi = manage(new Gtk::MenuItem());
-            mi->set_data("filepath", g_strdup(it->c_str()));
-            mi->set_data("name", g_strdup(name));
-            Gtk::HBox *hbox = manage(new Gtk::HBox());
-            hbox->show();
-            Gtk::Label* lbl = manage(new Gtk::Label(name));
-            lbl->show();
-            hbox->pack_start(*lbl, true, true, 0);
-            mi->add(*hbox);
-            mi->show_all();
-            _menu.append(*mi);
-//            g_free((void*)name);
-            cmsCloseProfile(hProfile);
-        }
+    std::vector<std::pair<Glib::ustring, Glib::ustring> > pairs = ColorProfile::getProfileFilesWithNames();
+    for ( std::vector<std::pair<Glib::ustring, Glib::ustring> >::const_iterator it = pairs.begin(); it != pairs.end(); ++it ) {
+        Glib::ustring file = it->first;
+        Glib::ustring name = it->second;
+
+        Gtk::MenuItem* mi = manage(new Gtk::MenuItem());
+        mi->set_data("filepath", g_strdup(file.c_str()));
+        mi->set_data("name", g_strdup(name.c_str()));
+        Gtk::HBox *hbox = manage(new Gtk::HBox());
+        hbox->show();
+        Gtk::Label* lbl = manage(new Gtk::Label(name));
+        lbl->show();
+        hbox->pack_start(*lbl, true, true, 0);
+        mi->add(*hbox);
+        mi->show_all();
+        _menu.append(*mi);
     }
 
     _menu.show_all();
diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp
index c6d81b070..68cf3b505 100644
--- a/src/ui/dialog/filter-effects-dialog.cpp
+++ b/src/ui/dialog/filter-effects-dialog.cpp
@@ -965,10 +965,10 @@ public:
         _settings.add_spinslider(0, SP_ATTR_ELEVATION, _("Elevation"), 0, 360, 1, 1, 0, _("Direction angle for the light source on the YZ plane, in degrees"));
 
         _settings.type(LIGHT_POINT);
-        _settings.add_multispinbutton(/*default x:*/ (double) 0, /*default y:*/ (double) 0, /*default z:*/ (double) 0, SP_ATTR_X, SP_ATTR_Y, SP_ATTR_Z, _("Location"), -99999, 99999, 1, 100, 0, _("X coordinate"), _("Y coordinate"), _("Z coordinate"));
+        _settings.add_multispinbutton(/*default x:*/ (double) 0, /*default y:*/ (double) 0, /*default z:*/ (double) 0, SP_ATTR_X, SP_ATTR_Y, SP_ATTR_Z, _("Location:"), -99999, 99999, 1, 100, 0, _("X coordinate"), _("Y coordinate"), _("Z coordinate"));
 
         _settings.type(LIGHT_SPOT);
-        _settings.add_multispinbutton(/*default x:*/ (double) 0, /*default y:*/ (double) 0, /*default z:*/ (double) 0, SP_ATTR_X, SP_ATTR_Y, SP_ATTR_Z, _("Location"), -99999, 99999, 1, 100, 0, _("X coordinate"), _("Y coordinate"), _("Z coordinate"));
+        _settings.add_multispinbutton(/*default x:*/ (double) 0, /*default y:*/ (double) 0, /*default z:*/ (double) 0, SP_ATTR_X, SP_ATTR_Y, SP_ATTR_Z, _("Location:"), -99999, 99999, 1, 100, 0, _("X coordinate"), _("Y coordinate"), _("Z coordinate"));
         _settings.add_multispinbutton(/*default x:*/ (double) 0, /*default y:*/ (double) 0, /*default z:*/ (double) 0,
                                       SP_ATTR_POINTSATX, SP_ATTR_POINTSATY, SP_ATTR_POINTSATZ,
                                       _("Points At"), -99999, 99999, 1, 100, 0, _("X coordinate"), _("Y coordinate"), _("Z coordinate"));
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index 3c272e691..d11ffd565 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -41,7 +41,7 @@
 #include "ui/widget/spinbutton.h"
 #include "display/nr-filter-gaussian.h"
 #include "display/nr-filter-types.h"
-#include "color-profile-fns.h"
+#include "cms-system.h"
 #include "color-profile.h"
 #include "display/canvas-grid.h"
 #include "path-prefix.h"
@@ -62,6 +62,7 @@ using Inkscape::UI::Widget::PrefCheckButton;
 using Inkscape::UI::Widget::PrefRadioButton;
 using Inkscape::UI::Widget::PrefSpinButton;
 using Inkscape::UI::Widget::StyleSwatch;
+using Inkscape::CMSSystem;
 
 
 InkscapePreferences::InkscapePreferences()
@@ -858,7 +859,7 @@ static void profileComboChanged( Gtk::ComboBoxText* combo )
     } else {
         Glib::ustring active = combo->get_active_text();
 
-        Glib::ustring path = get_path_for_profile(active);
+        Glib::ustring path = CMSSystem::getPathForProfile(active);
         if ( !path.empty() ) {
             prefs->setString("/options/displayprofile/uri", path);
         }
@@ -868,7 +869,7 @@ static void profileComboChanged( Gtk::ComboBoxText* combo )
 static void proofComboChanged( Gtk::ComboBoxText* combo )
 {
     Glib::ustring active = combo->get_active_text();
-    Glib::ustring path = get_path_for_profile(active);
+    Glib::ustring path = CMSSystem::getPathForProfile(active);
 
     if ( !path.empty() ) {
         Inkscape::Preferences *prefs = Inkscape::Preferences::get();
@@ -906,8 +907,8 @@ void InkscapePreferences::initPageCMS()
     _page_cms.add_group_header( _("Display adjustment"));
 
     Glib::ustring tmpStr;
-    std::list<Glib::ustring> sources = ColorProfile::getBaseProfileDirs();
-    for ( std::list<Glib::ustring>::const_iterator it = sources.begin(); it != sources.end(); ++it ) {
+    std::vector<Glib::ustring> sources = ColorProfile::getBaseProfileDirs();
+    for ( std::vector<Glib::ustring>::const_iterator it = sources.begin(); it != sources.end(); ++it ) {
         gchar* part = g_strdup_printf( "\n%s", it->c_str() );
         tmpStr += part;
         g_free(part);
@@ -975,7 +976,7 @@ void InkscapePreferences::initPageCMS()
 
 #if ENABLE_LCMS
     {
-        std::vector<Glib::ustring> names = ::Inkscape::colorprofile_get_display_names();
+        std::vector<Glib::ustring> names = ::Inkscape::CMSSystem::getDisplayNames();
         Glib::ustring current = prefs->getString( "/options/displayprofile/uri" );
 
         gint index = 0;
@@ -983,7 +984,7 @@ void InkscapePreferences::initPageCMS()
         index++;
         for ( std::vector<Glib::ustring>::iterator it = names.begin(); it != names.end(); ++it ) {
             _cms_display_profile.append_text( *it );
-            Glib::ustring path = get_path_for_profile(*it);
+            Glib::ustring path = CMSSystem::getPathForProfile(*it);
             if ( !path.empty() && path == current ) {
                 _cms_display_profile.set_active(index);
             }
@@ -993,12 +994,12 @@ void InkscapePreferences::initPageCMS()
             _cms_display_profile.set_active(0);
         }
 
-        names = ::Inkscape::colorprofile_get_softproof_names();
+        names = ::Inkscape::CMSSystem::getSoftproofNames();
         current = prefs->getString("/options/softproof/uri");
         index = 0;
         for ( std::vector<Glib::ustring>::iterator it = names.begin(); it != names.end(); ++it ) {
             _cms_proof_profile.append_text( *it );
-            Glib::ustring path = get_path_for_profile(*it);
+            Glib::ustring path = CMSSystem::getPathForProfile(*it);
             if ( !path.empty() && path == current ) {
                 _cms_proof_profile.set_active(index);
             }
diff --git a/src/ui/dialog/session-player.cpp b/src/ui/dialog/session-player.cpp
deleted file mode 100644
index 040c1419b..000000000
--- a/src/ui/dialog/session-player.cpp
+++ /dev/null
@@ -1,231 +0,0 @@
-/** @file
- * @brief Whiteboard session playback control dialog - implementation
- */
-/* Authors:
- * David Yip <yipdw@rose-hulman.edu>
- *   Abhishek Sharma
- *
- * Copyright (c) 2005 Authors
- * Released under GNU GPL, read the file 'COPYING' for more information
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <glibmm.h>
-#include <glibmm/i18n.h>
-#include <gtk/gtk.h>
-#include <gtkmm.h>
-
-#include "inkscape.h"
-#include "path-prefix.h"
-
-#include "desktop.h"
-#include "desktop-handles.h"
-#include "document.h"
-
-#include "jabber_whiteboard/node-tracker.h"
-#include "jabber_whiteboard/session-manager.h"
-#include "jabber_whiteboard/session-file-player.h"
-
-#include "ui/dialog/session-player.h"
-
-#include "util/ucompose.hpp"
-
-namespace Inkscape {
-
-namespace UI {
-
-namespace Dialog {
-
-SessionPlaybackDialog*
-SessionPlaybackDialog::create()
-{
-	return new SessionPlaybackDialogImpl();
-}
-
-SessionPlaybackDialogImpl::SessionPlaybackDialogImpl() 
-	: _delay(100, 1, 5000, 10, 100), _delayentry(_delay)
-{
-        this->_desktop = this->getDesktop();
-	this->_sm = this->_desktop->whiteboard_session_manager();
-	this->_sfp = this->_sm->session_player();
-	this->_openfile.set_text(this->_sfp->filename());
-
-	this->_construct();
-	this->get_vbox()->show_all_children();
-}
-
-SessionPlaybackDialogImpl::~SessionPlaybackDialogImpl()
-{
-
-}
-
-void
-SessionPlaybackDialogImpl::_construct()
-{
-	Gtk::VBox* main = this->get_vbox();
-
-	// Dialog organization
-	this->_filemanager.set_label(_("Session file"));
-	this->_playback.set_label(_("Playback controls"));
-	this->_currentmsgbox.set_label(_("Message information"));
-
-	this->_filemanager.set_border_width(4);
-	this->_playback.set_border_width(4);
-	this->_fm.set_border_width(4);
-	this->_toolbarbox.set_border_width(4);
-
-	// Active session file display
-	// fixme: Does this mean the active file for the session, or the file for the active session?
-	// Please indicate which with a TRANSLATORS comment.
-	this->_labels[0].set_text(_("Active session file:"));
-	this->_labels[1].set_text(_("Delay (milliseconds):"));
-
-	this->_openfile.set_editable(false);
-
-	this->_filebox.pack_start(this->_labels[0], true, false, 8);
-	this->_filebox.pack_end(this->_openfile, true, true, 0);
-
-	// Unload/load buttons
-	this->_close.set_label(_("Close file"));
-	this->_open.set_label(_("Open new file"));
-	this->_setdelay.set_label(_("Set delay"));
-
-	// Attach callbacks
-	this->_close.signal_clicked().connect(sigc::bind< 0 >(sigc::mem_fun(*this, &SessionPlaybackDialogImpl::_respCallback), CLOSE_FILE));
-	this->_open.signal_clicked().connect(sigc::bind< 0 >(sigc::mem_fun(*this, &SessionPlaybackDialogImpl::_respCallback), OPEN_FILE));
-	this->_setdelay.signal_clicked().connect(sigc::bind< 0 >(sigc::mem_fun(*this, &SessionPlaybackDialogImpl::_respCallback), RESET_DELAY));
-
-	// Button box
-	this->_filebuttons.pack_start(this->_close, true, false, 0);
-	this->_filebuttons.pack_start(this->_open, true, false, 0);
-
-	// Message information box
-	this->_currentmsgbuffer = Gtk::TextBuffer::create();
-	this->_currentmsgview.set_buffer(this->_currentmsgbuffer);
-	this->_currentmsgview.set_editable(false);
-	this->_currentmsgview.set_cursor_visible(false);
-	this->_currentmsgview.set_wrap_mode(Gtk::WRAP_WORD);
-	this->_currentmsgscroller.add(this->_currentmsgview);
-	this->_currentmsgbox.add(this->_currentmsgscroller);
-	this->_sfp->setMessageOutputWidget(this->_currentmsgbuffer);
-	
-	// Delay setting
-	// parameters: initial lower upper single-incr page-incr
-	this->_delayentry.set_numeric(true);
-
-	// Playback controls
-	this->_playbackcontrols.set_show_arrow(false);
-
-	this->_controls[0].set_label("Rewind");
-	this->_controls[1].set_label("Go back one");
-	this->_controls[2].set_label("Pause");
-	this->_controls[3].set_label("Go forward one");
-	this->_controls[4].set_label("Play");
-
-	this->_controls[0].set_tooltip(this->_tooltips, _("Rewind"));
-	this->_controls[1].set_tooltip(this->_tooltips, _("Go back one change"));
-	this->_controls[2].set_tooltip(this->_tooltips, _("Pause"));
-	this->_controls[3].set_tooltip(this->_tooltips, _("Go forward one change"));
-	this->_controls[4].set_tooltip(this->_tooltips, _("Play"));
-
-	for(int i = 0; i < 5; i++) {
-		this->_playbackcontrols.append(this->_controls[i], sigc::bind< 0 >(sigc::mem_fun(*this, &SessionPlaybackDialogImpl::_respCallback), TOOLBAR_BASE + i));
-	}
-
-	this->_delaybox.pack_start(this->_labels[1]);
-	this->_delaybox.pack_start(this->_delayentry);
-	this->_delaybox.pack_end(this->_setdelay);
-
-	this->_toolbarbox.pack_start(this->_delaybox);
-	this->_toolbarbox.pack_end(this->_playbackcontrols);
-
-	// Pack widgets into frames
-	this->_fm.pack_start(this->_filebox);
-	this->_fm.pack_end(this->_filebuttons);
-
-	this->_filemanager.add(this->_fm);
-	this->_playback.add(this->_toolbarbox);
-			
-	// Pack widgets into main vbox
-	main->pack_start(this->_filemanager);
-	main->pack_start(this->_playback);
-	main->pack_end(this->_currentmsgbox);
-}
-
-void
-SessionPlaybackDialogImpl::_respCallback(int resp)
-{
-	g_log(NULL, G_LOG_LEVEL_DEBUG, "_respCallback: %u", resp);
-	switch(resp) {
-		case CLOSE_FILE:
-			this->_sfp->unload();
-			break;
-		case OPEN_FILE: {
-			Gtk::FileChooserDialog sessionfiledlg(_("Open session file"), Gtk::FILE_CHOOSER_ACTION_OPEN);
-			sessionfiledlg.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
-			sessionfiledlg.add_button(Gtk::Stock::OPEN, Gtk::RESPONSE_OK);
-
-			int result = sessionfiledlg.run();
-			switch (result) {
-				case Gtk::RESPONSE_OK:
-					this->_sm->clearDocument();
-					SPDocumentUndo::done(sp_desktop_document(this->_desktop), SP_VERB_NONE, 
-							 /* TODO: annotate */ "session-player.cpp:186");
-					this->_sm->loadSessionFile(sessionfiledlg.get_filename());
-					this->_openfile.set_text(this->_sfp->filename());
-					break;
-				default:
-					break;
-			}
-			break;
-						}
-		case RESET_DELAY:
-			this->_sfp->setDelay(this->_delayentry.get_value_as_int());
-			break;
-		case REWIND:
-			if (this->_sfp->_playing) {
-				this->_sfp->stop();
-			}
-			this->_sfp->_curdir = Whiteboard::SessionFilePlayer::BACKWARD;
-			this->_sfp->start();
-			break;
-		case STEP_REWIND:
-			this->_sfp->step(Whiteboard::SessionFilePlayer::BACKWARD);
-			break;
-		case PAUSE:
-			this->_sfp->stop();
-			break;
-		case STEP_PLAY:
-			this->_sfp->step(Whiteboard::SessionFilePlayer::FORWARD);
-			break;
-		case PLAY:
-			if (this->_sfp->_playing) {
-				this->_sfp->stop();
-			}
-			this->_sfp->_curdir = Whiteboard::SessionFilePlayer::FORWARD;
-			this->_sfp->start();
-			break;
-		default:
-			break;
-	}
-}
-
-}
-
-}
-
-}
-
-/*
-  Local Variables:
-  mode:c++
-  c-file-style:"stroustrup"
-  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
-  indent-tabs-mode:nil
-  fill-column:99
-  End:
-*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/ui/dialog/session-player.h b/src/ui/dialog/session-player.h
deleted file mode 100644
index 2d235cd25..000000000
--- a/src/ui/dialog/session-player.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/** @file
- * @brief Whiteboard session playback control dialog
- */
-/* Authors:
- * David Yip <yipdw@rose-hulman.edu>
- *
- * Copyright (c) 2005 Authors
- * Released under GNU GPL, read the file 'COPYING' for more information
- */
-
-#ifndef __SESSION_PLAYBACK_DIALOG_H__
-#define __SESSION_PLAYBACK_DIALOG_H__
-
-#include "verbs.h"
-#include "dialog.h"
-
-#include "gtkmm/toolbutton.h"
-#include "gtkmm/toolbar.h"
-#include "gtkmm/expander.h"
-
-#include "ui/widget/icon-widget.h"
-
-struct SPDesktop;
-
-namespace Inkscape {
-
-namespace Whiteboard {
-
-class SessionManager;
-class SessionFilePlayer;
-
-}
-
-namespace UI {
-
-namespace Dialog {
-
-class SessionPlaybackDialog : public Dialog {
-public:
-	SessionPlaybackDialog() : Dialog("/dialogs/session_playback", SP_VERB_DIALOG_WHITEBOARD_SESSIONPLAYBACK)
-	{
-
-	}
-
-	static SessionPlaybackDialog* create();
-
-	virtual ~SessionPlaybackDialog()
-	{
-
-	}
-private:
-	SessionPlaybackDialog(SessionPlaybackDialog const& dlg);		// no copy
-	void operator=(SessionPlaybackDialog const& dlg);	// no assign
-};
-
-class SessionPlaybackDialogImpl : public SessionPlaybackDialog {
-public:
-	SessionPlaybackDialogImpl();
-	~SessionPlaybackDialogImpl();
-
-private:
-	// GTK+ widgets
-	Gtk::HBox _filebox;
-	Gtk::HBox _filebuttons;
-	Gtk::HBox _toolbarbox;
-	Gtk::HBox _delaybox;
-
-	Gtk::Entry _openfile;
-
-	Gtk::Label _labels[2];
-	Gtk::ToolButton _controls[5];
-
-	Gtk::Button _close, _open, _setdelay;
-
-	Gtk::Tooltips _tooltips;
-	Gtk::Toolbar _playbackcontrols;
-	Gtk::Adjustment _delay;
-	Widget::SpinButton _delayentry;
-
-	Gtk::Frame _filemanager;
-	Gtk::VBox _fm;
-
-	Gtk::Frame _playback;
-
-	Gtk::Expander _currentmsgbox;
-	Glib::RefPtr<Gtk::TextBuffer> _currentmsgbuffer;
-	Gtk::TextView _currentmsgview;
-	Gtk::ScrolledWindow _currentmsgscroller;
-
-	// Construction and callback
-	void _construct();
-	void _respCallback(int resp);
-
-	// SessionManager and SPDesktop pointers
-	::SPDesktop* _desktop;
-	Whiteboard::SessionManager* _sm;
-	Whiteboard::SessionFilePlayer* _sfp;
-
-	// button values
-	static unsigned short const CLOSE_FILE = 0;
-	static unsigned short const OPEN_FILE = 1;
-	static unsigned short const RESET_DELAY = 2;
-
-	static unsigned short const TOOLBAR_BASE = 10;
-	static unsigned short const REWIND = TOOLBAR_BASE + 0; 
-	static unsigned short const STEP_REWIND = TOOLBAR_BASE + 1;
-	static unsigned short const PAUSE = TOOLBAR_BASE + 2;
-	static unsigned short const STEP_PLAY = TOOLBAR_BASE + 3;
-	static unsigned short const PLAY = TOOLBAR_BASE + 4;
-
-
-	// noncopyable
-	SessionPlaybackDialogImpl(SessionPlaybackDialogImpl const& dlg);		// no copy
-	void operator=(SessionPlaybackDialogImpl const& dlg);	// no assign
-};
-
-}
-
-}
-
-}
-
-#endif
-
-/*
-  Local Variables:
-  mode:c++
-  c-file-style:"stroustrup"
-  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
-  indent-tabs-mode:nil
-  fill-column:99
-  End:
-*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/ui/widget/dock-item.h b/src/ui/widget/dock-item.h
index 79d69d862..1780b7525 100644
--- a/src/ui/widget/dock-item.h
+++ b/src/ui/widget/dock-item.h
@@ -19,7 +19,7 @@
 #include <gtkmm/paned.h>
 #include <gtkmm/window.h>
 
-#include "libgdl/libgdl.h"
+#include "libgdl/gdl.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/dock.h b/src/ui/widget/dock.h
index 5836cf83f..bd5685348 100644
--- a/src/ui/widget/dock.h
+++ b/src/ui/widget/dock.h
@@ -20,7 +20,7 @@
 
 #include "ui/widget/dock-item.h"
 
-#include "libgdl/libgdl.h"
+#include "libgdl/gdl.h"
 
 namespace Inkscape {
 namespace UI {