Mercurial > pidgin.yaz
comparison pidgin/gtkrequest.c @ 30264:38d5dd9c9a07
merge of 'c4a26372086186405c4635b2fbf448b8d089f863'
and 'c9659a3fecdd575434640e531c3eb61f90de6976'
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Fri, 30 Apr 2010 03:35:28 +0000 |
| parents | 75ea2a624b10 |
| children | ce52e101844a |
comparison
equal
deleted
inserted
replaced
| 30263:1f5c86f79eeb | 30264:38d5dd9c9a07 |
|---|---|
| 736 pidgin_request_action(const char *title, const char *primary, | 736 pidgin_request_action(const char *title, const char *primary, |
| 737 const char *secondary, int default_action, | 737 const char *secondary, int default_action, |
| 738 PurpleAccount *account, const char *who, PurpleConversation *conv, | 738 PurpleAccount *account, const char *who, PurpleConversation *conv, |
| 739 void *user_data, size_t action_count, va_list actions) | 739 void *user_data, size_t action_count, va_list actions) |
| 740 { | 740 { |
| 741 pidgin_request_action_with_icon(title, primary, secondary, default_action, | 741 return pidgin_request_action_with_icon(title, primary, secondary, |
| 742 account, who, conv, NULL, 0, user_data, action_count, actions); | 742 default_action, account, who, conv, NULL, 0, user_data, action_count, |
| 743 actions); | |
| 743 } | 744 } |
| 744 | 745 |
| 745 static void | 746 static void |
| 746 req_entry_field_changed_cb(GtkWidget *entry, PurpleRequestField *field) | 747 req_entry_field_changed_cb(GtkWidget *entry, PurpleRequestField *field) |
| 747 { | 748 { |