comparison: pidgin/gtknotify.c
pidgin/gtknotify.c
- branch
- next.minor
- changeset 21213
- 61d8c5197526
- parent 20980
- 1599801ecbae
- parent 20869
- e2db8ce46cda
- child 22007
- 386062b58867
equal
deleted
inserted
replaced
| 21173:8e191599d715 | 21213:61d8c5197526 |
|---|---|
| 268 gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); | 268 gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); |
| 269 | 269 |
| 270 primary_esc = g_markup_escape_text(primary, -1); | 270 primary_esc = g_markup_escape_text(primary, -1); |
| 271 secondary_esc = (secondary != NULL) ? g_markup_escape_text(secondary, -1) : NULL; | 271 secondary_esc = (secondary != NULL) ? g_markup_escape_text(secondary, -1) : NULL; |
| 272 g_snprintf(label_text, sizeof(label_text), | 272 g_snprintf(label_text, sizeof(label_text), |
| 273 "<span weight=\"bold\" size=\"larger\">%s</span>\n\n%s", | 273 "<span weight=\"bold\" size=\"larger\">%s</span>%s%s", |
| 274 primary_esc, (secondary ? secondary_esc : "")); | 274 primary_esc, (secondary ? "\n\n" : ""), |
| 275 (secondary ? secondary_esc : "")); | |
| 275 g_free(primary_esc); | 276 g_free(primary_esc); |
| 276 g_free(secondary_esc); | 277 g_free(secondary_esc); |
| 277 | 278 |
| 278 label = gtk_label_new(NULL); | 279 label = gtk_label_new(NULL); |
| 279 | 280 |
