summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Valavanis <valavanisalex@gmail.com>2017-08-16 18:08:04 +0000
committerAlexander Valavanis <valavanisalex@gmail.com>2017-08-16 18:08:04 +0000
commitc4a4bfba512e41f9c0a6cac61e654c3986341c8c (patch)
tree3d81a4d44d8406d7794bd08bf72bcdee7ecdd39b
parentAboutBox: Add placeholder Copyright string. Need to confirm contents (diff)
parentAboutBox: Add metadata (diff)
downloadinkscape-c4a4bfba512e41f9c0a6cac61e654c3986341c8c.tar.gz
inkscape-c4a4bfba512e41f9c0a6cac61e654c3986341c8c.zip
AboutBox: Resolve conflicts
-rw-r--r--src/ui/dialog/aboutbox.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/ui/dialog/aboutbox.cpp b/src/ui/dialog/aboutbox.cpp
index 569056ee1..4f094f876 100644
--- a/src/ui/dialog/aboutbox.cpp
+++ b/src/ui/dialog/aboutbox.cpp
@@ -124,8 +124,6 @@ void AboutBox::build_splash_widget() {
}
doc->ensureUpToDate();
- // TODO: Return a Gdk::Pixbuf instead of a widget, for better integration
- // with the parent Gtk::AboutDialog class
GtkWidget *v=sp_svg_view_widget_new(doc);
// temporary hack: halve the dimensions so the dialog will fit