pidgin/android/libpurple2

MXit: Use G_DIR_SEPARATOR_S as filename path separator.
release-2.x.y
2013-04-03, Andrew Victor
35f10b569e67
MXit: Use G_DIR_SEPARATOR_S as filename path separator.
(from 3.0.0 tree)
--- a/libpurple/protocols/mxit/splashscreen.c Wed Apr 03 20:48:03 2013 +0200
+++ b/libpurple/protocols/mxit/splashscreen.c Wed Apr 03 23:25:14 2013 +0200
@@ -93,7 +93,7 @@
purple_debug_info(MXIT_PLUGIN_ID, "Removing splashId: '%s'\n", splashId);
/* Delete stored splash image */
- filename = g_strdup_printf("%s/mxit/%s.png", purple_user_dir(), splashId);
+ filename = g_strdup_printf("%s" G_DIR_SEPARATOR_S "mxit" G_DIR_SEPARATOR_S "%s.png", purple_user_dir(), splashId);
g_unlink(filename);
g_free(filename);
@@ -121,7 +121,7 @@
splash_remove(session);
/* Save the new splash image */
- dir = g_strdup_printf("%s" G_DIR_SEPARATOR_S "mxit", purple_user_dir());
+ dir = g_strdup_printf("%s" G_DIR_SEPARATOR_S "mxit", purple_user_dir());
purple_build_dir(dir, S_IRUSR | S_IWUSR | S_IXUSR); /* ensure directory exists */
filename = g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s.png", dir, purple_escape_filename(splashId));
@@ -179,7 +179,7 @@
purple_debug_info(MXIT_PLUGIN_ID, "Display Splash: '%s'\n", splashId);
/* Load splash-screen image from file */
- filename = g_strdup_printf("%s/mxit/%s.png", purple_user_dir(), splashId);
+ filename = g_strdup_printf("%s" G_DIR_SEPARATOR_S "mxit" G_DIR_SEPARATOR_S "%s.png", purple_user_dir(), splashId);
if (g_file_get_contents(filename, &imgdata, &imglen, NULL)) {
char buf[128];