Support multiple inherited ubuntu session for indicators

didrocks · electron-bot · commit e459b38c5d47 · 2018-05-16T15:45:46.000Z
Multiple sessions inherits the "ubuntu" base settings properties in ubuntu. One of the most popular one is communitheme: the next ubuntu default theme has its dedicated session, with thus duplicated indicators for dropbox. Rather than a string comparison for ubuntu, only match a substring then. XDG_CURRENT_DESKTOP can be of form: "communitheme:ubuntu:GNOME", "ubuntu:GNOME", … Fixes: electron#12843.
diff --git a/lib/browser/init.js b/lib/browser/init.js
@@ -163,8 +163,10 @@ require('./api/protocol')
 const mainStartupScript = packageJson.main || 'index.js'
 
 // Workaround for electron/electron#5050 and electron/electron#9046
-if (process.platform === 'linux' && ['Pantheon', 'Unity:Unity7', 'ubuntu:GNOME', 'pop:GNOME'].includes(process.env.XDG_CURRENT_DESKTOP)) {
-  process.env.XDG_CURRENT_DESKTOP = 'Unity'
+if (process.platform === 'linux') {
+  if (['Pantheon', 'Unity:Unity7', 'pop:GNOME'].includes(process.env.XDG_CURRENT_DESKTOP) || process.env.XDG_CURRENT_DESKTOP.includes('ubuntu')) {
+    process.env.XDG_CURRENT_DESKTOP = 'Unity'
+  }
 }
 
 // Finally load app's main.js and transfer control to C++.
