From 651214aa18fc04ebd1b8728d7e3a4d76c809e427 Mon Sep 17 00:00:00 2001
From: gm10 <13855078+gm10@users.noreply.github.com>
Date: Sat, 23 Feb 2019 19:37:12 +0100
Subject: [PATCH] Fix tooltips and make them optional, remove category tooltips
 in apps

---
 usr/lib/linuxmint/mintMenu/mintMenu.py        | 21 ++++---------------
 .../mintMenu/plugins/applications.py          |  2 +-
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/usr/lib/linuxmint/mintMenu/mintMenu.py b/usr/lib/linuxmint/mintMenu/mintMenu.py
index 832141f..6859c74 100755
--- a/usr/lib/linuxmint/mintMenu/mintMenu.py
+++ b/usr/lib/linuxmint/mintMenu/mintMenu.py
@@ -73,9 +73,6 @@ class MainWindow(object):
         plugindir = os.path.join(os.path.expanduser("~"), ".linuxmint/mintMenu/plugins")
         sys.path.append(plugindir)
 
-        self.panelSettings = Gio.Settings.new("org.mate.panel")
-        self.panelSettings.connect("changed::tooltips-enabled", self.toggleTooltipsEnabled)
-
         self.settings.connect("changed::plugins-list", self.RegenPlugins)
         self.settings.connect("changed::start-with-favorites", self.toggleStartWithFavorites)
         self.settings.connect("changed::tooltips-enabled", self.toggleTooltipsEnabled)
@@ -86,12 +83,9 @@ class MainWindow(object):
         self.getSetGSettingEntries()
 
         self.tooltipsWidgets = []
-        if self.globalEnableTooltips and self.enableTooltips:
-            self.tooltipsEnable()
-        else:
-            self.tooltipsEnable(False)
 
         self.PopulatePlugins()
+        self.toggleTooltipsEnabled(self.settings, "tooltips-enabled")
         self.firstTime = True
 
     @classmethod
@@ -106,13 +100,9 @@ class MainWindow(object):
                 plugin.wake()
 
     def toggleTooltipsEnabled(self, settings, key, args = None):
-        if key == "tooltips-enabled":
-            self.globalEnableTooltips = settings.get_boolean(key)
-        else:
-            self.enableTooltips = settings.get_boolean(key)
-
-        if self.globalEnableTooltips and self.enableTooltips:
-            self.tooltipsEnable()
+        self.enableTooltips = settings.get_boolean(key)
+        if self.enableTooltips:
+            self.tooltipsEnable(True)
         else:
             self.tooltipsEnable(False)
 
@@ -142,8 +132,6 @@ class MainWindow(object):
         self.enableTooltips       = self.settings.get_boolean("tooltips-enabled")
         self.startWithFavorites   = self.settings.get_boolean("start-with-favorites")
 
-        self.globalEnableTooltips = self.panelSettings.get_boolean("tooltips-enabled")
-
     def PopulatePlugins(self):
         self.panesToColor = []
         self.headingsToColor = []
@@ -294,7 +282,6 @@ class MainWindow(object):
 
         self.paneholder.pack_start(ImageBox, False, False, 0)
         self.paneholder.pack_start(PluginPane, False, False, 0)
-        self.tooltipsEnable(False)
 
     # A little bit hacky but works.
     @staticmethod
diff --git a/usr/lib/linuxmint/mintMenu/plugins/applications.py b/usr/lib/linuxmint/mintMenu/plugins/applications.py
index b952bf3..e8ad771 100755
--- a/usr/lib/linuxmint/mintMenu/plugins/applications.py
+++ b/usr/lib/linuxmint/mintMenu/plugins/applications.py
@@ -1476,7 +1476,7 @@ class pluginclass(object):
                 for item in addedCategories:
                     try:
                         item["button"] = CategoryButton(item["icon"], categoryIconSize, [item["name"]], item["filter"])
-                        self.mintMenuWin.setTooltip(item["button"], item["tooltip"])
+                        # self.mintMenuWin.setTooltip(item["button"], item["tooltip"])
 
                         if self.categories_mouse_over:
                             startId = item["button"].connect("enter", self.StartFilter, item["filter"])