Revision ac156097f694ba8977900a053e669e480c15e274

wabz at pidgin.im wabz at pidgin.im
Mon Mar 26 20:52:37 EDT 2007


o   -----------------------------------------------------------------
|   Revision: ac156097f694ba8977900a053e669e480c15e274
|   Ancestor: 47400327390c7f3affa40f72061d5445daa5caef
|   Author: wabz at pidgin.im
|   Date: 2007-03-27T00:52:19
|   Branch: im.pidgin.pidgin
|   
|   Modified files:
|           finch/gntft.c
|   
|   ChangeLog: 
|   
|   allow cancellation of transfers waiting to be accepted
|   
|   ============================================================
|   --- finch/gntft.c	1b0b57c57b038563c6fe77e20f05645002393d4e
|   +++ finch/gntft.c	7d4dcdc04690eb84ee72892284aae27f77e3a1f2
|   @@ -158,18 +158,12 @@ stop_button_cb(GntButton *button)
|    stop_button_cb(GntButton *button)
|    {
|    	PurpleXfer *selected_xfer = gnt_tree_get_selection_data(GNT_TREE(xfer_dialog->tree));
|   -	if (selected_xfer && selected_xfer->status == PURPLE_XFER_STATUS_STARTED)
|   +	if (selected_xfer && selected_xfer->status != PURPLE_XFER_STATUS_CANCEL_LOCAL &&
|   +			selected_xfer->status != PURPLE_XFER_STATUS_CANCEL_REMOTE &&
|   +			selected_xfer->status != PURPLE_XFER_STATUS_DONE)
|    		purple_xfer_cancel_local(selected_xfer);
|    }
|    
|   -#if 0
|   -static void
|   -tree_selection_changed_cb(GntTree *tree, GntTreeRow *old, GntTreeRow *current, gpointer n)
|   -{
|   -	xfer_dialog->selected_xfer = (PurpleXfer *)gnt_tree_get_selection_data(tree);
|   -}
|   -#endif
|   -
|    /**************************************************************************
|     * Dialog Building Functions
|     **************************************************************************/
|   @@ -209,8 +203,7 @@ finch_xfer_dialog_new(void)
|    	gnt_tree_set_col_width(GNT_TREE(tree), COLUMN_STATUS, 10);
|    	gnt_tree_set_show_title(GNT_TREE(tree), TRUE);
|    	gnt_box_add_widget(GNT_BOX(window), tree);
|   -	/*g_signal_connect(G_OBJECT(tree), "selection-changed",*/
|   -					/*G_CALLBACK(tree_selection_changed_cb), NULL);*/
|   +
|    	checkbox = gnt_check_box_new( _("Close this window when all transfers finish"));
|    	gnt_check_box_set_checked(GNT_CHECK_BOX(checkbox),
|    								 !xfer_dialog->keep_open);
|   @@ -430,6 +423,7 @@ finch_xfer_dialog_update_xfer(PurpleXfer
|    	g_free(remaining_str);
|    	if (purple_xfer_is_completed(xfer)) {
|    		gnt_tree_change_text(GNT_TREE(xfer_dialog->tree), xfer, COLUMN_STATUS, _("Finished"));
|   +		gnt_tree_change_text(GNT_TREE(xfer_dialog->tree), xfer, COLUMN_REMAINING, _("Finished"));
|    	} else {
|    		gnt_tree_change_text(GNT_TREE(xfer_dialog->tree), xfer, COLUMN_STATUS, _("Transferring"));
|    	}

To get the patch for this revision, please do this:
mtn log --last 1 --diffs --from ac156097f694ba8977900a053e669e480c15e274


More information about the Commits mailing list