diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2016-10-03 21:35:23 +0000 |
|---|---|---|
| committer | jabiertxof <info@marker.es> | 2016-10-03 21:35:23 +0000 |
| commit | 67fa2b7c2a26e909b1adb5fb188285367dfba7e4 (patch) | |
| tree | 83fc014c6907d8273f77646225d7cbe8854be85f /src/widgets/font-selector.cpp | |
| parent | Update to trunk (diff) | |
| download | inkscape-67fa2b7c2a26e909b1adb5fb188285367dfba7e4.tar.gz inkscape-67fa2b7c2a26e909b1adb5fb188285367dfba7e4.zip | |
Fix merge bugs
(bzr r15017.1.36)
Diffstat (limited to 'src/widgets/font-selector.cpp')
| -rw-r--r-- | src/widgets/font-selector.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/widgets/font-selector.cpp b/src/widgets/font-selector.cpp index e9cf66621..f400de89c 100644 --- a/src/widgets/font-selector.cpp +++ b/src/widgets/font-selector.cpp @@ -19,10 +19,6 @@ #include <config.h> #endif -#include <2geom/transforms.h> - -#include <gtk/gtk.h> - #include <libnrtype/font-lister.h> #include <libnrtype/font-instance.h> @@ -33,7 +29,6 @@ /* SPFontSelector */ - struct SPFontSelector { GtkBox hbox; @@ -55,7 +50,6 @@ struct SPFontSelector }; - struct SPFontSelectorClass { GtkBoxClass parent_class; @@ -251,7 +245,6 @@ static void sp_font_selector_dispose(GObject *object) if (fsel->fontspec) { delete fsel->fontspec; - fsel->fontspec = 0; } if (fsel->families.length > 0) { |