From f30f258ce6f96a9edea67ace6aec21e791d7301d Mon Sep 17 00:00:00 2001 From: Michael Webster Date: Tue, 21 May 2013 10:38:23 -0400 Subject: [PATCH] Change how we check for updating the icon theme --- usr/lib/linuxmint/mintMenu/mintMenu.py | 2 +- usr/lib/linuxmint/mintMenu/plugins/easybuttons.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/usr/lib/linuxmint/mintMenu/mintMenu.py b/usr/lib/linuxmint/mintMenu/mintMenu.py index 536e3ea..c20b1a1 100755 --- a/usr/lib/linuxmint/mintMenu/mintMenu.py +++ b/usr/lib/linuxmint/mintMenu/mintMenu.py @@ -444,7 +444,7 @@ class MainWindow( object ): self.plugins["applications"].focusSearchEntry() def grab( self ): - gdk.gdk_pointer_grab (hash(self.window.window), True, Gdk.EventMask.BUTTON_PRESS_MASK, None, None, 0) + gdk.gdk_pointer_grab (hash(self.window.window), True, Gdk.EventMask.BUTTON_PRESS_MASK, None, None, Gdk.CURRENT_TIME) Gdk.keyboard_grab( self.window.window, False, Gdk.CURRENT_TIME ) Gtk.grab_add(self.window) diff --git a/usr/lib/linuxmint/mintMenu/plugins/easybuttons.py b/usr/lib/linuxmint/mintMenu/plugins/easybuttons.py index 7e899e5..6f85fb7 100755 --- a/usr/lib/linuxmint/mintMenu/plugins/easybuttons.py +++ b/usr/lib/linuxmint/mintMenu/plugins/easybuttons.py @@ -84,9 +84,9 @@ class IconManager(GObject.GObject): if iconFileName and needTempFile and os.path.exists( iconFileName ): tmpIconName = iconFileName.replace("/", "-") - shutil.copyfile(iconFileName, os.path.join(self.iconDir, tmpIconName)) realIconName = tmpIconName[:-4] - if not self.defaultTheme.has_icon( realIconName ): + if not os.path.exists(os.path.join(self.iconDir, tmpIconName)): + shutil.copyfile(iconFileName, os.path.join(self.iconDir, tmpIconName)) self.defaultTheme.append_search_path(self.iconDir) image = Gtk.Image()