cpw.nader.asynclogging-3: 548fcbd9: Corrected a few issues caused by find-re...

[morshed.nader at gmail.com]

----------------------------------------------------------------------
Revision: 548fcbd9e2f584ea5fd548408b2c424f6b39e623
Parent:   4e43c6306b76d23c49961d43d070032aff67ac60
Author:   morshed.nader at gmail.com
Date:     01/07/12 14:19:33
Branch:   im.pidgin.cpw.nader.asynclogging-3
URL: http://d.pidgin.im/viewmtn/revision/info/548fcbd9e2f584ea5fd548408b2c424f6b39e623

Changelog: 

Corrected a few issues caused by find-replace'ing on the variable names

Changes against parent 4e43c6306b76d23c49961d43d070032aff67ac60

  patched  pidgin/gtklog.c

-------------- next part --------------
============================================================
--- pidgin/gtklog.c	26526e7bc556b35b81a484652e1113d339401b12
+++ pidgin/gtklog.c	ef5e414def1a25e1e3225b3a9e6dcfb1e13bd996
@@ -625,26 +625,26 @@ log_menu_callback_data_free(log_menu_cal
 {
 	pidgin_log_data *data = callback_data->log_data;
 
-	pidgin_log_data->count--;
+	data->count--;
 
-	if (pidgin_log_data->count < 1)
-		pidgin_log_data_free(pidgin_log_data);
+	if (data->count < 1)
+		pidgin_log_data_free(data);
 
 	g_free(callback_data->iter);
 	g_free(callback_data);
 }
 
 static void
-log_show_popup_menu(GdkEventButton *event, log_menu_callback_data *data)
+log_show_popup_menu(GdkEventButton *event, log_menu_callback_data *callback_data)
 {
-	pidgin_log_data *data = data->log_data;
+	pidgin_log_data *data = callback_data->log_data;
 	PidginLogViewer *lv = data->log_viewer;
 	GtkWidget *menu, *menuitem;
 
 	menu = gtk_menu_new();
 	menuitem = gtk_menu_item_new_with_label(_("Delete Log..."));
 
-	if (!purple_log_is_removable(data->log_data->log))
+	if (!purple_log_is_removable(callback_data->log_data->log))
 		gtk_widget_set_sensitive(menuitem, FALSE);
 
 	g_signal_connect(menuitem, "activate", G_CALLBACK(log_delete_log_cb), data);
@@ -658,7 +658,7 @@ log_show_popup_menu(GdkEventButton *even
 	data->destroy_handler_id = g_signal_connect_swapped(lv,
 		"destroy", G_CALLBACK(pidgin_window_destroy_cb), data);
 
-	gtk_menu_popup(GTK_MENU(menu), NULL, NULL, data->func, NULL,
+	gtk_menu_popup(GTK_MENU(menu), NULL, NULL, callback_data->func, NULL,
 		event != NULL ? event->button : 0,
 		gdk_event_get_time((GdkEvent *) event));
 }