Fixed terminal and desktop icons

debian/changelog

@@ -1,3 +1,15 @@
+mintmenu (5.3.5) maya; urgency=low
+
+  * Fixed terminal and desktop icons
+
+ -- Clement Lefebvre <root@linuxmint.com>  Tue, 22 May 2012 16:42:57 +0100
+
+mintmenu (5.3.4) maya; urgency=low
+
+  * Limit number of APT suggestions to 3
+
+ -- Clement Lefebvre <root@linuxmint.com>  Fri, 18 May 2012 13:16:51 +0100
+
 mintmenu (5.3.3) maya; urgency=low
 
   * Use apturl directly if it's installed (instead of relying on MIME types being properly assigned)

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

@@ -658,6 +658,7 @@ class pluginclass( object ):
                 command = "%(command)s | grep %(word)s" % {'command':command, 'word':word}            
             pkgs = commands.getoutput(command)
             pkgs = pkgs.split("\n")
+            num_pkg_found = 0
             for pkg in pkgs:
                 values = string.split(pkg, "###")
                 if len(values) == 4:
@@ -681,8 +682,11 @@ class pluginclass( object ):
                             found_in_name.append(package)
                         else:                        
                             found_elsewhere.append(package)                                        
+                        num_pkg_found+=1
                     else:
                         print "Invalid status code: " + status
+                if num_pkg_found >= 3:
+                    break
             found_packages.extend(found_in_name)
             found_packages.extend(found_elsewhere)
             gtk.gdk.threads_enter()                                    

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

@@ -193,7 +193,7 @@ class pluginclass( object ):
                     desktopDir = tmpdesktopDir
             except Exception, detail:
                 print detail
-            Button4 = easyButton( "mate-fs-desktop", self.iconsize, [_("Desktop")], -1, -1 )
+            Button4 = easyButton( "desktop", self.iconsize, [_("Desktop")], -1, -1 )
             if self.de == "mate":
                 Button4.connect( "clicked", self.ButtonClicked, "caja \"" + desktopDir + "\"")
             else:

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

@@ -154,7 +154,7 @@ class pluginclass( object ):
             self.mintMenuWin.setTooltip( Button3, _("Configure your system") )
 
         if ( self.showTerminal == True ):
-            Button4 = easyButton( "mate-terminal", self.iconsize, [_("Terminal")], -1, -1 )
+            Button4 = easyButton( "terminal", self.iconsize, [_("Terminal")], -1, -1 )
             if os.path.exists("/usr/bin/mate-terminal"):
                 Button4.connect( "clicked", self.ButtonClicked, "mate-terminal" )
             else: