diff src/gtkconv.c @ 7650:6db061321ec4

[gaim-migrate @ 8293] I completely reverted the dnd sendfile stuff. I thought most of it was pretty decent. The parts for adding the sendfile option to the conv window looked good to me. I can't comment on the dnd stuff. In oscar.c, I didn't see a need to duplicate the oscar_ask_sendfile function. I also don't think the right click->send file option should have been removed... but that's just one man's opinion. Sean, could you please talk to Chip and/or the author of this patch and work towards making it acceptable by you? committer: Tailor Script <[e-mail]>

--- a/src/gtkconv.c	Fri Nov 28 19:10:57 2003 +0000
+++ b/src/gtkconv.c	Fri Nov 28 19:30:45 2003 +0000
@@ -881,20 +881,6 @@
 }
 
 static void
-menu_sendfile_cb(gpointer data, guint action, GtkWidget *widget)
-{
-	GaimConvWindow *win = (GaimConvWindow *)data;
-	GaimConversation *conv;
-	GaimConnection *gc;
-
-	conv = gaim_conv_window_get_active_conversation(win);
-
-	gc = gaim_conversation_get_gc(conv);
-
-	gaim_prpl_ask_send_file (gc, gaim_conversation_get_name (conv));
-}
-
-static void
 menu_warn_cb(gpointer data, guint action, GtkWidget *widget)
 {
 	GaimConvWindow *win = (GaimConvWindow *)data;
@@ -2093,24 +2079,6 @@
 		prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl);
 	}
 
-
-	if (gaim_prpl_has_send_file (gc, gaim_conversation_get_name(conv))) {
-		gtk_widget_show(gtkwin->menu.sendfile);
-		gtk_widget_set_sensitive(gtkwin->menu.sendfile, TRUE);
-	} else {
-		gtk_widget_hide(gtkwin->menu.sendfile);
-		gtk_widget_set_sensitive(gtkwin->menu.sendfile, FALSE);
-	}
-
-
-	if (gaim_prpl_has_send_file (gc, gaim_conversation_get_name(conv))) {
-		gtk_widget_show(gtkwin->menu.sendfile);
-		gtk_widget_set_sensitive(gtkwin->menu.sendfile, TRUE);
-	} else {
-		gtk_widget_hide(gtkwin->menu.sendfile);
-		gtk_widget_set_sensitive(gtkwin->menu.sendfile, FALSE);
-	}
-
 	/* Update the menubar */
 	if (gaim_conversation_get_type(conv) == GAIM_CONV_IM) {
 		gtk_widget_show(gtkwin->menu.view_log);
@@ -2969,12 +2937,6 @@
 	{ N_("/Conversation/In_vite..."), NULL, menu_invite_cb, 0,
 	  "<StockItem>", GAIM_STOCK_INVITE },
 
-	{ N_("/Conversation/Send _File..."), NULL, menu_sendfile_cb, 0,
-	  "<StockItem>", GAIM_STOCK_INVITE },
-
-	{ N_("/Conversation/Send _File..."), NULL, menu_sendfile_cb, 0,
-	  "<StockItem>", GAIM_STOCK_INVITE },
-
 	{ "/Conversation/sep2", NULL, NULL, 0, "<Separator>" },
 
 	{ N_("/Conversation/Insert _URL..."), NULL, menu_insert_link_cb, 0,
@@ -3063,14 +3025,6 @@
 		gtk_item_factory_get_widget(gtkwin->menu.item_factory,
 									N_("/Conversation/Invite..."));
 
-	gtkwin->menu.sendfile =
-		gtk_item_factory_get_widget(gtkwin->menu.item_factory,
-									N_("/Conversation/Send File..."));
-
-	gtkwin->menu.sendfile =
-		gtk_item_factory_get_widget(gtkwin->menu.item_factory,
-									N_("/Conversation/Send File..."));
-
 	/* --- */
 
 	gtkwin->menu.insert_link =