Mercurial > pidgin.yaz
changeset 15402:1ff775fd97ea
merge of '84140aa67d4b73a58ac23634d0098f50a79164a9'
and 'a61677cd0c711660b439549c3e12350e506db03c'
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Wed, 24 Jan 2007 20:10:53 +0000 |
| parents | 74ab783e3676 (current diff) 22bcaaefa478 (diff) |
| children | 14f1a1fad65e |
| files | |
| diffstat | 9 files changed, 83 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/util.c Wed Jan 24 20:06:47 2007 +0000 +++ b/libpurple/util.c Wed Jan 24 20:10:53 2007 +0000 @@ -3150,6 +3150,11 @@ g_free(gfud->request); gfud->request = NULL; + gaim_input_remove(gfud->inpa); + gfud->inpa = 0; + close(gfud->fd); + gfud->fd = 0; + g_free(gfud->website.user); g_free(gfud->website.passwd); g_free(gfud->website.address);
--- a/libpurple/win32/win32dep.h Wed Jan 24 20:06:47 2007 +0000 +++ b/libpurple/win32/win32dep.h Wed Jan 24 20:10:53 2007 +0000 @@ -28,6 +28,11 @@ #include "wgaimerror.h" #include "libc_interface.h" +/* rpcndr.h defines small as char, causing problems, so we need to undefine it */ +#ifdef _WIN32 +#undef small +#endif + /* * PROTOS */
--- a/pidgin/pixmaps/emotes/Makefile.am Wed Jan 24 20:06:47 2007 +0000 +++ b/pidgin/pixmaps/emotes/Makefile.am Wed Jan 24 20:10:53 2007 +0000 @@ -1,1 +1,3 @@ SUBDIRS=default none + +EXTRA_DIST = Makefile.mingw
--- a/pidgin/pixmaps/emotes/default/Makefile.am Wed Jan 24 20:06:47 2007 +0000 +++ b/pidgin/pixmaps/emotes/default/Makefile.am Wed Jan 24 20:10:53 2007 +0000 @@ -1,1 +1,5 @@ SUBDIRS=22 scalable + +EXTRA_DIST= \ + 22/Makefile.mingw \ + scalable/Makefile.mingw
--- a/pidgin/pixmaps/emotes/none/Makefile.am Wed Jan 24 20:06:47 2007 +0000 +++ b/pidgin/pixmaps/emotes/none/Makefile.am Wed Jan 24 20:10:53 2007 +0000 @@ -1,4 +1,5 @@ gaimsmileypixdir = $(datadir)/pixmaps/gaim/smileys/none gaimsmileypix_DATA = theme -EXTRA_DIST = $(gaimsmileypix_DATA) +EXTRA_DIST = $(gaimsmileypix_DATA) \ + Makefile.mingw
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/status/16/Makefile.mingw Wed Jan 24 20:10:53 2007 +0000 @@ -0,0 +1,20 @@ +# +# Makefile.mingw +# +# Description: Makefile for win32 (mingw) version of Pidgin pixmaps +# + +GAIM_TOP := ../../../.. +include $(GAIM_TOP)/libpurple/win32/global.mak + +datadir = $(GAIM_INSTALL_DIR) +include ./Makefile.am + +.PHONY: install + +install: + if test '$(pidginstatuspix_DATA)'; then \ + mkdir -p $(pidginstatuspixdir); \ + cp $(pidginstatuspix_DATA) $(pidginstatuspixdir); \ + fi; +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/status/22/Makefile.mingw Wed Jan 24 20:10:53 2007 +0000 @@ -0,0 +1,20 @@ +# +# Makefile.mingw +# +# Description: Makefile for win32 (mingw) version of Pidgin pixmaps +# + +GAIM_TOP := ../../../.. +include $(GAIM_TOP)/libpurple/win32/global.mak + +datadir = $(GAIM_INSTALL_DIR) +include ./Makefile.am + +.PHONY: install + +install: + if test '$(pidginstatuspix_DATA)'; then \ + mkdir -p $(pidginstatuspixdir); \ + cp $(pidginstatuspix_DATA) $(pidginstatuspixdir); \ + fi; +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/status/32/Makefile.mingw Wed Jan 24 20:10:53 2007 +0000 @@ -0,0 +1,20 @@ +# +# Makefile.mingw +# +# Description: Makefile for win32 (mingw) version of Pidgin pixmaps +# + +GAIM_TOP := ../../../.. +include $(GAIM_TOP)/libpurple/win32/global.mak + +datadir = $(GAIM_INSTALL_DIR) +include ./Makefile.am + +.PHONY: install + +install: + if test '$(pidginstatuspix_DATA)'; then \ + mkdir -p $(pidginstatuspixdir); \ + cp $(pidginstatuspix_DATA) $(pidginstatuspixdir); \ + fi; +