comparison src/protocols/msn/userlist.c @ 10774:d83f745c997b

[gaim-migrate @ 12383] Some escaping stuff, all over the place. Various escaping fixes in the IRC prpl. The core and plugins only need to escape text if it's going to be shown in a gtkimhtml or equivalent - such as writing to a conversation window, or gaim_notify_{formatted,userinfo} The primary and secondary text for all notify and request API functions do NOT need to be escaped by the core or plugins, because whether html-like markup is required for these is UI dependent. Now we always escape these in the Gtk UI request & notify ops. Should I backport any of the above to oldstatus? I also removed gaim_chat_get_display_name() - it was almost a duplicate of gaim_chat_get_name(), and it leaked. committer: Tailor Script <tailor@pidgin.im>
author Stu Tomlinson <stu@nosnilmot.com>
date Sat, 02 Apr 2005 17:18:43 +0000
parents a4c6f8deac96
children 34d2aac7b34f
comparison
equal deleted inserted replaced
10773:888d4c328be5 10774:d83f745c997b
71 71
72 static void 72 static void
73 got_new_entry(GaimConnection *gc, const char *passport, const char *friendly) 73 got_new_entry(GaimConnection *gc, const char *passport, const char *friendly)
74 { 74 {
75 MsnPermitAdd *pa; 75 MsnPermitAdd *pa;
76 char *msg, *escaped; 76 char *msg;
77 77
78 pa = g_new0(MsnPermitAdd, 1); 78 pa = g_new0(MsnPermitAdd, 1);
79 pa->who = g_strdup(passport); 79 pa->who = g_strdup(passport);
80 pa->gc = gc; 80 pa->gc = gc;
81 81
82 if (friendly != NULL) 82 if (friendly != NULL)
83 { 83 {
84 escaped = g_markup_escape_text(friendly, -1);
85 msg = g_strdup_printf( 84 msg = g_strdup_printf(
86 _("The user %s (%s) wants to add %s to his or her " 85 _("The user %s (%s) wants to add %s to his or her "
87 "buddy list."), 86 "buddy list."),
88 passport, escaped, 87 passport, friendly,
89 gaim_account_get_username(gc->account)); 88 gaim_account_get_username(gc->account));
90 g_free(escaped);
91 } 89 }
92 else 90 else
93 { 91 {
94 msg = g_strdup_printf( 92 msg = g_strdup_printf(
95 _("The user %s wants to add %s to his or " 93 _("The user %s wants to add %s to his or "