Mercurial > pidgin.yaz

comparison pidgin/gtknotify.c @ 21341:789ed158a50a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
explicit merge of '2762c6075c0dc52a96098c5478c5bf68cfd890a3' and '6f090c623ea4e9357e5b4238348a888b4c869ab7'
author Richard Laager <rlaager@wiktel.com>
date Fri, 16 Nov 2007 22:38:00 +0000
parents 38ee359ea4aa b6136fd465a0
children c88a3f2dbb52
comparison
equal deleted inserted replaced
20921:b2b16843851b 21341:789ed158a50a
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