Merge branch 'master' of git://github.com/linuxmint/mintmenu

Conflicts:
	usr/lib/linuxmint/mintMenu/plugins/places.py

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 <root@linuxmint.com>  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

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.

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')

usr/lib/linuxmint/mintMenu/mintMenuConfig.glade

@@ -5,7 +5,7 @@
   <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="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>
       <widget class="GtkVBox" id="vbox1">
         <property name="visible">True</property>

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()

usr/lib/linuxmint/mintMenu/plugins/filemonitor.py

@@ -23,8 +23,7 @@ if hasInotify:
 			
 	
 		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]
 			if mId >= 0:
 				self.callbacks[mId] = ( callback, args )

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']

usr/lib/linuxmint/mintMenu/plugins/system_management.py

@@ -97,6 +97,7 @@ class pluginclass( object ):
 	#Add standard items
 	def do_standard_items( self ):		
 
+		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()

usr/lib/linuxmint/mintMenu/version.py

@@ -1,13 +0,0 @@
-#!/usr/bin/python
-
-import apt
-import sys
-
-try:
-	cache = apt.Cache()	
-	pkg = cache["mintmenu"]
-	print pkg.installedVersion
-except:
-	pass
-
-