Mercurial > pidgin
comparison src/gtkstatusbox.c @ 13098:44a4bd35cc97
[gaim-migrate @ 15460]
Fix an assertion failure.
committer: Tailor Script <tailor@pidgin.im>
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Thu, 02 Feb 2006 19:14:54 +0000 |
parents | 0aa231ebbfd5 |
children | 328e8cf2fb02 |
comparison
equal
deleted
inserted
replaced
13097:f1bf8989bbf2 | 13098:44a4bd35cc97 |
---|---|
509 | 509 |
510 for (cur = list; cur != NULL; cur = cur->next) | 510 for (cur = list; cur != NULL; cur = cur->next) |
511 { | 511 { |
512 GaimSavedStatus *saved = cur->data; | 512 GaimSavedStatus *saved = cur->data; |
513 const gchar *message; | 513 const gchar *message; |
514 gchar *stripped; | 514 gchar *stripped = NULL; |
515 | 515 |
516 /* Get an appropriate status icon */ | 516 /* Get an appropriate status icon */ |
517 pixbuf = gaim_gtk_create_gaim_icon_with_status(gaim_savedstatus_get_type(saved), | 517 pixbuf = gaim_gtk_create_gaim_icon_with_status(gaim_savedstatus_get_type(saved), |
518 show_buddy_icons ? 1.0 : 0.5); | 518 show_buddy_icons ? 1.0 : 0.5); |
519 | 519 |
522 /* | 522 /* |
523 * Transient statuses do not have a title, so the savedstatus | 523 * Transient statuses do not have a title, so the savedstatus |
524 * API returns the message when gaim_savedstatus_get_title() is | 524 * API returns the message when gaim_savedstatus_get_title() is |
525 * called, so we don't need to get the message a second time. | 525 * called, so we don't need to get the message a second time. |
526 */ | 526 */ |
527 stripped = NULL; | |
528 } | 527 } |
529 else | 528 else |
530 { | 529 { |
531 message = gaim_savedstatus_get_message(saved); | 530 message = gaim_savedstatus_get_message(saved); |
532 stripped = gaim_markup_strip_html(message); | 531 if (message != NULL) |
533 gaim_util_chrreplace(stripped, '\n', ' '); | 532 { |
533 stripped = gaim_markup_strip_html(message); | |
534 gaim_util_chrreplace(stripped, '\n', ' '); | |
535 } | |
534 | 536 |
535 /* Overlay a disk in the bottom left corner */ | 537 /* Overlay a disk in the bottom left corner */ |
536 emblem = gtk_widget_render_icon(GTK_WIDGET(statusbox->vbox), | 538 emblem = gtk_widget_render_icon(GTK_WIDGET(statusbox->vbox), |
537 GTK_STOCK_SAVE, icon_size, "GtkGaimStatusBox"); | 539 GTK_STOCK_SAVE, icon_size, "GtkGaimStatusBox"); |
538 if (emblem != NULL) | 540 if (emblem != NULL) |