Bug 1639197 [Linux/Gtk] Use correct icon name for search provider, r=jhorak
authorMartin Stransky <stransky@redhat.com>
Tue, 19 May 2020 20:41:40 +0000
changeset 530924 3ccd44f06bc5d3de17b0021d9d9983ba87b9af53
parent 530923 6bc5897f488a9d7b74ce6a46543aa0511eb3ad2a
child 530925 41acfa78dae455503214f4beb23d75ac1995332b
push id37434
push userabutkovits@mozilla.com
push dateWed, 20 May 2020 10:05:10 +0000
treeherdermozilla-central@005ef1c25992 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjhorak
bugs1639197
milestone78.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1639197 [Linux/Gtk] Use correct icon name for search provider, r=jhorak Differential Revision: https://phabricator.services.mozilla.com/D75940
browser/components/shell/nsGNOMEShellDBusHelper.cpp
--- a/browser/components/shell/nsGNOMEShellDBusHelper.cpp
+++ b/browser/components/shell/nsGNOMEShellDBusHelper.cpp
@@ -280,17 +280,19 @@ static void DBusAppendSearchID(DBusMessa
 
   appendStringDictionary(aIter, "id", KEYWORD_SEARCH_STRING);
 
   // Extract ssssss part from aID
   auto searchTerm = nsAutoCStringN<32>(aID + KEYWORD_SEARCH_STRING_LEN + 1);
   nsAutoCString gnomeSearchTitle;
   if (GetGnomeSearchTitle(searchTerm.get(), gnomeSearchTitle)) {
     appendStringDictionary(aIter, "name", gnomeSearchTitle.get());
-    appendStringDictionary(aIter, "gicon", "org.mozilla.Firefox");
+    // TODO: When running on flatpak/snap we may need to use
+    // icon like org.mozilla.Firefox or so.
+    appendStringDictionary(aIter, "gicon", "firefox");
   }
 }
 
 DBusHandlerResult DBusHandleResultMetas(
     RefPtr<nsGNOMEShellHistorySearchResult> aSearchResult, DBusMessage* aMsg) {
   DBusMessage* reply;
   char** stringArray;
   int elements;