From a3648f82f9e66ecc2dd355e9d0c5b2f3e66b9b50 Mon Sep 17 00:00:00 2001
From: Krzysztof Kosi??ski <tweenk.pl@gmail.com>
Date: Tue, 13 Jan 2009 02:27:04 +0000
Subject: Improved version reporting. Add SVN revision and custom status to
 version string on Linux.

(bzr r7123)
---
 src/ui/dialog/Makefile_insert | 2 --
 src/ui/dialog/aboutbox.cpp    | 6 +++---
 src/ui/dialog/print.cpp       | 1 +
 3 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/dialog/Makefile_insert b/src/ui/dialog/Makefile_insert
index 6c301ef40..190118946 100644
--- a/src/ui/dialog/Makefile_insert
+++ b/src/ui/dialog/Makefile_insert
@@ -67,5 +67,3 @@ ui_dialog_libuidialog_a_SOURCES =		\
 	ui/dialog/undo-history.cpp		\
 	ui/dialog/undo-history.h		\
 	$(inkboard_dialogs)
-
-ui/dialog/aboutbox.$(OBJEXT): inkscape_version.h
diff --git a/src/ui/dialog/aboutbox.cpp b/src/ui/dialog/aboutbox.cpp
index 261a586b4..c418b5771 100644
--- a/src/ui/dialog/aboutbox.cpp
+++ b/src/ui/dialog/aboutbox.cpp
@@ -33,7 +33,7 @@
 #include "text-editing.h"
 #include "ui/dialog/aboutbox.h"
 
-#include "inkscape_version.h"
+#include "inkscape-version.h"
 
 
 
@@ -104,7 +104,7 @@ AboutBox::AboutBox() : Gtk::Dialog(_("About Inkscape")) {
     Gtk::Label *label=new Gtk::Label();
     gchar *label_text = 
         g_strdup_printf("<small><i>Inkscape %s, built %s</i></small>",
-              INKSCAPE_VERSION, __DATE__);
+              Inkscape::version_string, __DATE__);
     label->set_markup(label_text);
     label->set_alignment(Gtk::ALIGN_RIGHT, Gtk::ALIGN_CENTER);
     g_free(label_text);
@@ -153,7 +153,7 @@ Gtk::Widget *build_splash_widget() {
 
     SPObject *version = doc->getObjectById("version");
     if ( version && SP_IS_TEXT(version) ) {
-        sp_te_set_repr_text_multiline (SP_TEXT (version), INKSCAPE_VERSION);
+        sp_te_set_repr_text_multiline (SP_TEXT (version), Inkscape::version_string);
     }
     sp_document_ensure_up_to_date(doc);
 
diff --git a/src/ui/dialog/print.cpp b/src/ui/dialog/print.cpp
index b2094f540..bb2b5d68d 100644
--- a/src/ui/dialog/print.cpp
+++ b/src/ui/dialog/print.cpp
@@ -21,6 +21,7 @@
 #include "extension/internal/cairo-render-context.h"
 #include "extension/internal/cairo-renderer.h"
 #include "ui/widget/rendering-options.h"
+#include "document.h"
 
 #include "unit-constants.h"
 #include "helper/png-write.h"
-- 
cgit v1.2.3