Mercurial > pidgin3 / changeset

--- a/libpurple/win32/global.mak	Sun Oct 21 05:05:38 2007 +0000
+++ b/libpurple/win32/global.mak	Sun Oct 21 05:07:57 2007 +0000
@@ -15,7 +15,7 @@
 GTK_TOP ?= $(WIN32_DEV_TOP)/gtk_2_0
 GTK_BIN ?= $(GTK_TOP)/bin
 BONJOUR_TOP ?= $(WIN32_DEV_TOP)/Bonjour_SDK
-LIBXML2_TOP ?= $(WIN32_DEV_TOP)/libxml2
+LIBXML2_TOP ?= $(WIN32_DEV_TOP)/libxml2-2.6.30
 MEANWHILE_TOP ?= $(WIN32_DEV_TOP)/meanwhile-1.0.2
 NSPR_TOP ?= $(WIN32_DEV_TOP)/nspr-4.6.4
 NSS_TOP ?= $(WIN32_DEV_TOP)/nss-3.11.4

--- a/pidgin/gtkdialogs.c	Sun Oct 21 05:05:38 2007 +0000
+++ b/pidgin/gtkdialogs.c	Sun Oct 21 05:07:57 2007 +0000
@@ -645,11 +645,10 @@
 	g_string_append(str, "    <b>Network Security Services (NSS):</b> Disabled<br/>");
 #endif
 
-#ifdef HAVE_PERL
+if (purple_plugins_find_with_id("core-perl") != NULL)
 	g_string_append(str, "    <b>Perl:</b> Enabled<br/>");
-#else
+else
 	g_string_append(str, "    <b>Perl:</b> Disabled<br/>");
-#endif
 
 #ifndef _WIN32
 #ifdef HAVE_STARTUP_NOTIFICATION
@@ -659,17 +658,17 @@
 #endif
 #endif
 
-#ifdef HAVE_TCL
+if (purple_plugins_find_with_id("core-tcl") != NULL) {
 	g_string_append(str, "    <b>Tcl:</b> Enabled<br/>");
-#else
-	g_string_append(str, "    <b>Tcl:</b> Disabled<br/>");
-#endif
-
 #ifdef HAVE_TK
 	g_string_append(str, "    <b>Tk:</b> Enabled<br/>");
 #else
 	g_string_append(str, "    <b>Tk:</b> Disabled<br/>");
 #endif
+} else {
+	g_string_append(str, "    <b>Tcl:</b> Disabled<br/>");
+	g_string_append(str, "    <b>Tk:</b> Disabled<br/>");
+}
 
 #ifndef _WIN32
 #ifdef USE_SM

--- a/pidgin/gtkimhtml.c	Sun Oct 21 05:05:38 2007 +0000
+++ b/pidgin/gtkimhtml.c	Sun Oct 21 05:07:57 2007 +0000
@@ -553,6 +553,7 @@
 
 	if (GTK_IMHTML(imhtml)->tip) {
 		if ((tip == GTK_IMHTML(imhtml)->tip)) {
+			g_slist_free(tags);
 			return FALSE;
 		}
 		/* We've left the cell.  Remove the timeout and create a new one below */

--- a/pidgin/win32/winpidgin.c	Sun Oct 21 05:05:38 2007 +0000
+++ b/pidgin/win32/winpidgin.c	Sun Oct 21 05:07:57 2007 +0000
@@ -452,6 +452,8 @@
 		if (GetLastError() == ERROR_ALREADY_EXISTS) {
 			HWND msg_win;
 
+			printf("An instance of Pidgin is already running.\n");
+
 			if((msg_win = FindWindow(TEXT("WinpidginMsgWinCls"), NULL)))
 				if(SendMessage(msg_win, PIDGIN_WM_FOCUS_REQUEST, (WPARAM) NULL, (LPARAM) NULL))
 					return FALSE;