diff options
| author | Raphael Rosch <launchpad@insaner.com> | 2015-11-20 17:34:03 +0000 |
|---|---|---|
| committer | insaner <launchpad@insaner.com> | 2015-11-20 17:34:03 +0000 |
| commit | 9211d88591d6bbb00a803237cf5c6fa2860e5a96 (patch) | |
| tree | ef60cbbd9a8860fda6dc1432045d968b2bd82d90 | |
| parent | fix for bug 1517740 (crash in some cases in selection sets) (diff) | |
| download | inkscape-9211d88591d6bbb00a803237cf5c6fa2860e5a96.tar.gz inkscape-9211d88591d6bbb00a803237cf5c6fa2860e5a96.zip | |
window/task bar icon missing when installed in non-standard location
Fixed bugs:
- https://launchpad.net/bugs/1516238
(bzr r14479)
| -rw-r--r-- | src/main.cpp | 4 | ||||
| -rw-r--r-- | src/path-prefix.h | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/main.cpp b/src/main.cpp index 5393ddc6f..840643a90 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1045,6 +1045,10 @@ sp_main_gui(int argc, char const **argv) gchar *usericondir = Inkscape::Application::profile_path("icons"); gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(), usericondir); gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(), INKSCAPE_PIXMAPDIR); +#ifdef INKSCAPE_THEMEDIR + gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(), INKSCAPE_THEMEDIR); + gtk_icon_theme_rescan_if_needed (gtk_icon_theme_get_default()); +#endif g_free(usericondir); gdk_event_handler_set((GdkEventFunc)snooper, NULL, NULL); diff --git a/src/path-prefix.h b/src/path-prefix.h index 7042d5124..7f9bcec51 100644 --- a/src/path-prefix.h +++ b/src/path-prefix.h @@ -35,6 +35,7 @@ # define INKSCAPE_PATTERNSDIR BR_DATADIR( "/inkscape/patterns" ) # define INKSCAPE_SCREENSDIR BR_DATADIR( "/inkscape/screens" ) # define INKSCAPE_SYMBOLSDIR BR_DATADIR( "/inkscape/symbols" ) +# define INKSCAPE_THEMEDIR BR_DATADIR( "/icons" ) # define INKSCAPE_TUTORIALSDIR BR_DATADIR( "/inkscape/tutorials" ) # define INKSCAPE_TEMPLATESDIR BR_DATADIR( "/inkscape/templates" ) # define INKSCAPE_UIDIR BR_DATADIR( "/inkscape/ui" ) @@ -102,6 +103,7 @@ # define INKSCAPE_PATTERNSDIR INKSCAPE_DATADIR "/inkscape/patterns" # define INKSCAPE_SCREENSDIR INKSCAPE_DATADIR "/inkscape/screens" # define INKSCAPE_SYMBOLSDIR INKSCAPE_DATADIR "/inkscape/symbols" +# define INKSCAPE_THEMEDIR INKSCAPE_DATADIR "/icons" # define INKSCAPE_TUTORIALSDIR INKSCAPE_DATADIR "/inkscape/tutorials" # define INKSCAPE_TEMPLATESDIR INKSCAPE_DATADIR "/inkscape/templates" # define INKSCAPE_UIDIR INKSCAPE_DATADIR "/inkscape/ui" |