aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Window.cc22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/Window.cc b/src/Window.cc
index 06a544b..bba0d04 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -1172,17 +1172,17 @@ void FluxboxWindow::getWMName(void) {
1172 if ((XmbTextPropertyToTextList(display, &text_prop, 1172 if ((XmbTextPropertyToTextList(display, &text_prop,
1173 &list, &num) == Success) && 1173 &list, &num) == Success) &&
1174 (num > 0) && *list) { 1174 (num > 0) && *list) {
1175 client.title = bstrdup(*list); 1175 client.title = Misc::strdup(*list);
1176 XFreeStringList(list); 1176 XFreeStringList(list);
1177 } else 1177 } else
1178 client.title = bstrdup((char *) text_prop.value); 1178 client.title = Misc::strdup((char *) text_prop.value);
1179 1179
1180 } else 1180 } else
1181 client.title = bstrdup((char *) text_prop.value); 1181 client.title = Misc::strdup((char *) text_prop.value);
1182 1182
1183 XFree((char *) text_prop.value); 1183 XFree((char *) text_prop.value);
1184 } else 1184 } else
1185 client.title = bstrdup(i18n->getMessage( 1185 client.title = Misc::strdup(i18n->getMessage(
1186#ifdef NLS 1186#ifdef NLS
1187 WindowSet, WindowUnnamed, 1187 WindowSet, WindowUnnamed,
1188#else // !NLS 1188#else // !NLS
@@ -1190,7 +1190,7 @@ void FluxboxWindow::getWMName(void) {
1190#endif // 1190#endif //
1191 "Unnamed")); 1191 "Unnamed"));
1192 } else { 1192 } else {
1193 client.title = bstrdup(i18n->getMessage( 1193 client.title = Misc::strdup(i18n->getMessage(
1194#ifdef NLS 1194#ifdef NLS
1195 WindowSet, WindowUnnamed, 1195 WindowSet, WindowUnnamed,
1196#else // !NLS 1196#else // !NLS
@@ -1234,18 +1234,18 @@ void FluxboxWindow::getWMIconName(void) {
1234 if ((XmbTextPropertyToTextList(display, &text_prop, 1234 if ((XmbTextPropertyToTextList(display, &text_prop,
1235 &list, &num) == Success) && 1235 &list, &num) == Success) &&
1236 (num > 0) && *list) { 1236 (num > 0) && *list) {
1237 client.icon_title = bstrdup(*list); 1237 client.icon_title = Misc::strdup(*list);
1238 XFreeStringList(list); 1238 XFreeStringList(list);
1239 } else 1239 } else
1240 client.icon_title = bstrdup((char *) text_prop.value); 1240 client.icon_title = Misc::strdup((char *) text_prop.value);
1241 } else 1241 } else
1242 client.icon_title = bstrdup((char *) text_prop.value); 1242 client.icon_title = Misc::strdup((char *) text_prop.value);
1243 1243
1244 XFree((char *) text_prop.value); 1244 XFree((char *) text_prop.value);
1245 } else 1245 } else
1246 client.icon_title = bstrdup(client.title); 1246 client.icon_title = Misc::strdup(client.title);
1247 } else 1247 } else
1248 client.icon_title = bstrdup(client.title); 1248 client.icon_title = Misc::strdup(client.title);
1249} 1249}
1250 1250
1251 1251
@@ -2334,7 +2334,7 @@ void FluxboxWindow::redrawLabel(void) {
2334 GC gc = ((focused) ? screen->getWindowStyle()->l_text_focus_gc : 2334 GC gc = ((focused) ? screen->getWindowStyle()->l_text_focus_gc :
2335 screen->getWindowStyle()->l_text_unfocus_gc); 2335 screen->getWindowStyle()->l_text_unfocus_gc);
2336 2336
2337 DrawString(display, frame.label, gc, 2337 Misc::DrawString(display, frame.label, gc,
2338 &screen->getWindowStyle()->font, 2338 &screen->getWindowStyle()->font,
2339 client.title_text_w, frame.label_w, 2339 client.title_text_w, frame.label_w,
2340 frame.bevel_w, client.title); 2340 frame.bevel_w, client.title);