diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-05-27 04:58:27 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-05-27 04:58:27 +0800 |
| commit | 333656eba50f2120bbee3e817b8faf0baf448faf (patch) | |
| tree | 3869bc4847dd4ab67625b82207ff98ef19045e8d /plugins/exchange-operations/exchange-delegates-user.c | |
| parent | 1682814ef78902b385fe84589f8755b0ff4b5b5a (diff) | |
| parent | ffa17ed195a6bbb40d386fb572b7941e22f47f8d (diff) | |
| download | gsoc2013-evolution-333656eba50f2120bbee3e817b8faf0baf448faf.tar.gz gsoc2013-evolution-333656eba50f2120bbee3e817b8faf0baf448faf.tar.zst gsoc2013-evolution-333656eba50f2120bbee3e817b8faf0baf448faf.zip | |
Merge branch 'warnings'
Diffstat (limited to 'plugins/exchange-operations/exchange-delegates-user.c')
| -rw-r--r-- | plugins/exchange-operations/exchange-delegates-user.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/plugins/exchange-operations/exchange-delegates-user.c b/plugins/exchange-operations/exchange-delegates-user.c index 66a7e71014..635e82ade7 100644 --- a/plugins/exchange-operations/exchange-delegates-user.c +++ b/plugins/exchange-operations/exchange-delegates-user.c @@ -301,12 +301,13 @@ exchange_delegates_user_edit (ExchangeAccount *account, CamelMessageInfo *info; char *self_address, *delegate_mail_subject; char *role_name; - char *role_name_final = ""; + GString *role_name_final; const char *recipient_address; const char *delegate_exchange_dn; const char *msg_part1 = NULL, *msg_part2 = NULL; + role_name_final = g_string_new (""); self_address = g_strdup (exchange_account_get_email_id (account)); @@ -339,11 +340,13 @@ exchange_delegates_user_edit (ExchangeAccount *account, combobox = glade_xml_get_widget (xml, widget_names[i]); role = e_dialog_combo_box_get (combobox, exchange_perm_map); role_name = g_strdup (map_to_full_role_name(role)); - role_name_final = g_strconcat (role_name_final, "<tr><td>" , folder_names_for_display[i], - ":</td><td>", role_name, "</td> </tr>", NULL); + g_string_append_printf ( + role_name_final, + "<tr><td>%s:</td><td>%s</td></tr>", + folder_names_for_display[i], role_name); } - camel_stream_printf (stream, "%s</table>", role_name_final); + camel_stream_printf (stream, "%s</table>", role_name_final->str); if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check)) == TRUE) { /* To translators: This message is included if the delegatee has been given access @@ -360,7 +363,7 @@ exchange_delegates_user_edit (ExchangeAccount *account, "to see my private items.")); camel_data_wrapper_construct_from_stream (delegate_mail_text, stream); g_free (role_name); - g_free (role_name_final); + g_string_free (role_name_final, TRUE); camel_object_unref (stream); part = camel_mime_part_new (); |