diff --git a/debian/changelog b/debian/changelog index f8446e9..5b0cec2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +mintmenu (4.8.1) helena; urgency=low + + * Dependency on mint-common + * Updated calls to newer pyinotify API + * Updated path of keybinder API + * Removed dependency on mintinstall + + -- Clement Lefebvre Thu, 8 Oct 2009 10:26:00 +0000 + mintmenu (4.8.0) helena; urgency=low * Blueprint implemented: https://blueprints.launchpad.net/linuxmint/+spec/generic-branding diff --git a/debian/control b/debian/control index 966177a..e3f5274 100644 --- a/debian/control +++ b/debian/control @@ -7,6 +7,6 @@ Standards-Version: 3.7.2 Package: mintmenu Architecture: all -Depends: python (>= 2.4), python (<< 3), python-gtk2, python-glade2, mintinstall, deskbar-applet +Depends: python (>= 2.4), python (<< 3), python-gtk2, python-glade2, deskbar-applet, mint-common Description: Advanced Gnome menu One of the most advanced menus under Linux. MintMenu supports filtering, favorites, easy-uninstallation, autosession, and many other features. diff --git a/usr/lib/linuxmint/mintMenu/mintMenu.py b/usr/lib/linuxmint/mintMenu/mintMenu.py index 373012f..7bb2418 100755 --- a/usr/lib/linuxmint/mintMenu/mintMenu.py +++ b/usr/lib/linuxmint/mintMenu/mintMenu.py @@ -22,7 +22,7 @@ except Exception, e: global mbindkey # Load the key binding lib (developped by deskbar-applet, copied into mintMenu so we don't end up with an unnecessary dependency) try: - sys.path.append('/usr/lib/python2.5/site-packages/deskbar/core/keybinder') + sys.path.append('/usr/lib/pyshared/python2.6/deskbar/core/keybinder') from _keybinder import tomboy_keybinder_bind as bind_key except Exception, cause: print "*********** Keybind Driver Load Failure **************" @@ -748,7 +748,7 @@ class MenuWin( object ): about = gtk.AboutDialog() about.set_name("mintMenu") import commands - version = commands.getoutput("/usr/lib/linuxmint/mintMenu/version.py") + version = commands.getoutput("/usr/lib/linuxmint/common/version.py mintmenu") about.set_version(version) try: h = open('/usr/share/common-licenses/GPL','r') diff --git a/usr/lib/linuxmint/mintMenu/mintMenuConfig.glade b/usr/lib/linuxmint/mintMenu/mintMenuConfig.glade index ed705e4..d6a0422 100644 --- a/usr/lib/linuxmint/mintMenu/mintMenuConfig.glade +++ b/usr/lib/linuxmint/mintMenu/mintMenuConfig.glade @@ -5,7 +5,7 @@ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK center-always - /usr/lib/linuxmint/mintSystem/icon.png + /usr/share/linuxmint/logo.png True diff --git a/usr/lib/linuxmint/mintMenu/mintRemove.py b/usr/lib/linuxmint/mintMenu/mintRemove.py index 56407cd..830bee1 100755 --- a/usr/lib/linuxmint/mintMenu/mintRemove.py +++ b/usr/lib/linuxmint/mintMenu/mintRemove.py @@ -87,7 +87,7 @@ class mintRemoveWindow: warnDlg = gtk.Dialog(title="MintMenu", parent=None, flags=0, buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL)) warnDlg.add_button(gtk.STOCK_REMOVE, gtk.RESPONSE_OK) warnDlg.vbox.set_spacing(10) - warnDlg.set_icon_from_file("/usr/lib/linuxmint/mintSystem/icon.png") + warnDlg.set_icon_from_file("/usr/share/linuxmint/logo.png") labelSpc = gtk.Label(" ") warnDlg.vbox.pack_start(labelSpc) labelSpc.show() diff --git a/usr/lib/linuxmint/mintMenu/plugins/filemonitor.py b/usr/lib/linuxmint/mintMenu/plugins/filemonitor.py index 9868c44..57bd228 100755 --- a/usr/lib/linuxmint/mintMenu/plugins/filemonitor.py +++ b/usr/lib/linuxmint/mintMenu/plugins/filemonitor.py @@ -22,14 +22,13 @@ if hasInotify: self.notifier.start() - def addMonitor( self, filename, callback, args = None ): - - mask = pyinotify.EventsCodes.IN_DELETE | pyinotify.EventsCodes.IN_CREATE | pyinotify.EventsCodes.IN_MODIFY + def addMonitor( self, filename, callback, args = None ): + mask = pyinotify.IN_DELETE | pyinotify.IN_CREATE | pyinotify.IN_MODIFY mId = self.wm.add_watch( filename, mask, rec = True)[filename] if mId >= 0: self.callbacks[mId] = ( callback, args ) - return mId + return mId def removeMonitor( self, monitorId ): if monitorId in self.callbacks: diff --git a/usr/lib/linuxmint/mintMenu/plugins/places.py b/usr/lib/linuxmint/mintMenu/plugins/places.py index 0c77c78..d1add7d 100755 --- a/usr/lib/linuxmint/mintMenu/plugins/places.py +++ b/usr/lib/linuxmint/mintMenu/plugins/places.py @@ -145,7 +145,7 @@ class pluginclass( object ): desktopDir = home + "/Desktop" try: import sys - sys.path.append('/usr/lib/linuxmint/mintSystem/python') + sys.path.append('/usr/lib/linuxmint/mintSystem/common') from configobj import ConfigObj config = ConfigObj(home + "/.config/user-dirs.dirs") tmpdesktopDir = config['XDG_DESKTOP_DIR'] diff --git a/usr/lib/linuxmint/mintMenu/plugins/system_management.py b/usr/lib/linuxmint/mintMenu/plugins/system_management.py index f9de343..c3fec75 100755 --- a/usr/lib/linuxmint/mintMenu/plugins/system_management.py +++ b/usr/lib/linuxmint/mintMenu/plugins/system_management.py @@ -97,11 +97,12 @@ class pluginclass( object ): #Add standard items def do_standard_items( self ): - Button1 = easyButton( "/usr/lib/linuxmint/mintInstall/icon.svg", self.iconsize, [_("Software manager")], -1, -1 ) - Button1.connect( "clicked", self.ButtonClicked, "mintinstall" ) - Button1.show() - self.systemBtnHolder.pack_start( Button1, False, False ) - self.mintMenuWin.setTooltip( Button1, _("Browse and install available software") ) + if os.path.exists("/usr/lib/linuxmint/mintInstall/icon.svg"): + Button1 = easyButton( "/usr/lib/linuxmint/mintInstall/icon.svg", self.iconsize, [_("Software manager")], -1, -1 ) + Button1.connect( "clicked", self.ButtonClicked, "mintinstall" ) + Button1.show() + self.systemBtnHolder.pack_start( Button1, False, False ) + self.mintMenuWin.setTooltip( Button1, _("Browse and install available software") ) Button2 = easyButton( "synaptic", self.iconsize, [_("Package manager")], -1, -1 ) Button2.connect( "clicked", self.ButtonClicked, "gksu /usr/sbin/synaptic" ) diff --git a/usr/lib/linuxmint/mintMenu/version.py b/usr/lib/linuxmint/mintMenu/version.py deleted file mode 100755 index f5b01a9..0000000 --- a/usr/lib/linuxmint/mintMenu/version.py +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/python - -import apt -import sys - -try: - cache = apt.Cache() - pkg = cache["mintmenu"] - print pkg.installedVersion -except: - pass - - diff --git a/usr/lib/linuxmint/mintMenu/version.pyc b/usr/lib/linuxmint/mintMenu/version.pyc deleted file mode 100644 index 3334c74..0000000 Binary files a/usr/lib/linuxmint/mintMenu/version.pyc and /dev/null differ