comparison src/gtkft.c @ 4519:599d350fce4e

[gaim-migrate @ 4797] This should work better when the speed is set sometime during a transfer rather than before it. committer: Tailor Script <[e-mail]>

4518:a6be92358df3

	double kbps = 0.0;
	time_t elapsed;
	int secs_remaining;

	data = (struct gaim_gtkxfer_ui_data *)xfer->ui_data;

	if (gaim_xfer_get_size(xfer) == 0) {
		*speed_buf = '\0';
		strncpy(estimate_buf, _("Unknown"), sizeof(estimate_buf));
	}
	else {
		now     = time(NULL);
		kb_rem  = gaim_xfer_get_bytes_remaining(xfer) / 1024.0;
		kb_sent = gaim_xfer_get_bytes_sent(xfer) / 1024.0;
		elapsed = (now - data->start_time);
		kbps    = (elapsed > 0 ? (kb_sent / elapsed) : 0);

		secs_remaining = (int)(kb_rem / kbps);

		if (secs_remaining <= 0) {
			GdkPixbuf *pixbuf = NULL;

			int m = (secs_remaining % 3600) / 60;
			int s = secs_remaining % 60;

			g_snprintf(estimate_buf, sizeof(estimate_buf),
					   _("%d:%02d:%02d"), h, m, s);
			g_snprintf(speed_buf, sizeof(speed_buf),
					   _("%.2f KB/s"), kbps);
		}
	}

	gtk_list_store_set(xfer_dialog->model, &data->iter,
					   COLUMN_REMAINING, gaim_xfer_get_bytes_remaining(xfer),
					   COLUMN_PROGRESS, percent,
					   COLUMN_ESTIMATE, estimate_buf,
					   COLUMN_SPEED, speed_buf,
					   -1);
}

static void
gaim_gtkxfer_cancel(struct gaim_xfer *xfer)

4519:599d350fce4e

	double kbps = 0.0;
	time_t elapsed;
	int secs_remaining;

	data = (struct gaim_gtkxfer_ui_data *)xfer->ui_data;
	
	now     = time(NULL);
	kb_sent = gaim_xfer_get_bytes_sent(xfer) / 1024.0;
	elapsed = (now - data->start_time);
	kbps    = (elapsed > 0 ? (kb_sent / elapsed) : 0);

	g_snprintf(speed_buf, sizeof(speed_buf),
			   _("%.2f KB/s"), kbps);

	if (gaim_xfer_get_size(xfer) == 0) {
		strncpy(estimate_buf, _("Unknown"), sizeof(estimate_buf));
	}
	else {
		kb_rem = gaim_xfer_get_bytes_remaining(xfer) / 1024.0;
		secs_remaining = (int)(kb_rem / kbps);

		if (secs_remaining <= 0) {
			GdkPixbuf *pixbuf = NULL;

			int m = (secs_remaining % 3600) / 60;
			int s = secs_remaining % 60;

			g_snprintf(estimate_buf, sizeof(estimate_buf),
					   _("%d:%02d:%02d"), h, m, s);
		}
	}

	gtk_list_store_set(xfer_dialog->model, &data->iter,
					   COLUMN_REMAINING, gaim_xfer_get_bytes_remaining(xfer),
					   COLUMN_PROGRESS, percent,
					   COLUMN_ESTIMATE, estimate_buf,
					   COLUMN_SPEED, speed_buf,
					   COLUMN_SIZE, gaim_xfer_get_size(xfer),
					   -1);
}

static void
gaim_gtkxfer_cancel(struct gaim_xfer *xfer)