2 files changed, 3 insertions, 312 deletions
diff --git a/src/inkscape.cpp b/src/inkscape.cpp
index 24a744bbd..8dfff3c63 100644
--- a/src/inkscape.cpp
+++ b/src/inkscape.cpp
@@ -746,24 +746,15 @@ Application::crash_handler (int /*signum*/)
  */
 bool Application::load_menus()
 {
-    gchar *fn = Inkscape::IO::Resource::profile_path(MENUS_FILE);
+    using namespace Inkscape::IO::Resource;
+    Glib::ustring filename = get_filename(UIS, MENUS_FILE);
     gchar *menus_xml = 0;
     gsize len = 0;
 
-    if ( g_file_get_contents(fn, &menus_xml, &len, NULL) ) {
-        // load the menus_xml file
-        _menus = sp_repr_read_mem(menus_xml, len, NULL);
-
-        g_free(menus_xml);
-        menus_xml = 0;
-    }
-    g_free(fn);
-    fn = 0;
-
+    _menus = sp_repr_read_file(filename.c_str(), NULL);
     if ( !_menus ) {
         _menus = sp_repr_read_mem(menus_skeleton, MENUS_SKELETON_SIZE, NULL);
     }
-
     return (_menus != 0);
 }
 
diff --git a/src/menus-skeleton.h b/src/menus-skeleton.h
index ca337e6a7..4cafe85ac 100644
--- a/src/menus-skeleton.h
+++ b/src/menus-skeleton.h
@@ -16,308 +16,8 @@ static char const menus_skeleton[] =
 "  xmlns:inkscape=\"http://www.inkscape.org/namespaces/inkscape\">\n"
 "\n"
 "   <submenu name=\"" N_("_File") "\">\n"
-"       <verb verb-id=\"FileNew\" />\n"
-"       <verb verb-id=\"FileTemplates\" />\n"
-"       <verb verb-id=\"FileOpen\" />\n"
-"       <recent-file-list/>\n"
-"       <verb verb-id=\"FileRevert\" />\n"
-"       <verb verb-id=\"FileSave\" />\n"
-"       <verb verb-id=\"FileSaveAs\" />\n"
-"       <verb verb-id=\"FileSaveACopy\" />\n"
-"       <verb verb-id=\"FileSaveTemplate\" />\n"
-"       <separator/>\n"
-"       <verb verb-id=\"FileImport\" />\n"
-"       <verb verb-id=\"DialogExport\" />\n"
-"       <verb verb-id=\"FileImportFromOCAL\" />\n"
-//"       <verb verb-id=\"FileExportToOCAL\" />\n"
-"       <separator/>\n"
-"       <verb verb-id=\"FilePrint\" />\n"
-"       <separator/>\n"
-"       <verb verb-id=\"FileVacuum\" />\n"
-"       <separator/>\n"
-"       <verb verb-id=\"DialogDocumentProperties\" />\n"
-//"       <verb verb-id=\"DialogMetadata\" />\n"
-"       <separator/>\n"
-"       <verb verb-id=\"FileClose\" />\n"
 "       <verb verb-id=\"FileQuit\" />\n"
 "   </submenu>\n"
-"   <submenu name=\"" N_("_Edit") "\">\n"
-"       <verb verb-id=\"EditUndo\" />\n"
-"       <verb verb-id=\"EditRedo\" />\n"
-"       <verb verb-id=\"DialogUndoHistory\" />\n"
-"       <separator/>\n"
-"       <verb verb-id=\"EditCut\" />\n"
-"       <verb verb-id=\"EditCopy\" />\n"
-"       <verb verb-id=\"EditPaste\" />\n"
-"       <verb verb-id=\"EditPasteInPlace\" />\n"
-"       <verb verb-id=\"EditPasteStyle\" />\n"
-"       <submenu name=\"" N_("Paste Si_ze") "\">\n"
-"           <verb verb-id=\"EditPasteSize\" />\n"
-"           <verb verb-id=\"EditPasteWidth\" />\n"
-"           <verb verb-id=\"EditPasteHeight\" />\n"
-"           <verb verb-id=\"EditPasteSizeSeparately\" />\n"
-"           <verb verb-id=\"EditPasteWidthSeparately\" />\n"
-"           <verb verb-id=\"EditPasteHeightSeparately\" />\n"
-"       </submenu>\n"
-"       <separator/>\n"
-"       <verb verb-id=\"DialogFind\" />\n"
-"       <separator/>\n"
-"       <verb verb-id=\"EditDuplicate\" />\n"
-"       <submenu name=\"" N_("Clo_ne") "\">\n"
-"           <verb verb-id=\"EditClone\" />\n"
-"           <verb verb-id=\"DialogClonetiler\" />\n"
-"           <verb verb-id=\"EditUnlinkClone\" />\n"
-"           <verb verb-id=\"EditUnlinkCloneRecursive\" />\n"
-"           <verb verb-id=\"EditRelinkClone\" />\n"
-"           <verb verb-id=\"EditCloneSelectOriginal\" />\n"
-"           <verb verb-id=\"EditCloneOriginalPathLPE\" />\n"
-"       </submenu>\n"
-"       <verb verb-id=\"SelectionCreateBitmap\" />\n"
-"       <separator/>\n"
-"       <verb verb-id=\"EditDelete\" />\n"
-"       <separator/>\n"
-"       <verb verb-id=\"EditSelectAll\" />\n"
-"       <verb verb-id=\"EditSelectAllInAllLayers\" />\n"
-"       <submenu name=\"" N_("Select Sa_me") "\">\n"
-"           <verb verb-id=\"EditSelectSameFillStroke\" />\n"
-"           <verb verb-id=\"EditSelectSameFillColor\" />\n"
-"           <verb verb-id=\"EditSelectSameStrokeColor\" />\n"
-"           <verb verb-id=\"EditSelectSameStrokeStyle\" />\n"
-"           <verb verb-id=\"EditSelectSameObjectType\" />\n"
-"       </submenu>\n"
-"       <verb verb-id=\"EditInvert\" />\n"
-"       <verb verb-id=\"EditDeselect\" />\n"
-"       <separator/>\n"
-"       <verb verb-id=\"FitCanvasToSelectionOrDrawing\" />\n"
-"       <separator/>\n"
-"       <verb verb-id=\"EditGuidesAroundPage\" />\n"
-"       <verb verb-id=\"EditGuidesToggleLock\" check=\"yes\" />\n"
-"       <verb verb-id=\"EditRemoveAllGuides\" />\n"
-"       <separator/>\n"
-"       <verb verb-id=\"DialogXMLEditor\" />\n"
-"       <separator/>\n"
-"       <verb verb-id=\"DialogInput\" />\n"
-"       <verb verb-id=\"DialogPreferences\" />\n"
-"   </submenu>\n"
-"   <submenu name=\"" N_("_View") "\">\n"
-"     <submenu name=\"" N_("_Zoom") "\">\n"
-"       <verb verb-id=\"ZoomIn\" />\n"
-"       <verb verb-id=\"ZoomOut\" />\n"
-"       <separator/>\n"
-"       <verb verb-id=\"Zoom1:0\" />\n"
-"       <verb verb-id=\"Zoom1:2\" />\n"
-"       <verb verb-id=\"Zoom2:1\" />\n"
-"       <separator/>\n"
-"       <verb verb-id=\"ZoomSelection\" />\n"
-"       <verb verb-id=\"ZoomDrawing\" />\n"
-"       <verb verb-id=\"ZoomPage\" />\n"
-"       <verb verb-id=\"ZoomPageWidth\" />\n"
-"       <separator/>\n"
-"       <verb verb-id=\"ZoomPrev\" />\n"
-"       <verb verb-id=\"ZoomNext\" />\n"
-"     </submenu>\n"
-"       <submenu name=\"" N_("_Display mode") "\">\n"
-"         <verb verb-id=\"ViewModeToggle\"/>\n"
-"         <verb verb-id=\"ViewModeNormal\" radio=\"yes\" default=\"yes\"/>\n"
-"         <verb verb-id=\"ViewModeNoFilters\" radio=\"yes\"/>\n"
-"         <verb verb-id=\"ViewModeOutline\" radio=\"yes\"/>\n"
-// Better location in menu needs to be found
-//"         <verb verb-id=\"ViewModePrintColorsPreview\" radio=\"yes\"/>\n"
-//"         <verb verb-id=\"DialogPrintColorsPreview\" />\n"
-"       </submenu>\n"
-"       <submenu name=\"" N_("_Color display mode") "\">\n"
-"         <verb verb-id=\"ViewColorModeToggle\"/>\n"
-"         <verb verb-id=\"ViewColorModeNormal\" radio=\"yes\" default=\"yes\"/>\n"
-"         <verb verb-id=\"ViewColorModeGrayscale\" radio=\"yes\"/>\n"
-// Better location in menu needs to be found
-//"         <verb verb-id=\"ViewColorModePrintColorsPreview\" radio=\"yes\"/>\n"
-//"         <verb verb-id=\"DialogPrintColorsPreview\" />\n"
-"       </submenu>\n"
-"       <separator/>\n"
-"       <verb verb-id=\"ToggleGrid\" check=\"yes\" />\n"
-"       <verb verb-id=\"ToggleGuides\" check=\"yes\" />\n"
-"       <verb verb-id=\"ViewCmsToggle\" check=\"yes\" />\n"
-"       <separator/>\n"
-"       <submenu name=\"" N_("Sh_ow/Hide") "\">\n"
-"           <objects-checkboxes/>\n"
-"       </submenu>\n"
-"       <verb verb-id=\"DialogsToggle\" />\n"
-"       <separator/>\n"
-"       <verb verb-id=\"DialogSwatches\" />\n"
-"       <verb verb-id=\"DialogDebug\" />\n"
-"       <separator/>\n"
-"       <verb verb-id=\"PrevWindow\" />\n"
-"       <verb verb-id=\"NextWindow\" />\n"
-"       <separator/>\n"
-"       <verb verb-id=\"ViewIconPreview\" />\n"
-"       <verb verb-id=\"ViewNew\" />\n"
-"       <separator/>\n"
-"       <verb verb-id=\"FullScreen\" />\n"
-"       <separator/>\n"
-"       <task-checkboxes/>\n"
-// Not quite ready to be in the menus.
-// "       <verb verb-id=\"FocusToggle\" />\n"
-"   </submenu>\n"
-"   <submenu name=\"" N_("_Layer") "\">\n"
-"       <verb verb-id=\"LayerNew\" />\n"
-"       <verb verb-id=\"LayerRename\" />\n"
-"       <separator/>\n"
-"       <verb verb-id=\"LayerToggleHide\" />\n"
-"       <verb verb-id=\"LayerToggleLock\" />\n"
-"       <separator/>\n"
-"       <verb verb-id=\"LayerNext\" />\n"
-"       <verb verb-id=\"LayerPrev\" />\n"
-"       <separator/>\n"
-"       <verb verb-id=\"LayerMoveToNext\" />\n"
-"       <verb verb-id=\"LayerMoveToPrev\" />\n"
-"       <verb verb-id=\"LayerMoveTo\" />\n"
-"       <separator/>\n"
-"       <verb verb-id=\"LayerRaise\" />\n"
-"       <verb verb-id=\"LayerLower\" />\n"
-"       <verb verb-id=\"LayerToTop\" />\n"
-"       <verb verb-id=\"LayerToBottom\" />\n"
-"       <separator/>\n"
-"       <verb verb-id=\"LayerDuplicate\" />\n"
-"       <verb verb-id=\"LayerDelete\" />\n"
-"       <separator/>\n"
-"       <verb verb-id=\"DialogLayers\" />\n"
-"   </submenu>\n"
-"   <submenu name=\"" N_("_Object") "\">\n"
-"       <verb verb-id=\"DialogObjects\" />\n"
-"       <verb verb-id=\"DialogTags\" />\n"
-"       <verb verb-id=\"DialogStyle\" />\n"
-"       <separator/>\n"
-"       <verb verb-id=\"DialogFillStroke\" />\n"
-"       <verb verb-id=\"DialogObjectProperties\" />\n"
-"       <verb verb-id=\"DialogSymbols\" />\n"
-"       <separator/>\n"
-"       <verb verb-id=\"SelectionGroup\" />\n"
-"       <verb verb-id=\"SelectionUnGroup\" />\n"
-"       <verb verb-id=\"SelectionUnGroupPopSelection\" />\n"
-"       <separator/>\n"
-"       <submenu name=\"" N_("Cli_p") "\">\n"
-"           <verb verb-id=\"ObjectSetClipPath\" />\n"
-"           <verb verb-id=\"ObjectUnSetClipPath\" />\n"
-"       </submenu>\n"
-"       <submenu name=\"" N_("Mas_k") "\">\n"
-"           <verb verb-id=\"ObjectSetMask\" />\n"
-"           <verb verb-id=\"ObjectUnSetMask\" />\n"
-"       </submenu>\n"
-"       <submenu name=\"" N_("Patter_n") "\">\n"
-"           <verb verb-id=\"ObjectsToPattern\" />\n"
-"           <verb verb-id=\"ObjectsFromPattern\" />\n"
-"       </submenu>\n"
-"       <verb verb-id=\"ObjectsToMarker\" />\n"
-"       <verb verb-id=\"ObjectsToGuides\" />\n"
-"       <separator/>\n"
-"       <verb verb-id=\"SelectionRaise\" />\n"
-"       <verb verb-id=\"SelectionLower\" />\n"
-"       <verb verb-id=\"SelectionToFront\" />\n"
-"       <verb verb-id=\"SelectionToBack\" />\n"
-"       <separator/>\n"
-"       <verb verb-id=\"ObjectRotate90\" />\n"
-"       <verb verb-id=\"ObjectRotate90CCW\" />\n"
-"       <verb verb-id=\"ObjectFlipHorizontally\" />\n"
-"       <verb verb-id=\"ObjectFlipVertically\" />\n"
-"       <separator/>\n"
-"       <verb verb-id=\"UnhideAll\" />\n"
-"       <verb verb-id=\"UnlockAll\" />\n"
-"       <separator/>\n"
-"       <verb verb-id=\"DialogTransform\" />\n"
-"       <verb verb-id=\"DialogAlignDistribute\" />\n"
-"       <verb verb-id=\"DialogArrange\" />\n"
-"       <verb verb-id=\"DialogPrototype\" />\n"
-"   </submenu>\n"
-"   <submenu name=\"" N_("_Path") "\">\n"
-"       <verb verb-id=\"ObjectToPath\" />\n"
-"       <verb verb-id=\"StrokeToPath\" />\n"
-
-#if HAVE_POTRACE
-"       <verb verb-id=\"SelectionTrace\" />\n"
-#endif
-
-"       <verb verb-id=\"SelectionPixelArt\" />\n"
-"       <separator/>\n"
-"       <verb verb-id=\"SelectionUnion\"     show-icon=\"yes\" />\n"
-"       <verb verb-id=\"SelectionDiff\"      show-icon=\"yes\" />\n"
-"       <verb verb-id=\"SelectionIntersect\" show-icon=\"yes\" />\n"
-"       <verb verb-id=\"SelectionSymDiff\"   show-icon=\"yes\"/>\n"
-"       <verb verb-id=\"SelectionDivide\"    show-icon=\"yes\"/>\n"
-"       <verb verb-id=\"SelectionCutPath\"   show-icon=\"yes\"/>\n"
-"       <separator/>\n"
-"       <verb verb-id=\"SelectionCombine\"    show-icon=\"yes\"/>\n"
-"       <verb verb-id=\"SelectionBreakApart\" show-icon=\"yes\"/>\n"
-"       <separator/>\n"
-"       <verb verb-id=\"SelectionInset\"        show-icon=\"yes\"/>\n"
-"       <verb verb-id=\"SelectionOffset\"       show-icon=\"yes\"/>\n"
-"       <verb verb-id=\"SelectionDynOffset\"    show-icon=\"yes\"/>\n"
-"       <verb verb-id=\"SelectionLinkedOffset\" show-icon=\"yes\"/>\n"
-"       <separator/>\n"
-"       <verb verb-id=\"SelectionSimplify\" />\n"
-"       <verb verb-id=\"SelectionReverse\" />\n"
-"       <separator/>\n"
-"       <verb verb-id=\"DialogLivePathEffect\" />\n"
-"       <verb verb-id=\"PasteLivePathEffect\" />\n"
-"       <verb verb-id=\"RemoveLivePathEffect\" />\n"
-"   </submenu>\n"
-"   <submenu name=\"" N_("_Text") "\">\n"
-"       <verb verb-id=\"DialogText\" />\n"
-"       <verb verb-id=\"DialogSVGFonts\" />\n"
-"       <verb verb-id=\"DialogGlyphs\" />\n"
-"       <separator/>\n"
-"       <verb verb-id=\"SelectionTextToPath\" />\n"
-"       <verb verb-id=\"SelectionTextFromPath\" />\n"
-"       <separator/>\n"
-"       <verb verb-id=\"ObjectFlowText\" />\n"
-"       <verb verb-id=\"ObjectUnFlowText\" />\n"
-"       <verb verb-id=\"ObjectFlowtextToText\" />\n"
-"       <separator/>\n"
-"       <verb verb-id=\"SelectionTextRemoveKerns\" />\n"
-#ifdef HAVE_ASPELL
-"       <separator/>\n"
-"       <verb verb-id=\"DialogSpellcheck\" />\n"
-#endif
-"   </submenu>\n"
-"   <submenu name=\"" N_("Filter_s") "\">\n"
-"       <filters-list/>\n"
-"       <separator/>\n"
-"       <verb verb-id=\"DialogFilterEffects\" />\n"
-"       <verb verb-id=\"RemoveFilter\" />\n"
-"   </submenu>\n"
-"   <submenu name=\"" N_("Exte_nsions") "\">\n"
-"       <verb verb-id=\"EffectLast\" />\n"
-"       <verb verb-id=\"EffectLastPref\" />\n"
-"       <separator/>\n"
-"       <effects-list/>\n"
-"   </submenu>\n"
-"   <submenu name=\"" N_("_Help") "\">\n"
-"       <verb verb-id=\"org.inkscape.help.manual\" />\n"
-"       <verb verb-id=\"org.inkscape.help.keys\" />\n"
-"       <verb verb-id=\"org.inkscape.help.askaquestion\" />\n"
-"       <submenu name=\"" N_("Tutorials") "\">\n"
-"           <verb verb-id=\"TutorialsBasic\" />\n"
-"           <verb verb-id=\"TutorialsShapes\" />\n"
-"           <verb verb-id=\"TutorialsAdvanced\" />\n"
-#if HAVE_POTRACE
-"           <verb verb-id=\"TutorialsTracing\" />\n"
-#endif
-"           <verb verb-id=\"TutorialsTracingPixelArt\" />\n"
-"           <verb verb-id=\"TutorialsCalligraphy\" />\n"
-"           <verb verb-id=\"TutorialsInterpolate\" />\n"
-"           <verb verb-id=\"TutorialsDesign\" />\n"
-"           <verb verb-id=\"TutorialsTips\" />\n"
-"       </submenu>\n"
-//"       <verb verb-id=\"org.inkscape.dialogs.extensioneditor\" />\n"
-"       <verb verb-id=\"org.inkscape.help.commandline\" />\n"
-"       <verb verb-id=\"org.inkscape.help.faq\" />\n"
-"       <verb verb-id=\"org.inkscape.help.relnotes\" />\n"
-"       <verb verb-id=\"org.inkscape.help.reportabug\" />\n"
-"       <verb verb-id=\"org.inkscape.help.svgspec\" />\n"
-"       <separator/>\n"
-"       <verb verb-id=\"HelpAboutMemory\" />\n"
-"       <verb verb-id=\"HelpAbout\" />\n"
-//"       <verb verb-id=\"ShowLicense\" />\n"
-"   </submenu>\n"
 "</inkscape>\n";
 
 #define MENUS_SKELETON_SIZE (sizeof(menus_skeleton) - 1)