Mercurial > pidgin3 / file diff

--- a/pidgin/gtkconv.c	Sat Jun 29 19:00:03 2013 +0530
+++ b/pidgin/gtkconv.c	Sat Jun 29 20:12:09 2013 +0530
@@ -4119,11 +4119,11 @@
 static void
 deleting_chat_user_cb(PurpleChatUser *cb)
 {
-	GtkTreeRowReference *ref = purple_chat_user_get_ui_data(cb);
+	GtkTreeRowReference *ref = g_object_get_data(G_OBJECT(cb), "gtk-row");
 
 	if (ref) {
 		gtk_tree_row_reference_free(ref);
-		purple_chat_user_set_ui_data(cb, NULL);
+		g_object_set_data(G_OBJECT(cb), "gtk-row", NULL);
 	}
 }
 
@@ -4208,13 +4208,13 @@
 			CHAT_USERS_WEIGHT_COLUMN, is_buddy ? PANGO_WEIGHT_BOLD : PANGO_WEIGHT_NORMAL,
 			-1);
 
-	if (purple_chat_user_get_ui_data(cb)) {
-		GtkTreeRowReference *ref = purple_chat_user_get_ui_data(cb);
+	if (g_object_get_data(G_OBJECT(cb), "gtk-row")) {
+		GtkTreeRowReference *ref = g_object_get_data(G_OBJECT(cb), "gtk-row");
 		gtk_tree_row_reference_free(ref);
 	}
 
 	newpath = gtk_tree_model_get_path(tm, &iter);
-	purple_chat_user_set_ui_data(cb, gtk_tree_row_reference_new(tm, newpath));
+	g_object_set_data(G_OBJECT(cb), "gtk-row", gtk_tree_row_reference_new(tm, newpath));
 	gtk_tree_path_free(newpath);
 
 	if (is_me && color)
@@ -6763,7 +6763,7 @@
 
 	g_return_val_if_fail(cb != NULL, FALSE);
 
-	ref = purple_chat_user_get_ui_data(cb);
+	ref = g_object_get_data(G_OBJECT(cb), "gtk-row");
 	if (!ref)
 		return FALSE;
 
@@ -6850,11 +6850,11 @@
 		return;
 
 	if (get_iter_from_chatuser(old_chatuser, &iter)) {
-		GtkTreeRowReference *ref = purple_chat_user_get_ui_data(old_chatuser);
+		GtkTreeRowReference *ref = g_object_get_data(G_OBJECT(old_chatuser), "gtk-row");
 
 		gtk_list_store_remove(GTK_LIST_STORE(model), &iter);
 		gtk_tree_row_reference_free(ref);
-		purple_chat_user_set_ui_data(old_chatuser, NULL);
+		g_object_set_data(G_OBJECT(old_chatuser), "gtk-row", NULL);
 	}
 
 	g_return_if_fail(new_alias != NULL);
@@ -6939,10 +6939,10 @@
 		return;
 
 	if (get_iter_from_chatuser(chatuser, &iter)) {
-		GtkTreeRowReference *ref = purple_chat_user_get_ui_data(chatuser);
+		GtkTreeRowReference *ref = g_object_get_data(G_OBJECT(chatuser), "gtk-row");
 		gtk_list_store_remove(GTK_LIST_STORE(model), &iter);
 		gtk_tree_row_reference_free(ref);
-		purple_chat_user_set_ui_data(chatuser, NULL);
+		g_object_set_data(G_OBJECT(chatuser), "gtk-row", NULL);
 	}
 
 	if (chatuser)