ui: Use AppIndicator with Cinnamon 2.8 (fixes #487)

zealdocs · Feb 19, 2016 · a96c79b · a96c79b
1 parent fe008a2
commit a96c79b
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 8 deletions.
diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
@@ -92,6 +92,10 @@ MainWindow::MainWindow(Core::Application *app, QWidget *parent) :
 
     setWindowIcon(QIcon::fromTheme(QStringLiteral("zeal"), QIcon(QStringLiteral(":/zeal.ico"))));
 
+#ifdef USE_APPINDICATOR
+    detectAppIndicatorSupport();
+#endif
+
     if (m_settings->showSystrayIcon)
         createTrayIcon();
 
@@ -678,6 +682,26 @@ QAction *MainWindow::addHistoryAction(QWebHistory *history, const QWebHistoryIte
     return backAction;
 }
 
+#ifdef USE_APPINDICATOR
+void MainWindow::detectAppIndicatorSupport()
+{
+    const QByteArray xdgDesktop = qgetenv("XDG_CURRENT_DESKTOP");
+
+    // Unity
+    if (xdgDesktop == "Unity") {
+        m_useAppIndicator = true;
+        return;
+    }
+
+    // Cinnamon 2.8
+    // Checking specifically for 2.8 because direct AppIndicator support will be dropped soon.
+    if (xdgDesktop == "X-Cinnamon" && qgetenv("CINNAMON_VERSION").startsWith("2.8")) {
+        m_useAppIndicator = true;
+        return;
+    }
+}
+#endif
+
 #ifdef USE_APPINDICATOR
 void appIndicatorToggleWindow(GtkMenu *menu, gpointer data)
 {
@@ -697,10 +721,7 @@ void MainWindow::createTrayIcon()
 #endif
 
 #ifdef USE_APPINDICATOR
-    const QString desktop = qgetenv("XDG_CURRENT_DESKTOP");
-    const bool isUnity = (desktop.toLower() == QLatin1String("unity"));
-
-    if (isUnity) { // Application Indicators for Unity
+    if (m_useAppIndicator) {
         m_appIndicatorMenu = gtk_menu_new();
 
         m_appIndicatorShowHideMenuItem = gtk_menu_item_new_with_label(qPrintable(tr("Hide")));
@@ -764,10 +785,7 @@ void MainWindow::removeTrayIcon()
 #endif
 
 #ifdef USE_APPINDICATOR
-    const QString desktop = qgetenv("XDG_CURRENT_DESKTOP");
-    const bool isUnity = (desktop.toLower() == QLatin1String("unity"));
-
-    if (isUnity) {
+    if (m_useAppIndicator) {
         g_clear_object(&m_appIndicator);
         g_clear_object(&m_appIndicatorMenu);
         g_clear_object(&m_appIndicatorShowHideMenuItem);

diff --git a/src/ui/mainwindow.h b/src/ui/mainwindow.h
@@ -133,6 +133,10 @@ private slots:
     QString docsetName(const QUrl &url) const;
     QIcon docsetIcon(const QString &docsetName) const;
     QAction *addHistoryAction(QWebHistory *history, const QWebHistoryItem &item);
+
+#ifdef USE_APPINDICATOR
+    void detectAppIndicatorSupport();
+#endif
     void createTrayIcon();
     void removeTrayIcon();
 
@@ -159,6 +163,7 @@ private slots:
     QSystemTrayIcon *m_trayIcon = nullptr;
 
 #ifdef USE_APPINDICATOR
+    bool m_useAppIndicator = false;
     _AppIndicator *m_appIndicator = nullptr;
     _GtkWidget *m_appIndicatorMenu = nullptr;
     _GtkWidget *m_appIndicatorQuitMenuItem = nullptr;