diff -Nru mate-menu-17.04.2/debian/changelog mate-menu-17.04.3/debian/changelog --- mate-menu-17.04.2/debian/changelog 2017-03-21 01:04:44.000000000 +0000 +++ mate-menu-17.04.3/debian/changelog 2017-03-28 22:41:24.000000000 +0000 @@ -1,3 +1,9 @@ +mate-menu (17.04.3-0ubuntu1) zesty; urgency=medium + + * New upstream release. (LP: #1648650) (LP: #1631330) + + -- Martin Wimpress Tue, 28 Mar 2017 23:39:20 +0100 + mate-menu (17.04.2-0ubuntu2) zesty; urgency=medium [ Martin Wimpress ] @@ -5,11 +11,11 @@ -- Martin Wimpress Tue, 21 Mar 2017 01:04:44 +0000 -mate-menu (17.04.2-0ubuntu1) zesty; urgency=medium +mate-menu (17.04.1-0ubuntu1) zesty; urgency=medium * New upstream release. - -- Martin Wimpress Fri, 17 Mar 2017 14:13:22 +0000 + -- Martin Wimpress Wed, 15 Mar 2017 19:42:59 +0000 mate-menu (17.04.0-0ubuntu1) zesty; urgency=medium diff -Nru mate-menu-17.04.2/debian/control mate-menu-17.04.3/debian/control --- mate-menu-17.04.2/debian/control 2017-03-21 01:04:27.000000000 +0000 +++ mate-menu-17.04.3/debian/control 2017-03-13 17:56:33.000000000 +0000 @@ -26,7 +26,7 @@ libmatedesktop, libmatepanelapplet, mate-menus (>= 1.14), - mozo | menulibre, + mozo (>=1.14), python (>= 2.4), python (<< 3), python-configobj, python-mate-menu, diff -Nru mate-menu-17.04.2/lib/mate-menu-config.py mate-menu-17.04.3/lib/mate-menu-config.py --- mate-menu-17.04.2/lib/mate-menu-config.py 2017-03-17 14:10:44.000000000 +0000 +++ mate-menu-17.04.3/lib/mate-menu-config.py 2017-03-28 22:36:39.000000000 +0000 @@ -27,7 +27,7 @@ gi.require_version("Gtk", "3.0") -from gi.repository import Gtk, Gdk +from gi.repository import Gtk, Gdk, GdkPixbuf import mate_menu.keybinding as keybinding signal.signal(signal.SIGINT, signal.SIG_DFL) @@ -348,7 +348,8 @@ def setButtonIcon( self, value ): self.buttonIconChooser.set_filename(value) - self.buttonIconImage.set_from_file(value) + pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size(value, -1, 22) + self.buttonIconImage.set_from_pixbuf(pixbuf) def getShowButtonIcon( self ): return not self.showButtonIcon.get_active() diff -Nru mate-menu-17.04.2/lib/mate-menu.py mate-menu-17.04.3/lib/mate-menu.py --- mate-menu-17.04.2/lib/mate-menu.py 2017-03-17 14:10:44.000000000 +0000 +++ mate-menu-17.04.3/lib/mate-menu.py 2017-03-28 22:36:39.000000000 +0000 @@ -19,7 +19,7 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -__VERSION__='17.04.2' +__VERSION__='17.04.3' import gc import gi @@ -576,13 +576,17 @@ self.do_image(self.buttonIcon, False) def do_image(self, image_file, saturate): - pixbuf = GdkPixbuf.Pixbuf.new_from_file(image_file) + if image_file.endswith(".svg"): + pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size(image_file, -1, 22) + else: + pixbuf = GdkPixbuf.Pixbuf.new_from_file(image_file) if saturate: GdkPixbuf.Pixbuf.saturate_and_pixelate(pixbuf, pixbuf, 1.5, False) self.button_icon.set_from_pixbuf(pixbuf) def createPanelButton( self ): - self.button_icon = Gtk.Image.new_from_file( self.buttonIcon ) + self.button_icon = Gtk.Image() + self.do_image(self.buttonIcon, False) self.systemlabel = Gtk.Label(label= "%s " % self.buttonText ) try: process = subprocess.Popen(['lsb_release', '-d'], stdout=subprocess.PIPE) @@ -681,7 +685,7 @@ def updateButton( self ): self.systemlabel.set_text( self.buttonText ) self.button_icon.clear() - self.button_icon.set_from_file( self.buttonIcon ) + self.do_image(self.buttonIcon, False) self.sizeButton() def bind_hot_key (self): diff -Nru mate-menu-17.04.2/mate_menu/easybuttons.py mate-menu-17.04.3/mate_menu/easybuttons.py --- mate-menu-17.04.2/mate_menu/easybuttons.py 2017-03-17 14:10:44.000000000 +0000 +++ mate-menu-17.04.3/mate_menu/easybuttons.py 2017-03-28 22:36:39.000000000 +0000 @@ -305,7 +305,7 @@ self.appName = self.strip_accents(desktopItem.getName()) self.appGenericName = self.strip_accents(desktopItem.getGenericName()) self.appComment = self.strip_accents(desktopItem.getComment()) - self.appExec = self.strip_accents(desktopItem.getExec()) + self.appExec = self.strip_accents(desktopItem.getExec().replace('\\\\', '\\')) self.appIconName = desktopItem.getIcon() self.appCategories = desktopItem.getCategories() self.appMateDocPath = desktopItem.get( "X-MATE-DocPath" ) or "" @@ -567,6 +567,7 @@ def __init__( self, iconName, iconSize, labels , f ): easyButton.__init__( self, iconName, iconSize, labels ) self.filter = f + self.set_focus_on_click(False) iconManager = IconManager() diff -Nru mate-menu-17.04.2/mate_menu/plugins/applications.py mate-menu-17.04.3/mate_menu/plugins/applications.py --- mate-menu-17.04.2/mate_menu/plugins/applications.py 2017-03-17 14:10:44.000000000 +0000 +++ mate-menu-17.04.3/mate_menu/plugins/applications.py 2017-03-28 22:36:39.000000000 +0000 @@ -640,7 +640,6 @@ self.current_results = [] for i in self.categoriesBox.get_children(): - i.released() i.set_relief( Gtk.ReliefStyle.NONE ) allButton = self.categoriesBox.get_children()[0]; @@ -662,7 +661,6 @@ i.filterCategory( category ) for i in self.categoriesBox.get_children(): - i.released() i.set_relief( Gtk.ReliefStyle.NONE ) widget.set_relief( Gtk.ReliefStyle.HALF )