Mercurial > pidgin.yaz

changeset 4405:cb629f3efee6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 4674] Fix for win32 path bugs, and removed redundant filter_break from gaimrc_read_plugins. committer: Tailor Script <tailor@pidgin.im>
author Herman Bloggs <hermanator12002@yahoo.com>
date Thu, 23 Jan 2003 19:24:12 +0000
parents 16f7f9451814
children 217572342740
files src/gaimrc.c
diffstat 1 files changed, 10 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/gaimrc.c	Thu Jan 23 18:54:01 2003 +0000
+++ b/src/gaimrc.c	Thu Jan 23 19:24:12 2003 +0000
@@ -433,9 +433,7 @@
 		p = (struct gaim_plugin *)pl->data;
 
 		path = escape_text2(p->path);
-			
 		fprintf(f, "\tplugin { %s }\n", path);
-
 		free(path);
 
 		pl = pl->next;
@@ -462,9 +460,6 @@
 
 		p = parse_line(buf, &parse_buffer);
 		if (!strcmp(p->option, "plugin")) {
-#ifndef _WIN32
-			filter_break(p->value[0]);
-#endif
 			load = g_slist_append(load, g_strdup(p->value[0]));
 		}
 	}
@@ -961,8 +956,17 @@
 	int i;
 	fprintf(f, "sound_files {\n");
 	for (i = 0; i < NUM_SOUNDS; i++)
-		if (sound_file[i])
+		if (sound_file[i]) {
+#ifndef _WIN32
 			fprintf(f, "\tsound%c { %s }\n", i + 'A', sound_file[i]);
+#else
+			/* Make sure windows dir speparators arn't swallowed up when
+			   path is read back in from resource file */
+			char* tmp=wgaim_escape_dirsep(sound_file[i]);
+			fprintf(f, "\tsound%c { %s }\n", i + 'A', tmp);
+			g_free(tmp);
+#endif
+		}
 		else
 			fprintf(f, "\tsound%c {  }\n", i + 'A');
 #ifndef _WIN32