3 files changed, 18 insertions, 11 deletions

diff --git a/src/Ewmh.cc b/src/Ewmh.cc
index afab938..fef4428 100644
--- a/src/Ewmh.cc
+++ b/src/Ewmh.cc
@@ -310,8 +310,7 @@ void Ewmh::setupFrame(FluxboxWindow &win) {
             } else if (atoms[l] == m_net_wm_window_type_dialog) {
                 // dialog windows should not be tabable
                 win.setTabable(false);
-            } else if (atoms[l] == m_net_wm_window_type_menu ||
-                       atoms[l] == m_net_wm_window_type_toolbar) {
+            } else if (atoms[l] == m_net_wm_window_type_menu) {
                 /*
                  * _NET_WM_WINDOW_TYPE_TOOLBAR and _NET_WM_WINDOW_TYPE_MENU
                  * indicate toolbar and pinnable menu windows, respectively
@@ -319,6 +318,10 @@ void Ewmh::setupFrame(FluxboxWindow &win) {
                  * application). Windows of this type may set the
                  * WM_TRANSIENT_FOR hint indicating the main application window.
                  */
+                win.setDecoration(FluxboxWindow::DECOR_TINY);
+                win.setIconHidden(true);
+                win.moveToLayer(Layer::ABOVE_DOCK);
+            } else if (atoms[l] == m_net_wm_window_type_toolbar) {
                 win.setDecoration(FluxboxWindow::DECOR_NONE);
                 win.setIconHidden(true);
                 win.moveToLayer(Layer::ABOVE_DOCK);
diff --git a/src/FbTk/XmbFontImp.cc b/src/FbTk/XmbFontImp.cc
index 025f96d..3a45b09 100644
--- a/src/FbTk/XmbFontImp.cc
+++ b/src/FbTk/XmbFontImp.cc
@@ -115,7 +115,9 @@ const char *getFontElement(const char *pattern, char *buf, int bufsiz, ...) {
 XFontSet createFontSet(const char *fontname, bool& utf8mode) {
     Display *display = FbTk::App::instance()->display();
     XFontSet fs;
-    char **missing, *def = "-";
+    char **missing;
+    const char *constdef = "-";
+    char *def = const_cast<char *>(constdef);
     int nmissing;
     string orig_locale = "";
 
diff --git a/src/main.cc b/src/main.cc
index 2d1ff0d..4554123 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -321,14 +321,16 @@ int main(int argc, char **argv) {
     FbTk::FbStringUtil::shutdown();
 
     if (restarting) {
-        const char *shell = getenv("SHELL");
-        if (!shell)
-            shell = "/bin/sh";
-
-        const char *arg = restart_argument.c_str();
-        if (arg) {
-            execlp(shell, shell, "-c", arg, (char *) NULL);
-            perror(arg);
+        if (!restart_argument.empty()) {
+            const char *shell = getenv("SHELL");
+            if (!shell)
+                shell = "/bin/sh";
+
+            const char *arg = restart_argument.c_str();
+            if (arg) {
+                execlp(shell, shell, "-c", arg, (const char *) NULL);
+                perror(arg);
+            }
         }
 
         // fall back in case the above execlp doesn't work