Merge pull request #114 from monsta/patch-9

small fixes

usr/lib/linuxmint/mintMenu/keybinding.py

@@ -178,10 +178,9 @@ class GlobalKeyBinding(GObject.GObject, threading.Thread):
         self.display.close()
 
 class KeymapKey(Structure):
-     _fields_ = [("keycode", c_uint),
-                 ("group", c_int),
-                 ("level", c_int)]
-
+    _fields_ = [("keycode", c_uint),
+                ("group", c_int),
+                ("level", c_int)]
 
 class KeybindingWidget(Gtk.HBox):
     __gsignals__ = {

usr/lib/linuxmint/mintMenu/mintMenu.py

@@ -697,15 +697,15 @@ class MenuWin( object ):
         self.button_icon.size_request(bi_req)
         self.systemlabel.size_request(sl_req)
         if self.applet.get_orient() == MatePanelApplet.AppletOrient.UP or self.applet.get_orient() == MatePanelApplet.AppletOrient.DOWN:
-           if self.hideIcon:
-               self.applet.set_size_request( sl_req.width + 2, bi_req.height )
-           else:
-               self.applet.set_size_request( sl_req.width + bi_req.width + 5, bi_req.height )
+            if self.hideIcon:
+                self.applet.set_size_request( sl_req.width + 2, bi_req.height )
+            else:
+                self.applet.set_size_request( sl_req.width + bi_req.width + 5, bi_req.height )
         else:
-           if self.hideIcon:
-               self.applet.set_size_request( bi_req.width, sl_req.height + 2 )
-           else:
-               self.applet.set_size_request( bi_req.width, sl_req.height + bi_req.height + 5 )
+            if self.hideIcon:
+                self.applet.set_size_request( bi_req.width, sl_req.height + 2 )
+            else:
+                self.applet.set_size_request( bi_req.width, sl_req.height + bi_req.height + 5 )
 
     def reloadSettings( self, *args ):
         self.loadSettings()

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

@@ -205,9 +205,9 @@ class SuggestionButton ( Gtk.Button ):
         self.image.set_from_stock( self.iconName, size )
 
 class TargetEntry(Structure):
-     _fields_ = [("target", c_char_p),
-                 ("flags", c_int),
-                 ("info", c_int)]
+    _fields_ = [("target", c_char_p),
+                ("flags", c_int),
+                ("info", c_int)]
 
 class pluginclass( object ):
     TARGET_TYPE_TEXT = 80
@@ -472,7 +472,11 @@ class pluginclass( object ):
         
         # save old config - this is necessary because the app will notified when it sets the default values and you don't want the to reload itself several times
         oldcategories_mouse_over = self.categories_mouse_over
-        oldtotalrecent = self.totalrecent
+        oldiconsize = self.iconSize
+        oldfaviconsize = self.faviconsize
+        oldswapgeneric = self.swapgeneric
+        oldshowcategoryicons = self.showcategoryicons
+        oldcategoryhoverdelay = self.categoryhoverdelay
         oldsticky = self.sticky
         oldminimized = self.minimized
         oldicon = self.icon
@@ -482,7 +486,7 @@ class pluginclass( object ):
         self.GetGSettingsEntries()
 
         # if the config hasn't changed return
-        if oldcategories_mouse_over == self.categories_mouse_over and oldiconsize == self.iconSize and oldfaviconsize == self.faviconsize and oldtotalrecent == self.totalrecent and oldswapgeneric == self.swapgeneric and oldshowcategoryicons == self.showcategoryicons and oldcategoryhoverdelay == self.categoryhoverdelay and oldsticky == self.sticky and oldminimized == self.minimized and oldicon == self.icon and oldhideseparator == self.hideseparator and oldshowapplicationcomments == self.showapplicationcomments:
+        if oldcategories_mouse_over == self.categories_mouse_over and oldiconsize == self.iconSize and oldfaviconsize == self.faviconsize and oldswapgeneric == self.swapgeneric and oldshowcategoryicons == self.showcategoryicons and oldcategoryhoverdelay == self.categoryhoverdelay and oldsticky == self.sticky and oldminimized == self.minimized and oldicon == self.icon and oldhideseparator == self.hideseparator and oldshowapplicationcomments == self.showapplicationcomments:
             return
 
         self.Todos()
@@ -776,14 +780,14 @@ class pluginclass( object ):
                         found_packages.append(pkg)                     
                                                            
             if len(found_packages) > 0:         
-                    last_separator = Gtk.EventBox()
-                    last_separator.add(Gtk.HSeparator())
-                    last_separator.set_visible_window(False)
-                    last_separator.set_size_request(-1, 20)       
-                    last_separator.type = "separator"        
-                    last_separator.show_all()
-                    self.applicationsBox.add(last_separator)
-                    self.suggestions.append(last_separator)
+                last_separator = Gtk.EventBox()
+                last_separator.add(Gtk.HSeparator())
+                last_separator.set_visible_window(False)
+                last_separator.set_size_request(-1, 20)
+                last_separator.type = "separator"
+                last_separator.show_all()
+                self.applicationsBox.add(last_separator)
+                self.suggestions.append(last_separator)
             
             for pkg in found_packages:
                 name = pkg.name
@@ -1403,7 +1407,6 @@ class pluginclass( object ):
 
     def buildFavorites( self ):
         try:
-            from user import home
             if (not os.path.exists(home + "/.linuxmint/mintMenu/applications.list")):
                 os.system("mkdir -p " + home + "/.linuxmint/mintMenu/applications")
                 os.system("cp /usr/lib/linuxmint/mintMenu/applications.list " + home + "/.linuxmint/mintMenu/applications.list")

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

@@ -1,7 +1,6 @@
 #!/usr/bin/python
 
 import os
-import subprocess
 
 def RemoveArgs(Execline):
 	NewExecline = []
@@ -40,7 +39,6 @@ def Execute( cmd , commandCwd=None):
 		os.chdir( cwd )
 		string = ' '.join(cmd)
 		string = string + " &"
-		#subprocess.Popen( cmd ) // use os.system instead of popen so children don't end up in zombie waiting for us to wait() for them
 		os.system(string)		
 		return True
 	except Exception, detail:

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

@@ -167,11 +167,11 @@ class pluginclass( object ):
             self.mintMenuWin.setTooltip( Button4, _("Use the command line") )
 
         if self.de == "xfce":
-                Button6 = easyButton( "system-log-out", self.iconsize, [_("Logout")], -1, -1 )
-                Button6.connect( "clicked", self.ButtonClicked, "xfce4-session-logout" )
-                Button6.show()
-                self.systemBtnHolder.pack_start( Button6, False, False, 0 )
-                self.mintMenuWin.setTooltip( Button6, _("Log out or switch user") )
+            Button6 = easyButton( "system-log-out", self.iconsize, [_("Logout")], -1, -1 )
+            Button6.connect( "clicked", self.ButtonClicked, "xfce4-session-logout" )
+            Button6.show()
+            self.systemBtnHolder.pack_start( Button6, False, False, 0 )
+            self.mintMenuWin.setTooltip( Button6, _("Log out or switch user") )
         else:
             if ( self.showLockScreen == True ):
                 Button5 = easyButton( "system-lock-screen", self.iconsize, [_("Lock Screen")], -1, -1 )