From a8f751a4aaa2136efdc7fa0afd6633edb45a7d9d Mon Sep 17 00:00:00 2001
From: JKAbrams <JKAbrams@users.noreply.github.com>
Date: Tue, 9 Aug 2016 13:04:37 +0200
Subject: [PATCH 01/14] Added setting to disable internet searching

---
 usr/lib/linuxmint/mintMenu/mintMenu.py        |   2 +
 .../linuxmint/mintMenu/mintMenuConfig.glade   |  24 ++-
 usr/lib/linuxmint/mintMenu/mintMenuConfig.py  |   4 +-
 .../mintMenu/plugins/applications.py          | 140 ++++++++++--------
 .../com.linuxmint.mintmenu.gschema.xml        |   6 +
 5 files changed, 111 insertions(+), 65 deletions(-)

diff --git a/usr/lib/linuxmint/mintMenu/mintMenu.py b/usr/lib/linuxmint/mintMenu/mintMenu.py
index 0945e4d..86beed6 100755
--- a/usr/lib/linuxmint/mintMenu/mintMenu.py
+++ b/usr/lib/linuxmint/mintMenu/mintMenu.py
@@ -480,6 +480,7 @@ class MenuWin( object ):
         self.settings.connect( "changed::hot-key", self.reloadSettings )
         self.settings.connect( "changed::applet-icon", self.reloadSettings )
         self.settings.connect( "changed::hide-applet-icon", self.reloadSettings )
+        #self.settings.connect( "changed::enable-internet-search", self.reloadSettings )
         self.settings.connect( "changed::applet-icon-size", self.reloadSettings )
         self.settings.connect( "changed::hot-key", self.hotkeyChanged )
         self.loadSettings()
@@ -601,6 +602,7 @@ class MenuWin( object ):
 
     def loadSettings( self, *args, **kargs ):
         self.hideIcon   =  self.settings.get_boolean( "hide-applet-icon" )
+        #self.internetSearchEnabled   =  self.settings.get_boolean( "enable-internet-search" )
         self.buttonText =  self.settings.get_string( "applet-text" )
         self.theme_name =  self.settings.get_string( "theme-name" )
         self.hotkeyText =  self.settings.get_string( "hot-key" )
diff --git a/usr/lib/linuxmint/mintMenu/mintMenuConfig.glade b/usr/lib/linuxmint/mintMenu/mintMenuConfig.glade
index 29dcf3f..2616f1a 100644
--- a/usr/lib/linuxmint/mintMenu/mintMenuConfig.glade
+++ b/usr/lib/linuxmint/mintMenu/mintMenuConfig.glade
@@ -913,7 +913,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="n_rows">8</property>
+                    <property name="n_rows">9</property>
                     <property name="n_columns">2</property>
                     <property name="row_spacing">5</property>
                     <property name="homogeneous">True</property>
@@ -1120,7 +1120,26 @@
                         <property name="x_padding">5</property>
                       </packing>
                     </child>
-                  </object>
+                    <child>
+                      <object class="GtkCheckButton" id="enableInternetSearch">
+                        <property name="label" translatable="yes">Enable internet search</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="right_attach">2</property>
+                        <property name="top_attach">8</property>
+                        <property name="bottom_attach">9</property>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options"/>
+                        <property name="x_padding">5</property>
+                      </packing>
+                    </child>
+		          </object>
                 </child>
                 <child type="label">
                   <object class="GtkLabel" id="applicationsLabel">
@@ -2070,3 +2089,4 @@
     </child>
   </object>
 </interface>
+
diff --git a/usr/lib/linuxmint/mintMenu/mintMenuConfig.py b/usr/lib/linuxmint/mintMenu/mintMenuConfig.py
index 5e48a8d..55633d9 100755
--- a/usr/lib/linuxmint/mintMenu/mintMenuConfig.py
+++ b/usr/lib/linuxmint/mintMenu/mintMenuConfig.py
@@ -44,6 +44,7 @@ class mintMenuConfig( object ):
 
         self.builder.get_object("startWithFavorites").set_label(_("Always start with favorites pane"))
         self.builder.get_object("showButtonIcon").set_label(_("Show button icon"))
+        self.builder.get_object("enableInternetSearch").set_label(_("Enable internet search"))
         self.builder.get_object("useCustomColors").set_label(_("Use custom colors"))
         self.builder.get_object("showRecentPlugin").set_label(_("Show recent documents plugin"))
         self.builder.get_object("showApplicationsPlugin").set_label(_("Show applications plugin"))
@@ -139,6 +140,7 @@ class mintMenuConfig( object ):
         self.borderColorLabel = self.builder.get_object( "borderColorLabel" )
         self.headingColorLabel = self.builder.get_object( "headingColorLabel" )
         self.showButtonIcon = self.builder.get_object( "showButtonIcon" )
+        self.enableInternetSearch = self.builder.get_object( "enableInternetSearch" )
         self.buttonText = self.builder.get_object( "buttonText" )
         self.hotkeyWidget = keybinding.KeybindingWidget(_("Keyboard shortcut:") )
         table = self.builder.get_object( "main_table" )
@@ -208,7 +210,7 @@ class mintMenuConfig( object ):
         self.bindGSettingsValueToWidget( self.settingsApplications, "int", "favicon-size", self.favIconSize, "value-changed", self.favIconSize.set_value, self.favIconSize.get_value )
         self.bindGSettingsValueToWidget( self.settingsApplications, "int", "fav-cols", self.favCols, "value-changed", self.favCols.set_value, self.favCols.get_value )
         self.bindGSettingsValueToWidget( self.settingsApplications, "bool", "remember-filter", self.rememberFilter, "toggled", self.rememberFilter.set_active, self.rememberFilter.get_active)
-
+        self.bindGSettingsValueToWidget( self.settingsApplications, "bool", "enable-internet-search", self.enableInternetSearch, "toggled", self.enableInternetSearch.set_active,  self.enableInternetSearch.get_active)
         self.bindGSettingsValueToWidget( self.settingsPlaces, "int", "icon-size", self.placesIconSize, "value-changed", self.placesIconSize.set_value, self.placesIconSize.get_value )
         self.bindGSettingsValueToWidget( self.settingsSystem, "int", "icon-size", self.systemIconSize, "value-changed", self.systemIconSize.set_value, self.systemIconSize.get_value )
 
diff --git a/usr/lib/linuxmint/mintMenu/plugins/applications.py b/usr/lib/linuxmint/mintMenu/plugins/applications.py
index 2a927ef..3ba9f5d 100755
--- a/usr/lib/linuxmint/mintMenu/plugins/applications.py
+++ b/usr/lib/linuxmint/mintMenu/plugins/applications.py
@@ -242,9 +242,11 @@ class pluginclass( object ):
             self.settings.notifyAdd( "use-apt", self.switchAPTUsage)
             self.settings.notifyAdd( "fav-cols", self.changeFavCols )
             self.settings.notifyAdd( "remember-filter", self.changeRememberFilter)
+            self.settings.notifyAdd( "enable-internet-search", self.changeEnableInternetSearch)
 
             self.settings.bindGSettingsEntryToVar( "int", "category-hover-delay", self, "categoryhoverdelay" )
             self.settings.bindGSettingsEntryToVar( "bool", "do-not-filter", self, "donotfilterapps" )
+            self.settings.bindGSettingsEntryToVar( "bool", "enable-internet-search", self, "enableInternetSearch" )
             self.settings.bindGSettingsEntryToVar( "string", "search-command", self, "searchtool" )
             self.settings.bindGSettingsEntryToVar( "int", "default-tab", self, "defaultTab" )
         except Exception, detail:
@@ -387,6 +389,9 @@ class pluginclass( object ):
     def changeRememberFilter( self, settings, key, args):
         self.rememberFilter = settings.get_boolean(key)
 
+    def changeEnableInternetSearch( self, settings, key, args):
+        self.enableInternetSearch = settings.get_boolean(key)
+
     def changeShowApplicationComments( self, settings, key, args ):
         self.showapplicationcomments = settings.get_boolean(key)
         for child in self.applicationsBox:
@@ -451,6 +456,7 @@ class pluginclass( object ):
         self.showapplicationcomments = self.settings.get( "bool", "show-application-comments")
         self.useAPT = self.settings.get( "bool", "use-apt")
         self.rememberFilter = self.settings.get( "bool", "remember-filter")
+        self.enableInternetSearch = self.settings.get( "bool", "enable-internet-search")
 
         self.lastActiveTab =  self.settings.get( "int", "last-active-tab")
         self.defaultTab = self.settings.get( "int", "default-tab")
@@ -577,28 +583,29 @@ class pluginclass( object ):
 
         text = "<b>%s</b>" % text
 
-        suggestionButton = SuggestionButton(Gtk.STOCK_ADD, self.iconSize, "")
-        suggestionButton.connect("clicked", self.search_google)
-        suggestionButton.set_text(_("Search Google for %s") % text)
-        suggestionButton.set_image("/usr/lib/linuxmint/mintMenu/search_engines/google.ico")
-        self.applicationsBox.add(suggestionButton)
-        self.suggestions.append(suggestionButton)
+        if self.enableInternetSearch:
+            suggestionButton = SuggestionButton(Gtk.STOCK_ADD, self.iconSize, "")
+            suggestionButton.connect("clicked", self.search_google)
+            suggestionButton.set_text(_("Search Google for %s") % text)
+            suggestionButton.set_image("/usr/lib/linuxmint/mintMenu/search_engines/google.ico")
+            self.applicationsBox.add(suggestionButton)
+            self.suggestions.append(suggestionButton)
 
-        suggestionButton = SuggestionButton(Gtk.STOCK_ADD, self.iconSize, "")
-        suggestionButton.connect("clicked", self.search_wikipedia)
-        suggestionButton.set_text(_("Search Wikipedia for %s") % text)
-        suggestionButton.set_image("/usr/lib/linuxmint/mintMenu/search_engines/wikipedia.ico")
-        self.applicationsBox.add(suggestionButton)
-        self.suggestions.append(suggestionButton)
+            suggestionButton = SuggestionButton(Gtk.STOCK_ADD, self.iconSize, "")
+            suggestionButton.connect("clicked", self.search_wikipedia)
+            suggestionButton.set_text(_("Search Wikipedia for %s") % text)
+            suggestionButton.set_image("/usr/lib/linuxmint/mintMenu/search_engines/wikipedia.ico")
+            self.applicationsBox.add(suggestionButton)
+            self.suggestions.append(suggestionButton)
 
-        separator = Gtk.EventBox()
-        separator.add(Gtk.HSeparator())
-        separator.set_visible_window(False)
-        separator.set_size_request(-1, 20)
-        separator.type = "separator"
-        separator.show_all()
-        self.applicationsBox.add(separator)
-        self.suggestions.append(separator)
+            separator = Gtk.EventBox()
+            separator.add(Gtk.HSeparator())
+            separator.set_visible_window(False)
+            separator.set_size_request(-1, 20)
+            separator.type = "separator"
+            separator.show_all()
+            self.applicationsBox.add(separator)
+            self.suggestions.append(separator)
 
         suggestionButton = SuggestionButton(Gtk.STOCK_ADD, self.iconSize, "")
         suggestionButton.connect("clicked", self.search_dictionary)
@@ -1007,22 +1014,24 @@ class pluginclass( object ):
     def searchPopup( self, widget=None, event=None ):
         menu = Gtk.Menu()
 
-        menuItem = Gtk.ImageMenuItem(_("Search Google"))
-        img = Gtk.Image()
-        img.set_from_file('/usr/lib/linuxmint/mintMenu/search_engines/google.ico')
-        menuItem.set_image(img)
-        menuItem.connect("activate", self.search_google)
-        menu.append(menuItem)
+        if self.enableInternetSearch:
 
-        menuItem = Gtk.ImageMenuItem(_("Search Wikipedia"))
-        img = Gtk.Image()
-        img.set_from_file('/usr/lib/linuxmint/mintMenu/search_engines/wikipedia.ico')
-        menuItem.set_image(img)
-        menuItem.connect("activate", self.search_wikipedia)
-        menu.append(menuItem)
+            menuItem = Gtk.ImageMenuItem(_("Search Google"))
+            img = Gtk.Image()
+            img.set_from_file('/usr/lib/linuxmint/mintMenu/search_engines/google.ico')
+            menuItem.set_image(img)
+            menuItem.connect("activate", self.search_google)
+            menu.append(menuItem)
 
-        menuItem = Gtk.SeparatorMenuItem()
-        menu.append(menuItem)
+            menuItem = Gtk.ImageMenuItem(_("Search Wikipedia"))
+            img = Gtk.Image()
+            img.set_from_file('/usr/lib/linuxmint/mintMenu/search_engines/wikipedia.ico')
+            menuItem.set_image(img)
+            menuItem.connect("activate", self.search_wikipedia)
+            menu.append(menuItem)
+
+            menuItem = Gtk.SeparatorMenuItem()
+            menu.append(menuItem)
 
         menuItem = Gtk.ImageMenuItem(_("Lookup Dictionary"))
         img = Gtk.Image()
@@ -1096,16 +1105,18 @@ class pluginclass( object ):
         return (x, y, False)
 
     def search_google(self, widget):
-        text = self.searchEntry.get_text()
-        text = text.replace(" ", "+")
-        os.system("xdg-open \"http://www.google.com/cse?cx=002683415331144861350%3Atsq8didf9x0&ie=utf-8&sa=Search&q=" + text + "\" &")
-        self.mintMenuWin.hide()
+        if self.enableInternetSearch:
+            text = self.searchEntry.get_text()
+            text = text.replace(" ", "+")
+            os.system("xdg-open \"http://www.google.com/cse?cx=002683415331144861350%3Atsq8didf9x0&ie=utf-8&sa=Search&q=" + text + "\" &")
+            self.mintMenuWin.hide()
 
     def search_wikipedia(self, widget):
-        text = self.searchEntry.get_text()
-        text = text.replace(" ", "+")
-        os.system("xdg-open \"http://en.wikipedia.org/wiki/Special:Search?search=" + text + "\" &")
-        self.mintMenuWin.hide()
+        if self.enableInternetSearch:
+            text = self.searchEntry.get_text()
+            text = text.replace(" ", "+")
+            os.system("xdg-open \"http://en.wikipedia.org/wiki/Special:Search?search=" + text + "\" &")
+            self.mintMenuWin.hide()
 
     def search_dictionary(self, widget):
         text = self.searchEntry.get_text()
@@ -1113,34 +1124,39 @@ class pluginclass( object ):
         self.mintMenuWin.hide()
 
     def search_mint_tutorials(self, widget):
-        text = self.searchEntry.get_text()
-        text = text.replace(" ", "%20")
-        os.system("xdg-open \"http://community.linuxmint.com/index.php/tutorial/search/0/" + text + "\" &")
-        self.mintMenuWin.hide()
+        if self.enableInternetSearch:
+            text = self.searchEntry.get_text()
+            text = text.replace(" ", "%20")
+            os.system("xdg-open \"http://community.linuxmint.com/index.php/tutorial/search/0/" + text + "\" &")
+            self.mintMenuWin.hide()
 
     def search_mint_ideas(self, widget):
-        text = self.searchEntry.get_text()
-        text = text.replace(" ", "%20")
-        os.system("xdg-open \"http://community.linuxmint.com/index.php/idea/search/0/" + text + "\" &")
-        self.mintMenuWin.hide()
+        if self.enableInternetSearch:
+            text = self.searchEntry.get_text()
+            text = text.replace(" ", "%20")
+            os.system("xdg-open \"http://community.linuxmint.com/index.php/idea/search/0/" + text + "\" &")
+            self.mintMenuWin.hide()
 
     def search_mint_users(self, widget):
-        text = self.searchEntry.get_text()
-        text = text.replace(" ", "%20")
-        os.system("xdg-open \"http://community.linuxmint.com/index.php/user/search/0/" + text + "\" &")
-        self.mintMenuWin.hide()
+        if self.enableInternetSearch:
+            text = self.searchEntry.get_text()
+            text = text.replace(" ", "%20")
+            os.system("xdg-open \"http://community.linuxmint.com/index.php/user/search/0/" + text + "\" &")
+            self.mintMenuWin.hide()
 
     def search_mint_hardware(self, widget):
-        text = self.searchEntry.get_text()
-        text = text.replace(" ", "%20")
-        os.system("xdg-open \"http://community.linuxmint.com/index.php/hardware/search/0/" + text + "\" &")
-        self.mintMenuWin.hide()
+        if self.enableInternetSearch:
+            text = self.searchEntry.get_text()
+            text = text.replace(" ", "%20")
+            os.system("xdg-open \"http://community.linuxmint.com/index.php/hardware/search/0/" + text + "\" &")
+            self.mintMenuWin.hide()
 
     def search_mint_software(self, widget):
-        text = self.searchEntry.get_text()
-        text = text.replace(" ", "%20")
-        os.system("xdg-open \"http://community.linuxmint.com/index.php/software/search/0/" + text + "\" &")
-        self.mintMenuWin.hide()
+        if self.enableInternetSearch:
+            text = self.searchEntry.get_text()
+            text = text.replace(" ", "%20")
+            os.system("xdg-open \"http://community.linuxmint.com/index.php/software/search/0/" + text + "\" &")
+            self.mintMenuWin.hide()
 
     def add_to_desktop(self, widget, desktopEntry):
         os.system("xdg-desktop-icon install --novendor %s" % desktopEntry.desktopFile)
diff --git a/usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.xml b/usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.xml
index 22d4c84..f02e736 100644
--- a/usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.xml
+++ b/usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.xml
@@ -313,6 +313,12 @@
       <summary></summary>
       <description></description>
     </key>
+
+    <key type="b" name="enable-internet-search">
+      <default>false</default>
+      <summary></summary>
+      <description></description>
+    </key>
   </schema>
 
   <schema id="com.linuxmint.mintmenu.plugins.system_management" path="/com/linuxmint/mintmenu/plugins/system_management/">

From 2bae23715596af02571ef918ce73743b88b45d84 Mon Sep 17 00:00:00 2001
From: JKAbrams <JKAbrams@users.noreply.github.com>
Date: Tue, 9 Aug 2016 13:27:49 +0200
Subject: [PATCH 02/14] Revert "Added setting to disable internet searching"

This reverts commit a8f751a4aaa2136efdc7fa0afd6633edb45a7d9d.
---
 usr/lib/linuxmint/mintMenu/mintMenu.py        |   2 -
 .../linuxmint/mintMenu/mintMenuConfig.glade   |  24 +--
 usr/lib/linuxmint/mintMenu/mintMenuConfig.py  |   4 +-
 .../mintMenu/plugins/applications.py          | 140 ++++++++----------
 .../com.linuxmint.mintmenu.gschema.xml        |   6 -
 5 files changed, 65 insertions(+), 111 deletions(-)

diff --git a/usr/lib/linuxmint/mintMenu/mintMenu.py b/usr/lib/linuxmint/mintMenu/mintMenu.py
index 86beed6..0945e4d 100755
--- a/usr/lib/linuxmint/mintMenu/mintMenu.py
+++ b/usr/lib/linuxmint/mintMenu/mintMenu.py
@@ -480,7 +480,6 @@ class MenuWin( object ):
         self.settings.connect( "changed::hot-key", self.reloadSettings )
         self.settings.connect( "changed::applet-icon", self.reloadSettings )
         self.settings.connect( "changed::hide-applet-icon", self.reloadSettings )
-        #self.settings.connect( "changed::enable-internet-search", self.reloadSettings )
         self.settings.connect( "changed::applet-icon-size", self.reloadSettings )
         self.settings.connect( "changed::hot-key", self.hotkeyChanged )
         self.loadSettings()
@@ -602,7 +601,6 @@ class MenuWin( object ):
 
     def loadSettings( self, *args, **kargs ):
         self.hideIcon   =  self.settings.get_boolean( "hide-applet-icon" )
-        #self.internetSearchEnabled   =  self.settings.get_boolean( "enable-internet-search" )
         self.buttonText =  self.settings.get_string( "applet-text" )
         self.theme_name =  self.settings.get_string( "theme-name" )
         self.hotkeyText =  self.settings.get_string( "hot-key" )
diff --git a/usr/lib/linuxmint/mintMenu/mintMenuConfig.glade b/usr/lib/linuxmint/mintMenu/mintMenuConfig.glade
index 2616f1a..29dcf3f 100644
--- a/usr/lib/linuxmint/mintMenu/mintMenuConfig.glade
+++ b/usr/lib/linuxmint/mintMenu/mintMenuConfig.glade
@@ -913,7 +913,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="n_rows">9</property>
+                    <property name="n_rows">8</property>
                     <property name="n_columns">2</property>
                     <property name="row_spacing">5</property>
                     <property name="homogeneous">True</property>
@@ -1120,26 +1120,7 @@
                         <property name="x_padding">5</property>
                       </packing>
                     </child>
-                    <child>
-                      <object class="GtkCheckButton" id="enableInternetSearch">
-                        <property name="label" translatable="yes">Enable internet search</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">8</property>
-                        <property name="bottom_attach">9</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options"/>
-                        <property name="x_padding">5</property>
-                      </packing>
-                    </child>
-		          </object>
+                  </object>
                 </child>
                 <child type="label">
                   <object class="GtkLabel" id="applicationsLabel">
@@ -2089,4 +2070,3 @@
     </child>
   </object>
 </interface>
-
diff --git a/usr/lib/linuxmint/mintMenu/mintMenuConfig.py b/usr/lib/linuxmint/mintMenu/mintMenuConfig.py
index 55633d9..5e48a8d 100755
--- a/usr/lib/linuxmint/mintMenu/mintMenuConfig.py
+++ b/usr/lib/linuxmint/mintMenu/mintMenuConfig.py
@@ -44,7 +44,6 @@ class mintMenuConfig( object ):
 
         self.builder.get_object("startWithFavorites").set_label(_("Always start with favorites pane"))
         self.builder.get_object("showButtonIcon").set_label(_("Show button icon"))
-        self.builder.get_object("enableInternetSearch").set_label(_("Enable internet search"))
         self.builder.get_object("useCustomColors").set_label(_("Use custom colors"))
         self.builder.get_object("showRecentPlugin").set_label(_("Show recent documents plugin"))
         self.builder.get_object("showApplicationsPlugin").set_label(_("Show applications plugin"))
@@ -140,7 +139,6 @@ class mintMenuConfig( object ):
         self.borderColorLabel = self.builder.get_object( "borderColorLabel" )
         self.headingColorLabel = self.builder.get_object( "headingColorLabel" )
         self.showButtonIcon = self.builder.get_object( "showButtonIcon" )
-        self.enableInternetSearch = self.builder.get_object( "enableInternetSearch" )
         self.buttonText = self.builder.get_object( "buttonText" )
         self.hotkeyWidget = keybinding.KeybindingWidget(_("Keyboard shortcut:") )
         table = self.builder.get_object( "main_table" )
@@ -210,7 +208,7 @@ class mintMenuConfig( object ):
         self.bindGSettingsValueToWidget( self.settingsApplications, "int", "favicon-size", self.favIconSize, "value-changed", self.favIconSize.set_value, self.favIconSize.get_value )
         self.bindGSettingsValueToWidget( self.settingsApplications, "int", "fav-cols", self.favCols, "value-changed", self.favCols.set_value, self.favCols.get_value )
         self.bindGSettingsValueToWidget( self.settingsApplications, "bool", "remember-filter", self.rememberFilter, "toggled", self.rememberFilter.set_active, self.rememberFilter.get_active)
-        self.bindGSettingsValueToWidget( self.settingsApplications, "bool", "enable-internet-search", self.enableInternetSearch, "toggled", self.enableInternetSearch.set_active,  self.enableInternetSearch.get_active)
+
         self.bindGSettingsValueToWidget( self.settingsPlaces, "int", "icon-size", self.placesIconSize, "value-changed", self.placesIconSize.set_value, self.placesIconSize.get_value )
         self.bindGSettingsValueToWidget( self.settingsSystem, "int", "icon-size", self.systemIconSize, "value-changed", self.systemIconSize.set_value, self.systemIconSize.get_value )
 
diff --git a/usr/lib/linuxmint/mintMenu/plugins/applications.py b/usr/lib/linuxmint/mintMenu/plugins/applications.py
index 3ba9f5d..2a927ef 100755
--- a/usr/lib/linuxmint/mintMenu/plugins/applications.py
+++ b/usr/lib/linuxmint/mintMenu/plugins/applications.py
@@ -242,11 +242,9 @@ class pluginclass( object ):
             self.settings.notifyAdd( "use-apt", self.switchAPTUsage)
             self.settings.notifyAdd( "fav-cols", self.changeFavCols )
             self.settings.notifyAdd( "remember-filter", self.changeRememberFilter)
-            self.settings.notifyAdd( "enable-internet-search", self.changeEnableInternetSearch)
 
             self.settings.bindGSettingsEntryToVar( "int", "category-hover-delay", self, "categoryhoverdelay" )
             self.settings.bindGSettingsEntryToVar( "bool", "do-not-filter", self, "donotfilterapps" )
-            self.settings.bindGSettingsEntryToVar( "bool", "enable-internet-search", self, "enableInternetSearch" )
             self.settings.bindGSettingsEntryToVar( "string", "search-command", self, "searchtool" )
             self.settings.bindGSettingsEntryToVar( "int", "default-tab", self, "defaultTab" )
         except Exception, detail:
@@ -389,9 +387,6 @@ class pluginclass( object ):
     def changeRememberFilter( self, settings, key, args):
         self.rememberFilter = settings.get_boolean(key)
 
-    def changeEnableInternetSearch( self, settings, key, args):
-        self.enableInternetSearch = settings.get_boolean(key)
-
     def changeShowApplicationComments( self, settings, key, args ):
         self.showapplicationcomments = settings.get_boolean(key)
         for child in self.applicationsBox:
@@ -456,7 +451,6 @@ class pluginclass( object ):
         self.showapplicationcomments = self.settings.get( "bool", "show-application-comments")
         self.useAPT = self.settings.get( "bool", "use-apt")
         self.rememberFilter = self.settings.get( "bool", "remember-filter")
-        self.enableInternetSearch = self.settings.get( "bool", "enable-internet-search")
 
         self.lastActiveTab =  self.settings.get( "int", "last-active-tab")
         self.defaultTab = self.settings.get( "int", "default-tab")
@@ -583,29 +577,28 @@ class pluginclass( object ):
 
         text = "<b>%s</b>" % text
 
-        if self.enableInternetSearch:
-            suggestionButton = SuggestionButton(Gtk.STOCK_ADD, self.iconSize, "")
-            suggestionButton.connect("clicked", self.search_google)
-            suggestionButton.set_text(_("Search Google for %s") % text)
-            suggestionButton.set_image("/usr/lib/linuxmint/mintMenu/search_engines/google.ico")
-            self.applicationsBox.add(suggestionButton)
-            self.suggestions.append(suggestionButton)
+        suggestionButton = SuggestionButton(Gtk.STOCK_ADD, self.iconSize, "")
+        suggestionButton.connect("clicked", self.search_google)
+        suggestionButton.set_text(_("Search Google for %s") % text)
+        suggestionButton.set_image("/usr/lib/linuxmint/mintMenu/search_engines/google.ico")
+        self.applicationsBox.add(suggestionButton)
+        self.suggestions.append(suggestionButton)
 
-            suggestionButton = SuggestionButton(Gtk.STOCK_ADD, self.iconSize, "")
-            suggestionButton.connect("clicked", self.search_wikipedia)
-            suggestionButton.set_text(_("Search Wikipedia for %s") % text)
-            suggestionButton.set_image("/usr/lib/linuxmint/mintMenu/search_engines/wikipedia.ico")
-            self.applicationsBox.add(suggestionButton)
-            self.suggestions.append(suggestionButton)
+        suggestionButton = SuggestionButton(Gtk.STOCK_ADD, self.iconSize, "")
+        suggestionButton.connect("clicked", self.search_wikipedia)
+        suggestionButton.set_text(_("Search Wikipedia for %s") % text)
+        suggestionButton.set_image("/usr/lib/linuxmint/mintMenu/search_engines/wikipedia.ico")
+        self.applicationsBox.add(suggestionButton)
+        self.suggestions.append(suggestionButton)
 
-            separator = Gtk.EventBox()
-            separator.add(Gtk.HSeparator())
-            separator.set_visible_window(False)
-            separator.set_size_request(-1, 20)
-            separator.type = "separator"
-            separator.show_all()
-            self.applicationsBox.add(separator)
-            self.suggestions.append(separator)
+        separator = Gtk.EventBox()
+        separator.add(Gtk.HSeparator())
+        separator.set_visible_window(False)
+        separator.set_size_request(-1, 20)
+        separator.type = "separator"
+        separator.show_all()
+        self.applicationsBox.add(separator)
+        self.suggestions.append(separator)
 
         suggestionButton = SuggestionButton(Gtk.STOCK_ADD, self.iconSize, "")
         suggestionButton.connect("clicked", self.search_dictionary)
@@ -1014,24 +1007,22 @@ class pluginclass( object ):
     def searchPopup( self, widget=None, event=None ):
         menu = Gtk.Menu()
 
-        if self.enableInternetSearch:
+        menuItem = Gtk.ImageMenuItem(_("Search Google"))
+        img = Gtk.Image()
+        img.set_from_file('/usr/lib/linuxmint/mintMenu/search_engines/google.ico')
+        menuItem.set_image(img)
+        menuItem.connect("activate", self.search_google)
+        menu.append(menuItem)
 
-            menuItem = Gtk.ImageMenuItem(_("Search Google"))
-            img = Gtk.Image()
-            img.set_from_file('/usr/lib/linuxmint/mintMenu/search_engines/google.ico')
-            menuItem.set_image(img)
-            menuItem.connect("activate", self.search_google)
-            menu.append(menuItem)
+        menuItem = Gtk.ImageMenuItem(_("Search Wikipedia"))
+        img = Gtk.Image()
+        img.set_from_file('/usr/lib/linuxmint/mintMenu/search_engines/wikipedia.ico')
+        menuItem.set_image(img)
+        menuItem.connect("activate", self.search_wikipedia)
+        menu.append(menuItem)
 
-            menuItem = Gtk.ImageMenuItem(_("Search Wikipedia"))
-            img = Gtk.Image()
-            img.set_from_file('/usr/lib/linuxmint/mintMenu/search_engines/wikipedia.ico')
-            menuItem.set_image(img)
-            menuItem.connect("activate", self.search_wikipedia)
-            menu.append(menuItem)
-
-            menuItem = Gtk.SeparatorMenuItem()
-            menu.append(menuItem)
+        menuItem = Gtk.SeparatorMenuItem()
+        menu.append(menuItem)
 
         menuItem = Gtk.ImageMenuItem(_("Lookup Dictionary"))
         img = Gtk.Image()
@@ -1105,18 +1096,16 @@ class pluginclass( object ):
         return (x, y, False)
 
     def search_google(self, widget):
-        if self.enableInternetSearch:
-            text = self.searchEntry.get_text()
-            text = text.replace(" ", "+")
-            os.system("xdg-open \"http://www.google.com/cse?cx=002683415331144861350%3Atsq8didf9x0&ie=utf-8&sa=Search&q=" + text + "\" &")
-            self.mintMenuWin.hide()
+        text = self.searchEntry.get_text()
+        text = text.replace(" ", "+")
+        os.system("xdg-open \"http://www.google.com/cse?cx=002683415331144861350%3Atsq8didf9x0&ie=utf-8&sa=Search&q=" + text + "\" &")
+        self.mintMenuWin.hide()
 
     def search_wikipedia(self, widget):
-        if self.enableInternetSearch:
-            text = self.searchEntry.get_text()
-            text = text.replace(" ", "+")
-            os.system("xdg-open \"http://en.wikipedia.org/wiki/Special:Search?search=" + text + "\" &")
-            self.mintMenuWin.hide()
+        text = self.searchEntry.get_text()
+        text = text.replace(" ", "+")
+        os.system("xdg-open \"http://en.wikipedia.org/wiki/Special:Search?search=" + text + "\" &")
+        self.mintMenuWin.hide()
 
     def search_dictionary(self, widget):
         text = self.searchEntry.get_text()
@@ -1124,39 +1113,34 @@ class pluginclass( object ):
         self.mintMenuWin.hide()
 
     def search_mint_tutorials(self, widget):
-        if self.enableInternetSearch:
-            text = self.searchEntry.get_text()
-            text = text.replace(" ", "%20")
-            os.system("xdg-open \"http://community.linuxmint.com/index.php/tutorial/search/0/" + text + "\" &")
-            self.mintMenuWin.hide()
+        text = self.searchEntry.get_text()
+        text = text.replace(" ", "%20")
+        os.system("xdg-open \"http://community.linuxmint.com/index.php/tutorial/search/0/" + text + "\" &")
+        self.mintMenuWin.hide()
 
     def search_mint_ideas(self, widget):
-        if self.enableInternetSearch:
-            text = self.searchEntry.get_text()
-            text = text.replace(" ", "%20")
-            os.system("xdg-open \"http://community.linuxmint.com/index.php/idea/search/0/" + text + "\" &")
-            self.mintMenuWin.hide()
+        text = self.searchEntry.get_text()
+        text = text.replace(" ", "%20")
+        os.system("xdg-open \"http://community.linuxmint.com/index.php/idea/search/0/" + text + "\" &")
+        self.mintMenuWin.hide()
 
     def search_mint_users(self, widget):
-        if self.enableInternetSearch:
-            text = self.searchEntry.get_text()
-            text = text.replace(" ", "%20")
-            os.system("xdg-open \"http://community.linuxmint.com/index.php/user/search/0/" + text + "\" &")
-            self.mintMenuWin.hide()
+        text = self.searchEntry.get_text()
+        text = text.replace(" ", "%20")
+        os.system("xdg-open \"http://community.linuxmint.com/index.php/user/search/0/" + text + "\" &")
+        self.mintMenuWin.hide()
 
     def search_mint_hardware(self, widget):
-        if self.enableInternetSearch:
-            text = self.searchEntry.get_text()
-            text = text.replace(" ", "%20")
-            os.system("xdg-open \"http://community.linuxmint.com/index.php/hardware/search/0/" + text + "\" &")
-            self.mintMenuWin.hide()
+        text = self.searchEntry.get_text()
+        text = text.replace(" ", "%20")
+        os.system("xdg-open \"http://community.linuxmint.com/index.php/hardware/search/0/" + text + "\" &")
+        self.mintMenuWin.hide()
 
     def search_mint_software(self, widget):
-        if self.enableInternetSearch:
-            text = self.searchEntry.get_text()
-            text = text.replace(" ", "%20")
-            os.system("xdg-open \"http://community.linuxmint.com/index.php/software/search/0/" + text + "\" &")
-            self.mintMenuWin.hide()
+        text = self.searchEntry.get_text()
+        text = text.replace(" ", "%20")
+        os.system("xdg-open \"http://community.linuxmint.com/index.php/software/search/0/" + text + "\" &")
+        self.mintMenuWin.hide()
 
     def add_to_desktop(self, widget, desktopEntry):
         os.system("xdg-desktop-icon install --novendor %s" % desktopEntry.desktopFile)
diff --git a/usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.xml b/usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.xml
index f02e736..22d4c84 100644
--- a/usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.xml
+++ b/usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.xml
@@ -313,12 +313,6 @@
       <summary></summary>
       <description></description>
     </key>
-
-    <key type="b" name="enable-internet-search">
-      <default>false</default>
-      <summary></summary>
-      <description></description>
-    </key>
   </schema>
 
   <schema id="com.linuxmint.mintmenu.plugins.system_management" path="/com/linuxmint/mintmenu/plugins/system_management/">

From b3f84781db638c981463ac7fc4b3d24e1ec559ac Mon Sep 17 00:00:00 2001
From: JKAbrams <JKAbrams@users.noreply.github.com>
Date: Tue, 9 Aug 2016 13:45:02 +0200
Subject: [PATCH 03/14] Making internet searching from the start menu optional

---
 .../linuxmint/mintMenu/mintMenuConfig.glade   |  21 ++-
 usr/lib/linuxmint/mintMenu/mintMenuConfig.py  |   3 +
 .../mintMenu/plugins/applications.py          | 140 ++++++++++--------
 .../com.linuxmint.mintmenu.gschema.xml        |   6 +
 4 files changed, 107 insertions(+), 63 deletions(-)

diff --git a/usr/lib/linuxmint/mintMenu/mintMenuConfig.glade b/usr/lib/linuxmint/mintMenu/mintMenuConfig.glade
index 29dcf3f..13a87ec 100644
--- a/usr/lib/linuxmint/mintMenu/mintMenuConfig.glade
+++ b/usr/lib/linuxmint/mintMenu/mintMenuConfig.glade
@@ -913,7 +913,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="n_rows">8</property>
+                    <property name="n_rows">9</property>
                     <property name="n_columns">2</property>
                     <property name="row_spacing">5</property>
                     <property name="homogeneous">True</property>
@@ -1120,6 +1120,25 @@
                         <property name="x_padding">5</property>
                       </packing>
                     </child>
+                    <child>
+                      <object class="GtkCheckButton" id="enableInternetSearch">
+                        <property name="label" translatable="yes">Enable internet search</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="right_attach">2</property>
+                        <property name="top_attach">8</property>
+                        <property name="bottom_attach">9</property>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options"/>
+                        <property name="x_padding">5</property>
+                      </packing>
+                    </child>
                   </object>
                 </child>
                 <child type="label">
diff --git a/usr/lib/linuxmint/mintMenu/mintMenuConfig.py b/usr/lib/linuxmint/mintMenu/mintMenuConfig.py
index 5e48a8d..6faf3a0 100755
--- a/usr/lib/linuxmint/mintMenu/mintMenuConfig.py
+++ b/usr/lib/linuxmint/mintMenu/mintMenuConfig.py
@@ -44,6 +44,7 @@ class mintMenuConfig( object ):
 
         self.builder.get_object("startWithFavorites").set_label(_("Always start with favorites pane"))
         self.builder.get_object("showButtonIcon").set_label(_("Show button icon"))
+        self.builder.get_object("enableInternetSearch").set_label(_("Enable internet search"))
         self.builder.get_object("useCustomColors").set_label(_("Use custom colors"))
         self.builder.get_object("showRecentPlugin").set_label(_("Show recent documents plugin"))
         self.builder.get_object("showApplicationsPlugin").set_label(_("Show applications plugin"))
@@ -139,6 +140,7 @@ class mintMenuConfig( object ):
         self.borderColorLabel = self.builder.get_object( "borderColorLabel" )
         self.headingColorLabel = self.builder.get_object( "headingColorLabel" )
         self.showButtonIcon = self.builder.get_object( "showButtonIcon" )
+        self.enableInternetSearch = self.builder.get_object( "enableInternetSearch" )
         self.buttonText = self.builder.get_object( "buttonText" )
         self.hotkeyWidget = keybinding.KeybindingWidget(_("Keyboard shortcut:") )
         table = self.builder.get_object( "main_table" )
@@ -208,6 +210,7 @@ class mintMenuConfig( object ):
         self.bindGSettingsValueToWidget( self.settingsApplications, "int", "favicon-size", self.favIconSize, "value-changed", self.favIconSize.set_value, self.favIconSize.get_value )
         self.bindGSettingsValueToWidget( self.settingsApplications, "int", "fav-cols", self.favCols, "value-changed", self.favCols.set_value, self.favCols.get_value )
         self.bindGSettingsValueToWidget( self.settingsApplications, "bool", "remember-filter", self.rememberFilter, "toggled", self.rememberFilter.set_active, self.rememberFilter.get_active)
+        self.bindGSettingsValueToWidget( self.settingsApplications, "bool", "enable-internet-search", self.enableInternetSearch, "toggled", self.enableInternetSearch.set_active,  self.enableInternetSearch.get_active)
 
         self.bindGSettingsValueToWidget( self.settingsPlaces, "int", "icon-size", self.placesIconSize, "value-changed", self.placesIconSize.set_value, self.placesIconSize.get_value )
         self.bindGSettingsValueToWidget( self.settingsSystem, "int", "icon-size", self.systemIconSize, "value-changed", self.systemIconSize.set_value, self.systemIconSize.get_value )
diff --git a/usr/lib/linuxmint/mintMenu/plugins/applications.py b/usr/lib/linuxmint/mintMenu/plugins/applications.py
index 2a927ef..3ba9f5d 100755
--- a/usr/lib/linuxmint/mintMenu/plugins/applications.py
+++ b/usr/lib/linuxmint/mintMenu/plugins/applications.py
@@ -242,9 +242,11 @@ class pluginclass( object ):
             self.settings.notifyAdd( "use-apt", self.switchAPTUsage)
             self.settings.notifyAdd( "fav-cols", self.changeFavCols )
             self.settings.notifyAdd( "remember-filter", self.changeRememberFilter)
+            self.settings.notifyAdd( "enable-internet-search", self.changeEnableInternetSearch)
 
             self.settings.bindGSettingsEntryToVar( "int", "category-hover-delay", self, "categoryhoverdelay" )
             self.settings.bindGSettingsEntryToVar( "bool", "do-not-filter", self, "donotfilterapps" )
+            self.settings.bindGSettingsEntryToVar( "bool", "enable-internet-search", self, "enableInternetSearch" )
             self.settings.bindGSettingsEntryToVar( "string", "search-command", self, "searchtool" )
             self.settings.bindGSettingsEntryToVar( "int", "default-tab", self, "defaultTab" )
         except Exception, detail:
@@ -387,6 +389,9 @@ class pluginclass( object ):
     def changeRememberFilter( self, settings, key, args):
         self.rememberFilter = settings.get_boolean(key)
 
+    def changeEnableInternetSearch( self, settings, key, args):
+        self.enableInternetSearch = settings.get_boolean(key)
+
     def changeShowApplicationComments( self, settings, key, args ):
         self.showapplicationcomments = settings.get_boolean(key)
         for child in self.applicationsBox:
@@ -451,6 +456,7 @@ class pluginclass( object ):
         self.showapplicationcomments = self.settings.get( "bool", "show-application-comments")
         self.useAPT = self.settings.get( "bool", "use-apt")
         self.rememberFilter = self.settings.get( "bool", "remember-filter")
+        self.enableInternetSearch = self.settings.get( "bool", "enable-internet-search")
 
         self.lastActiveTab =  self.settings.get( "int", "last-active-tab")
         self.defaultTab = self.settings.get( "int", "default-tab")
@@ -577,28 +583,29 @@ class pluginclass( object ):
 
         text = "<b>%s</b>" % text
 
-        suggestionButton = SuggestionButton(Gtk.STOCK_ADD, self.iconSize, "")
-        suggestionButton.connect("clicked", self.search_google)
-        suggestionButton.set_text(_("Search Google for %s") % text)
-        suggestionButton.set_image("/usr/lib/linuxmint/mintMenu/search_engines/google.ico")
-        self.applicationsBox.add(suggestionButton)
-        self.suggestions.append(suggestionButton)
+        if self.enableInternetSearch:
+            suggestionButton = SuggestionButton(Gtk.STOCK_ADD, self.iconSize, "")
+            suggestionButton.connect("clicked", self.search_google)
+            suggestionButton.set_text(_("Search Google for %s") % text)
+            suggestionButton.set_image("/usr/lib/linuxmint/mintMenu/search_engines/google.ico")
+            self.applicationsBox.add(suggestionButton)
+            self.suggestions.append(suggestionButton)
 
-        suggestionButton = SuggestionButton(Gtk.STOCK_ADD, self.iconSize, "")
-        suggestionButton.connect("clicked", self.search_wikipedia)
-        suggestionButton.set_text(_("Search Wikipedia for %s") % text)
-        suggestionButton.set_image("/usr/lib/linuxmint/mintMenu/search_engines/wikipedia.ico")
-        self.applicationsBox.add(suggestionButton)
-        self.suggestions.append(suggestionButton)
+            suggestionButton = SuggestionButton(Gtk.STOCK_ADD, self.iconSize, "")
+            suggestionButton.connect("clicked", self.search_wikipedia)
+            suggestionButton.set_text(_("Search Wikipedia for %s") % text)
+            suggestionButton.set_image("/usr/lib/linuxmint/mintMenu/search_engines/wikipedia.ico")
+            self.applicationsBox.add(suggestionButton)
+            self.suggestions.append(suggestionButton)
 
-        separator = Gtk.EventBox()
-        separator.add(Gtk.HSeparator())
-        separator.set_visible_window(False)
-        separator.set_size_request(-1, 20)
-        separator.type = "separator"
-        separator.show_all()
-        self.applicationsBox.add(separator)
-        self.suggestions.append(separator)
+            separator = Gtk.EventBox()
+            separator.add(Gtk.HSeparator())
+            separator.set_visible_window(False)
+            separator.set_size_request(-1, 20)
+            separator.type = "separator"
+            separator.show_all()
+            self.applicationsBox.add(separator)
+            self.suggestions.append(separator)
 
         suggestionButton = SuggestionButton(Gtk.STOCK_ADD, self.iconSize, "")
         suggestionButton.connect("clicked", self.search_dictionary)
@@ -1007,22 +1014,24 @@ class pluginclass( object ):
     def searchPopup( self, widget=None, event=None ):
         menu = Gtk.Menu()
 
-        menuItem = Gtk.ImageMenuItem(_("Search Google"))
-        img = Gtk.Image()
-        img.set_from_file('/usr/lib/linuxmint/mintMenu/search_engines/google.ico')
-        menuItem.set_image(img)
-        menuItem.connect("activate", self.search_google)
-        menu.append(menuItem)
+        if self.enableInternetSearch:
 
-        menuItem = Gtk.ImageMenuItem(_("Search Wikipedia"))
-        img = Gtk.Image()
-        img.set_from_file('/usr/lib/linuxmint/mintMenu/search_engines/wikipedia.ico')
-        menuItem.set_image(img)
-        menuItem.connect("activate", self.search_wikipedia)
-        menu.append(menuItem)
+            menuItem = Gtk.ImageMenuItem(_("Search Google"))
+            img = Gtk.Image()
+            img.set_from_file('/usr/lib/linuxmint/mintMenu/search_engines/google.ico')
+            menuItem.set_image(img)
+            menuItem.connect("activate", self.search_google)
+            menu.append(menuItem)
 
-        menuItem = Gtk.SeparatorMenuItem()
-        menu.append(menuItem)
+            menuItem = Gtk.ImageMenuItem(_("Search Wikipedia"))
+            img = Gtk.Image()
+            img.set_from_file('/usr/lib/linuxmint/mintMenu/search_engines/wikipedia.ico')
+            menuItem.set_image(img)
+            menuItem.connect("activate", self.search_wikipedia)
+            menu.append(menuItem)
+
+            menuItem = Gtk.SeparatorMenuItem()
+            menu.append(menuItem)
 
         menuItem = Gtk.ImageMenuItem(_("Lookup Dictionary"))
         img = Gtk.Image()
@@ -1096,16 +1105,18 @@ class pluginclass( object ):
         return (x, y, False)
 
     def search_google(self, widget):
-        text = self.searchEntry.get_text()
-        text = text.replace(" ", "+")
-        os.system("xdg-open \"http://www.google.com/cse?cx=002683415331144861350%3Atsq8didf9x0&ie=utf-8&sa=Search&q=" + text + "\" &")
-        self.mintMenuWin.hide()
+        if self.enableInternetSearch:
+            text = self.searchEntry.get_text()
+            text = text.replace(" ", "+")
+            os.system("xdg-open \"http://www.google.com/cse?cx=002683415331144861350%3Atsq8didf9x0&ie=utf-8&sa=Search&q=" + text + "\" &")
+            self.mintMenuWin.hide()
 
     def search_wikipedia(self, widget):
-        text = self.searchEntry.get_text()
-        text = text.replace(" ", "+")
-        os.system("xdg-open \"http://en.wikipedia.org/wiki/Special:Search?search=" + text + "\" &")
-        self.mintMenuWin.hide()
+        if self.enableInternetSearch:
+            text = self.searchEntry.get_text()
+            text = text.replace(" ", "+")
+            os.system("xdg-open \"http://en.wikipedia.org/wiki/Special:Search?search=" + text + "\" &")
+            self.mintMenuWin.hide()
 
     def search_dictionary(self, widget):
         text = self.searchEntry.get_text()
@@ -1113,34 +1124,39 @@ class pluginclass( object ):
         self.mintMenuWin.hide()
 
     def search_mint_tutorials(self, widget):
-        text = self.searchEntry.get_text()
-        text = text.replace(" ", "%20")
-        os.system("xdg-open \"http://community.linuxmint.com/index.php/tutorial/search/0/" + text + "\" &")
-        self.mintMenuWin.hide()
+        if self.enableInternetSearch:
+            text = self.searchEntry.get_text()
+            text = text.replace(" ", "%20")
+            os.system("xdg-open \"http://community.linuxmint.com/index.php/tutorial/search/0/" + text + "\" &")
+            self.mintMenuWin.hide()
 
     def search_mint_ideas(self, widget):
-        text = self.searchEntry.get_text()
-        text = text.replace(" ", "%20")
-        os.system("xdg-open \"http://community.linuxmint.com/index.php/idea/search/0/" + text + "\" &")
-        self.mintMenuWin.hide()
+        if self.enableInternetSearch:
+            text = self.searchEntry.get_text()
+            text = text.replace(" ", "%20")
+            os.system("xdg-open \"http://community.linuxmint.com/index.php/idea/search/0/" + text + "\" &")
+            self.mintMenuWin.hide()
 
     def search_mint_users(self, widget):
-        text = self.searchEntry.get_text()
-        text = text.replace(" ", "%20")
-        os.system("xdg-open \"http://community.linuxmint.com/index.php/user/search/0/" + text + "\" &")
-        self.mintMenuWin.hide()
+        if self.enableInternetSearch:
+            text = self.searchEntry.get_text()
+            text = text.replace(" ", "%20")
+            os.system("xdg-open \"http://community.linuxmint.com/index.php/user/search/0/" + text + "\" &")
+            self.mintMenuWin.hide()
 
     def search_mint_hardware(self, widget):
-        text = self.searchEntry.get_text()
-        text = text.replace(" ", "%20")
-        os.system("xdg-open \"http://community.linuxmint.com/index.php/hardware/search/0/" + text + "\" &")
-        self.mintMenuWin.hide()
+        if self.enableInternetSearch:
+            text = self.searchEntry.get_text()
+            text = text.replace(" ", "%20")
+            os.system("xdg-open \"http://community.linuxmint.com/index.php/hardware/search/0/" + text + "\" &")
+            self.mintMenuWin.hide()
 
     def search_mint_software(self, widget):
-        text = self.searchEntry.get_text()
-        text = text.replace(" ", "%20")
-        os.system("xdg-open \"http://community.linuxmint.com/index.php/software/search/0/" + text + "\" &")
-        self.mintMenuWin.hide()
+        if self.enableInternetSearch:
+            text = self.searchEntry.get_text()
+            text = text.replace(" ", "%20")
+            os.system("xdg-open \"http://community.linuxmint.com/index.php/software/search/0/" + text + "\" &")
+            self.mintMenuWin.hide()
 
     def add_to_desktop(self, widget, desktopEntry):
         os.system("xdg-desktop-icon install --novendor %s" % desktopEntry.desktopFile)
diff --git a/usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.xml b/usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.xml
index 22d4c84..f02e736 100644
--- a/usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.xml
+++ b/usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.xml
@@ -313,6 +313,12 @@
       <summary></summary>
       <description></description>
     </key>
+
+    <key type="b" name="enable-internet-search">
+      <default>false</default>
+      <summary></summary>
+      <description></description>
+    </key>
   </schema>
 
   <schema id="com.linuxmint.mintmenu.plugins.system_management" path="/com/linuxmint/mintmenu/plugins/system_management/">

From eafbd9d7ef48fcfb179d9cc382723d0779668b7f Mon Sep 17 00:00:00 2001
From: Clement Lefebvre <clement.lefebvre@linuxmint.com>
Date: Wed, 5 Oct 2016 10:21:21 +0100
Subject: [PATCH 04/14] Fixed launching some Wine applications

Replaces "\\" ocurrences in appExec with "\".
---
 usr/lib/linuxmint/mintMenu/plugins/easybuttons.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/lib/linuxmint/mintMenu/plugins/easybuttons.py b/usr/lib/linuxmint/mintMenu/plugins/easybuttons.py
index 41a959d..bfdbbf7 100755
--- a/usr/lib/linuxmint/mintMenu/plugins/easybuttons.py
+++ b/usr/lib/linuxmint/mintMenu/plugins/easybuttons.py
@@ -294,7 +294,7 @@ class ApplicationLauncher( easyButton ):
             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 ""

From ae3e99e957d9ca4f1df7c93d47b63f5d6e39a88d Mon Sep 17 00:00:00 2001
From: Clement Lefebvre <clement.lefebvre@linuxmint.com>
Date: Wed, 2 Nov 2016 14:03:40 +0000
Subject: [PATCH 05/14] 5.7.3

---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d982e94..2884a0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mintmenu (5.7.3) serena; urgency=medium
+
+  * Fixed launching some Wine applications
+
+ -- Clement Lefebvre <root@linuxmint.com>  Wed, 02 Nov 2016 14:03:20 +0000
+
 mintmenu (5.7.2) sarah; urgency=medium
 
   * Menu icon: Scale svg files to 22px to prevent them from getting too big

From 60461c5a0bb200aa51db96cb6619bae783036f8d Mon Sep 17 00:00:00 2001
From: Clement Lefebvre <clement.lefebvre@linuxmint.com>
Date: Wed, 23 Nov 2016 15:13:29 +0000
Subject: [PATCH 06/14] Search engines: Replace Google CSE with DDG

In the absence of locale detection, DDG should be the default engine for everybody.
It's a Mint partner and a much better engine than CSE.
---
 .../linuxmint/mintMenu/plugins/applications.py  |  16 ++++++++--------
 .../linuxmint/mintMenu/search_engines/ddg.png   | Bin 0 -> 573 bytes
 .../mintMenu/search_engines/google.ico          | Bin 1150 -> 0 bytes
 3 files changed, 8 insertions(+), 8 deletions(-)
 create mode 100644 usr/lib/linuxmint/mintMenu/search_engines/ddg.png
 delete mode 100644 usr/lib/linuxmint/mintMenu/search_engines/google.ico

diff --git a/usr/lib/linuxmint/mintMenu/plugins/applications.py b/usr/lib/linuxmint/mintMenu/plugins/applications.py
index 3ba9f5d..5052e87 100755
--- a/usr/lib/linuxmint/mintMenu/plugins/applications.py
+++ b/usr/lib/linuxmint/mintMenu/plugins/applications.py
@@ -585,9 +585,9 @@ class pluginclass( object ):
 
         if self.enableInternetSearch:
             suggestionButton = SuggestionButton(Gtk.STOCK_ADD, self.iconSize, "")
-            suggestionButton.connect("clicked", self.search_google)
-            suggestionButton.set_text(_("Search Google for %s") % text)
-            suggestionButton.set_image("/usr/lib/linuxmint/mintMenu/search_engines/google.ico")
+            suggestionButton.connect("clicked", self.search_ddg)
+            suggestionButton.set_text(_("Search DuckDuckGo for %s") % text)
+            suggestionButton.set_image("/usr/lib/linuxmint/mintMenu/search_engines/ddg.png")
             self.applicationsBox.add(suggestionButton)
             self.suggestions.append(suggestionButton)
 
@@ -1016,11 +1016,11 @@ class pluginclass( object ):
 
         if self.enableInternetSearch:
 
-            menuItem = Gtk.ImageMenuItem(_("Search Google"))
+            menuItem = Gtk.ImageMenuItem(_("Search DuckDuckGo"))
             img = Gtk.Image()
-            img.set_from_file('/usr/lib/linuxmint/mintMenu/search_engines/google.ico')
+            img.set_from_file('/usr/lib/linuxmint/mintMenu/search_engines/ddg.png')
             menuItem.set_image(img)
-            menuItem.connect("activate", self.search_google)
+            menuItem.connect("activate", self.search_ddg)
             menu.append(menuItem)
 
             menuItem = Gtk.ImageMenuItem(_("Search Wikipedia"))
@@ -1104,11 +1104,11 @@ class pluginclass( object ):
         y = rect.y + rect.height
         return (x, y, False)
 
-    def search_google(self, widget):
+    def search_ddg(self, widget):
         if self.enableInternetSearch:
             text = self.searchEntry.get_text()
             text = text.replace(" ", "+")
-            os.system("xdg-open \"http://www.google.com/cse?cx=002683415331144861350%3Atsq8didf9x0&ie=utf-8&sa=Search&q=" + text + "\" &")
+            os.system("xdg-open \"https://duckduckgo.com/?q=%s&t=lm&ia=web\" &" % text)
             self.mintMenuWin.hide()
 
     def search_wikipedia(self, widget):
diff --git a/usr/lib/linuxmint/mintMenu/search_engines/ddg.png b/usr/lib/linuxmint/mintMenu/search_engines/ddg.png
new file mode 100644
index 0000000000000000000000000000000000000000..7cdf03da1fc92d541630a79ddfea76e9faa111ae
GIT binary patch
literal 573
zcmV-D0>b@?P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00066Nkl<Zc${^T
zPiPZC7{!0PiEXkmsWo1_=ms<!rPxv`cn}fP9#TaF4}ypn6)XkKtv!i?7FzrREfp+S
zJ%~{7AVGy5#e-rjO?nAM2p(!N-9;O$*~aXyhfUYrZSuju%<$fu_kHsO%d&8nmPjRm
zi$E{X*SO9B^T3OEskr3E3vK}|k-7<t0wJ204vfT0#YbBNv_$F+kZwWr*V}lhH~=8J
zUQPqVo=wyF@jW}<y{7&AxmE({1_wcvl_Zegv@P!4gEV-JZKqCvzCm?j3Vrq!7)G;p
zx`WsQb9#<G7$ex*<Deq<?jUTBP@SIf3xt3RBKEYM3LHpzP=TR2+RmP7)yiR!|6c`w
zRjCjdnsd&^!!E>K^GH`!qT|a%Z>_lDeL=ruJzv0>?6<|f-@wwQ0B9e8dS2qsOx%MH
zVu$3kBT!hRt^cGgP|ace4zoVdLA?;hS{MEA<wWd+xg0Dydr{6(`w&4IT&3gbH=^Uq
z1a{Zm@XuSmQHaIZx$p@D0f3)Jj$!^NBZN#W-Qz$9y2VDeN8CevUKpdSmjU=CcQTpT
z=O=?5>7}MozCU{u)d;epuW?We^OX&rT>j!Fd!r1{xX1wd{<6eq&t0;|UosrH#G!>X
zx9!X(*|uz1o~6o4vU276W208nOw;^ptg2O2R<f$B+*V~J>Bs*AH=@_*or*}V00000
LNkvXXu0mjflur-o

literal 0
HcmV?d00001

diff --git a/usr/lib/linuxmint/mintMenu/search_engines/google.ico b/usr/lib/linuxmint/mintMenu/search_engines/google.ico
deleted file mode 100644
index ee7c943abf1064e3110161deb3a6477fcc7789b5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1150
zcmai!ZEO@(6o&8IDMXq|w?7~;fHp><qKz>@yX|&cgxJ_d0|o(W0wkiuMEv;W=W3v(
z)q+3~th6X-V-^ZT+iD9Nw5Wh0X<8r_wUvGWQrV^LZkvVebm#HR_?tMBvv>E*ec$uG
zXU<)v47oiXC7+q<#T2DxDy6a{Bqf>u^0M6Wii}$XPK8<0I>KX3QJ$1_XGfg4m7sUv
z9K~<WX2IKv!hmLBK#~8B;!*kS5ZaR#YmW4hwm-tmrcq`zN164_ICmb55;!>w*c>_2
zz(cQ__{t3m%S;O1RTKz*@mq@CNQ_zaf8Yt-AT1Ony(LC^^Qg=5;GwIGC4|9>Q&KU9
z+)Alip~;tZ;RcOgbc|a!$qBZjz8yiIvPnH*F|93*I(Ute#vW|jhDn>{JMLvcmBP1G
z;TQbkjZ;L20ZBOf&luju4pJNYP%W3xUkx(9;R1g~q7Ib)q2DR2yq(-?@&2KSze-b3
zAs#j=&K?Vr91goayGAEyyf{QnXD`>rZb%NS$q8N#7BhdVfp@3W7mnO5;^70~5{_-f
zck|h5FU{|*;D_p081C+rjwR)`3CF^`bfAcA!RFTp*1=2ow@Yl6*rcd0oyV8UXS28D
zHg-RrL3F6k^?W%pz*BW|$=)UPKGFCjyz<@mk@Ri5fnPLur5^`Y%;3`{9)hnfqOE?D
z>(>(9zjhzzt~WFf?@{E`O4NzoU7|z6>(t+3Q1HINzSZ-%&~_MG`k07~(0lxIt`By*
z9%_$P@IaZ=tTV~mZIUA%awYP1$Q+1|MS{OR&?D7s;?W^m)@O0-X+>z&bS`&>-29%V
zS~6doL(a!ivqok}aF0|?Bm0Fs((m8wygoP1H<S@tra1F_3g17YIbB`qYTzbh-S-Pq
z@A!#~xlLqbwlc*d^P&e(Mwft{`GB^7kDpfwZk^`jvzm@=D{=bZTuYZ-Bt?zOelS&1
z)-jp=E10_5eQsG6t?TdM^jbydI>nErit}HWJGR`}D=O;8PzjVdiD4v!V^lc8!qMjp
zh-|VsTE3LfN=5rx&3DgDC-(PW?z`yvElz6MRoR=wG;F~+_2Z%^A|CqPGl-nQ!Jc-4
vYcl!bi4@Kqt`tj2MxqJw3Qx%XF0`I-Ikc-^&W9Ryu^WtA{w@6P0|)yrC_;$3


From f37700f5a0d4fcbaa86c6a3c6c1cad37334c79a2 Mon Sep 17 00:00:00 2001
From: Clement Lefebvre <clement.lefebvre@linuxmint.com>
Date: Wed, 23 Nov 2016 15:15:05 +0000
Subject: [PATCH 07/14] Search engines: Re-enable search engines by default.

This was disabled in a previous commit due to the presence of Google CSE.
---
 usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.xml b/usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.xml
index f02e736..5bffba8 100644
--- a/usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.xml
+++ b/usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.xml
@@ -315,7 +315,7 @@
     </key>
 
     <key type="b" name="enable-internet-search">
-      <default>false</default>
+      <default>true</default>
       <summary></summary>
       <description></description>
     </key>

From d1ee7606705d828663b79939e0f87d95ca52a671 Mon Sep 17 00:00:00 2001
From: Clement Lefebvre <clement.lefebvre@linuxmint.com>
Date: Wed, 23 Nov 2016 15:20:35 +0000
Subject: [PATCH 08/14] Search engines: Fix community links when Internet
 search is disabled

---
 .../mintMenu/plugins/applications.py          | 63 +++++++++----------
 1 file changed, 28 insertions(+), 35 deletions(-)

diff --git a/usr/lib/linuxmint/mintMenu/plugins/applications.py b/usr/lib/linuxmint/mintMenu/plugins/applications.py
index 5052e87..ef2016d 100755
--- a/usr/lib/linuxmint/mintMenu/plugins/applications.py
+++ b/usr/lib/linuxmint/mintMenu/plugins/applications.py
@@ -1105,18 +1105,16 @@ class pluginclass( object ):
         return (x, y, False)
 
     def search_ddg(self, widget):
-        if self.enableInternetSearch:
-            text = self.searchEntry.get_text()
-            text = text.replace(" ", "+")
-            os.system("xdg-open \"https://duckduckgo.com/?q=%s&t=lm&ia=web\" &" % text)
-            self.mintMenuWin.hide()
+        text = self.searchEntry.get_text()
+        text = text.replace(" ", "+")
+        os.system("xdg-open \"https://duckduckgo.com/?q=%s&t=lm&ia=web\" &" % text)
+        self.mintMenuWin.hide()
 
     def search_wikipedia(self, widget):
-        if self.enableInternetSearch:
-            text = self.searchEntry.get_text()
-            text = text.replace(" ", "+")
-            os.system("xdg-open \"http://en.wikipedia.org/wiki/Special:Search?search=" + text + "\" &")
-            self.mintMenuWin.hide()
+        text = self.searchEntry.get_text()
+        text = text.replace(" ", "+")
+        os.system("xdg-open \"http://en.wikipedia.org/wiki/Special:Search?search=" + text + "\" &")
+        self.mintMenuWin.hide()
 
     def search_dictionary(self, widget):
         text = self.searchEntry.get_text()
@@ -1124,39 +1122,34 @@ class pluginclass( object ):
         self.mintMenuWin.hide()
 
     def search_mint_tutorials(self, widget):
-        if self.enableInternetSearch:
-            text = self.searchEntry.get_text()
-            text = text.replace(" ", "%20")
-            os.system("xdg-open \"http://community.linuxmint.com/index.php/tutorial/search/0/" + text + "\" &")
-            self.mintMenuWin.hide()
+        text = self.searchEntry.get_text()
+        text = text.replace(" ", "%20")
+        os.system("xdg-open \"http://community.linuxmint.com/index.php/tutorial/search/0/" + text + "\" &")
+        self.mintMenuWin.hide()
 
     def search_mint_ideas(self, widget):
-        if self.enableInternetSearch:
-            text = self.searchEntry.get_text()
-            text = text.replace(" ", "%20")
-            os.system("xdg-open \"http://community.linuxmint.com/index.php/idea/search/0/" + text + "\" &")
-            self.mintMenuWin.hide()
+        text = self.searchEntry.get_text()
+        text = text.replace(" ", "%20")
+        os.system("xdg-open \"http://community.linuxmint.com/index.php/idea/search/0/" + text + "\" &")
+        self.mintMenuWin.hide()
 
     def search_mint_users(self, widget):
-        if self.enableInternetSearch:
-            text = self.searchEntry.get_text()
-            text = text.replace(" ", "%20")
-            os.system("xdg-open \"http://community.linuxmint.com/index.php/user/search/0/" + text + "\" &")
-            self.mintMenuWin.hide()
+        text = self.searchEntry.get_text()
+        text = text.replace(" ", "%20")
+        os.system("xdg-open \"http://community.linuxmint.com/index.php/user/search/0/" + text + "\" &")
+        self.mintMenuWin.hide()
 
     def search_mint_hardware(self, widget):
-        if self.enableInternetSearch:
-            text = self.searchEntry.get_text()
-            text = text.replace(" ", "%20")
-            os.system("xdg-open \"http://community.linuxmint.com/index.php/hardware/search/0/" + text + "\" &")
-            self.mintMenuWin.hide()
+        text = self.searchEntry.get_text()
+        text = text.replace(" ", "%20")
+        os.system("xdg-open \"http://community.linuxmint.com/index.php/hardware/search/0/" + text + "\" &")
+        self.mintMenuWin.hide()
 
     def search_mint_software(self, widget):
-        if self.enableInternetSearch:
-            text = self.searchEntry.get_text()
-            text = text.replace(" ", "%20")
-            os.system("xdg-open \"http://community.linuxmint.com/index.php/software/search/0/" + text + "\" &")
-            self.mintMenuWin.hide()
+        text = self.searchEntry.get_text()
+        text = text.replace(" ", "%20")
+        os.system("xdg-open \"http://community.linuxmint.com/index.php/software/search/0/" + text + "\" &")
+        self.mintMenuWin.hide()
 
     def add_to_desktop(self, widget, desktopEntry):
         os.system("xdg-desktop-icon install --novendor %s" % desktopEntry.desktopFile)

From 1810b6b3ee2b354272d574e21ebb96bde503f7a2 Mon Sep 17 00:00:00 2001
From: Clement Lefebvre <clement.lefebvre@linuxmint.com>
Date: Wed, 23 Nov 2016 15:21:15 +0000
Subject: [PATCH 09/14] l10n: Capitalize "Internet"

---
 usr/lib/linuxmint/mintMenu/mintMenuConfig.glade | 2 +-
 usr/lib/linuxmint/mintMenu/mintMenuConfig.py    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/lib/linuxmint/mintMenu/mintMenuConfig.glade b/usr/lib/linuxmint/mintMenu/mintMenuConfig.glade
index 13a87ec..2776f30 100644
--- a/usr/lib/linuxmint/mintMenu/mintMenuConfig.glade
+++ b/usr/lib/linuxmint/mintMenu/mintMenuConfig.glade
@@ -1122,7 +1122,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="enableInternetSearch">
-                        <property name="label" translatable="yes">Enable internet search</property>
+                        <property name="label" translatable="yes">Enable Internet search</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
diff --git a/usr/lib/linuxmint/mintMenu/mintMenuConfig.py b/usr/lib/linuxmint/mintMenu/mintMenuConfig.py
index 6faf3a0..77dfb75 100755
--- a/usr/lib/linuxmint/mintMenu/mintMenuConfig.py
+++ b/usr/lib/linuxmint/mintMenu/mintMenuConfig.py
@@ -44,7 +44,7 @@ class mintMenuConfig( object ):
 
         self.builder.get_object("startWithFavorites").set_label(_("Always start with favorites pane"))
         self.builder.get_object("showButtonIcon").set_label(_("Show button icon"))
-        self.builder.get_object("enableInternetSearch").set_label(_("Enable internet search"))
+        self.builder.get_object("enableInternetSearch").set_label(_("Enable Internet search"))
         self.builder.get_object("useCustomColors").set_label(_("Use custom colors"))
         self.builder.get_object("showRecentPlugin").set_label(_("Show recent documents plugin"))
         self.builder.get_object("showApplicationsPlugin").set_label(_("Show applications plugin"))

From 3f5895145b6d4128fce7d9d2172b069f086cf590 Mon Sep 17 00:00:00 2001
From: Clement Lefebvre <clement.lefebvre@linuxmint.com>
Date: Wed, 23 Nov 2016 15:33:34 +0000
Subject: [PATCH 10/14] Search engines: Point to local version of Wikipedia

Look at the locale and point at the appropriate version of Wikipedia.

Before this commit, mintmenu always pointed at the English Wikipedia.

Note: This commit might introduce regressions when a particular locale isn't supported by Wikipedia.
If this becomes a problem, we can fix this based on feedback.
---
 usr/lib/linuxmint/mintMenu/plugins/applications.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/usr/lib/linuxmint/mintMenu/plugins/applications.py b/usr/lib/linuxmint/mintMenu/plugins/applications.py
index ef2016d..1d9ce18 100755
--- a/usr/lib/linuxmint/mintMenu/plugins/applications.py
+++ b/usr/lib/linuxmint/mintMenu/plugins/applications.py
@@ -174,6 +174,12 @@ class pluginclass( object ):
         self.toggleButton = toggleButton
         self.de = de
 
+        # Detect the locale (this is used for the Wikipedia search)
+        self.lang = "en"
+        lang = os.getenv('LANG')
+        if lang is not None and lang != "":
+            self.lang = lang.split("_")[0]
+
         self.builder = Gtk.Builder()
         # The Glade file for the plugin
         self.builder.add_from_file (os.path.join( os.path.dirname( __file__ ), "applications.glade" ))
@@ -1113,7 +1119,7 @@ class pluginclass( object ):
     def search_wikipedia(self, widget):
         text = self.searchEntry.get_text()
         text = text.replace(" ", "+")
-        os.system("xdg-open \"http://en.wikipedia.org/wiki/Special:Search?search=" + text + "\" &")
+        os.system("xdg-open \"http://%s.wikipedia.org/wiki/Special:Search?search=%s\" &" % (self.lang, text))
         self.mintMenuWin.hide()
 
     def search_dictionary(self, widget):

From dcd39446cd56404a94d16de96b8fe565792b828c Mon Sep 17 00:00:00 2001
From: Clement Lefebvre <clement.lefebvre@linuxmint.com>
Date: Wed, 23 Nov 2016 15:37:01 +0000
Subject: [PATCH 11/14] l10n: Update POT file

---
 mintmenu.pot | 258 +++++++++++++++++++++++++--------------------------
 1 file changed, 129 insertions(+), 129 deletions(-)

diff --git a/mintmenu.pot b/mintmenu.pot
index 042086a..89b8d9a 100644
--- a/mintmenu.pot
+++ b/mintmenu.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-27 15:05+0300\n"
+"POT-Creation-Date: 2016-11-23 15:36+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,31 +21,31 @@ msgstr ""
 msgid "Menu"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenu.py:256
+#: usr/lib/linuxmint/mintMenu/mintMenu.py:247
 msgid "Couldn't load plugin:"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenu.py:328
+#: usr/lib/linuxmint/mintMenu/mintMenu.py:319
 msgid "Couldn't initialize plugin"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenu.py:731
+#: usr/lib/linuxmint/mintMenu/mintMenu.py:727
 msgid "Advanced MATE Menu"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenu.py:818
+#: usr/lib/linuxmint/mintMenu/mintMenu.py:815
 msgid "Preferences"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenu.py:821
+#: usr/lib/linuxmint/mintMenu/mintMenu.py:818
 msgid "Edit menu"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenu.py:824
+#: usr/lib/linuxmint/mintMenu/mintMenu.py:821
 msgid "Reload plugins"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenu.py:827
+#: usr/lib/linuxmint/mintMenu/mintMenu.py:824
 msgid "About"
 msgstr ""
 
@@ -62,286 +62,286 @@ msgid "Show button icon"
 msgstr ""
 
 #: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:47
-msgid "Use custom colors"
+msgid "Enable Internet search"
 msgstr ""
 
 #: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:48
-msgid "Show recent documents plugin"
+msgid "Use custom colors"
 msgstr ""
 
 #: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:49
-msgid "Show applications plugin"
+msgid "Show recent documents plugin"
 msgstr ""
 
 #: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:50
-msgid "Show system plugin"
+msgid "Show applications plugin"
 msgstr ""
 
 #: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:51
+msgid "Show system plugin"
+msgstr ""
+
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:52
 msgid "Show places plugin"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:53
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:54
 msgid "Show application comments"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:54
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:55
 msgid "Show category icons"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:55
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:56
 msgid "Hover"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:56
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:57
 msgid "Remember the last category or search"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:57
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:58
 msgid "Search for packages to install"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:58
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:59
 msgid "Swap name and generic name"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:60
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:61
 msgid "Border width:"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:61
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:62
 msgid "pixels"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:63
-msgid "Opacity:"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:66
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:64
 msgid "Button text:"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:67
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:65
 msgid "Options"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:68
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:251
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:66
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:203
 msgid "Applications"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:70
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:68
 msgid "Theme"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:71
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:248
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:249
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:69
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:200
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:201
 msgid "Favorites"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:72
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:70
 msgid "Main button"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:73
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:71
 msgid "Plugins"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:75
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:73
 msgid "Background:"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:76
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:74
 msgid "Headings:"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:77
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:75
 msgid "Borders:"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:78
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:76
 msgid "Theme:"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:82
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:80
 msgid "Number of columns:"
 msgstr ""
 
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:81
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:82
 #: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:83
 #: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:84
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:85
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:86
 msgid "Icon size:"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:87
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:85
 msgid "Hover delay (ms):"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:88
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:86
 msgid "Button icon:"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:89
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:87
 msgid "Search command:"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:91
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:89
 #: usr/lib/linuxmint/mintMenu/plugins/places.py:44
 msgid "Places"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:92
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:104
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:90
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:102
 msgid "Allow Scrollbar"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:93
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:91
 msgid "Show GTK Bookmarks"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:94
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:105
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:92
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:103
 msgid "Height:"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:95
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:93
 msgid "Toggle Default Places:"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:96
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:94
 #: usr/lib/linuxmint/mintMenu/plugins/places.py:141
 msgid "Computer"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:97
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:95
 #: usr/lib/linuxmint/mintMenu/plugins/places.py:151
 msgid "Home Folder"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:98
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:96
 #: usr/lib/linuxmint/mintMenu/plugins/places.py:164
 #: usr/lib/linuxmint/mintMenu/plugins/places.py:166
 msgid "Network"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:99
-#: usr/lib/linuxmint/mintMenu/plugins/places.py:189
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:97
+#: usr/lib/linuxmint/mintMenu/plugins/places.py:188
 msgid "Desktop"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:100
-#: usr/lib/linuxmint/mintMenu/plugins/places.py:199
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:98
+#: usr/lib/linuxmint/mintMenu/plugins/places.py:198
 msgid "Trash"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:101
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:99
 msgid "Custom Places:"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:103
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:101
 #: usr/lib/linuxmint/mintMenu/plugins/system_management.py:40
 msgid "System"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:106
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:104
 msgid "Toggle Default Items:"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:107
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:105
 #: usr/lib/linuxmint/mintMenu/plugins/system_management.py:136
 msgid "Software Manager"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:108
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:106
 #: usr/lib/linuxmint/mintMenu/plugins/system_management.py:143
 msgid "Package Manager"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:109
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:107
 #: usr/lib/linuxmint/mintMenu/plugins/system_management.py:150
 msgid "Control Center"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:110
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:108
 #: usr/lib/linuxmint/mintMenu/plugins/system_management.py:160
 msgid "Terminal"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:111
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:109
 #: usr/lib/linuxmint/mintMenu/plugins/system_management.py:177
 msgid "Lock Screen"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:112
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:110
 msgid "Log Out"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:113
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:111
 #: usr/lib/linuxmint/mintMenu/plugins/system_management.py:194
 msgid "Quit"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:115
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:113
 msgid "Edit Place"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:116
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:114
 msgid "New Place"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:117
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:115
 msgid "Select a folder"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:147
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:145
 msgid "Keyboard shortcut:"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:153
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:151
 msgid "Images"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:271
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:269
 msgid "Name"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:272
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:270
 msgid "Path"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:287
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:285
 msgid "Desktop theme"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:426
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:457
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:434
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:465
 msgid "Name:"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:427
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:458
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:435
+#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:466
 msgid "Path:"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/keybinding.py:197
+#: usr/lib/linuxmint/mintMenu/keybinding.py:199
 msgid "Click to set a new accelerator key for opening and closing the menu.  "
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/keybinding.py:198
+#: usr/lib/linuxmint/mintMenu/keybinding.py:200
 msgid "Press Escape or click again to cancel the operation.  "
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/keybinding.py:199
+#: usr/lib/linuxmint/mintMenu/keybinding.py:201
 msgid "Press Backspace to clear the existing keybinding."
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/keybinding.py:212
+#: usr/lib/linuxmint/mintMenu/keybinding.py:214
 msgid "Pick an accelerator"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/keybinding.py:265
+#: usr/lib/linuxmint/mintMenu/keybinding.py:267
 msgid "<not set>"
 msgstr ""
 
@@ -349,142 +349,142 @@ msgstr ""
 msgid "Recent documents"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:246
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:198
 msgid "Search:"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:250
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:202
 msgid "All applications"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:634
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:595
 #, python-format
-msgid "Search Google for %s"
+msgid "Search DuckDuckGo for %s"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:641
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:602
 #, python-format
 msgid "Search Wikipedia for %s"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:657
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:618
 #, python-format
 msgid "Lookup %s in Dictionary"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:664
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:625
 #, python-format
 msgid "Search Computer for %s"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:742
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:795
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:703
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:756
 #, python-format
 msgid "Install package '%s'"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:918
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:986
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:890
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:960
 msgid "Add to desktop"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:919
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:987
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:891
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:961
 msgid "Add to panel"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:921
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:969
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:893
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:942
 msgid "Insert space"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:922
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:970
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:894
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:943
 msgid "Insert separator"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:924
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:990
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:896
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:964
 msgid "Launch when I log in"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:926
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:992
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:898
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:966
 msgid "Launch"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:927
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:899
 msgid "Remove from favorites"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:929
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:996
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:901
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:970
 msgid "Edit properties"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:968
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:941
 msgid "Remove"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:989
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:963
 msgid "Show in my favorites"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:993
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:967
 msgid "Uninstall"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:994
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:968
 msgid "Delete from menu"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1048
-msgid "Search Google"
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1025
+msgid "Search DuckDuckGo"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1055
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1032
 msgid "Search Wikipedia"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1065
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1042
 msgid "Lookup Dictionary"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1072
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1049
 msgid "Search Computer"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1082
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1059
 msgid "Find Software"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1089
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1066
 msgid "Find Tutorials"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1096
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1073
 msgid "Find Hardware"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1103
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1080
 msgid "Find Ideas"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1110
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1087
 msgid "Find Users"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1577
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1547
 msgid ""
 "Couldn't save favorites. Check if you have write access to ~/.linuxmint/"
 "mintMenu"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1778
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1758
 msgid "All"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1778
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1758
 msgid "Show all applications"
 msgstr ""
 
@@ -535,14 +535,14 @@ msgstr ""
 msgid "Browse bookmarked and local network locations"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/places.py:196
+#: usr/lib/linuxmint/mintMenu/plugins/places.py:195
 msgid "Browse items placed on the desktop"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/places.py:210
+#: usr/lib/linuxmint/mintMenu/plugins/places.py:209
 msgid "Browse deleted files"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/places.py:262
+#: usr/lib/linuxmint/mintMenu/plugins/places.py:261
 msgid "Empty trash"
 msgstr ""

From c555ecfed6d0d06b16562995c65cafad7d87a12c Mon Sep 17 00:00:00 2001
From: Clement Lefebvre <clement.lefebvre@linuxmint.com>
Date: Wed, 23 Nov 2016 15:40:12 +0000
Subject: [PATCH 12/14] 5.7.4

---
 debian/changelog | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2884a0e..829941b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+mintmenu (5.7.4) serena; urgency=medium
+
+  [ JKAbrams ]
+  * Added setting to disable internet searching
+  * Revert "Added setting to disable internet searching"
+  * Making internet searching from the start menu optional
+
+  [ Clement Lefebvre ]
+  * Search engines: Replace Google CSE with DDG
+  * Search engines: Re-enable search engines by default.
+  * Search engines: Fix community links when Internet search is disabled
+  * l10n: Capitalize "Internet"
+  * Search engines: Point to local version of Wikipedia
+  * l10n: Update POT file
+
+ -- Clement Lefebvre <root@linuxmint.com>  Wed, 23 Nov 2016 15:37:46 +0000
+
 mintmenu (5.7.3) serena; urgency=medium
 
   * Fixed launching some Wine applications

From b1331807cf58c4edc10e31f8a045daa3e2065f0f Mon Sep 17 00:00:00 2001
From: Clement Lefebvre <clement.lefebvre@linuxmint.com>
Date: Wed, 23 Nov 2016 22:49:31 +0000
Subject: [PATCH 13/14] Favorites: Add rhythmbox

---
 usr/lib/linuxmint/mintMenu/applications.list | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/lib/linuxmint/mintMenu/applications.list b/usr/lib/linuxmint/mintMenu/applications.list
index 6ad2cf8..e779c50 100644
--- a/usr/lib/linuxmint/mintMenu/applications.list
+++ b/usr/lib/linuxmint/mintMenu/applications.list
@@ -2,6 +2,7 @@ location:/usr/share/applications/firefox.desktop
 location:/usr/share/applications/thunderbird.desktop
 location:/usr/share/applications/pidgin.desktop
 location:/usr/share/applications/banshee.desktop
+location:/usr/share/applications/rhythmbox.desktop
 separator
 location:/usr/share/applications/gnome-calculator.desktop
 location:/usr/share/applications/gcalctool.desktop

From 5a910aeb868a8618938bbe559db496a68b2cf9a0 Mon Sep 17 00:00:00 2001
From: Clement Lefebvre <clement.lefebvre@linuxmint.com>
Date: Wed, 23 Nov 2016 22:50:07 +0000
Subject: [PATCH 14/14] 5.7.5

---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 829941b..d26069e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mintmenu (5.7.5) serena; urgency=medium
+
+  * Favorites: Add rhythmbox
+
+ -- Clement Lefebvre <root@linuxmint.com>  Wed, 23 Nov 2016 22:49:47 +0000
+
 mintmenu (5.7.4) serena; urgency=medium
 
   [ JKAbrams ]