Mercurial > pidgin

comparison src/gtkft.c @ 7107:9220c7490cd1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 7672] This is a big one: normalize() -> gaim_normalize, linkify_text() -> gaim_markup_linkify(), gaim_get_size_string() -> gaim_str_size_to_units(), and moved clean_pid() to main.c. committer: Tailor Script <tailor@pidgin.im>
author Christian Hammond <chipx86@chipx86.com>
date Wed, 01 Oct 2003 06:17:28 +0000
parents feb3d21a7794
children 02f697df677b
comparison
equal deleted inserted replaced
7106:db6bd3e794d8 7107:9220c7490cd1
756 756
757 data->start_time = time(NULL); 757 data->start_time = time(NULL);
758 758
759 type = gaim_xfer_get_type(xfer); 759 type = gaim_xfer_get_type(xfer);
760 760
761 size_str = gaim_get_size_string(gaim_xfer_get_size(xfer)); 761 size_str = gaim_str_size_to_units(gaim_xfer_get_size(xfer));
762 remaining_str = gaim_get_size_string(gaim_xfer_get_bytes_remaining(xfer)); 762 remaining_str = gaim_str_size_to_units(gaim_xfer_get_bytes_remaining(xfer));
763 763
764 pixbuf = gtk_widget_render_icon(dialog->window, 764 pixbuf = gtk_widget_render_icon(dialog->window,
765 (type == GAIM_XFER_RECEIVE 765 (type == GAIM_XFER_RECEIVE
766 ? GAIM_STOCK_DOWNLOAD 766 ? GAIM_STOCK_DOWNLOAD
767 : GAIM_STOCK_UPLOAD), 767 : GAIM_STOCK_UPLOAD),
874 g_return_if_fail(xfer != NULL); 874 g_return_if_fail(xfer != NULL);
875 875
876 if ((data = GAIM_GTKXFER(xfer)) == NULL) 876 if ((data = GAIM_GTKXFER(xfer)) == NULL)
877 return; 877 return;
878 878
879 size_str = gaim_get_size_string(gaim_xfer_get_size(xfer)); 879 size_str = gaim_str_size_to_units(gaim_xfer_get_size(xfer));
880 remaining_str = gaim_get_size_string(gaim_xfer_get_bytes_remaining(xfer)); 880 remaining_str = gaim_str_size_to_units(gaim_xfer_get_bytes_remaining(xfer));
881 881
882 gtk_list_store_set(xfer_dialog->model, &data->iter, 882 gtk_list_store_set(xfer_dialog->model, &data->iter,
883 COLUMN_PROGRESS, gaim_xfer_get_progress(xfer), 883 COLUMN_PROGRESS, gaim_xfer_get_progress(xfer),
884 COLUMN_SIZE, size_str, 884 COLUMN_SIZE, size_str,
885 COLUMN_REMAINING, remaining_str, 885 COLUMN_REMAINING, remaining_str,
1100 char *buf, *size_buf; 1100 char *buf, *size_buf;
1101 size_t size; 1101 size_t size;
1102 1102
1103 size = gaim_xfer_get_size(xfer); 1103 size = gaim_xfer_get_size(xfer);
1104 1104
1105 size_buf = gaim_get_size_string(size); 1105 size_buf = gaim_str_size_to_units(size);
1106 1106
1107 buf = g_strdup_printf(_("%s wants to send you %s (%s)"), 1107 buf = g_strdup_printf(_("%s wants to send you %s (%s)"),
1108 xfer->who, gaim_xfer_get_filename(xfer), size_buf); 1108 xfer->who, gaim_xfer_get_filename(xfer), size_buf);
1109 1109
1110 g_free(size_buf); 1110 g_free(size_buf);