comparison libpurple/request.c @ 31007:c5ba7dd399fa

merged from im.pidgin.pidgin: - oscar.c needs to be revised - changes in google.c may need to be salvaged
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Wed, 22 Sep 2010 14:17:09 +0900
parents 2ce4b36f1260
children a8cc50c2279f
comparison
equal deleted inserted replaced
30786:86e77ae76e16 31007:c5ba7dd399fa
1397 user_data, action_count, actions); 1397 user_data, action_count, actions);
1398 1398
1399 handles = g_list_append(handles, info); 1399 handles = g_list_append(handles, info);
1400 1400
1401 return info->ui_handle; 1401 return info->ui_handle;
1402 } else {
1403 /* Fall back on the non-icon request if the UI doesn't support icon
1404 requests */
1405 return purple_request_action_varg(handle, title, primary, secondary,
1406 default_action, account, who, conv, user_data, action_count, actions);
1402 } 1407 }
1403 1408
1404 return NULL; 1409 return NULL;
1405 } 1410 }
1406 1411