mirror of
https://github.com/gryf/wmaker.git
synced 2026-02-04 07:15:47 +01:00
- renamed wstrappend() to wstrconcat().
be sure to replace wstrappend() with wstrconcat() anywhere in your code because a new wstrappend() function will be implemented that will have different semantics and if your code will use the new one instead of the old will break.
This commit is contained in:
@@ -575,7 +575,7 @@ killCallback(WMenu *menu, WMenuEntry *entry)
|
||||
|
||||
assert(entry->clientdata!=NULL);
|
||||
|
||||
buffer = wstrappend(wapp->app_icon ? wapp->app_icon->wm_class : NULL,
|
||||
buffer = wstrconcat(wapp->app_icon ? wapp->app_icon->wm_class : NULL,
|
||||
_(" will be forcibly closed.\n"
|
||||
"Any unsaved changes will be lost.\n"
|
||||
"Please confirm."));
|
||||
|
||||
@@ -273,7 +273,7 @@ killCallback(WMenu *menu, WMenuEntry *entry)
|
||||
tapplist = tapplist->next;
|
||||
}
|
||||
#else
|
||||
buffer = wstrappend(icon->wm_class,
|
||||
buffer = wstrconcat(icon->wm_class,
|
||||
_(" will be forcibly closed.\n"
|
||||
"Any unsaved changes will be lost.\n"
|
||||
"Please confirm."));
|
||||
|
||||
@@ -1699,7 +1699,7 @@ connectKFM(WScreen *scr)
|
||||
int sock = 0;
|
||||
struct sockaddr_un addr;
|
||||
|
||||
path = wstrappend(wgethomedir(), "/.kde/share/apps/kfm/pid");
|
||||
path = wstrconcat(wgethomedir(), "/.kde/share/apps/kfm/pid");
|
||||
strcpy(buffer, getenv("DISPLAY"));
|
||||
|
||||
ptr = strchr(buffer, ':');
|
||||
@@ -1716,7 +1716,7 @@ connectKFM(WScreen *scr)
|
||||
strcat(buffer, b);
|
||||
}
|
||||
ptr = path;
|
||||
path = wstrappend(ptr, buffer);
|
||||
path = wstrconcat(ptr, buffer);
|
||||
wfree(ptr);
|
||||
|
||||
/* pid file */
|
||||
@@ -1749,7 +1749,7 @@ connectKFM(WScreen *scr)
|
||||
return -1;
|
||||
}
|
||||
|
||||
path = wstrappend(wgethomedir(), "/.kde/share/apps/kfm/magic");
|
||||
path = wstrconcat(wgethomedir(), "/.kde/share/apps/kfm/magic");
|
||||
f = fopen(path, "r");
|
||||
if (!f) {
|
||||
return -1;
|
||||
@@ -1761,7 +1761,7 @@ connectKFM(WScreen *scr)
|
||||
}
|
||||
puts(buffer);
|
||||
|
||||
ptr = wstrappend("auth", buffer);
|
||||
ptr = wstrconcat("auth", buffer);
|
||||
|
||||
writeSocket(sock, ptr);
|
||||
wfree(ptr);
|
||||
|
||||
10
src/main.c
10
src/main.c
@@ -249,7 +249,7 @@ shellCommandHandler(pid_t pid, unsigned char status, _tuple *data)
|
||||
if (status == 127) {
|
||||
char *buffer;
|
||||
|
||||
buffer = wstrappend(_("Could not execute command: "), data->command);
|
||||
buffer = wstrconcat(_("Could not execute command: "), data->command);
|
||||
|
||||
wMessageDialog(data->scr, _("Error"), buffer, _("OK"), NULL, NULL);
|
||||
wfree(buffer);
|
||||
@@ -464,7 +464,7 @@ static void
|
||||
execInitScript()
|
||||
{
|
||||
char *file;
|
||||
char *paths = wstrappend(wusergnusteppath(), ":"DEF_CONFIG_PATHS);
|
||||
char *paths = wstrconcat(wusergnusteppath(), ":"DEF_CONFIG_PATHS);
|
||||
|
||||
file = wfindfile(paths, DEF_INIT_SCRIPT);
|
||||
wfree(paths);
|
||||
@@ -489,7 +489,7 @@ void
|
||||
ExecExitScript()
|
||||
{
|
||||
char *file;
|
||||
char *paths = wstrappend(wusergnusteppath(), ":"DEF_CONFIG_PATHS);
|
||||
char *paths = wstrconcat(wusergnusteppath(), ":"DEF_CONFIG_PATHS);
|
||||
|
||||
file = wfindfile(paths, DEF_EXIT_SCRIPT);
|
||||
wfree(paths);
|
||||
@@ -540,7 +540,7 @@ getFullPath(char *path)
|
||||
|
||||
|
||||
} else {
|
||||
return wstrappend(path);
|
||||
return wstrconcat(path);
|
||||
}
|
||||
|
||||
return tmp;
|
||||
@@ -562,7 +562,7 @@ main(int argc, char **argv)
|
||||
|
||||
/* for telling WPrefs what's the name of the wmaker binary being ran */
|
||||
|
||||
str = wstrappend("WMAKER_BIN_NAME=", argv[0]);
|
||||
str = wstrconcat("WMAKER_BIN_NAME=", argv[0]);
|
||||
putenv(str);
|
||||
|
||||
ArgCount = argc;
|
||||
|
||||
@@ -1029,7 +1029,7 @@ appendrealloc(char *a, char *b)
|
||||
if (a == NULL)
|
||||
return wstrdup(b);
|
||||
else {
|
||||
char *c = wstrappend(a, b);
|
||||
char *c = wstrconcat(a, b);
|
||||
wfree(a);
|
||||
return c;
|
||||
}
|
||||
@@ -1093,7 +1093,7 @@ GetShortcutString(char *text)
|
||||
/* ksym = XStringToKeysym(text);
|
||||
tmp = keysymToString(ksym, modmask);
|
||||
puts(tmp);
|
||||
buffer = wstrappend(buffer, tmp);
|
||||
buffer = wstrconcat(buffer, tmp);
|
||||
*/
|
||||
wfree(tmp);
|
||||
|
||||
|
||||
@@ -806,7 +806,7 @@ addMenuEntry(WMenu *menu, char *title, char *shortcut, char *command,
|
||||
file_name, command);
|
||||
else {
|
||||
entry = wMenuAddCallback(menu, title, execCommand,
|
||||
wstrappend("exec ", params));
|
||||
wstrconcat("exec ", params));
|
||||
entry->free_cdata = free;
|
||||
shortcutOk = True;
|
||||
}
|
||||
|
||||
@@ -1266,8 +1266,8 @@ createInspectorForWindow(WWindow *wwin, int xpos, int ypos,
|
||||
if (wwin->wm_class && wwin->wm_instance) {
|
||||
char *str, *tmp;
|
||||
|
||||
tmp = wstrappend(wwin->wm_instance, ".");
|
||||
str = wstrappend(tmp, wwin->wm_class);
|
||||
tmp = wstrconcat(wwin->wm_instance, ".");
|
||||
str = wstrconcat(tmp, wwin->wm_class);
|
||||
|
||||
panel->bothRb = WMCreateRadioButton(panel->specFrm);
|
||||
WMMoveWidget(panel->bothRb, 10, 18);
|
||||
|
||||
Reference in New Issue
Block a user