Karmic compatibility, mint-common dependency
This commit is contained in:
parent
2257fe4a05
commit
4f0861abc3
8
debian/changelog
vendored
8
debian/changelog
vendored
@ -1,3 +1,11 @@
|
|||||||
|
mintmenu (4.8.1) helena; urgency=low
|
||||||
|
|
||||||
|
* Dependency on mint-common
|
||||||
|
* Updated calls to newer pyinotify API
|
||||||
|
* Updated path of keybinder API
|
||||||
|
|
||||||
|
-- Clement Lefebvre <root@linuxmint.com> Thu, 8 Oct 2009 10:26:00 +0000
|
||||||
|
|
||||||
mintmenu (4.8.0) helena; urgency=low
|
mintmenu (4.8.0) helena; urgency=low
|
||||||
|
|
||||||
* Blueprint implemented: https://blueprints.launchpad.net/linuxmint/+spec/generic-branding
|
* Blueprint implemented: https://blueprints.launchpad.net/linuxmint/+spec/generic-branding
|
||||||
|
2
debian/control
vendored
2
debian/control
vendored
@ -7,6 +7,6 @@ Standards-Version: 3.7.2
|
|||||||
|
|
||||||
Package: mintmenu
|
Package: mintmenu
|
||||||
Architecture: all
|
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, mintinstall, deskbar-applet, mint-common
|
||||||
Description: Advanced Gnome menu
|
Description: Advanced Gnome menu
|
||||||
One of the most advanced menus under Linux. MintMenu supports filtering, favorites, easy-uninstallation, autosession, and many other features.
|
One of the most advanced menus under Linux. MintMenu supports filtering, favorites, easy-uninstallation, autosession, and many other features.
|
||||||
|
@ -22,7 +22,7 @@ except Exception, e:
|
|||||||
global mbindkey
|
global mbindkey
|
||||||
# Load the key binding lib (developped by deskbar-applet, copied into mintMenu so we don't end up with an unnecessary dependency)
|
# Load the key binding lib (developped by deskbar-applet, copied into mintMenu so we don't end up with an unnecessary dependency)
|
||||||
try:
|
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
|
from _keybinder import tomboy_keybinder_bind as bind_key
|
||||||
except Exception, cause:
|
except Exception, cause:
|
||||||
print "*********** Keybind Driver Load Failure **************"
|
print "*********** Keybind Driver Load Failure **************"
|
||||||
@ -747,7 +747,7 @@ class MenuWin( object ):
|
|||||||
about = gtk.AboutDialog()
|
about = gtk.AboutDialog()
|
||||||
about.set_name("mintMenu")
|
about.set_name("mintMenu")
|
||||||
import commands
|
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)
|
about.set_version(version)
|
||||||
try:
|
try:
|
||||||
h = open('/usr/share/common-licenses/GPL','r')
|
h = open('/usr/share/common-licenses/GPL','r')
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
<widget class="GtkWindow" id="mainWindow">
|
<widget class="GtkWindow" id="mainWindow">
|
||||||
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
|
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
|
||||||
<property name="window_position">center-always</property>
|
<property name="window_position">center-always</property>
|
||||||
<property name="icon">/usr/lib/linuxmint/mintSystem/icon.png</property>
|
<property name="icon">/usr/share/linuxmint/logo.png</property>
|
||||||
<child>
|
<child>
|
||||||
<widget class="GtkVBox" id="vbox1">
|
<widget class="GtkVBox" id="vbox1">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
|
@ -87,7 +87,7 @@ class mintRemoveWindow:
|
|||||||
warnDlg = gtk.Dialog(title="MintMenu", parent=None, flags=0, buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
|
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.add_button(gtk.STOCK_REMOVE, gtk.RESPONSE_OK)
|
||||||
warnDlg.vbox.set_spacing(10)
|
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(" ")
|
labelSpc = gtk.Label(" ")
|
||||||
warnDlg.vbox.pack_start(labelSpc)
|
warnDlg.vbox.pack_start(labelSpc)
|
||||||
labelSpc.show()
|
labelSpc.show()
|
||||||
|
@ -22,14 +22,13 @@ if hasInotify:
|
|||||||
self.notifier.start()
|
self.notifier.start()
|
||||||
|
|
||||||
|
|
||||||
def addMonitor( self, filename, callback, args = None ):
|
def addMonitor( self, filename, callback, args = None ):
|
||||||
|
mask = pyinotify.IN_DELETE | pyinotify.IN_CREATE | pyinotify.IN_MODIFY
|
||||||
mask = pyinotify.EventsCodes.IN_DELETE | pyinotify.EventsCodes.IN_CREATE | pyinotify.EventsCodes.IN_MODIFY
|
|
||||||
mId = self.wm.add_watch( filename, mask, rec = True)[filename]
|
mId = self.wm.add_watch( filename, mask, rec = True)[filename]
|
||||||
if mId >= 0:
|
if mId >= 0:
|
||||||
self.callbacks[mId] = ( callback, args )
|
self.callbacks[mId] = ( callback, args )
|
||||||
|
|
||||||
return mId
|
return mId
|
||||||
|
|
||||||
def removeMonitor( self, monitorId ):
|
def removeMonitor( self, monitorId ):
|
||||||
if monitorId in self.callbacks:
|
if monitorId in self.callbacks:
|
||||||
|
@ -123,7 +123,7 @@ class pluginclass( object ):
|
|||||||
desktopDir = home + "/Desktop"
|
desktopDir = home + "/Desktop"
|
||||||
try:
|
try:
|
||||||
import sys
|
import sys
|
||||||
sys.path.append('/usr/lib/linuxmint/mintSystem/python')
|
sys.path.append('/usr/lib/linuxmint/common')
|
||||||
from configobj import ConfigObj
|
from configobj import ConfigObj
|
||||||
config = ConfigObj(home + "/.config/user-dirs.dirs")
|
config = ConfigObj(home + "/.config/user-dirs.dirs")
|
||||||
tmpdesktopDir = config['XDG_DESKTOP_DIR']
|
tmpdesktopDir = config['XDG_DESKTOP_DIR']
|
||||||
|
@ -1,13 +0,0 @@
|
|||||||
#!/usr/bin/python
|
|
||||||
|
|
||||||
import apt
|
|
||||||
import sys
|
|
||||||
|
|
||||||
try:
|
|
||||||
cache = apt.Cache()
|
|
||||||
pkg = cache["mintmenu"]
|
|
||||||
print pkg.installedVersion
|
|
||||||
except:
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
Binary file not shown.
Loading…
Reference in New Issue
Block a user