From: Daniel A. <dat...@us...> - 2005-02-11 05:11:07
|
Update of /cvsroot/gaim/gaim/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13953/src Modified Files: Makefile.mingw buddyicon.c desktopitem.c ft.c gtkaccount.c gtkconv.c gtkdebug.c gtkimhtml.c gtkmain.c gtkprefs.c gtkthemes.c internal.h log.c util.c Log Message: Use GLib 2.6's gstdio functions. This should fix gaim not liking non-ascii filenames in win32. Index: Makefile.mingw =================================================================== RCS file: /cvsroot/gaim/gaim/src/Makefile.mingw,v retrieving revision 1.77 retrieving revision 1.78 diff -u -d -p -r1.77 -r1.78 --- Makefile.mingw 26 Dec 2004 00:46:25 -0000 1.77 +++ Makefile.mingw 11 Feb 2005 05:10:21 -0000 1.78 @@ -175,7 +175,7 @@ DLL_LIBS = -lgtk-win32-2.0 \ -lws2_32 \ -liberty \ -lwinmm \ - -lzdll \ + -lz \ -lidletrack \ -lnss3 \ -lnspr4 \ Index: buddyicon.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/buddyicon.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -p -r1.18 -r1.19 --- buddyicon.c 18 Jan 2005 02:16:48 -0000 1.18 +++ buddyicon.c 11 Feb 2005 05:10:21 -0000 1.19 @@ -225,7 +225,7 @@ gaim_buddy_icon_cache(GaimBuddyIcon *ico { gaim_debug_info("buddy icons", "Creating icon cache directory.\n"); - if (mkdir(dirname, S_IRUSR | S_IWUSR | S_IXUSR) < 0) + if (g_mkdir(dirname, S_IRUSR | S_IWUSR | S_IXUSR) < 0) { gaim_debug_error("buddy icons", "Unable to create directory %s: %s\n", @@ -233,7 +233,7 @@ gaim_buddy_icon_cache(GaimBuddyIcon *ico } } - if ((file = fopen(filename, "wb")) != NULL) + if ((file = g_fopen(filename, "wb")) != NULL) { fwrite(data, 1, len, file); fclose(file); @@ -243,12 +243,12 @@ gaim_buddy_icon_cache(GaimBuddyIcon *ico if (old_icon != NULL) { - if(!stat(old_icon, &st)) - unlink(old_icon); + if(!g_stat(old_icon, &st)) + g_unlink(old_icon); else { filename = g_build_filename(dirname, old_icon, NULL); - if(!stat(filename, &st)) - unlink(filename); + if(!g_stat(filename, &st)) + g_unlink(filename); g_free(filename); } } @@ -373,13 +373,13 @@ gaim_buddy_icons_find(GaimAccount *accou if ((file = gaim_blist_node_get_string((GaimBlistNode*)b, "buddy_icon")) == NULL) return NULL; - if (!stat(file, &st)) + if (!g_stat(file, &st)) filename = g_strdup(file); else filename = g_build_filename(gaim_buddy_icons_get_cache_dir(), file, NULL); - if (!stat(filename, &st)) { - FILE *f = fopen(filename, "rb"); + if (!g_stat(filename, &st)) { + FILE *f = g_fopen(filename, "rb"); if (f) { char *data = g_malloc(st.st_size); fread(data, 1, st.st_size, f); Index: desktopitem.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/desktopitem.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -p -r1.1 -r1.2 --- desktopitem.c 22 Nov 2004 02:57:33 -0000 1.1 +++ desktopitem.c 11 Feb 2005 05:10:21 -0000 1.2 @@ -1150,7 +1150,7 @@ gaim_desktop_item_new_from_file (const c g_return_val_if_fail (filename != NULL, NULL); - dfile = fopen(filename, "r"); + dfile = g_fopen(filename, "r"); if (!dfile) { printf ("Can't open %s: %s", filename, strerror(errno)); return NULL; Index: ft.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/ft.c,v retrieving revision 1.81 retrieving revision 1.82 diff -u -d -p -r1.81 -r1.82 --- ft.c 11 Jan 2005 17:24:54 -0000 1.81 +++ ft.c 11 Feb 2005 05:10:21 -0000 1.82 @@ -171,7 +171,7 @@ gaim_xfer_choose_file_ok_cb(void *user_d xfer = (GaimXfer *)user_data; - if (stat(filename, &st) != 0) { + if (g_stat(filename, &st) != 0) { /* File not found. */ if (gaim_xfer_get_type(xfer) == GAIM_XFER_RECEIVE) { gaim_xfer_request_accepted(xfer, filename); @@ -370,7 +370,7 @@ gaim_xfer_request_accepted(GaimXfer *xfe return; } - if (stat(filename, &st) == -1) { + if (g_stat(filename, &st) == -1) { gaim_xfer_show_file_error(xfer, filename); gaim_xfer_unref(xfer); return; @@ -792,7 +792,7 @@ begin_transfer(GaimXfer *xfer, GaimInput { GaimXferType type = gaim_xfer_get_type(xfer); - xfer->dest_fp = fopen(gaim_xfer_get_local_filename(xfer), + xfer->dest_fp = g_fopen(gaim_xfer_get_local_filename(xfer), type == GAIM_XFER_RECEIVE ? "wb" : "rb"); if (xfer->dest_fp == NULL) { Index: gtkaccount.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkaccount.c,v retrieving revision 1.165 retrieving revision 1.166 diff -u -d -p -r1.165 -r1.166 --- gtkaccount.c 22 Jan 2005 04:43:14 -0000 1.165 +++ gtkaccount.c 11 Feb 2005 05:10:21 -0000 1.166 @@ -304,7 +304,7 @@ icon_preview_change_cb(GtkTreeSelection GTK_FILE_SELECTION(dialog->icon_filesel))); #endif /* FILECHOOSER */ - if (!filename || stat(filename, &st)) + if (!filename || g_stat(filename, &st)) { g_free(filename); return; @@ -520,7 +520,7 @@ convert_buddy_icon(GaimPlugin *plugin, c format = gdk_pixbuf_get_file_info (path, &width, &height); #else loader = gdk_pixbuf_loader_new(); - if (!stat(path, &st) && (file = fopen(path, "rb")) != NULL) { + if (!g_stat(path, &st) && (file = g_fopen(path, "rb")) != NULL) { data = g_malloc(st.st_size); fread(data, 1, st.st_size, file); fclose(file); @@ -599,7 +599,7 @@ convert_buddy_icon(GaimPlugin *plugin, c if (!g_file_test(dirname, G_FILE_TEST_IS_DIR)) { gaim_debug_info("buddyicon", "Creating icon cache directory.\n"); - if (mkdir(dirname, S_IRUSR | S_IWUSR | S_IXUSR) < 0) { + if (g_mkdir(dirname, S_IRUSR | S_IWUSR | S_IXUSR) < 0) { gaim_debug_error("buddyicon", "Unable to create directory %s: %s\n", dirname, strerror(errno)); Index: gtkconv.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkconv.c,v retrieving revision 1.524 retrieving revision 1.525 diff -u -d -p -r1.524 -r1.525 --- gtkconv.c 4 Feb 2005 05:54:31 -0000 1.524 +++ gtkconv.c 11 Feb 2005 05:10:22 -0000 1.525 @@ -869,7 +869,7 @@ savelog_writefile_cb(void *user_data, co FILE *fp; const char *name; - if ((fp = fopen(filename, "w+")) == NULL) { + if ((fp = g_fopen(filename, "w+")) == NULL) { gaim_notify_error(conv, NULL, _("Unable to open file."), NULL); return; } @@ -2520,7 +2520,7 @@ saveicon_writefile_cb(void *user_data, c const void *data; size_t len; - if ((fp = fopen(filename, "wb")) == NULL) { + if ((fp = g_fopen(filename, "wb")) == NULL) { gaim_notify_error(conv, NULL, _("Unable to open file."), NULL); return; } Index: gtkdebug.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkdebug.c,v retrieving revision 1.51 retrieving revision 1.52 diff -u -d -p -r1.51 -r1.52 --- gtkdebug.c 29 Dec 2004 22:48:59 -0000 1.51 +++ gtkdebug.c 11 Feb 2005 05:10:23 -0000 1.52 @@ -173,7 +173,7 @@ save_writefile_cb(void *user_data, const FILE *fp; char *tmp; - if ((fp = fopen(filename, "w+")) == NULL) { + if ((fp = g_fopen(filename, "w+")) == NULL) { gaim_notify_error(win, NULL, _("Unable to open file."), NULL); return; } Index: gtkimhtml.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v retrieving revision 1.388 retrieving revision 1.389 diff -u -d -p -r1.388 -r1.389 --- gtkimhtml.c 5 Feb 2005 17:59:19 -0000 1.388 +++ gtkimhtml.c 11 Feb 2005 05:10:23 -0000 1.389 @@ -153,7 +153,7 @@ clipboard_win32_to_html(char *clipboard) gaim_debug_info("imhtml clipboard", "from clipboard: %s\n", clipboard); - fd = fopen("e:\\gaimcb.txt", "wb"); + fd = g_fopen("e:\\gaimcb.txt", "wb"); fprintf(fd, "%s", clipboard); fclose(fd); #endif Index: gtkmain.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkmain.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -p -r1.21 -r1.22 --- gtkmain.c 8 Feb 2005 04:59:35 -0000 1.21 +++ gtkmain.c 11 Feb 2005 05:10:24 -0000 1.22 @@ -404,7 +404,7 @@ static char *gaim_find_binary_location(v basebuf = g_find_program_in_path(argv0); /* But we still need to deal with symbolic links */ - lstat(basebuf, &st); + g_lstat(basebuf, &st); while ((st.st_mode & S_IFLNK) == S_IFLNK) { linkbuf = g_malloc(1024); readlink(basebuf, linkbuf, 1024); @@ -423,7 +423,7 @@ static char *gaim_find_binary_location(v g_free(linkbuf); g_free(basebuf); basebuf = fullbuf; - lstat(basebuf, &st); + g_lstat(basebuf, &st); } fullname = basebuf; Index: gtkprefs.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkprefs.c,v retrieving revision 1.248 retrieving revision 1.249 diff -u -d -p -r1.248 -r1.249 --- gtkprefs.c 9 Jan 2005 00:13:34 -0000 1.248 +++ gtkprefs.c 11 Feb 2005 05:10:24 -0000 1.249 @@ -519,7 +519,7 @@ theme_got_url(void *data, const char *th theme_install_theme(path, data); - unlink(path); + g_unlink(path); g_free(path); } Index: gtkthemes.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkthemes.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -p -r1.1 -r1.2 --- gtkthemes.c 2 Dec 2004 13:03:23 -0000 1.1 +++ gtkthemes.c 11 Feb 2005 05:10:25 -0000 1.2 @@ -62,7 +62,7 @@ void smiley_themeize(GtkWidget *imhtml) void load_smiley_theme(const char *file, gboolean load) { - FILE *f = fopen(file, "r"); + FILE *f = g_fopen(file, "r"); char buf[256]; char *i; struct smiley_theme *theme=NULL; @@ -232,7 +232,7 @@ void smiley_theme_probe() } g_dir_close(dir); } else if (l == 1) { - mkdir(probedirs[l], S_IRUSR | S_IWUSR | S_IXUSR); + g_mkdir(probedirs[l], S_IRUSR | S_IWUSR | S_IXUSR); } g_free(probedirs[l]); } Index: internal.h =================================================================== RCS file: /cvsroot/gaim/gaim/src/internal.h,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -p -r1.16 -r1.17 --- internal.h 11 Feb 2005 03:51:26 -0000 1.16 +++ internal.h 11 Feb 2005 05:10:25 -0000 1.17 @@ -121,11 +121,28 @@ #define PATHSIZE 1024 #include <glib.h> +#if GLIB_CHECK_VERSION(2,6,0) +# include <glib/gstdio.h> +#endif #ifdef _WIN32 #include "win32dep.h" #endif +#if !GLIB_CHECK_VERSION(2,6,0) +# define g_freopen freopen +# define g_fopen fopen +# define g_rmdir rmdir +# define g_remove remove +# define g_unlink unlink +# define g_lstat lstat +# define g_stat stat +# define g_mkdir mkdir +# define g_rename rename +# define g_open open +#endif + + /* ugly ugly ugly */ /* This is a workaround for the fact that G_GINT64_MODIFIER and G_GSIZE_FORMAT * are only defined in Glib >= 2.4 */ Index: log.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/log.c,v retrieving revision 1.108 retrieving revision 1.109 diff -u -d -p -r1.108 -r1.109 --- log.c 5 Feb 2005 21:50:54 -0000 1.108 +++ log.c 11 Feb 2005 05:10:25 -0000 1.109 @@ -392,7 +392,7 @@ static void log_writer_common(GaimLog *l log->logger_data = data = g_new0(struct generic_logger_data, 1); - data->file = fopen(path, "a"); + data->file = g_fopen(path, "a"); if (!data->file) { gaim_debug(GAIM_DEBUG_ERROR, "log", "Could not create log file %s\n", path); @@ -447,7 +447,7 @@ int log_sizer_common(GaimLog *log) struct stat st; struct generic_logger_data *data = log->logger_data; - if (!data->path || stat(data->path, &st)) + if (!data->path || g_stat(data->path, &st)) st.st_size = 0; return st.st_size; @@ -490,7 +490,7 @@ static void xml_logger_write(GaimLog *lo char *filename = g_build_filename(dir, date, NULL); g_free(dir); - log->logger_data = fopen(filename, "a"); + log->logger_data = g_fopen(filename, "a"); if (!log->logger_data) { gaim_debug(GAIM_DEBUG_ERROR, "log", "Could not create log file %s\n", filename); g_free(filename); @@ -851,7 +851,7 @@ static GList *old_logger_list(GaimLogTyp g_free(logfile); g_free(pathstr); - if (!(file = fopen(gaim_stringref_value(pathref), "rb"))) { + if (!(file = g_fopen(gaim_stringref_value(pathref), "rb"))) { gaim_stringref_unref(pathref); return NULL; } @@ -962,7 +962,7 @@ static int old_logger_total_size(GaimLog int size; struct stat st; - if (stat(pathstr, &st)) + if (g_stat(pathstr, &st)) size = 0; else size = st.st_size; @@ -976,7 +976,7 @@ static int old_logger_total_size(GaimLog static char * old_logger_read (GaimLog *log, GaimLogReadFlags *flags) { struct old_logger_data *data = log->logger_data; - FILE *file = fopen(gaim_stringref_value(data->pathref), "rb"); + FILE *file = g_fopen(gaim_stringref_value(data->pathref), "rb"); char *read = g_malloc(data->length + 1); fseek(file, data->offset, SEEK_SET); fread(read, data->length, 1, file); Index: util.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/util.c,v retrieving revision 1.338 retrieving revision 1.339 diff -u -d -p -r1.338 -r1.339 --- util.c 3 Feb 2005 22:36:56 -0000 1.338 +++ util.c 11 Feb 2005 05:10:26 -0000 1.339 @@ -1928,7 +1928,7 @@ int gaim_build_dir (const char *path, in return -1; } - if (mkdir(dir, mode) < 0) { + if (g_mkdir(dir, mode) < 0) { gaim_debug_warning("build_dir", "mkdir: %s\n", strerror(errno)); g_strfreev(components); g_free(dir); @@ -1963,7 +1963,7 @@ gaim_util_write_data_to_file(const char /* Ensure the user directory exists */ if (!g_file_test(user_dir, G_FILE_TEST_IS_DIR)) { - if (mkdir(user_dir, S_IRUSR | S_IWUSR | S_IXUSR) == -1) + if (g_mkdir(user_dir, S_IRUSR | S_IWUSR | S_IXUSR) == -1) { gaim_debug_error("util", "Error creating directory %s: %s\n", user_dir, strerror(errno)); @@ -1977,7 +1977,7 @@ gaim_util_write_data_to_file(const char /* Remove an old temporary file, if one exists */ if (g_file_test(filename_temp, G_FILE_TEST_EXISTS)) { - if (unlink(filename_temp) == -1) + if (g_unlink(filename_temp) == -1) { gaim_debug_error("util", "Error removing old file %s: %s\n", filename_temp, strerror(errno)); @@ -1985,7 +1985,7 @@ gaim_util_write_data_to_file(const char } /* Open file */ - file = fopen(filename_temp, "wb"); + file = g_fopen(filename_temp, "wb"); if (file == NULL) { gaim_debug_error("util", "Error opening file %s for writing: %s\n", @@ -2020,7 +2020,7 @@ gaim_util_write_data_to_file(const char return FALSE; } /* Use stat to be absolutely sure. */ - if ((stat(filename_temp, &st) == -1) || (st.st_size != real_size)) + if ((g_stat(filename_temp, &st) == -1) || (st.st_size != real_size)) { gaim_debug_error("util", "Error writing data to file %s: " "Incomplete file written; is your disk full?\n", @@ -2040,7 +2040,7 @@ gaim_util_write_data_to_file(const char /* Remove the old file, if it exists */ if (g_file_test(filename_full, G_FILE_TEST_EXISTS)) { - if (unlink(filename_full) == -1) + if (g_unlink(filename_full) == -1) { gaim_debug_error("util", "Error removing old file %s: %s\n", filename_full, strerror(errno)); @@ -2048,7 +2048,7 @@ gaim_util_write_data_to_file(const char } /* Rename to the REAL name */ - if (rename(filename_temp, filename_full) == -1) + if (g_rename(filename_temp, filename_full) == -1) { gaim_debug_error("util", "Error renaming %s to %s: %s\n", filename_temp, filename_full, strerror(errno)); @@ -2161,7 +2161,7 @@ gaim_mkstemp(char **fpath, gboolean bina "Problem creating the template\n"); else { - if( (fp = fopen( result, binary?"wb+":"w+")) == NULL ) { + if( (fp = g_fopen( result, binary?"wb+":"w+")) == NULL ) { gaim_debug(GAIM_DEBUG_ERROR, "gaim_mkstemp", "Couldn't fopen() %s\n", result); } |