diff -Naur mintmenu/usr/bin/mintmenu mintmenu.new/usr/bin/mintmenu --- mintmenu/usr/bin/mintmenu 2013-05-21 12:38:22.000000000 +0300 +++ mintmenu.new/usr/bin/mintmenu 2013-05-26 22:05:47.353982840 +0300 @@ -12,4 +12,4 @@ os.system("rm -rf ~/.linuxmint/mintMenu") print "All mintMenu settings are now restored to default" else: - os.system("/usr/lib/linuxmint/mintMenu/mintMenu.py") + os.system("/usr/share/mintMenu/mintMenu.py") diff -Naur mintmenu/usr/lib/linuxmint/mintMenu/mintMenuConfig.py mintmenu.new/usr/lib/linuxmint/mintMenu/mintMenuConfig.py --- mintmenu/usr/lib/linuxmint/mintMenu/mintMenuConfig.py 2013-05-21 23:21:41.000000000 +0300 +++ mintmenu.new/usr/lib/linuxmint/mintMenu/mintMenuConfig.py 2013-05-26 22:09:59.301730146 +0300 @@ -40,7 +40,7 @@ #i18n self.mainWindow.set_title(_("Menu preferences")) - self.mainWindow.set_icon_from_file("/usr/lib/linuxmint/mintMenu/icon.svg") + self.mainWindow.set_icon_from_file("/usr/share/mintMenu/icon.svg") self.builder.get_object("startWithFavorites").set_label(_("Always start with favorites pane")) self.builder.get_object("showButtonIcon").set_label(_("Show button icon")) @@ -185,7 +185,7 @@ self.systemHeightButton = self.builder.get_object( "systemHeightSpinButton" ) if (self.allowSystemScrollbarToggle.get_active() == False): self.systemHeightButton.set_sensitive(False) self.allowSystemScrollbarToggle.connect("toggled", self.toggleSystemHeightEnabled ) - if os.path.exists("/usr/lib/linuxmint/mintInstall/icon.svg"): + if os.path.exists("/usr/share/mintMenu/mintInstall/icon.svg"): self.builder.get_object( "softwaremanagercheckbutton" ).show() else: self.builder.get_object( "softwaremanagercheckbutton" ).hide() @@ -427,7 +427,7 @@ newPlaceDialog = self.builder.get_object( "editPlaceDialog" ) folderChooserDialog = self.builder.get_object( "fileChooserDialog" ) newPlaceDialog.set_transient_for(self.mainWindow) - newPlaceDialog.set_icon_from_file("/usr/lib/linuxmint/mintMenu/icon.svg") + newPlaceDialog.set_icon_from_file("/usr/share/mintMenu/icon.svg") newPlaceDialog.set_title(self.newPlaceDialogTitle) folderChooserDialog.set_title(self.folderChooserDialogTitle) newPlaceDialog.set_default_response(Gtk.ResponseType.OK) @@ -458,7 +458,7 @@ editPlaceDialog = self.builder.get_object( "editPlaceDialog" ) folderChooserDialog = self.builder.get_object( "fileChooserDialog" ) editPlaceDialog.set_transient_for(self.mainWindow) - editPlaceDialog.set_icon_from_file("/usr/lib/linuxmint/mintMenu/icon.svg") + editPlaceDialog.set_icon_from_file("/usr/share/mintMenu/icon.svg") editPlaceDialog.set_title(self.editPlaceDialogTitle) folderChooserDialog.set_title(self.folderChooserDialogTitle) editPlaceDialog.set_default_response(Gtk.ResponseType.OK) diff -Naur mintmenu/usr/lib/linuxmint/mintMenu/mintMenu.py mintmenu.new/usr/lib/linuxmint/mintMenu/mintMenu.py --- mintmenu/usr/lib/linuxmint/mintMenu/mintMenu.py 2013-05-21 23:21:41.000000000 +0300 +++ mintmenu.new/usr/lib/linuxmint/mintMenu/mintMenu.py 2013-05-26 22:09:59.298730191 +0300 @@ -72,7 +72,7 @@ self.detect_desktop_environment() - self.icon = "/usr/lib/linuxmint/mintMenu/visualisation-logo.png" + self.icon = "/usr/share/mintMenu/visualisation-logo.png" self.toggle = toggleButton # Load UI file and extract widgets @@ -741,7 +741,7 @@ about = Gtk.AboutDialog() about.set_name("mintMenu") import commands - version = commands.getoutput("/usr/lib/linuxmint/common/version.py mintmenu") + version = commands.getoutput("/usr/share/mintMenu/common/version.py mintmenu") about.set_version(version) try: h = open('/usr/share/common-licenses/GPL','r') @@ -757,7 +757,7 @@ # about.set_authors( ["Clement Lefebvre <clem@linuxmint.com>", "Lars-Peter Clausen <lars@laprican.de>"] ) about.set_translator_credits(("translator-credits") ) #about.set_copyright( _("Based on USP from S.Chanderbally") ) - about.set_logo( GdkPixbuf.Pixbuf.new_from_file("/usr/lib/linuxmint/mintMenu/icon.svg") ) + about.set_logo( GdkPixbuf.Pixbuf.new_from_file("/usr/share/mintMenu/icon.svg") ) about.connect( "response", lambda dialog, r: dialog.destroy() ) about.show() diff -Naur mintmenu/usr/lib/linuxmint/mintMenu/mintRemove.py mintmenu.new/usr/lib/linuxmint/mintMenu/mintRemove.py --- mintmenu/usr/lib/linuxmint/mintMenu/mintRemove.py 2013-03-10 04:02:01.000000000 +0200 +++ mintmenu.new/usr/lib/linuxmint/mintMenu/mintRemove.py 2013-05-26 22:09:59.294730251 +0300 @@ -61,8 +61,8 @@ self.builder = Gtk.Builder() - self.builder.add_from_file ("/usr/lib/linuxmint/mintMenu/mintRemove.glade") - self.builder.get_object("main_window").set_icon_from_file("/usr/lib/linuxmint/mintMenu/icon.svg") + self.builder.add_from_file ("/usr/share/mintMenu/mintRemove.glade") + self.builder.get_object("main_window").set_icon_from_file("/usr/share/mintMenu/icon.svg") self.builder.get_object("main_window").set_title("") self.builder.get_object("main_window").connect("destroy", self.giveUp) diff -Naur mintmenu/usr/lib/linuxmint/mintMenu/plugins/applications.py mintmenu.new/usr/lib/linuxmint/mintMenu/plugins/applications.py --- mintmenu/usr/lib/linuxmint/mintMenu/plugins/applications.py 2013-05-21 23:21:41.000000000 +0300 +++ mintmenu.new/usr/lib/linuxmint/mintMenu/plugins/applications.py 2013-05-26 22:09:59.286730370 +0300 @@ -346,7 +346,7 @@ def refresh_apt_cache(self): if self.useAPT: os.system("mkdir -p %s/.linuxmint/mintMenu/" % home) - os.system("/usr/lib/linuxmint/mintMenu/plugins/get_apt_cache.py > %s/.linuxmint/mintMenu/apt.cache &" % home) + os.system("/usr/share/mintMenu/plugins/get_apt_cache.py > %s/.linuxmint/mintMenu/apt.cache &" % home) def get_panel(self): panelsettings = Gio.Settings.new("org.mate.panel") @@ -624,14 +624,14 @@ suggestionButton = SuggestionButton(Gtk.STOCK_ADD, self.iconSize, "") suggestionButton.connect("clicked", self.search_google) suggestionButton.set_text(_("Search Google for %s") % text) - suggestionButton.set_image("/usr/lib/linuxmint/mintMenu/search_engines/google.ico") + suggestionButton.set_image("/usr/share/mintMenu/search_engines/google.ico") self.applicationsBox.add(suggestionButton) self.suggestions.append(suggestionButton) suggestionButton = SuggestionButton(Gtk.STOCK_ADD, self.iconSize, "") suggestionButton.connect("clicked", self.search_wikipedia) suggestionButton.set_text(_("Search Wikipedia for %s") % text) - suggestionButton.set_image("/usr/lib/linuxmint/mintMenu/search_engines/wikipedia.ico") + suggestionButton.set_image("/usr/share/mintMenu/search_engines/wikipedia.ico") self.applicationsBox.add(suggestionButton) self.suggestions.append(suggestionButton) @@ -648,7 +648,7 @@ suggestionButton = SuggestionButton(Gtk.STOCK_ADD, self.iconSize, "") suggestionButton.connect("clicked", self.search_dictionary) suggestionButton.set_text(_("Lookup %s in Dictionary") % text) - suggestionButton.set_image("/usr/lib/linuxmint/mintMenu/search_engines/dictionary.png") + suggestionButton.set_image("/usr/share/mintMenu/search_engines/dictionary.png") self.applicationsBox.add(suggestionButton) self.suggestions.append(suggestionButton) @@ -828,7 +828,7 @@ else: shownList.append(i) showns = True - if (not showns and os.path.exists("/usr/lib/linuxmint/mintInstall/icon.svg")): + if (not showns and os.path.exists("/usr/share/mintMenu/mintInstall/icon.svg")): if len(text) >= 3: if self.current_suggestion is not None and self.current_suggestion in text: # We're restricting our search... @@ -1041,14 +1041,14 @@ menuItem = Gtk.ImageMenuItem(_("Search Google")) img = Gtk.Image() - img.set_from_file('/usr/lib/linuxmint/mintMenu/search_engines/google.ico') + img.set_from_file('/usr/share/mintMenu/search_engines/google.ico') menuItem.set_image(img) menuItem.connect("activate", self.search_google) menu.append(menuItem) menuItem = Gtk.ImageMenuItem(_("Search Wikipedia")) img = Gtk.Image() - img.set_from_file('/usr/lib/linuxmint/mintMenu/search_engines/wikipedia.ico') + img.set_from_file('/usr/share/mintMenu/search_engines/wikipedia.ico') menuItem.set_image(img) menuItem.connect("activate", self.search_wikipedia) menu.append(menuItem) @@ -1058,7 +1058,7 @@ menuItem = Gtk.ImageMenuItem(_("Lookup Dictionary")) img = Gtk.Image() - img.set_from_file('/usr/lib/linuxmint/mintMenu/search_engines/dictionary.png') + img.set_from_file('/usr/share/mintMenu/search_engines/dictionary.png') menuItem.set_image(img) menuItem.connect("activate", self.search_dictionary) menu.append(menuItem) @@ -1075,35 +1075,35 @@ menuItem = Gtk.ImageMenuItem(_("Find Software")) img = Gtk.Image() - img.set_from_file('/usr/lib/linuxmint/mintMenu/search_engines/software.png') + img.set_from_file('/usr/share/mintMenu/search_engines/software.png') menuItem.set_image(img) menuItem.connect("activate", self.search_mint_software) menu.append(menuItem) menuItem = Gtk.ImageMenuItem(_("Find Tutorials")) img = Gtk.Image() - img.set_from_file('/usr/lib/linuxmint/mintMenu/search_engines/tutorials.png') + img.set_from_file('/usr/share/mintMenu/search_engines/tutorials.png') menuItem.set_image(img) menuItem.connect("activate", self.search_mint_tutorials) menu.append(menuItem) menuItem = Gtk.ImageMenuItem(_("Find Hardware")) img = Gtk.Image() - img.set_from_file('/usr/lib/linuxmint/mintMenu/search_engines/hardware.png') + img.set_from_file('/usr/share/mintMenu/search_engines/hardware.png') menuItem.set_image(img) menuItem.connect("activate", self.search_mint_hardware) menu.append(menuItem) menuItem =Gtk.ImageMenuItem(_("Find Ideas")) img = Gtk.Image() - img.set_from_file('/usr/lib/linuxmint/mintMenu/search_engines/ideas.png') + img.set_from_file('/usr/share/mintMenu/search_engines/ideas.png') menuItem.set_image(img) menuItem.connect("activate", self.search_mint_ideas) menu.append(menuItem) menuItem = Gtk.ImageMenuItem(_("Find Users")) img = Gtk.Image() - img.set_from_file('/usr/lib/linuxmint/mintMenu/search_engines/users.png') + img.set_from_file('/usr/share/mintMenu/search_engines/users.png') menuItem.set_image(img) menuItem.connect("activate", self.search_mint_users) menu.append(menuItem) @@ -1177,7 +1177,7 @@ try: # Determine where the Desktop folder is (could be localized) import sys, commands - sys.path.append('/usr/lib/linuxmint/common') + sys.path.append('/usr/share/common') from configobj import ConfigObj config = ConfigObj(home + "/.config/user-dirs.dirs") desktopDir = home + "/Desktop" @@ -1417,7 +1417,7 @@ from user import home if (not os.path.exists(home + "/.linuxmint/mintMenu/applications.list")): os.system("mkdir -p " + home + "/.linuxmint/mintMenu/applications") - os.system("cp /usr/lib/linuxmint/mintMenu/applications.list " + home + "/.linuxmint/mintMenu/applications.list") + os.system("cp /usr/share/mintMenu/applications.list " + home + "/.linuxmint/mintMenu/applications.list") applicationsFile = open ( os.path.join( os.path.expanduser( "~" ), ".linuxmint", "mintMenu", "applications.list" ), "r" ) applicationsList = applicationsFile.readlines() diff -Naur b/usr/lib/linuxmint/mintMenu/plugins/easybuttons.py a/usr/lib/linuxmint/mintMenu/plugins/easybuttons.py --- mintmenu/usr/lib/linuxmint/mintMenu/plugins/easybuttons.py 2013-11-25 17:59:08.000000000 +0200 +++ mintmenu.new/usr/lib/linuxmint/mintMenu/plugins/easybuttons.py 2013-11-29 01:34:25.252338880 +0200 @@ -389,7 +389,7 @@ Execute(self.appExec, self.appPath) def uninstall (self, *args ): - Execute("gksu /usr/lib/linuxmint/mintMenu/mintRemove.py " + self.desktopFile) + Execute("gksu /usr/share/mintMenu/mintRemove.py " + self.desktopFile) # IconTheme changed, setup new icons for button and drag 'n drop def iconChanged( self ): diff -Naur mintmenu/usr/lib/linuxmint/mintMenu/plugins/places.py mintmenu.new/usr/lib/linuxmint/mintMenu/plugins/places.py --- mintmenu/usr/lib/linuxmint/mintMenu/plugins/places.py 2013-05-21 12:11:36.000000000 +0300 +++ mintmenu.new/usr/lib/linuxmint/mintMenu/plugins/places.py 2013-05-26 22:09:59.278730490 +0300 @@ -178,7 +178,7 @@ desktopDir = home + "/Desktop" try: import sys - sys.path.append('/usr/lib/linuxmint/common') + sys.path.append('/usr/share/common') from configobj import ConfigObj config = ConfigObj(home + "/.config/user-dirs.dirs") tmpdesktopDir = config['XDG_DESKTOP_DIR'] diff -Naur mintmenu/usr/share/dbus-1/services/org.mate.panel.applet.MintMenuAppletFactory.service mintmenu.new/usr/share/dbus-1/services/org.mate.panel.applet.MintMenuAppletFactory.service --- mintmenu/usr/share/dbus-1/services/org.mate.panel.applet.MintMenuAppletFactory.service 2013-03-04 14:53:09.000000000 +0200 +++ mintmenu.new/usr/share/dbus-1/services/org.mate.panel.applet.MintMenuAppletFactory.service 2013-05-26 22:21:29.637612650 +0300 @@ -1,3 +1,3 @@ [D-BUS Service] Name=org.mate.panel.applet.MintMenuAppletFactory -Exec=/usr/lib/linuxmint/mintMenu/mintMenu.py +Exec=/usr/share/mintMenu/mintMenu.py diff -Naur mintmenu/usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.xml mintmenu.new/usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.xml --- mintmenu/usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.xml 2013-05-21 23:21:41.000000000 +0300 +++ mintmenu.new/usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.xml 2013-05-26 22:22:34.253828252 +0300 @@ -69,7 +69,7 @@ </key> <key type="s" name="applet-icon"> - <default>"/usr/lib/linuxmint/mintMenu/visualisation-logo.png"</default> + <default>"/usr/share/icons/menta/24x24/places/start-here.png"</default> <summary></summary> <description></description> </key> diff -Naur mintmenu/usr/share/mate-panel/applets/org.mate.panel.MintMenuApplet.mate-panel-applet mintmenu.new/usr/share/mate-panel/applets/org.mate.panel.MintMenuApplet.mate-panel-applet --- mintmenu/usr/share/mate-panel/applets/org.mate.panel.MintMenuApplet.mate-panel-applet 2013-03-04 14:53:09.000000000 +0200 +++ mintmenu.new/usr/share/mate-panel/applets/org.mate.panel.MintMenuApplet.mate-panel-applet 2013-05-26 22:20:43.120175230 +0300 @@ -1,13 +1,13 @@ [Applet Factory] Id=MintMenuAppletFactory InProcess=false -Location=/usr/lib/linuxmint/mintMenu/mintMenu.py +Location=/usr/share/mintMenu/mintMenu.py Name=MintMenu Applet Factory Description=Advanced Menu [MintMenuApplet] Name=mintMenu Description=Advanced Menu -Icon=/usr/lib/linuxmint/mintMenu/mint-logo.svg +Icon=/usr/share/icons/mageia.png MateComponentId=OAFIID:MATE_MintMenuApplet;