comparison: pidgin/gtkxfer.c
pidgin/gtkxfer.c
- changeset 41962
- f802660eaef2
- parent 41947
- 7b3312d0760c
- child 42172
- 7c2d151b410d
equal
deleted
inserted
replaced
| 41961:0da91f053305 | 41962:f802660eaef2 |
|---|---|
| 220 } | 220 } |
| 221 | 221 |
| 222 static void | 222 static void |
| 223 update_detailed_info(PidginXferDialog *dialog, PurpleXfer *xfer) | 223 update_detailed_info(PidginXferDialog *dialog, PurpleXfer *xfer) |
| 224 { | 224 { |
| 225 PurpleAccount *account = NULL; | |
| 226 PurpleContactInfo *info = NULL; | |
| 225 PidginXferUiData *data; | 227 PidginXferUiData *data; |
| 226 char *kbsec, *time_elapsed, *time_remaining; | 228 char *kbsec, *time_elapsed, *time_remaining; |
| 227 char *status, *utf8; | 229 char *status, *utf8; |
| 228 | 230 |
| 229 if (dialog == NULL || xfer == NULL) | 231 if (dialog == NULL || xfer == NULL) |
| 255 _("<b>Sending To:</b>")); | 257 _("<b>Sending To:</b>")); |
| 256 gtk_label_set_markup(GTK_LABEL(dialog->local_user_desc_label), | 258 gtk_label_set_markup(GTK_LABEL(dialog->local_user_desc_label), |
| 257 _("<b>Sending As:</b>")); | 259 _("<b>Sending As:</b>")); |
| 258 } | 260 } |
| 259 | 261 |
| 262 account = purple_xfer_get_account(xfer); | |
| 263 info = PURPLE_CONTACT_INFO(account); | |
| 264 | |
| 260 gtk_label_set_text(GTK_LABEL(dialog->local_user_label), | 265 gtk_label_set_text(GTK_LABEL(dialog->local_user_label), |
| 261 purple_account_get_username(purple_xfer_get_account(xfer))); | 266 purple_contact_info_get_username(info)); |
| 262 gtk_label_set_text(GTK_LABEL(dialog->remote_user_label), purple_xfer_get_remote_user(xfer)); | 267 gtk_label_set_text(GTK_LABEL(dialog->remote_user_label), |
| 268 purple_xfer_get_remote_user(xfer)); | |
| 263 gtk_label_set_text(GTK_LABEL(dialog->protocol_label), | 269 gtk_label_set_text(GTK_LABEL(dialog->protocol_label), |
| 264 purple_account_get_protocol_name(purple_xfer_get_account(xfer))); | 270 purple_account_get_protocol_name(account)); |
| 265 | 271 |
| 266 if (purple_xfer_get_xfer_type(xfer) == PURPLE_XFER_TYPE_RECEIVE) { | 272 if (purple_xfer_get_xfer_type(xfer) == PURPLE_XFER_TYPE_RECEIVE) { |
| 267 gtk_label_set_text(GTK_LABEL(dialog->filename_label), | 273 gtk_label_set_text(GTK_LABEL(dialog->filename_label), |
| 268 purple_xfer_get_filename(xfer)); | 274 purple_xfer_get_filename(xfer)); |
| 269 } else { | 275 } else { |
