Merge remote-tracking branch 'upstream/master'

Conflicts:
	debian/control

debian/changelog

@@ -1,3 +1,21 @@
+mintmenu (5.2.8) lisa; urgency=low
+
+  * Fixed "Add to panel" in applications plugin
+
+ -- Clement Lefebvre <root@linuxmint.com>  Thu, 01 Dec 2011 20:05:40 +0000
+
+mintmenu (5.2.7) lisa; urgency=low
+
+  * Replaced system and places shortcut in MATE to use caja and mate-terminal
+
+ -- Clement Lefebvre <root@linuxmint.com>  Mon, 28 Nov 2011 12:43:49 +0000
+
+mintmenu (5.2.6) lisa; urgency=low
+
+  * Adjusted dependencies for MATE
+
+ -- Clement Lefebvre <root@linuxmint.com>  Fri, 18 Nov 2011 17:58:00 +0000
+
 mintmenu (5.2.5) lisa; urgency=low
 
   * Switched support from Gnome/Bonobo to Mate/MateComponent

debian/control

@@ -1,13 +1,20 @@
-Source: mintmenu
+Source: mintmenu-mate
 Section: admin
 Priority: optional
 Maintainer: clem <root@linuxmint.com>
 Build-Depends: debhelper (>= 5)
 Standards-Version: 3.9.2
 
-Package: mintmenu
+Package: mintmenu-mate
 Architecture: all
-Depends: python (>= 2.4), python (<< 3), python-gtk2, python-glade2, python-mate-menu, python-mate, python-mate-desktop, python-xdg
+Depends: python (>= 2.4), python (<< 3), python-gtk2, python-glade2, python-mate-menu, python-mate, python-mate-desktop, python-xdg, python-corba
-Recommends: deskbar-applet, mint-common
+Suggests: mint-common
-Description: Advanced Mate menu
+Provides: mintmenu
- One of the most advanced menus under Linux. MintMenu supports filtering, favorites, easy-uninstallation, autosession, and many other features.
+Replaces: mintmenu
+Conflicts: mintmenu
+Description: Advanced Mate menu (MATE EDITION)
+ One of the most advanced menus under Linux. MintMenu supports filtering,
+ favorites, easy-uninstallation, autosession, and many other features.
+ .
+ This package is built from MATE Team. It will dropped when mintmenu for
+ MATE will added in LMDE repository.

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

@@ -333,7 +333,7 @@ class pluginclass( object ):
         self.panel_position = 0
         appletidlist = mateconf.client_get_default().get_list("/apps/panel/general/applet_id_list", "string")
         for applet in appletidlist:
-            bonobo_id = mateconf.client_get_default().get_string("/apps/panel/applets/" + applet + "/bonobo_iid")
+            bonobo_id = mateconf.client_get_default().get_string("/apps/panel/applets/" + applet + "/applet_iid")
             if bonobo_id == "OAFIID:MATE_mintMenu":
                 self.panel = mateconf.client_get_default().get_string("/apps/panel/applets/" + applet + "/toplevel_id")
                 self.panel_position = mateconf.client_get_default().get_int("/apps/panel/applets/" + applet + "/position") + 1

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

@@ -147,7 +147,7 @@ class pluginclass( object ):
         if ( self.showcomputer == True ):
             Button1 = easyButton( "computer", self.iconsize, [_("Computer")], -1, -1 )
             if self.de == "mate":
-                Button1.connect( "clicked", self.ButtonClicked, "nautilus computer:" )
+                Button1.connect( "clicked", self.ButtonClicked, "caja computer:" )
             else:
                 Button1.connect( "clicked", self.ButtonClicked, "xdg-open /" )
             Button1.show()
@@ -156,7 +156,10 @@ class pluginclass( object ):
 
         if ( self.showhomefolder == True ):
             Button2 = easyButton( "user-home", self.iconsize, [_("Home Folder")], -1, -1 )
-            Button2.connect( "clicked", self.ButtonClicked, "xdg-open %s " % home )
+            if self.de == "mate":
+                Button2.connect( "clicked", self.ButtonClicked, "caja %s " % home )
+            else:
+                Button2.connect( "clicked", self.ButtonClicked, "xdg-open %s " % home )
             Button2.show()
             self.placesBtnHolder.pack_start( Button2, False, False )
             self.mintMenuWin.setTooltip( Button2, _("Open your personal folder") )
@@ -168,7 +171,10 @@ class pluginclass( object ):
                 Button3 = easyButton( "notification-network-ethernet-connected", self.iconsize, [_("Network")], -1, -1)
             else:
                 Button3 = easyButton( "network-workgroup", self.iconsize, [_("Network")], -1, -1)
-            Button3.connect( "clicked", self.ButtonClicked, "nautilus network:" )
+            if self.de == "mate":
+                Button3.connect( "clicked", self.ButtonClicked, "caja network:" )
+            else:
+                Button3.connect( "clicked", self.ButtonClicked, "xdg-open network:" )
             Button3.show()
             self.placesBtnHolder.pack_start( Button3, False, False )
             self.mintMenuWin.setTooltip( Button3, _("Browse bookmarked and local network locations") )
@@ -188,7 +194,10 @@ class pluginclass( object ):
             except Exception, detail:
                 print detail
             Button4 = easyButton( "mate-fs-desktop", self.iconsize, [_("Desktop")], -1, -1 )
-            Button4.connect( "clicked", self.ButtonClicked, "xdg-open \"" + desktopDir + "\"")
+            if self.de == "mate":
+                Button4.connect( "clicked", self.ButtonClicked, "caja \"" + desktopDir + "\"")
+            else:
+                Button4.connect( "clicked", self.ButtonClicked, "xdg-open \"" + desktopDir + "\"")
             Button4.show()
             self.placesBtnHolder.pack_start( Button4, False, False )
             self.mintMenuWin.setTooltip( Button4, _("Browse items placed on the desktop") )
@@ -197,6 +206,8 @@ class pluginclass( object ):
             self.trashButton = easyButton( "user-trash", self.iconsize, [_("Trash")], -1, -1 )
             if self.de == "xfce":
                 self.trashButton.connect( "clicked", self.ButtonClicked, "thunar trash:" )
+            elif self.de == "mate":
+                self.trashButton.connect( "clicked", self.ButtonClicked, "caja trash:" )
             else:
                 self.trashButton.connect( "clicked", self.ButtonClicked, "xdg-open trash:" )
             self.trashButton.show()
@@ -209,7 +220,10 @@ class pluginclass( object ):
         for index in range( len(self.custompaths) ):
             path = self.custompaths[index]
             path = path.replace("~", home)
-            command = ( "xdg-open \"" + path + "\"")
+            if self.de == "mate":
+                command = ( "caja \"" + path + "\"")
+            else:
+                command = ( "xdg-open \"" + path + "\"")
             currentbutton = easyButton( "folder", self.iconsize, [self.customnames[index]], -1, -1 )
             currentbutton.connect( "clicked", self.ButtonClicked, command )
             currentbutton.show()
@@ -239,7 +253,10 @@ class pluginclass( object ):
                 
     def launch_gtk_bookmark (self, widget, path):
         self.mintMenuWin.hide()
-        os.system("xdg-open %s &" % path)        
+        if self.de == "mate":
+            os.system("caja %s &" % path)        
+        else:
+            os.system("xdg-open %s &" % path)        
 
     def trashPopup( self, widget, event ):
         if event.button == 3:

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

@@ -155,7 +155,10 @@ class pluginclass( object ):
 
         if ( self.showTerminal == True ):
             Button4 = easyButton( "mate-terminal", self.iconsize, [_("Terminal")], -1, -1 )
-            Button4.connect( "clicked", self.ButtonClicked, "x-terminal-emulator" )
+            if os.path.exists("/usr/bin/mate-terminal"):
+                Button4.connect( "clicked", self.ButtonClicked, "mate-terminal" )
+            else:
+                Button4.connect( "clicked", self.ButtonClicked, "x-terminal-emulator" )
             Button4.show()
             self.systemBtnHolder.pack_start( Button4, False, False )
             self.mintMenuWin.setTooltip( Button4, _("Use the command line") )