Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv23926/src
Modified Files:
browser.c gaimrc.c sound.c
Log Message:
that's just rather pathetic
Index: browser.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/browser.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- browser.c 2001/10/26 01:48:25 1.17
+++ browser.c 2001/11/20 06:16:15 1.18
@@ -622,14 +622,7 @@
char *ms;
- if (strstr(web_command, "\"%s\""))
- g_snprintf(command, sizeof(command), web_command, url);
- else if ((ms = strstr(web_command, "%s")) != NULL) {
- *ms = 0;
- g_snprintf(command, sizeof(command), "%s\"%s\"%s", web_command, url,
- ms + 2);
- } else
- g_snprintf(command, sizeof(command), web_command);
+ g_snprintf(command, sizeof(command), web_command, url);
args[0] = "sh";
args[1] = "-c";
Index: gaimrc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaimrc.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- gaimrc.c 2001/11/19 12:03:38 1.89
+++ gaimrc.c 2001/11/20 06:16:15 1.90
@@ -1026,7 +1026,7 @@
report_idle = IDLE_SCREENSAVER;
web_browser = BROWSER_NETSCAPE;
- g_snprintf(web_command, sizeof(web_command), "xterm -e lynx %%s");
+ g_snprintf(web_command, sizeof(web_command), "xterm -e lynx \"%%s\"");
auto_away = 10;
a = g_new0(struct away_message, 1);
Index: sound.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/sound.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- sound.c 2001/11/06 21:30:31 1.43
+++ sound.c 2001/11/20 06:16:15 1.44
@@ -406,14 +406,9 @@
char *args[4];
char command[4096];
char *ms;
- if (strstr(sound_cmd, "\"%s\""))
- g_snprintf(command, sizeof(command), sound_cmd, filename);
- else if ((ms = strstr(sound_cmd, "%s")) != NULL) {
- *ms = 0;
- g_snprintf(command, sizeof(command), "%s\"%s\"%s", sound_cmd,
- filename, ms + 2);
- } else
- g_snprintf(command, sizeof(command), sound_cmd);
+
+ g_snprintf(command, sizeof(command), sound_cmd, filename);
+
args[0] = "sh";
args[1] = "-c";
args[2] = command;
|
