pidgin.yaz: src/gtkconv.c comparison

comparison src/gtkconv.c @ 10879:601739f63f23

[gaim-migrate @ 12574] Patch from Richard Laager to, well he said it better than I'll be able to: As seen on Gaim's Funniest Home Convos, right-clicking on a user in a chat causes a crash. It was caused by some changes that left mismatches between functions expecting GaimGtkConversations and getting GaimConversations. I went through the file and compared each function to its caller(s). This patch should squash this and any similar bugs. committer: Tailor Script <tailor@pidgin.im>

author	Gary Kramlich <grim@reaperworld.com>
date	Wed, 27 Apr 2005 04:44:40 +0000
parents	c522fdb85dbc
children	b0fdadf463d4

comparison

equal deleted inserted replaced

-:da36acb8442c
+:601739f63f23
 	gtk_imhtml_clear(GTK_IMHTML(gtkconv->entry));
 	default_formatize(gtkconv);
 }
 static void
-add_remove_cb(GtkWidget *widget, GaimGtkConversation *gtkconv)
+add_remove_cb(GtkWidget *widget, GaimConversation *conv)
 {
 	GaimAccount *account;
 	const char *name;
-	GaimConversation *conv = gtkconv->active_conv;
 	account = gaim_conversation_get_account(conv);
 	name    = gaim_conversation_get_name(conv);
 	if (gaim_conversation_get_type(conv) == GAIM_CONV_IM) {
 	}
 	gtk_widget_grab_focus(GAIM_GTK_CONVERSATION(conv)->entry);
 }
-static void chat_do_info(GaimGtkConversation *gtkconv, const char *who)
+static void chat_do_info(GaimConversation *conv, const char *who)
 {
-	GaimConversation *conv = gtkconv->active_conv;
 	GaimPluginProtocolInfo *prpl_info = NULL;
 	GaimConnection *gc;
 	if ((gc = gaim_conversation_get_gc(conv))) {
 		prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl);
 		if (gtk_tree_selection_get_selected(sel, NULL, &iter))
 			gtk_tree_model_get(GTK_TREE_MODEL(model), &iter, CHAT_USERS_NAME_COLUMN, &name, -1);
 		else
 			return;
-		chat_do_info(gtkconv, name);
+		chat_do_info(conv, name);
 		g_free(name);
 	}
 }
 static void
-block_cb(GtkWidget *widget, GaimGtkConversation *gtkconv)
+block_cb(GtkWidget *widget, GaimConversation *conv)
 {
-	GaimConversation *conv = gtkconv->active_conv;
 	GaimAccount *account;
 	account = gaim_conversation_get_account(conv);
 	if (account != NULL && gaim_account_is_connected(account))
 	{"GAIM_BLIST_NODE", GTK_TARGET_SAME_APP, 0},
 	{"application/x-im-contact", 0, 1}
 };
 static void
-invite_cb(GtkWidget *widget, GaimGtkConversation *gtkconv)
+invite_cb(GtkWidget *widget, GaimConversation *conv)
 {
-	GaimConversation *conv = gtkconv->active_conv;
 	InviteBuddyInfo *info = NULL;
 	if (invite_dialog == NULL) {
 		GaimConnection *gc;
 		GaimConvWindow *win;
 	GaimConvWindow *win = (GaimConvWindow *)data;
 	GaimConversation *conv;
 	conv = gaim_conv_window_get_active_conversation(win);
-	invite_cb(NULL, GAIM_GTK_CONVERSATION(conv));
+	invite_cb(NULL, conv);
 }
 static void
 menu_warn_cb(gpointer data, guint action, GtkWidget *widget)
 {
 	GaimConvWindow *win = (GaimConvWindow *)data;
 	GaimConversation *conv;
 	conv = gaim_conv_window_get_active_conversation(win);
-	block_cb(NULL, GAIM_GTK_CONVERSATION(conv));
+	block_cb(NULL, conv);
 }
 static void
 menu_add_remove_cb(gpointer data, guint action, GtkWidget *widget)
 {
 	GaimConvWindow *win = (GaimConvWindow *)data;
 	GaimConversation *conv;
 	conv = gaim_conv_window_get_active_conversation(win);
-	add_remove_cb(NULL, GAIM_GTK_CONVERSATION(conv));
+	add_remove_cb(NULL, conv);
 }
 static void
 menu_close_conv_cb(gpointer data, guint action, GtkWidget *widget)
 {
 	gtk_imhtml_show_comments(GTK_IMHTML(gtkconv->imhtml),
 		gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget)));
 }
 static void
-chat_do_im(GaimGtkConversation *gtkconv, const char *who)
+chat_do_im(GaimConversation *conv, const char *who)
 {
-	GaimConversation *conv = gtkconv->active_conv;
 	GaimAccount *account;
 	GaimConnection *gc;
 	GaimPluginProtocolInfo *prpl_info = NULL;
 	char *real_who;
 	if (gtk_tree_selection_get_selected(sel, NULL, &iter))
 		gtk_tree_model_get(GTK_TREE_MODEL(model), &iter, CHAT_USERS_NAME_COLUMN, &name, -1);
 	else
 		return;
-	chat_do_im(gtkconv, name);
+	chat_do_im(gtkconv->active_conv, name);
 	g_free(name);
 }
 static void
-ignore_cb(GtkWidget *w, GaimGtkConversation *gtkconv)
+ignore_cb(GtkWidget *w, GaimConversation *conv)
 {
-	GaimConversation *conv = gtkconv->active_conv;
+	GaimGtkConversation *gtkconv = GAIM_GTK_CONVERSATION(conv);
 	GaimGtkChatPane *gtkchat;
 	GaimConvChat *chat;
 	GtkTreeIter iter;
 	GtkTreeModel *model;
 	GtkTreeSelection *sel;
 	add_chat_buddy_common(conv, name);
 	g_free(name);
 }
 static void
-menu_chat_im_cb(GtkWidget *w, GaimGtkConversation *gtkconv)
+menu_chat_im_cb(GtkWidget *w, GaimConversation *conv)
 {
 	const char *who = g_object_get_data(G_OBJECT(w), "user_data");
-	chat_do_im(gtkconv, who);
+	chat_do_im(conv, who);
 }
 static void
-menu_chat_send_file_cb(GtkWidget *w, GaimGtkConversation *gtkconv)
+menu_chat_send_file_cb(GtkWidget *w, GaimConversation *conv)
 {
-	GaimConversation *conv = gtkconv->active_conv;
 	const char *who = g_object_get_data(G_OBJECT(w), "user_data");
 	GaimConnection *gc  = gaim_conversation_get_gc(conv);
 	serv_send_file(gc, who, NULL);
 }
 static void
-menu_chat_info_cb(GtkWidget *w, GaimGtkConversation *gtkconv)
+menu_chat_info_cb(GtkWidget *w, GaimConversation *conv)
 {
 	char *who;
 	who = g_object_get_data(G_OBJECT(w), "user_data");
-	chat_do_info(gtkconv, who);
+	chat_do_info(conv, who);
 }
 static void
-menu_chat_get_away_cb(GtkWidget *w, GaimGtkConversation *gtkconv)
+menu_chat_get_away_cb(GtkWidget *w, GaimConversation *conv)
 {
-	GaimConversation *conv = gtkconv->active_conv;
 	GaimPluginProtocolInfo *prpl_info = NULL;
 	GaimConnection *gc;
 	char *who;
 	gc  = gaim_conversation_get_gc(conv);
 		}
 	}
 }
 static void
-menu_chat_add_remove_cb(GtkWidget *w, GaimGtkConversation *gtkconv)
+menu_chat_add_remove_cb(GtkWidget *w, GaimConversation *conv)
 {
-	GaimConversation *conv = gtkconv->active_conv;
 	GaimAccount *account;
 	GaimBuddy *b;
 	char *name;
 	account = gaim_conversation_get_account(conv);
 	return menu;
 }
 static gint
-gtkconv_chat_popup_menu_cb(GtkWidget *widget, GaimGtkConversation *gtkconv)
+gtkconv_chat_popup_menu_cb(GtkWidget *widget, GaimConversation *conv)
 {
-	GaimConversation *conv = gtkconv->active_conv;
+	GaimGtkConversation *gtkconv;
 	GaimPluginProtocolInfo *prpl_info = NULL;
 	GaimGtkChatPane *gtkchat;
 	GaimConnection *gc;
 	GaimAccount *account;
 	GtkTreeSelection *sel;
 }
 static gint
 right_click_chat_cb(GtkWidget *widget, GdkEventButton *event,
-					GaimGtkConversation *gtkconv)
+					GaimConversation *conv)
 {
-	GaimConversation *conv = gtkconv->active_conv;
+	GaimGtkConversation *gtkconv = GAIM_GTK_CONVERSATION(conv);
 	GaimPluginProtocolInfo *prpl_info = NULL;
 	GaimGtkChatPane *gtkchat;
 	GaimConnection *gc;
 	GaimAccount *account;
 	GtkTreePath *path;
 	gtk_tree_model_get_iter(GTK_TREE_MODEL(model), &iter, path);
 	gtk_tree_model_get(GTK_TREE_MODEL(model), &iter, CHAT_USERS_NAME_COLUMN, &who, -1);
 	if (event->button == 1 && event->type == GDK_2BUTTON_PRESS) {
-		chat_do_im(gtkconv, who);
+		chat_do_im(conv, who);
 	} else if (event->button == 3 && event->type == GDK_BUTTON_PRESS) {
 		GtkWidget *menu = create_chat_menu (conv, who, prpl_info, gc);
 		gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL,
 					   event->button, event->time);
 	}
 	else
 		stop_anim(NULL, gtkconv);
 }
 static void
-remove_icon(GaimGtkConversation *gtkconv)
+remove_icon(GaimConversation *conv)
 {
-	GaimConversation *conv = gtkconv->active_conv;
+	GaimGtkConversation *gtkconv = GAIM_GTK_CONVERSATION(conv);
 	GaimGtkWindow *gtkwin;
 	g_return_if_fail(conv != NULL);
 	if (gtkconv->u.im->icon_container != NULL)
 	fwrite(data, 1, len, fp);
 	fclose(fp);
 }
 static void
-icon_menu_save_cb(GtkWidget *widget, GaimGtkConversation *gtkconv)
+icon_menu_save_cb(GtkWidget *widget, GaimConversation *conv)
 {
-	GaimConversation *conv = gtkconv->active_conv;
 	gchar *buf;
 	g_return_if_fail(conv != NULL);
 	/*
 	g_free(buf);
 }
 static gboolean
-icon_menu(GtkObject *obj, GdkEventButton *e, GaimGtkConversation *gtkconv)
+icon_menu(GtkObject *obj, GdkEventButton *e, GaimConversation *conv)
 {
-	GaimConversation *conv = gtkconv->active_conv;
 	static GtkWidget *menu = NULL;
 	GtkWidget *button;
+	GaimGtkConversation *gtkconv = GAIM_GTK_CONVERSATION(conv);
 	if (e->button != 3 || e->type != GDK_BUTTON_PRESS)
 		return FALSE;
 	/*
 	if (gtkconv->u.im->anim &&
 		!(gdk_pixbuf_animation_is_static_image(gtkconv->u.im->anim)))
 	{
 		gaim_new_check_item(menu, _("Animate"),
-							G_CALLBACK(toggle_icon_animate_cb), conv,
+							G_CALLBACK(toggle_icon_animate_cb), gtkconv,
 							gtkconv->u.im->icon_timer);
 	}
 	button = gtk_menu_item_new_with_label(_("Hide Icon"));
 	g_signal_connect_swapped(G_OBJECT(button), "activate",
 	active = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget));
 	gtkconv->u.im->show_icon = active;
 	if (active)
 		gaim_gtkconv_update_buddy_icon(conv);
 	else
-		remove_icon(gtkconv);
+		remove_icon(conv);
 }
 /**************************************************************************
 * End of the bunch of buddy icon functions
 **************************************************************************/
 	gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
 	gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
 	gtk_tooltips_set_tip(gtkconv->tooltips, button,
 						 _("Ignore the user"), NULL);
 	g_signal_connect(G_OBJECT(button), "clicked",
-					 G_CALLBACK(ignore_cb), gtkconv);
+					 G_CALLBACK(ignore_cb), conv);
 	gtk_widget_show(button);
 	/* Info */
 	button = gaim_pixbuf_button_from_stock(NULL, GAIM_STOCK_INFO,
 										   GAIM_BUTTON_VERTICAL);

Mercurial > pidgin.yaz

comparison src/gtkconv.c @ 10879:601739f63f23