summaryrefslogtreecommitdiffstats
path: root/src/main.cpp
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2016-03-14 16:37:50 +0000
committerJabiertxof <jtx@jtx.marker.es>2016-03-14 16:37:50 +0000
commitb8d22beef5345210ad27cdc2685083aeae6f8f3b (patch)
treed69b8bfd19d3627a8425a1b265c2abf229b05354 /src/main.cpp
parentfixes for update to trunk (diff)
parent"Relative to" option for node alignment. (diff)
downloadinkscape-b8d22beef5345210ad27cdc2685083aeae6f8f3b.tar.gz
inkscape-b8d22beef5345210ad27cdc2685083aeae6f8f3b.zip
update to trunk
(bzr r13708.1.39)
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 26c25af02..840643a90 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -212,7 +212,7 @@ static gboolean sp_export_id_only = FALSE;
static gchar *sp_export_svg = NULL;
static gchar *sp_export_ps = NULL;
static gchar *sp_export_eps = NULL;
-static gint sp_export_ps_level = 2;
+static gint sp_export_ps_level = 3;
static gchar *sp_export_pdf = NULL;
static gchar *sp_export_pdf_version = NULL;
static gchar *sp_export_emf = NULL;
@@ -260,7 +260,7 @@ static void resetCommandlineGlobals() {
sp_export_svg = NULL;
sp_export_ps = NULL;
sp_export_eps = NULL;
- sp_export_ps_level = 2;
+ sp_export_ps_level = 3;
sp_export_pdf = NULL;
sp_export_pdf_version = NULL;
sp_export_emf = NULL;
@@ -405,7 +405,7 @@ struct poptOption options[] = {
{"export-ps-level", 0,
POPT_ARG_INT, &sp_export_ps_level, SP_ARG_EXPORT_PS_LEVEL,
N_("Choose the PostScript Level used to export. Possible choices are"
- " 2 (the default) and 3"),
+ " 2 and 3 (the default)"),
N_("PS Level")},
{"export-pdf", 'A',
@@ -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);