cpw.qulogic.gtk3-required: 94fbc370: Fix merge typos.

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 94fbc370a306e01e8929b57a03130d66410406fd
Parent:   77c5115bbff32a47fa0a8a1c91f04c57b98067ed
Author:   qulogic at pidgin.im
Date:     12/23/11 04:21:21
Branch:   im.pidgin.cpw.qulogic.gtk3-required
URL: http://d.pidgin.im/viewmtn/revision/info/94fbc370a306e01e8929b57a03130d66410406fd

Changelog: 

Fix merge typos.

Changes against parent 77c5115bbff32a47fa0a8a1c91f04c57b98067ed

  patched  pidgin/gtkconv.c

-------------- next part --------------
============================================================
--- pidgin/gtkconv.c	cdd4164da5002194126a6b41189024e0e440dba2
+++ pidgin/gtkconv.c	1b18e2d48ead9db66275f8eeab4445ec76f9464c
@@ -1230,17 +1230,17 @@ static void
 }
 
 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(obj, "index"));
 		purple_prpl_send_attention(purple_conversation_get_connection(conv),
 			purple_conversation_get_name(conv), index);
 	}