Mercurial > pidgin.yaz
comparison libpurple/notify.c @ 22608:ae436d5e42d5
merge of '7477b26751dbf08e918a1f300fbd2697dd0c6369'
and '911e3a3a992368fcb0a43a90238092e27a92c581'
| author | Etan Reisner <pidgin@unreliablesource.net> |
|---|---|
| date | Fri, 04 Apr 2008 02:45:33 +0000 |
| parents | 93c40e412b54 |
| children | 5e6b42e77fb7 3c26ef82d556 |
comparison
equal
deleted
inserted
replaced
| 22599:185b37776140 | 22608:ae436d5e42d5 |
|---|---|
| 584 | 584 |
| 585 return g_string_free(text, FALSE); | 585 return g_string_free(text, FALSE); |
| 586 } | 586 } |
| 587 | 587 |
| 588 | 588 |
| 589 gchar * | 589 const gchar * |
| 590 purple_notify_user_info_entry_get_label(PurpleNotifyUserInfoEntry *user_info_entry) | 590 purple_notify_user_info_entry_get_label(PurpleNotifyUserInfoEntry *user_info_entry) |
| 591 { | 591 { |
| 592 g_return_val_if_fail(user_info_entry != NULL, NULL); | 592 g_return_val_if_fail(user_info_entry != NULL, NULL); |
| 593 | 593 |
| 594 return user_info_entry->label; | 594 return user_info_entry->label; |
| 601 | 601 |
| 602 g_free(user_info_entry->label); | 602 g_free(user_info_entry->label); |
| 603 user_info_entry->label = g_strdup(label); | 603 user_info_entry->label = g_strdup(label); |
| 604 } | 604 } |
| 605 | 605 |
| 606 gchar * | 606 const gchar * |
| 607 purple_notify_user_info_entry_get_value(PurpleNotifyUserInfoEntry *user_info_entry) | 607 purple_notify_user_info_entry_get_value(PurpleNotifyUserInfoEntry *user_info_entry) |
| 608 { | 608 { |
| 609 g_return_val_if_fail(user_info_entry != NULL, NULL); | 609 g_return_val_if_fail(user_info_entry != NULL, NULL); |
| 610 | 610 |
| 611 return user_info_entry->value; | 611 return user_info_entry->value; |