# HG changeset patch
# User Herman Bloggs <hermanator12002@yahoo.com>
# Date 1063049110 0
# Node ID 40ba19133882d379d033cb7d6258626ba0b41672
# Parent  ab5dd35443c6fd27f4d98ad568f4b155401abf19
[gaim-migrate @ 7334]
NSS for windows

committer: Tailor Script <tailor@pidgin.im>

diff -r ab5dd35443c6 -r 40ba19133882 Makefile.mingw
--- a/Makefile.mingw	Mon Sep 08 18:54:20 2003 +0000
+++ b/Makefile.mingw	Mon Sep 08 19:25:10 2003 +0000
@@ -13,6 +13,8 @@
 GAIM_INSTALL_DIR = ./win32-install-dir
 PERL_TOP = ../win32-dev/perl56
 GTKSPELL_TOP = ../win32-dev/gtkspell-2.0.4/gtkspell
+NSS_TOP = ../win32-dev/nss-3.8
+NSPR_TOP = ../win32-dev/nspr-4.3
 IDLETRACK_TOP = $(GAIM_SRC)/win32/IdleTracker
 GTKRC_TOP = ../win32-dev/gtkrc
 OSCAR = $(GAIM_PROTOS)/oscar
@@ -30,7 +32,14 @@
 
 NEEDED_DLLS =		$(PERL_TOP)/perl56.dll \
 			$(GTKSPELL_TOP)/libgtkspell.dll \
-			$(IDLETRACK_TOP)/idletrack.dll
+			$(IDLETRACK_TOP)/idletrack.dll \
+			$(NSS_TOP)/lib/nss3.dll \
+			$(NSS_TOP)/lib/nssckbi.dll \
+			$(NSS_TOP)/lib/softokn3.dll \
+			$(NSS_TOP)/lib/ssl3.dll \
+			$(NSPR_TOP)/lib/nspr4.dll \
+			$(NSPR_TOP)/lib/plc4.dll \
+			$(NSPR_TOP)/lib/plds4.dll
 
 
 SOUNDS =		$(GAIM_SOUNDS)/leave.wav \
diff -r ab5dd35443c6 -r 40ba19133882 config.h.mingw
--- a/config.h.mingw	Mon Sep 08 18:54:20 2003 +0000
+++ b/config.h.mingw	Mon Sep 08 19:25:10 2003 +0000
@@ -372,6 +372,10 @@
 /* Define if you have the external 'daylight' variable. */
 #define HAVE_DAYLIGHT 1
 
+#define HAVE_SSL 1
+#define HAVE_NSS 1
+/*#define HAVE_GNUTLS 1*/
+
 /*
  * Following are added for Win32 version of Gaim
  */
diff -r ab5dd35443c6 -r 40ba19133882 src/Makefile.mingw
--- a/src/Makefile.mingw	Mon Sep 08 18:54:20 2003 +0000
+++ b/src/Makefile.mingw	Mon Sep 08 19:25:10 2003 +0000
@@ -17,6 +17,8 @@
 IDLETRACK_TOP :=	$(GAIM_TOP)/src/win32/IdleTracker
 GAIM_INSTALL_DIR :=	$(GAIM_TOP)/win32-install-dir
 MINGW_PLUS_DIR :=	$(GAIM_SRC)/win32/mingw_plus
+NSS_DIR :=		../../win32-dev/nss-3.8
+NSPR_DIR :=		../../win32-dev/nspr-4.3
 
 ##
 ## VARIABLE DEFINITIONS
@@ -58,13 +60,17 @@
 			-I$(GTK_TOP)/lib/glib-2.0/include \
 			-I$(GTK_TOP)/lib/gtk-2.0/include \
 			-I$(ASPELL_TOP)/include \
-			-I$(GTKSPELL_TOP)
+			-I$(GTKSPELL_TOP) \
+			-I$(NSS_DIR)/include \
+			-I$(NSPR_DIR)/include
 
 
 LIB_PATHS =		-L$(GTK_TOP)/lib \
 			-L$(GAIM_SRC) \
 			-L$(IDLETRACK_TOP) \
-			-L$(ASPELL_TOP)/lib
+			-L$(ASPELL_TOP)/lib \
+			-L$(NSS_DIR)/lib \
+			-L$(NSPR_DIR)/lib
 
 ##
 ##  SOURCES, OBJECTS
@@ -119,6 +125,7 @@
 			signals.c \
 			sound.c \
 			sslconn.c \
+			ssl-nss.c \
 			status.c \
 			stock.c \
 			themes.c \
@@ -154,7 +161,10 @@
 			-liberty \
 			-lwinmm \
 			-llibz \
-			-lidletrack
+			-lidletrack \
+			-lnss3 \
+			-lnspr4 \
+			-lssl3
 			
 
 EXE_LIBS =		-lgaim \
diff -r ab5dd35443c6 -r 40ba19133882 src/protocols/msn/Makefile.mingw
--- a/src/protocols/msn/Makefile.mingw	Mon Sep 08 18:54:20 2003 +0000
+++ b/src/protocols/msn/Makefile.mingw	Mon Sep 08 19:25:10 2003 +0000
@@ -74,6 +74,8 @@
 			group.c \
 			msg.c \
 			msn.c \
+			msnobject.c \
+			msnslp.c \
 			notification.c \
 			page.c \
 			servconn.c \
diff -r ab5dd35443c6 -r 40ba19133882 src/protocols/yahoo/yahoo.c
--- a/src/protocols/yahoo/yahoo.c	Mon Sep 08 18:54:20 2003 +0000
+++ b/src/protocols/yahoo/yahoo.c	Mon Sep 08 19:25:10 2003 +0000
@@ -1729,13 +1729,14 @@
 {
 	struct yahoo_data *yd = (struct yahoo_data *)gc->proto_data;
 	struct yahoo_friend *f;
+        struct yahoo_packet *pkt;
 
 	if (!(f = g_hash_table_lookup(yd->friends, who)))
 		return;
 
 	g_hash_table_remove(yd->friends, who);
 
-	struct yahoo_packet *pkt = yahoo_packet_new(YAHOO_SERVICE_REMBUDDY, YAHOO_STATUS_AVAILABLE, 0);
+	pkt = yahoo_packet_new(YAHOO_SERVICE_REMBUDDY, YAHOO_STATUS_AVAILABLE, 0);
 	yahoo_packet_hash(pkt, 1, gaim_connection_get_display_name(gc));
 	yahoo_packet_hash(pkt, 7, who);
 	yahoo_packet_hash(pkt, 65, group);
diff -r ab5dd35443c6 -r 40ba19133882 src/ssl-nss.c
--- a/src/ssl-nss.c	Mon Sep 08 18:54:20 2003 +0000
+++ b/src/ssl-nss.c	Mon Sep 08 19:25:10 2003 +0000
@@ -125,7 +125,13 @@
 	NSS_NoDB_Init(NULL);
 
 	/* TODO: Fix this so autoconf does the work trying to find this lib. */
-	SECMOD_AddNewModule("Builtins", LIBDIR "/libnssckbi.so", 0, 0);
+	SECMOD_AddNewModule("Builtins",
+#ifndef _WIN32
+                            LIBDIR "/libnssckbi.so",
+#else
+                            "nssckbi.dll",
+#endif
+                            0, 0);
 	NSS_SetDomesticPolicy();
 
 	_identity = PR_GetUniqueIdentity("Gaim");