Mercurial > pidgin.yaz
changeset 15733:326aab92ba64
merge of '2dd816030b55d7b1bd8f58209657ef2fb54bc1d0'
and '8dbc0d1a790c3aec996b9d2550a618fce7868d03'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Mon, 26 Feb 2007 05:46:45 +0000 |
| parents | 2eacd3be75a0 (current diff) 4ffeecc47fd3 (diff) |
| children | 80fe830ab842 |
| files | |
| diffstat | 8 files changed, 47 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/COPYRIGHT Mon Feb 26 05:44:06 2007 +0000 +++ b/COPYRIGHT Mon Feb 26 05:46:45 2007 +0000 @@ -105,6 +105,7 @@ Stefan Esser Steffen Eschenbacher Marc Etcheverry +David Everly Larry Ewing Gábor Farkas Jesse Farmer
--- a/libpurple/protocols/jabber/jabber.c Mon Feb 26 05:44:06 2007 +0000 +++ b/libpurple/protocols/jabber/jabber.c Mon Feb 26 05:46:45 2007 +0000 @@ -283,7 +283,7 @@ sasl_encode(js->sasl, &data[pos], towrite, &out, &olen); pos += towrite; - if (js->writeh > 0) + if (js->writeh == 0) ret = jabber_do_send(js, out, olen); else { ret = -1;
--- a/libpurple/protocols/sametime/sametime.c Mon Feb 26 05:44:06 2007 +0000 +++ b/libpurple/protocols/sametime/sametime.c Mon Feb 26 05:46:45 2007 +0000 @@ -4810,13 +4810,13 @@ msg = gaim_markup_strip_html(message); if(conf) { - ret = ! mwConference_sendText(conf, message); + ret = ! mwConference_sendText(conf, msg); } else { struct mwPlace *place = ID_TO_PLACE(pd, id); g_return_val_if_fail(place != NULL, 0); - ret = ! mwPlace_sendText(place, message); + ret = ! mwPlace_sendText(place, msg); } g_free(msg);
--- a/libpurple/win32/win32dep.c Mon Feb 26 05:44:06 2007 +0000 +++ b/libpurple/win32/win32dep.c Mon Feb 26 05:46:45 2007 +0000 @@ -588,6 +588,8 @@ } /* DLL initializer */ +/* suppress gcc "no previous prototype" warning */ +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved); BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { libgaimdll_hInstance = hinstDLL; return TRUE;
--- a/pidgin/gtkaccount.c Mon Feb 26 05:44:06 2007 +0000 +++ b/pidgin/gtkaccount.c Mon Feb 26 05:46:45 2007 +0000 @@ -2577,9 +2577,9 @@ default_avatar = NULL; } } - -printf("AVATAR: %s\n", default_avatar); + gaim_prefs_add_path("/gaim/gtk/accounts/buddyicon", default_avatar); + g_free(default_avatar); gaim_signal_register(pidgin_account_get_handle(), "account-modified", gaim_marshal_VOID__POINTER, NULL, 1,
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/tray/22/Makefile.mingw Mon Feb 26 05:46:45 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 '$(pidgintraypix_DATA)'; then \ + mkdir -p $(pidgintraypixdir); \ + cp $(pidgintraypix_DATA) $(pidgintraypixdir); \ + fi; +
--- a/pidgin/pixmaps/tray/Makefile.am Mon Feb 26 05:44:06 2007 +0000 +++ b/pidgin/pixmaps/tray/Makefile.am Mon Feb 26 05:46:45 2007 +0000 @@ -1,1 +1,6 @@ SUBDIRS = 22 + +EXTRA_DIST = \ + Makefile.mingw \ + 22/Makefile.mingw +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/tray/Makefile.mingw Mon Feb 26 05:46:45 2007 +0000 @@ -0,0 +1,14 @@ +# +# Makefile.mingw +# +# Description: Makefile for win32 (mingw) version of Gaim pixmaps +# + +include ./Makefile.am + +install: + if test '$(SUBDIRS)'; then \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + $(MAKE) -C $$subdir -f Makefile.mingw install || exit 1; \ + done; \ + fi;