Mercurial > pidgin.yaz
comparison libpurple/util.c @ 32518:0f0996c93c42
merge of '5c4e09621b978c0972fd440fd215b775a926e26d'
and 'dc01d13c59e6c7a6352cd4c3c6bf679f095e00fe'
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Tue, 06 Sep 2011 18:30:50 +0000 |
| parents | 4d5e1dc93265 |
| children | 904686722499 |
comparison
equal
deleted
inserted
replaced
| 32515:cc55df4702aa | 32518:0f0996c93c42 |
|---|---|
| 111 g_return_val_if_fail(act != NULL, NULL); | 111 g_return_val_if_fail(act != NULL, NULL); |
| 112 | 112 |
| 113 return act->label; | 113 return act->label; |
| 114 } | 114 } |
| 115 | 115 |
| 116 PurpleCallback * | 116 PurpleCallback purple_menu_action_get_callback(const PurpleMenuAction *act) |
| 117 purple_menu_action_get_callback(const PurpleMenuAction *act) | |
| 118 { | 117 { |
| 119 g_return_val_if_fail(act != NULL, NULL); | 118 g_return_val_if_fail(act != NULL, NULL); |
| 120 | 119 |
| 121 return act->callback; | 120 return act->callback; |
| 122 } | 121 } |