im.pidgin.pidgin.2.2.2: b3926053e08230ca6b17bd97f4f3e239b85e5008

[lschiere at pidgin.im]

-----------------------------------------------------------------
Revision: b3926053e08230ca6b17bd97f4f3e239b85e5008
Ancestor: c9a673bec3f603c5ccfb4d022083c3bbca44635c
Author: lschiere at pidgin.im
Date: 2007-10-21T05:07:57
Branch: im.pidgin.pidgin.2.2.2

Modified files:
        libpurple/win32/global.mak pidgin/gtkdialogs.c
        pidgin/gtkimhtml.c pidgin/win32/winpidgin.c

ChangeLog: 

applied changes from d6da6a7a5ad01f170f0fd78424183f73200dc78c
             through ca4c40c7119d3222ca33d10a8f578782de29ad28

applied changes from ca4c40c7119d3222ca33d10a8f578782de29ad28
             through 4341e599d112f3be408cb2a92fa459cc7c25b29c

applied changes from 1e8c3f6ec50a7e8ea15b850e7e2974e273c1cb6c
             through fe00ca8a057e772d955ff56c7b6557e221d3e514

applied changes from 35e02ab2f9968d9b567123e1ba43552597218596
             through aed8cc0e2684056309c481d621fdafcd366b7d24

-------------- next part --------------
============================================================
--- libpurple/win32/global.mak	7d6aaf3266b75b53ac4f151d1fadc6f2e63ee924
+++ libpurple/win32/global.mak	19afa1ab12b622fcceea51e01702230b4a78e150
@@ -15,7 +15,7 @@ BONJOUR_TOP ?= $(WIN32_DEV_TOP)/Bonjour_
 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
============================================================
--- pidgin/gtkdialogs.c	94142e894ebeade0c73a866e46220562e1d8949b
+++ pidgin/gtkdialogs.c	d50958bafc85818e0cb1f48c5e156fd17c0a497c
@@ -645,11 +645,10 @@ g_string_append(str, "<br/>  <b>Library 
 	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 @@ g_string_append(str, "<br/>  <b>Library 
 #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
============================================================
--- pidgin/gtkimhtml.c	5da45f5e789c81e8967f951df1dcca1016a57791
+++ pidgin/gtkimhtml.c	2f8838fe6822470043664e2ca164fdd6101f7354
@@ -553,6 +553,7 @@ gtk_motion_event_notify(GtkWidget *imhtm
 
 	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 */
============================================================
--- pidgin/win32/winpidgin.c	ce5243016c574a3fffc3417f85c448aabf04c740
+++ pidgin/win32/winpidgin.c	ae92b5edd15c7939147b474ef43357b59b223f93
@@ -452,6 +452,8 @@ static BOOL winpidgin_set_running() {
 		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;