changeset 18644:a5b37b3f02c6

merge of 'ba1886a94b2131f499b71e5c939807d4df199b08' and 'f4d2e27ee5bc44bb6d4d834730822b698a4dc534'

--- a/finch/gntblist.c	Wed Jul 25 19:56:50 2007 +0000
+++ b/finch/gntblist.c	Wed Jul 25 21:01:21 2007 +0000
@@ -1325,8 +1325,10 @@
 	strip = purple_markup_strip_html(tmp);
 	g_string_append(str, strip);
 
-	if (purple_presence_is_status_primitive_active(presence, PURPLE_STATUS_MOBILE))
+	if (purple_presence_is_status_primitive_active(presence, PURPLE_STATUS_MOBILE)) {
+		g_string_append(str, "\n");
 		g_string_append(str, _("On Mobile"));
+	}
 
 	g_free(strip);
 	g_free(tmp);

--- a/libpurple/protocols/oscar/oscar.c	Wed Jul 25 19:56:50 2007 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Wed Jul 25 21:01:21 2007 +0000
@@ -6606,7 +6606,7 @@
 			if (message) {
 				/* Spaces are encoded as '+' */
 				g_strdelimit(message, "+", ' ');
-				purple_conv_im_send(PURPLE_CONV_IM(conv), message);
+				purple_conv_send_confirm(conv, message);
 			}
 		}
 		/*else

--- a/libpurple/protocols/yahoo/yahoo.c	Wed Jul 25 19:56:50 2007 +0000
+++ b/libpurple/protocols/yahoo/yahoo.c	Wed Jul 25 21:01:21 2007 +0000
@@ -3915,7 +3915,7 @@
 			if (message) {
 				/* Spaces are encoded as '+' */
 				g_strdelimit(message, "+", ' ');
-				purple_conv_im_send(PURPLE_CONV_IM(conv), message);
+				purple_conv_send_confirm(conv, message);
 			}
 		}
 		/*else

--- a/pidgin/gtkutils.c	Wed Jul 25 19:56:50 2007 +0000
+++ b/pidgin/gtkutils.c	Wed Jul 25 21:01:21 2007 +0000
@@ -137,6 +137,10 @@
 	wnd = GTK_WINDOW(gtk_window_new(GTK_WINDOW_TOPLEVEL));
 	if (title)
 		gtk_window_set_title(wnd, title);
+#ifdef _WIN32
+	else
+		gtk_window_set_title(wnd, PIDGIN_ALERT_TITLE);
+#endif
 	gtk_container_set_border_width(GTK_CONTAINER(wnd), border_width);
 	if (role)
 		gtk_window_set_role(wnd, role);

--- a/pidgin/plugins/cap/Makefile.am	Wed Jul 25 19:56:50 2007 +0000
+++ b/pidgin/plugins/cap/Makefile.am	Wed Jul 25 21:01:21 2007 +0000
@@ -25,3 +25,5 @@
 	$(DEBUG_CFLAGS) \
 	$(GTK_CFLAGS) \
 	$(SQLITE3_CFLAGS)
+
+EXTRA_DIST = Makefile.mingw

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pidgin/plugins/cap/Makefile.mingw	Wed Jul 25 21:01:21 2007 +0000
@@ -0,0 +1,82 @@
+#
+# Makefile.mingw
+#
+# Description: Makefile for cap plugin.
+#
+
+PIDGIN_TREE_TOP := ../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
+
+TARGET = cap
+
+# This is where sqlite3.[ch] from the sqlite "amalgamation" archive were extracted to
+# This is available from http://www.sqlite.org/download.html
+SQLITE_TOP ?= $(WIN32_DEV_TOP)/sqlite-3.4.1
+
+##
+## INCLUDE PATHS
+##
+INCLUDE_PATHS +=	-I. \
+			-I$(SQLITE_TOP) \
+			-I$(GTK_TOP)/include \
+			-I$(GTK_TOP)/include/gtk-2.0 \
+			-I$(GTK_TOP)/include/glib-2.0 \
+			-I$(GTK_TOP)/include/pango-1.0 \
+			-I$(GTK_TOP)/include/atk-1.0 \
+			-I$(GTK_TOP)/include/cairo \
+			-I$(GTK_TOP)/lib/glib-2.0/include \
+			-I$(GTK_TOP)/lib/gtk-2.0/include \
+			-I$(PURPLE_TOP) \
+			-I$(PURPLE_TOP)/win32 \
+			-I$(PIDGIN_TOP) \
+			-I$(PIDGIN_TOP)/win32 \
+			-I$(PIDGIN_TREE_TOP)
+
+LIB_PATHS +=		-L$(GTK_TOP)/lib \
+			-L$(PURPLE_TOP) \
+			-L$(PIDGIN_TOP)
+
+##
+##  SOURCES, OBJECTS
+##
+C_SRC =			cap.c \
+			$(SQLITE_TOP)/sqlite3.c
+
+OBJECTS = $(C_SRC:%.c=%.o)
+
+##
+## LIBRARIES
+##
+LIBS =			-lgtk-win32-2.0 \
+			-lglib-2.0 \
+			-lgdk-win32-2.0 \
+			-lgobject-2.0 \
+			-lintl \
+			-lpurple \
+			-lpidgin
+
+include $(PIDGIN_COMMON_RULES)
+
+##
+## TARGET DEFINITIONS
+##
+.PHONY: all install clean
+
+all: $(TARGET).dll
+
+install: $(PIDGIN_INSTALL_PLUGINS_DIR) all
+	cp $(TARGET).dll $(PIDGIN_INSTALL_PLUGINS_DIR)
+
+$(OBJECTS): $(PIDGIN_CONFIG_H)
+
+$(TARGET).dll: $(PURPLE_DLL).a $(PIDGIN_DLL).a $(OBJECTS)
+	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll
+
+##
+## CLEAN RULES
+##
+clean:
+	rm -rf $(OBJECTS)
+	rm -rf $(TARGET).dll
+
+include $(PIDGIN_COMMON_TARGETS)

--- a/pidgin/plugins/cap/cap.c	Wed Jul 25 19:56:50 2007 +0000
+++ b/pidgin/plugins/cap/cap.c	Wed Jul 25 21:01:21 2007 +0000
@@ -107,25 +107,26 @@
 }
 
 static CapStatistics * get_stats_for(PurpleBuddy *buddy) {
-	gchar *buddy_name;
 	CapStatistics *stats;
 
 	g_return_val_if_fail(buddy != NULL, NULL);
 
-	buddy_name = g_strdup(buddy->name);
-	stats = g_hash_table_lookup(_buddy_stats, buddy_name);
+	stats = g_hash_table_lookup(_buddy_stats, buddy->name);
 	if(!stats) {
 		stats = g_malloc(sizeof(CapStatistics));
 		stats->last_message = -1;
 		stats->last_message_status_id = NULL;
 		stats->last_status_id = NULL;
 		stats->prediction = NULL;
-		g_hash_table_insert(_buddy_stats, buddy_name, stats);
 		stats->buddy = buddy;
 		stats->last_seen = -1;
 		stats->last_status_id = "";
+
+		g_hash_table_insert(_buddy_stats, g_strdup(buddy->name), stats);
 	} else {
-		g_free(buddy_name);
+		/* This may actually be a different PurpleBuddy than what is in stats.
+		 * We replace stats->buddy to make sure we're looking at a valid pointer. */
+		stats->buddy = buddy;
 	}
 	generate_prediction(stats);
 	return stats;
@@ -409,7 +410,7 @@
 /* buddy-signed-on */
 static void buddy_signed_on(PurpleBuddy *buddy) {
 	CapStatistics *stats = get_stats_for(buddy);
-	
+
 	/* If the statistic object existed but doesn't have a buddy pointer associated
 	 * with it then reassociate one with it. The pointer being null is a result
 	 * of a buddy with existing stats signing off and Purple sticking around. */