diff --git a/usr/lib/linuxmint/mintMenu/icon.png b/usr/lib/linuxmint/mintMenu/icon.png deleted file mode 100644 index 94caff0..0000000 Binary files a/usr/lib/linuxmint/mintMenu/icon.png and /dev/null differ diff --git a/usr/lib/linuxmint/mintMenu/keybinding.py b/usr/lib/linuxmint/mintMenu/keybinding.py index 4e59964..0851f47 100644 --- a/usr/lib/linuxmint/mintMenu/keybinding.py +++ b/usr/lib/linuxmint/mintMenu/keybinding.py @@ -24,13 +24,14 @@ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER # DEALINGS IN THE SOFTWARE. +import threading + import gi gi.require_version("Gtk", "3.0") +from gi.repository import Gdk, GLib, GObject, Gtk -from Xlib.display import Display from Xlib import X, error -from gi.repository import Gtk, Gdk, GObject, GLib -import threading +from Xlib.display import Display SPECIAL_MODS = (["Super_L", ""], ["Super_R", ""], diff --git a/usr/lib/linuxmint/mintMenu/mint-logo.svg b/usr/lib/linuxmint/mintMenu/mint-logo.svg deleted file mode 100644 index e4a5477..0000000 --- a/usr/lib/linuxmint/mintMenu/mint-logo.svg +++ /dev/null @@ -1,613 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - diff --git a/usr/lib/linuxmint/mintMenu/mintMenu.png b/usr/lib/linuxmint/mintMenu/mintMenu.png deleted file mode 100644 index 106e0fa..0000000 Binary files a/usr/lib/linuxmint/mintMenu/mintMenu.png and /dev/null differ diff --git a/usr/lib/linuxmint/mintMenu/plugins/easyfiles.py b/usr/lib/linuxmint/mintMenu/plugins/easyfiles.py deleted file mode 100755 index d2b1385..0000000 --- a/usr/lib/linuxmint/mintMenu/plugins/easyfiles.py +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/python2 - -import urllib - - -def GetFilePath(uri): - path = urllib.url2pathname(uri) # escape special chars - path = path.strip('\r\n\x00') # remove \r\n and NULL - - # get the path to file - if path.startswith('file://'): # nautilus, rox - path = path[7:] # 7 is len('file://') - return path diff --git a/usr/lib/linuxmint/mintMenu/plugins/recentHelper.py b/usr/lib/linuxmint/mintMenu/plugins/recentHelper.py index 30bf6ff..5ee07e8 100644 --- a/usr/lib/linuxmint/mintMenu/plugins/recentHelper.py +++ b/usr/lib/linuxmint/mintMenu/plugins/recentHelper.py @@ -108,7 +108,6 @@ def doRecentApps(): if recentAppBox is not None: # recentAppBox is initiated by the recent plugin # only build UI widgets if it's enabled - for i in recentAppBox.get_children(): i.destroy() @@ -122,7 +121,6 @@ def doRecentApps(): return True def applicationButtonClicked(widget): - # TODO all this runs whether the plugin is enabled or not mintMenuWin.hide() recentAppsAdd(widget) recentAppsSave() diff --git a/usr/lib/linuxmint/mintMenu/pointerMonitor.py b/usr/lib/linuxmint/mintMenu/pointerMonitor.py index f9da7a8..7f6292c 100644 --- a/usr/lib/linuxmint/mintMenu/pointerMonitor.py +++ b/usr/lib/linuxmint/mintMenu/pointerMonitor.py @@ -50,7 +50,7 @@ class PointerMonitor(GObject.GObject, threading.Thread): if event.type == X.ButtonPress: # Check if pointer is inside monitored windows for w in self.windows: - if Gtk.check_version (3, 20, 0) is None: + if (Gtk.MAJOR_VERSION, Gtk.MINOR_VERSION) >= (3, 20): pdevice = Gdk.Display.get_default().get_default_seat().get_pointer() else: pdevice = Gdk.Display.get_default().get_device_manager().get_client_pointer()