Mercurial > pidgin.yaz
changeset 4373:dcc6c130c6d9
[gaim-migrate @ 4639]
win32 fixes
committer: Tailor Script <tailor@pidgin.im>
| author | Herman Bloggs <hermanator12002@yahoo.com> |
|---|---|
| date | Tue, 21 Jan 2003 00:38:33 +0000 |
| parents | 00f4fa7a93ff |
| children | 2628346f53bd |
| files | Makefile.mingw plugins/spellchk.c src/conversation.c src/gtkconv.c src/protocols/gg/gg.c src/protocols/irc/irc.c src/protocols/oscar/oscar.c src/win32/libc_interface.h |
| diffstat | 8 files changed, 45 insertions(+), 43 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.mingw Tue Jan 21 00:18:06 2003 +0000 +++ b/Makefile.mingw Tue Jan 21 00:38:33 2003 +0000 @@ -13,6 +13,7 @@ GAIM_INSTALL_DIR = ./win32-install-dir GTK_TOP = ../win32-dev/gtk_2_0 GTK_LIBS = $(GTK_TOP)/lib +GTK_BIN = $(GTK_TOP)/bin PERL_TOP = ../win32-dev/perl56 IDLETRACKER_TOP = $(GAIM_SRC)/win32/IdleTracker GTKRC_TOP = ../win32-dev/gtkrc @@ -28,37 +29,37 @@ VERSION := $(shell cat ./VERSION) -NEEDED_DLLS = $(GTK_LIBS)/libgdk-win32-2.0-0.dll \ - $(GTK_LIBS)/libglib-2.0-0.dll \ - $(GTK_LIBS)/libintl-1.dll \ - $(GTK_LIBS)/iconv.dll \ - $(GTK_LIBS)/libgmodule-2.0-0.dll \ - $(GTK_LIBS)/libgtk-win32-2.0-0.dll \ - $(GTK_LIBS)/libgdk_pixbuf-2.0-0.dll \ - $(GTK_LIBS)/libgobject-2.0-0.dll \ - $(GTK_LIBS)/libgthread-2.0-0.dll \ - $(GTK_TOP)/bin/libjpeg.dll \ - $(GTK_TOP)/bin/libpng.dll \ - $(GTK_TOP)/bin/libtiff.dll \ - $(GTK_TOP)/bin/zlib.dll \ - $(GTK_LIBS)/libpango-1.0-0.dll \ - $(GTK_LIBS)/libpangoft2-1.0-0.dll \ - $(GTK_LIBS)/libpangowin32-1.0-0.dll \ - $(GTK_LIBS)/libatk-1.0-0.dll \ +NEEDED_DLLS = $(GTK_BIN)/libgdk-win32-2.0-0.dll \ + $(GTK_BIN)/libglib-2.0-0.dll \ + $(GTK_BIN)/libintl-1.dll \ + $(GTK_BIN)/iconv.dll \ + $(GTK_BIN)/libgmodule-2.0-0.dll \ + $(GTK_BIN)/libgtk-win32-2.0-0.dll \ + $(GTK_BIN)/libgdk_pixbuf-2.0-0.dll \ + $(GTK_BIN)/libgobject-2.0-0.dll \ + $(GTK_BIN)/libgthread-2.0-0.dll \ + $(GTK_BIN)/libjpeg.dll \ + $(GTK_BIN)/libpng.dll \ + $(GTK_BIN)/libtiff.dll \ + $(GTK_BIN)/zlib.dll \ + $(GTK_BIN)/libpango-1.0-0.dll \ + $(GTK_BIN)/libpangoft2-1.0-0.dll \ + $(GTK_BIN)/libpangowin32-1.0-0.dll \ + $(GTK_BIN)/libatk-1.0-0.dll \ $(PERL_TOP)/perl56.dll \ $(IDLETRACKER_TOP)/IdleTrac.dll # For Gtk 2.0.3 -# $(GTK_LIBS)/libjpeg6b.dll \ -# $(GTK_LIBS)/libpng-3.dll \ -# $(GTK_LIBS)/libtiff.dll \ -# $(GTK_LIBS)/libz.dll \ +# $(GTK_BIN)/libjpeg6b.dll \ +# $(GTK_BIN)/libpng-3.dll \ +# $(GTK_BIN)/libtiff.dll \ +# $(GTK_BIN)/libz.dll \ # For Gtk 2.0.6 -# $(GTK_TOP)/bin/libjpeg.dll \ -# $(GTK_TOP)/bin/libpng.dll \ -# $(GTK_TOP)/bin/libtiff.dll \ -# $(GTK_TOP)/bin/zlib.dll \ +# $(GTK_BIN)/libjpeg.dll \ +# $(GTK_BIN)/libpng.dll \ +# $(GTK_BIN)/libtiff.dll \ +# $(GTK_BIN)/zlib.dll \ SOUNDS = $(GAIM_SOUNDS)/leave.wav \ @@ -91,7 +92,7 @@ $(MAKE) TYPE='$(IRC_TYPE)' -C $(IRC) -f Makefile.mingw $(MAKE) TYPE='$(JABBER_TYPE)' -C $(JABBER) -f Makefile.mingw $(MAKE) TYPE='$(GG_TYPE)' -C $(GG) -f Makefile.mingw - $(MAKE) TYPE '$(NAPSTER_TYPE)' -C $(NAPSTER) -f Makefile.mingw + $(MAKE) -C $(GAIM_SRC) -f Makefile.mingw $(MAKE) -C $(GAIM_PLUGINS) -f Makefile.mingw @@ -109,11 +110,10 @@ $(MAKE) TYPE='$(IRC_TYPE)' -C $(IRC) -f Makefile.mingw install $(MAKE) TYPE='$(JABBER_TYPE)' -C $(JABBER) -f Makefile.mingw install $(MAKE) TYPE='$(GG_TYPE)' -C $(GG) -f Makefile.mingw install - $(MAKE) TYPE='$(NAPSTER_TYPE)' -C $(NAPSTER) -f Makefile.mingw install cp $(NEEDED_DLLS) $(GAIM_INSTALL_DIR) cp $(SOUNDS) $(GAIM_INSTALL_DIR)/sounds/gaim mkdir -p $(GAIM_INSTALL_DIR)/lib/gtk-2.0 - cp -R $(GTK_LIBS)/gtk-2.0/2.0.0 $(GAIM_INSTALL_DIR)/lib/gtk-2.0 + cp -R $(GTK_LIBS)/gtk-2.0/2.2.0 $(GAIM_INSTALL_DIR)/lib/gtk-2.0 cp -R $(GTK_LIBS)/pango $(GAIM_INSTALL_DIR)/lib cp -R $(GTK_TOP)/etc $(GAIM_INSTALL_DIR) cp $(GAIM_SRC)/win32/themes/gtkrc $(GAIM_INSTALL_DIR)/etc/gtk-2.0 @@ -130,7 +130,6 @@ $(MAKE) -C $(IRC) -f Makefile.mingw clean $(MAKE) -C $(JABBER) -f Makefile.mingw clean $(MAKE) -C $(GG) -f Makefile.mingw clean - $(MAKE) -C $(NAPSTER) -f Makefile.mingw clean $(MAKE) -C $(GAIM_SRC) -f Makefile.mingw clean $(MAKE) -C $(GAIM_PLUGINS) -f Makefile.mingw clean rm -rf config.h $(GAIM_INSTALL_DIR)
--- a/plugins/spellchk.c Tue Jan 21 00:18:06 2003 +0000 +++ b/plugins/spellchk.c Tue Jan 21 00:38:33 2003 +0000 @@ -321,10 +321,8 @@ return; } - #ifndef _WIN32 fchmod(fd, S_IRUSR | S_IWUSR); - #endif - + if(gtk_tree_model_get_iter_first(GTK_TREE_MODEL(model), &iter)) { do { GValue val0, val1;
--- a/src/conversation.c Tue Jan 21 00:18:06 2003 +0000 +++ b/src/conversation.c Tue Jan 21 00:38:33 2003 +0000 @@ -27,14 +27,15 @@ #include <stdlib.h> #include <sys/stat.h> #include <errno.h> -#ifdef _WIN32 -#include "wgaimerror.h" -#endif #include <ctype.h> #include "conversation.h" #include "gaim.h" #include "prpl.h" +#ifdef _WIN32 +#include "win32dep.h" +#endif + #define SEND_TYPED_TIMEOUT 5000 static GList *conversations = NULL;
--- a/src/gtkconv.c Tue Jan 21 00:18:06 2003 +0000 +++ b/src/gtkconv.c Tue Jan 21 00:38:33 2003 +0000 @@ -27,11 +27,6 @@ #include <unistd.h> #include <gdk/gdkx.h> #include <X11/Xlib.h> -#else -#include "win32dep.h" -#ifdef small -#undef small -#endif #endif /*_WIN32*/ #include <sys/types.h> #include <sys/stat.h> @@ -49,6 +44,10 @@ #include "gtkimhtml.h" #include "dnd-hints.h" +#ifdef _WIN32 +#include "win32dep.h" +#endif + static char nick_colors[][8] = { "#ba55d3", /* Medium Orchid */ "#ee82ee", /* Violet */
--- a/src/protocols/gg/gg.c Tue Jan 21 00:18:06 2003 +0000 +++ b/src/protocols/gg/gg.c Tue Jan 21 00:38:33 2003 +0000 @@ -1,6 +1,6 @@ /* * gaim - Gadu-Gadu Protocol Plugin - * $Id: gg.c 4614 2003-01-19 22:16:52Z faceprint $ + * $Id: gg.c 4639 2003-01-21 00:38:33Z hermanator $ * * Copyright (C) 2001 Arkadiusz Mi¶kiewicz <misiek@pld.ORG.PL> * @@ -45,6 +45,7 @@ /* Library from EKG (Eksperymentalny Klient Gadu-Gadu) */ #include "libgg.h" #include "multi.h" +#include "core.h" #include "prpl.h" #include "gaim.h" #include "proxy.h" @@ -89,7 +90,7 @@ /* for win32 compatability */ G_MODULE_IMPORT GSList *connections; - +G_MODULE_IMPORT GSList *groups; struct agg_data { struct gg_session *sess;
--- a/src/protocols/irc/irc.c Tue Jan 21 00:18:06 2003 +0000 +++ b/src/protocols/irc/irc.c Tue Jan 21 00:38:33 2003 +0000 @@ -41,6 +41,7 @@ #include <sys/stat.h> #include <ctype.h> #include "multi.h" +#include "core.h" #include "prpl.h" #include "gaim.h" #include "proxy.h" @@ -62,7 +63,7 @@ /* for win32 compatability */ G_MODULE_IMPORT GSList *connections; - +G_MODULE_IMPORT GSList *groups; /* Datastructs */ struct dcc_chat
--- a/src/protocols/oscar/oscar.c Tue Jan 21 00:18:06 2003 +0000 +++ b/src/protocols/oscar/oscar.c Tue Jan 21 00:38:33 2003 +0000 @@ -47,6 +47,7 @@ #include "multi.h" #include "prpl.h" #include "gaim.h" +#include "core.h" #include "aim.h" #include "proxy.h" @@ -88,6 +89,7 @@ /* For win32 compatability */ G_MODULE_IMPORT GSList *connections; G_MODULE_IMPORT int report_idle; +G_MODULE_IMPORT GSList *groups; static int caps_aim = AIM_CAPS_CHAT | AIM_CAPS_BUDDYICON | AIM_CAPS_IMIMAGE | AIM_CAPS_SENDFILE;