wxTaskBarIcon seems no longer to work on new-ish Gnome (e.g. the Ubuntu 18.04 one...

diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc
index 3c2cd58dac2592e7f1d46c5eaa1a28a5e8e8fd9e..727983b5ac2ba41992e220950f15f0c53827e6b8 100644 (file)
--- a/src/tools/dcpomatic_server.cc
+++ b/src/tools/dcpomatic_server.cc
@@ -210,12 +210,7 @@ public:
 #ifdef DCPOMATIC_WINDOWS
                wxIcon icon (std_to_wx ("id"));
 #else
 #ifdef DCPOMATIC_WINDOWS
                wxIcon icon (std_to_wx ("id"));
 #else

-#ifdef DCPOMATIC_LINUX
-               wxBitmap bitmap (wxString::Format (wxT ("%s/dcpomatic2_server_small.png"), std_to_wx (shared_path().string())), wxBITMAP_TYPE_PNG);
-#endif
-#ifdef DCPOMATIC_OSX

                wxBitmap bitmap (wxString::Format (wxT ("%s/dcpomatic_small.png"), std_to_wx (shared_path().string())), wxBITMAP_TYPE_PNG);
                wxBitmap bitmap (wxString::Format (wxT ("%s/dcpomatic_small.png"), std_to_wx (shared_path().string())), wxBITMAP_TYPE_PNG);

-#endif

                wxIcon icon;
                icon.CopyFromBitmap (bitmap);
 #endif
                wxIcon icon;
                icon.CopyFromBitmap (bitmap);
 #endif


@@ -293,7 +288,12 @@ private:
                */
                Config::instance();
 
                */
                Config::instance();
 

+#ifdef DCPOMATIC_LINUX
+               StatusDialog* d = new StatusDialog ();
+               d->Show ();
+#else

                _icon = new TaskBarIcon;
                _icon = new TaskBarIcon;

+#endif

                _thread = new thread (bind (&App::main_thread, this));
 
                Bind (wxEVT_TIMER, boost::bind (&App::check, this));
                _thread = new thread (bind (&App::main_thread, this));
 
                Bind (wxEVT_TIMER, boost::bind (&App::check, this));