From ca7bb4a2bf25b18014dbed47aa5a375d752f5692 Mon Sep 17 00:00:00 2001
From: chriswombat <chriswombat@users.sourceforge.net>
Date: Wed, 5 Aug 2009 08:10:42 +0000
Subject: Changed Inkscape logo icon mapping from "inkscape" to "inkscape-logo"
 as "inkscape" wasn't working (probably some obscure bug somewhere with a
 reserved name or similar).  This fixes the problem where the About Inkscape
 menu item in Help had a broken image picture rather than the Inkscape logo
 (on Win32 at least).

(bzr r8411)
---
 share/icons/icons.svg    | 2 +-
 src/ui/icon-names.h      | 2 +-
 src/widgets/icon.cpp     | 2 +-
 src/widgets/mappings.xml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/share/icons/icons.svg b/share/icons/icons.svg
index c36c2d5db..dd0fe6068 100644
--- a/share/icons/icons.svg
+++ b/share/icons/icons.svg
@@ -5047,7 +5047,7 @@ http://www.inkscape.org/</dc:description>
      y="0"
      x="0" />
   <g
-     id="inkscape"
+     id="inkscape-logo"
      transform="matrix(0.1336824,0,0,0.1336824,329.5233,64.55912)"
      inkscape:label="#inkscape_options">
     <use
diff --git a/src/ui/icon-names.h b/src/ui/icon-names.h
index 3332dd8cf..f9a6f2a7d 100644
--- a/src/ui/icon-names.h
+++ b/src/ui/icon-names.h
@@ -235,7 +235,7 @@
 #define INKSCAPE_ICON_IMAGE_FILTER_TURBULENCE \
     "image-filter-turbulence"
 #define INKSCAPE_ICON_INKSCAPE \
-    "inkscape"
+    "inkscape-logo"
 #define INKSCAPE_ICON_LAYER_BOTTOM \
     "layer-bottom"
 #define INKSCAPE_ICON_LAYER_DELETE \
diff --git a/src/widgets/icon.cpp b/src/widgets/icon.cpp
index 5e47bd8e4..56602962d 100644
--- a/src/widgets/icon.cpp
+++ b/src/widgets/icon.cpp
@@ -381,7 +381,7 @@ static void setupLegacyNaming() {
     legacyNames["text-unkern"] ="remove_manual_kerns";
     legacyNames["help-keyboard-shortcuts"] ="help_keys";
     legacyNames["help-contents"] ="help_tutorials";
-    legacyNames["inkscape"] ="inkscape_options";
+    legacyNames["inkscape-logo"] ="inkscape_options";
     legacyNames["dialog-memory"] ="about_memory";
     legacyNames["tool-pointer"] ="draw_select";
     legacyNames["tool-node-editor"] ="draw_node";
diff --git a/src/widgets/mappings.xml b/src/widgets/mappings.xml
index f142c450c..2de3ff545 100644
--- a/src/widgets/mappings.xml
+++ b/src/widgets/mappings.xml
@@ -113,7 +113,7 @@
   <!-- help menu -->
   <remap id='help_keys' newid='help-keyboard-shortcuts'/>
   <remap id='help_tutorials' newid='help-contents'/>
-  <remap id='inkscape_options' newid='inkscape'/>
+  <remap id='inkscape_options' newid='inkscape-logo'/>
   <remap id='about_memory' newid='dialog-memory'/>
   
   <!-- tools -->
-- 
cgit v1.2.3