diff options
| author | Ankit Vani <a@nevitus.org> | 2013-11-06 05:58:46 +0530 |
|---|---|---|
| committer | Ankit Vani <a@nevitus.org> | 2013-11-06 05:58:46 +0530 |
| commit | eb9f9968553b0cec24f1ca52f1ad94de3b83e103 (patch) | |
| tree | c08df2259dba34d271160059df1c337cbe5da3ea /libpurple/request-datasheet.c | |
| parent | 46b7293758f1ec3e9451941feee8918cd03cf99c (diff) | |
| parent | 23d617573ba853e93612929a8b884e57901c0041 (diff) | |
| download | pidgin-eb9f9968553b0cec24f1ca52f1ad94de3b83e103.tar.gz | |
Merged default branch
Diffstat (limited to 'libpurple/request-datasheet.c')
| -rw-r--r-- | libpurple/request-datasheet.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/libpurple/request-datasheet.c b/libpurple/request-datasheet.c index 7b5619503a..07234bf005 100644 --- a/libpurple/request-datasheet.c +++ b/libpurple/request-datasheet.c @@ -242,8 +242,16 @@ purple_request_datasheet_action_call(PurpleRequestDatasheetAction *act, { g_return_if_fail(act != NULL); - if (act->cb) - act->cb(rec, act->cb_data); + if (!act->cb) + return; + + if (!purple_request_datasheet_action_is_sensitive(act, rec)) { + purple_debug_warning("request-datasheet", + "Action is disabled for this record"); + return; + } + + act->cb(rec, act->cb_data); } void @@ -266,7 +274,7 @@ purple_request_datasheet_action_is_sensitive(PurpleRequestDatasheetAction *act, if (!act->sens_cb) return (rec != NULL); - return act->sens_cb(rec, act->cb_data); + return act->sens_cb(rec, act->sens_data); } /***** Datasheet record API ***************************************************/ |