diff options
| author | Eduard Braun <eduard.braun2@gmx.de> | 2017-07-09 12:42:10 +0000 |
|---|---|---|
| committer | Eduard Braun <eduard.braun2@gmx.de> | 2017-07-09 12:42:10 +0000 |
| commit | 241554b7ad311b5868ba284c7a4e6a410432b9bd (patch) | |
| tree | 8bf6fed572d27e9b97ca60b90ae1684ba4856eeb /src/main.cpp | |
| parent | Use .xml when exporting shortcuts by default (diff) | |
| parent | Shortcuts: Fix for 7d248fbba5b0c24d9a24cda8c3f2e79f96395553 (is_user_set was ... (diff) | |
| download | inkscape-241554b7ad311b5868ba284c7a4e6a410432b9bd.tar.gz inkscape-241554b7ad311b5868ba284c7a4e6a410432b9bd.zip | |
Merge branch 'master' into shortcuts
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/main.cpp b/src/main.cpp index a40d44afe..27db9903b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -113,7 +113,6 @@ #include "main-cmdlineact.h" #include "main-cmdlinexact.h" -#include "widgets/icon.h" #include <errno.h> #include "verbs.h" @@ -1030,8 +1029,6 @@ sp_main_gui(int argc, char const **argv) // Set default window icon. Obeys the theme. Gtk::Window::set_default_icon_name("inkscape"); - // Do things that were previously in inkscape_gtk_stock_init(). - sp_icon_get_phys_size(GTK_ICON_SIZE_MENU); Inkscape::UI::Widget::Panel::prep(); bool create_new = true; |