cpw.qulogic.gtk3: 7b652356: Fix some merging typos.

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 7b6523560e839d3775c83d46b3c466732954bb03
Parent:   538eca4f2470f750d0a9771bc604eddf655cb8d4
Author:   qulogic at pidgin.im
Date:     12/23/11 03:06:49
Branch:   im.pidgin.cpw.qulogic.gtk3
URL: http://d.pidgin.im/viewmtn/revision/info/7b6523560e839d3775c83d46b3c466732954bb03

Changelog: 

Fix some merging typos.

Changes against parent 538eca4f2470f750d0a9771bc604eddf655cb8d4

  patched  pidgin/gtkconv.c

-------------- next part --------------
============================================================
--- pidgin/gtkconv.c	b9ae2277b7564a878eeaaf3ca65deaf8b1984e04
+++ pidgin/gtkconv.c	fadb73bdbd7fd93cf49d5dce25c822c9cc8d94da
@@ -1231,17 +1231,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(G_OBJECT(obj), "index"));
 		purple_prpl_send_attention(purple_conversation_get_connection(conv),
 			purple_conversation_get_name(conv), index);
 	}