Mercurial > pidgin.yaz

changeset 4363:65d98b565fbe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 4629] Win32 fixes for the latest stuff by I Eat Phroggies. committer: Tailor Script <tailor@pidgin.im>
author Christian Hammond <chipx86@chipx86.com>
date Mon, 20 Jan 2003 16:57:09 +0000
parents 4f8a1b65ffa3
children fa56829b9587
files Makefile.mingw plugins/Makefile.mingw plugins/spellchk.c src/Makefile.mingw src/conversation.c src/dnd-hints.c src/gtkconv.c src/protocols/napster/.cvsignore src/stock.c
diffstat 9 files changed, 26 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.mingw	Mon Jan 20 14:16:27 2003 +0000
+++ b/Makefile.mingw	Mon Jan 20 16:57:09 2003 +0000
@@ -91,7 +91,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) -C $(GAIM_SRC) -f Makefile.mingw
+	$(MAKE) TYPE '$(NAPSTER_TYPE)' -C $(NAPSTER) -f Makefile.mingw
 	$(MAKE) -C $(GAIM_PLUGINS) -f Makefile.mingw
 
 
@@ -109,6 +109,7 @@
 	$(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
@@ -129,6 +130,7 @@
 	$(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/Makefile.mingw	Mon Jan 20 14:16:27 2003 +0000
+++ b/plugins/Makefile.mingw	Mon Jan 20 16:57:09 2003 +0000
@@ -75,13 +75,13 @@
 
 all: plugins
 	$(MAKE) -C $(TICKER) -f Makefile.mingw
-	$(MAKE) -C $(TRANSPARENCY) -f Makefile.mingw
+#	$(MAKE) -C $(TRANSPARENCY) -f Makefile.mingw
 	$(MAKE) -C $(WINPREFS) -f Makefile.mingw
 
 install:
 	cp $(GAIM_PLUGINS)/*.dll $(GAIM_PLUGINS)/gaim.pl $(GAIM_INSTALL_DIR)/plugins
 	$(MAKE) -C $(TICKER) -f Makefile.mingw install
-	$(MAKE) -C $(TRANSPARENCY) -f Makefile.mingw install
+#	$(MAKE) -C $(TRANSPARENCY) -f Makefile.mingw install
 	$(MAKE) -C $(WINPREFS) -f Makefile.mingw install
 
 #
@@ -107,5 +107,5 @@
 	rm -rf *.o
 	rm -rf *.dll
 	$(MAKE) -C $(TICKER) -f Makefile.mingw clean
-	$(MAKE) -C $(TRANSPARENCY) -f Makefile.mingw clean
+#	$(MAKE) -C $(TRANSPARENCY) -f Makefile.mingw clean
 	$(MAKE) -C $(WINPREFS) -f Makefile.mingw clean
--- a/plugins/spellchk.c	Mon Jan 20 14:16:27 2003 +0000
+++ b/plugins/spellchk.c	Mon Jan 20 16:57:09 2003 +0000
@@ -321,7 +321,9 @@
 		return;
 	}
 
+	#ifndef _WIN32
 	fchmod(fd, S_IRUSR | S_IWUSR);
+	#endif
 		
 	if(gtk_tree_model_get_iter_first(GTK_TREE_MODEL(model), &iter)) {
 		do {
--- a/src/Makefile.mingw	Mon Jan 20 14:16:27 2003 +0000
+++ b/src/Makefile.mingw	Mon Jan 20 16:57:09 2003 +0000
@@ -84,10 +84,11 @@
 			conversation.c \
 			core.c \
 			dialogs.c \
-			dnd-utils.c \
+			dnd-hints.c \
 			ft.c \
 			gaimrc.c \
 			gtkconv.c \
+			gtkcellrendererprogress.c \
 			gtkimhtml.c \
 			gtkutils.c \
 			html.c \
@@ -103,6 +104,7 @@
 			prpl.c \
 			server.c \
 			sound.c \
+			stock.c \
 			themes.c \
 			util.c \
 			win32/win32dep.c \
--- a/src/conversation.c	Mon Jan 20 14:16:27 2003 +0000
+++ b/src/conversation.c	Mon Jan 20 16:57:09 2003 +0000
@@ -27,6 +27,9 @@
 #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"
--- a/src/dnd-hints.c	Mon Jan 20 14:16:27 2003 +0000
+++ b/src/dnd-hints.c	Mon Jan 20 16:57:09 2003 +0000
@@ -24,6 +24,10 @@
 #include <gdk/gdk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
+#ifdef _WIN32
+#include "win32dep.h"
+#endif
+
 typedef struct
 {
 	GtkWidget *widget;
--- a/src/gtkconv.c	Mon Jan 20 14:16:27 2003 +0000
+++ b/src/gtkconv.c	Mon Jan 20 16:57:09 2003 +0000
@@ -28,6 +28,7 @@
 #include <gdk/gdkx.h>
 #include <X11/Xlib.h>
 #else
+#include "win32dep.h"
 #ifdef small
 #undef small
 #endif
--- a/src/protocols/napster/.cvsignore	Mon Jan 20 14:16:27 2003 +0000
+++ b/src/protocols/napster/.cvsignore	Mon Jan 20 16:57:09 2003 +0000
@@ -4,3 +4,6 @@
 .libs
 libnapster.la
 napster.lo
+libnapster.def
+libnapster.dll
+libnapster.lib
--- a/src/stock.c	Mon Jan 20 14:16:27 2003 +0000
+++ b/src/stock.c	Mon Jan 20 16:57:09 2003 +0000
@@ -25,6 +25,10 @@
 #include <gtk/gtk.h>
 #include <string.h>
 
+#ifdef _WIN32
+#include "win32dep.h"
+#endif
+
 static struct StockIcon
 {
 	const char *name;