aboutsummaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authormarkt <markt>2007-07-31 23:16:05 (GMT)
committermarkt <markt>2007-07-31 23:16:05 (GMT)
commit8da54ca0eb91e0595b506725369ede0a6426d795 (patch)
tree444fbcc9849c10764f5bc6f3b71481c6057992a8 /util
parent363764db5b36dbffcc019cec8ffb405d357d7130 (diff)
downloadfluxbox-8da54ca0eb91e0595b506725369ede0a6426d795.zip
fluxbox-8da54ca0eb91e0595b506725369ede0a6426d795.tar.bz2
add some decorations to torn menus, and fix restart without an argument
Diffstat (limited to 'util')
-rw-r--r--util/fbrun/FbRun.cc8
-rw-r--r--util/fbrun/fbrun.xpm2
2 files changed, 5 insertions, 5 deletions
diff --git a/util/fbrun/FbRun.cc b/util/fbrun/FbRun.cc
index 908b3c2..8d449b3 100644
--- a/util/fbrun/FbRun.cc
+++ b/util/fbrun/FbRun.cc
@@ -79,8 +79,8 @@ FbRun::FbRun(int x, int y, size_t width):
79 XClassHint *class_hint = XAllocClassHint(); 79 XClassHint *class_hint = XAllocClassHint();
80 if (class_hint == 0) 80 if (class_hint == 0)
81 throw string("Out of memory"); 81 throw string("Out of memory");
82 class_hint->res_name = "fbrun"; 82 class_hint->res_name = const_cast<char *>("fbrun");
83 class_hint->res_class = "FbRun"; 83 class_hint->res_class = const_cast<char *>("FbRun");
84 XSetClassHint(m_display, window(), class_hint); 84 XSetClassHint(m_display, window(), class_hint);
85 85
86 XFree(class_hint); 86 XFree(class_hint);
@@ -89,7 +89,7 @@ FbRun::FbRun(int x, int y, size_t width):
89 Pixmap pm; 89 Pixmap pm;
90 XpmCreatePixmapFromData(m_display, 90 XpmCreatePixmapFromData(m_display,
91 window(), 91 window(),
92 fbrun_xpm, 92 const_cast<char **>(fbrun_xpm),
93 &pm, 93 &pm,
94 &mask, 94 &mask,
95 0); // attribs 95 0); // attribs
@@ -120,7 +120,7 @@ void FbRun::run(const std::string &command) {
120 // fork and execute program 120 // fork and execute program
121 if (!fork()) { 121 if (!fork()) {
122 122
123 char *shell = getenv("SHELL"); 123 const char *shell = getenv("SHELL");
124 if (!shell) 124 if (!shell)
125 shell = "/bin/sh"; 125 shell = "/bin/sh";
126 126
diff --git a/util/fbrun/fbrun.xpm b/util/fbrun/fbrun.xpm
index 856f214..0ee2c18 100644
--- a/util/fbrun/fbrun.xpm
+++ b/util/fbrun/fbrun.xpm
@@ -1,5 +1,5 @@
1/* XPM */ 1/* XPM */
2static char * fbrun_xpm[] = { 2static const char * fbrun_xpm[] = {
3"32 32 433 2", 3"32 32 433 2",
4" c None", 4" c None",
5". c #000000", 5". c #000000",