Mercurial > pidgin.yaz

comparison pidgin/gtkft.c @ 32689:48bc3f9f2115

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
purple_xfer_is_canceled() renamed to purple_xfer_is_cancelled()
author andrew.victor@mxit.com
date Sun, 25 Sep 2011 19:15:05 +0000
parents 0eee1b13ec2b
children edb20c793641
comparison
equal deleted inserted replaced
32688:f331cb5325d7 32689:48bc3f9f2115
153 153
154 if (time_remaining != NULL) { 154 if (time_remaining != NULL) {
155 if (purple_xfer_is_completed(xfer)) { 155 if (purple_xfer_is_completed(xfer)) {
156 *time_remaining = g_strdup(_("Finished")); 156 *time_remaining = g_strdup(_("Finished"));
157 } 157 }
158 else if (purple_xfer_is_canceled(xfer)) { 158 else if (purple_xfer_is_cancelled(xfer)) {
159 *time_remaining = g_strdup(_("Cancelled")); 159 *time_remaining = g_strdup(_("Cancelled"));
160 } 160 }
161 else if (purple_xfer_get_size(xfer) == 0 || (kb_sent > 0 && kbps == 0)) { 161 else if (purple_xfer_get_size(xfer) == 0 || (kb_sent > 0 && kbps == 0)) {
162 *time_remaining = g_strdup(_("Unknown")); 162 *time_remaining = g_strdup(_("Unknown"));
163 } 163 }
355 gtk_widget_set_sensitive (dialog->open_button, FALSE); 355 gtk_widget_set_sensitive (dialog->open_button, FALSE);
356 } 356 }
357 #endif 357 #endif
358 358
359 gtk_widget_set_sensitive(dialog->remove_button, TRUE); 359 gtk_widget_set_sensitive(dialog->remove_button, TRUE);
360 } else if (purple_xfer_is_canceled(xfer)) { 360 } else if (purple_xfer_is_cancelled(xfer)) {
361 gtk_widget_hide(dialog->stop_button); 361 gtk_widget_hide(dialog->stop_button);
362 gtk_widget_show(dialog->remove_button); 362 gtk_widget_show(dialog->remove_button);
363 363
364 gtk_widget_set_sensitive(dialog->open_button, FALSE); 364 gtk_widget_set_sensitive(dialog->open_button, FALSE);
365 365
977 977
978 pixbuf = gtk_widget_render_icon(dialog->window, 978 pixbuf = gtk_widget_render_icon(dialog->window,
979 PIDGIN_STOCK_FILE_CANCELED, 979 PIDGIN_STOCK_FILE_CANCELED,
980 GTK_ICON_SIZE_MENU, NULL); 980 GTK_ICON_SIZE_MENU, NULL);
981 981
982 if (purple_xfer_is_canceled(xfer)) 982 if (purple_xfer_is_cancelled(xfer))
983 status = _("Cancelled"); 983 status = _("Cancelled");
984 else 984 else
985 status = _("Failed"); 985 status = _("Failed");
986 986
987 gtk_list_store_set(dialog->model, &data->iter, 987 gtk_list_store_set(dialog->model, &data->iter,