# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1324627609 0
# Node ID 48d35c0c62241c8806379fbe8de9b8176eb78e9b
# Parent  763d65f3f758696f184b4c67e7f07d659c5e3160
Fix some merging typos.

diff -r 763d65f3f758 -r 48d35c0c6224 pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Fri Dec 23 06:58:52 2011 +0000
+++ b/pidgin/gtkconv.c	Fri Dec 23 08:06:49 2011 +0000
@@ -1231,17 +1231,17 @@
 }
 
 static void
-menu_get_attention_cb(GtkAction *ation, gpointer data)
+menu_get_attention_cb(GObject *obj, gpointer data)
 {
 	PidginWindow *win = data;
 	PurpleConversation *conv = pidgin_conv_window_get_active_conversation(win);
 
 	if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM) {
 		int index;
-		if (widget == win->menu.get_attention)
+		if ((GtkAction *)obj == win->menu.get_attention)
 			index = 0;
 		else
-			index = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), "index"));
+			index = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(obj), "index"));
 		purple_prpl_send_attention(purple_conversation_get_connection(conv),
 			purple_conversation_get_name(conv), index);
 	}