# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1182977492 0
# Node ID 477a6ddd56a021bc0dd34bd67c4563dff26dac49
# Parent  bd137144da3cc5fb6262a27356154a2d750708c8# Parent  8aff2d3d6820dfb22ff16dce6127b7a6ffc655b1
merge of '02e31783092022387f8f75061f64d72af74c1ceb'
     and '86b91f8649e1520dbbff9c55ae3d0f20220a1c5c'

diff -r 8aff2d3d6820 -r 477a6ddd56a0 pidgin/gtkblist.c
--- a/pidgin/gtkblist.c	Wed Jun 27 20:46:39 2007 +0000
+++ b/pidgin/gtkblist.c	Wed Jun 27 20:51:32 2007 +0000
@@ -3116,6 +3116,15 @@
 	} else if(PURPLE_BLIST_NODE_IS_BUDDY(node)) {
 		buddy = (PurpleBuddy*)node;
 		gtkbuddynode = node->ui_data;
+		p = purple_buddy_get_presence(buddy);
+		if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_MOBILE)) {
+			path = g_build_filename(DATADIR, "pixmaps", "pidgin", "emblems", 
+						"16", "mobile.png", NULL);
+			ret = gdk_pixbuf_new_from_file(path, NULL);
+			g_free(path);
+			return ret;
+		}
+
 		if (((struct _pidgin_blist_node*)(node->parent->ui_data))->contact_expanded)
 			return pidgin_create_prpl_icon(((PurpleBuddy*)node)->account, PIDGIN_PRPL_ICON_SMALL);
 	} else if(PURPLE_BLIST_NODE_IS_CHAT(node)) {
@@ -4911,10 +4920,17 @@
 	gboolean selected;
 	char group_count[12] = "";
 	char *mark, *esc;
+	PurpleBlistNode *selected_node = NULL;
+	GtkTreeIter iter;
 
 	group = (PurpleGroup*)gnode;
 	textcolor = gtkblist->treeview->style->fg[GTK_STATE_ACTIVE];
-	selected = gtkblist ? (gtkblist->selected_node == gnode) : FALSE;
+        
+	if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(gtkblist->treeview)), NULL, &iter)) {
+		gtk_tree_model_get(GTK_TREE_MODEL(gtkblist->treemodel), &iter,
+				NODE_COLUMN, &selected_node, -1);
+	}
+	selected = (gnode == selected_node);
 
 	if (!expanded) {
 		g_snprintf(group_count, sizeof(group_count), " (%d/%d)",
diff -r 8aff2d3d6820 -r 477a6ddd56a0 pidgin/gtkimhtml.c
--- a/pidgin/gtkimhtml.c	Wed Jun 27 20:46:39 2007 +0000
+++ b/pidgin/gtkimhtml.c	Wed Jun 27 20:51:32 2007 +0000
@@ -4939,9 +4939,6 @@
 
 	if (imhtml->edit.link)
 		gtk_imhtml_toggle_link(imhtml, NULL);
-
-	gtk_text_buffer_remove_all_tags(imhtml->text_buffer, iter, iter);
-
 }
 
 char *gtk_imhtml_get_markup(GtkIMHtml *imhtml)