From bc3f2d78003fe893afd4d1ba748d78f1c2e26ed4 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza <jabier.arraiza@marker.es>
Date: Sat, 4 Aug 2018 01:30:25 +0200
Subject: Add inkscape app icon to themes

---
 src/inkscape.cpp | 60 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

(limited to 'src/inkscape.cpp')

diff --git a/src/inkscape.cpp b/src/inkscape.cpp
index ada4fea96..05b5aeec1 100644
--- a/src/inkscape.cpp
+++ b/src/inkscape.cpp
@@ -456,37 +456,7 @@ Application::Application(const char* argv, bool use_gui) :
     // then the Filters and Extensions menus don't work.
     _S_inst = this;
 
-    /* Load the preferences and menus */
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-    GtkSettings *settings = gtk_settings_get_default();
-    if (settings) {
-        const gchar *gtkThemeName;
-        g_object_get(settings, "gtk-theme-name", &gtkThemeName, NULL);
-        const gchar *gtkIconThemeName;
-        g_object_get(settings, "gtk-icon-theme-name", &gtkIconThemeName, NULL);
-        prefs->setString("/theme/defaultIconTheme", Glib::ustring(gtkIconThemeName));
-        gboolean gtkApplicationPreferDarkTheme;
-        g_object_get(settings, "gtk-application-prefer-dark-theme", &gtkApplicationPreferDarkTheme, NULL);
-        if (prefs->getString("/theme/gtkTheme") != "") {
-            g_object_set(settings, "gtk-theme-name", prefs->getString("/theme/gtkTheme").c_str(), NULL);
-        }
-        else {
-            prefs->setString("/theme/gtkTheme", Glib::ustring(gtkThemeName));
-        }
-
-        if (prefs->getString("/theme/iconTheme") != "") {
-            g_object_set(settings, "gtk-icon-theme-name", prefs->getString("/theme/iconTheme").c_str(), NULL);
-        }
-        else {
-            Glib::ustring defaulticontheme = prefs->getString("/theme/defaultIconTheme");
-            if (defaulticontheme == "Adwaita") {
-                defaulticontheme = "hicolor";
-            }
-            prefs->setString("/theme/iconTheme", defaulticontheme);
-        }
-        g_object_set(settings, "gtk-application-prefer-dark-theme",
-                     prefs->getBool("/theme/darkTheme", gtkApplicationPreferDarkTheme), NULL);
-    }
     InkErrorHandler* handler = new InkErrorHandler(use_gui);
     prefs->setErrorHandler(handler);
     {
@@ -499,6 +469,36 @@ Application::Application(const char* argv, bool use_gui) :
 
     if (use_gui) {
         add_style_sheet();
+        /* Load the preferences and menus */
+        GtkSettings *settings = gtk_settings_get_default();
+        if (settings) {
+            const gchar *gtkThemeName;
+            g_object_get(settings, "gtk-theme-name", &gtkThemeName, NULL);
+            const gchar *gtkIconThemeName;
+            g_object_get(settings, "gtk-icon-theme-name", &gtkIconThemeName, NULL);
+            prefs->setString("/theme/defaultIconTheme", Glib::ustring(gtkIconThemeName));
+            gboolean gtkApplicationPreferDarkTheme;
+            g_object_get(settings, "gtk-application-prefer-dark-theme", &gtkApplicationPreferDarkTheme, NULL);
+            if (prefs->getString("/theme/gtkTheme") != "") {
+                g_object_set(settings, "gtk-theme-name", prefs->getString("/theme/gtkTheme").c_str(), NULL);
+            }
+            else {
+                prefs->setString("/theme/gtkTheme", Glib::ustring(gtkThemeName));
+            }
+
+            if (prefs->getString("/theme/iconTheme") != "") {
+                g_object_set(settings, "gtk-icon-theme-name", prefs->getString("/theme/iconTheme").c_str(), NULL);
+            }
+            else {
+                Glib::ustring defaulticontheme = prefs->getString("/theme/defaultIconTheme");
+                if (defaulticontheme == "Adwaita") {
+                    defaulticontheme = "hicolor";
+                }
+                prefs->setString("/theme/iconTheme", defaulticontheme);
+            }
+            g_object_set(settings, "gtk-application-prefer-dark-theme",
+                         prefs->getBool("/theme/darkTheme", gtkApplicationPreferDarkTheme), NULL);
+        }
         load_menus();
         Inkscape::DeviceManager::getManager().loadConfig();
     }
-- 
cgit v1.2.3