Mercurial > pidgin.yaz
changeset 9795:719fc957e9ee
[gaim-migrate @ 10663]
for some strange reason an otherwise sensible guy like datallah
wants to compile on win32
committer: Tailor Script <tailor@pidgin.im>
| author | Luke Schierer <lschiere@pidgin.im> |
|---|---|
| date | Fri, 20 Aug 2004 20:15:09 +0000 |
| parents | 31ea81339336 |
| children | 68574cef02e2 |
| files | plugins/win32/winprefs/gtkappbar.c plugins/win32/winprefs/winprefs.c src/ft.c |
| diffstat | 3 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/win32/winprefs/gtkappbar.c Fri Aug 20 17:05:58 2004 +0000 +++ b/plugins/win32/winprefs/gtkappbar.c Fri Aug 20 20:15:09 2004 +0000 @@ -399,7 +399,6 @@ return wnd_size(data, xevent); case APPBAR_CALLBACK: return gtk_appbar_callback(data, xevent); - default: } return GDK_FILTER_CONTINUE; }
--- a/plugins/win32/winprefs/winprefs.c Fri Aug 20 17:05:58 2004 +0000 +++ b/plugins/win32/winprefs/winprefs.c Fri Aug 20 20:15:09 2004 +0000 @@ -24,7 +24,6 @@ #include <gdk/gdkwin32.h> #include "internal.h" -#include "gtkinternal.h" #include "core.h" #include "prefs.h"
--- a/src/ft.c Fri Aug 20 17:05:58 2004 +0000 +++ b/src/ft.c Fri Aug 20 20:15:09 2004 +0000 @@ -131,9 +131,14 @@ case ENOTDIR: msg = g_strdup_printf( _("A component of %s is not a directory.\n"), filename); break; +#ifndef _WIN32 case ELOOP: msg = g_strdup_printf( _("Too many symbolic links in path for %s\n"), filename); break; + case ETXTBSY: + msg = g_strdup_printf(_("Cannot write %s: File is in use\n"), filename); + break; +#endif case EACCES: msg = g_strdup_printf( _("Permission denied accessing %s\n"), filename); break; @@ -146,9 +151,6 @@ case ENOSPC: msg = g_strdup_printf(_("Cannot write %s: No space on filesystem\n"), filename); break; - case ETXTBSY: - msg = g_strdup_printf(_("Cannot write %s: File is in use\n"), filename); - break; case EMFILE: msg = g_strdup_printf(_("Cannot open %s: Gaim has too many files open\n"), filename); break;