comparison: pidgin/gtkrequest.c
pidgin/gtkrequest.c
- changeset 19296
- 88929e03177f
- parent 19245
- a580e5114651
- child 19300
- c55fa83a55ea
equal
deleted
inserted
replaced
| 19295:ee1b55223496 | 19296:88929e03177f |
|---|---|
| 284 const char *secondary, const char *default_value, | 284 const char *secondary, const char *default_value, |
| 285 gboolean multiline, gboolean masked, gchar *hint, | 285 gboolean multiline, gboolean masked, gchar *hint, |
| 286 const char *ok_text, GCallback ok_cb, | 286 const char *ok_text, GCallback ok_cb, |
| 287 const char *cancel_text, GCallback cancel_cb, | 287 const char *cancel_text, GCallback cancel_cb, |
| 288 PurpleAccount *account, const char *who, PurpleConversation *conv, | 288 PurpleAccount *account, const char *who, PurpleConversation *conv, |
| 289 void *user_data) | 289 const char *ui_hint, void *user_data) |
| 290 { | 290 { |
| 291 PidginRequestData *data; | 291 PidginRequestData *data; |
| 292 GtkWidget *dialog; | 292 GtkWidget *dialog; |
| 293 GtkWidget *vbox; | 293 GtkWidget *vbox; |
| 294 GtkWidget *hbox; | 294 GtkWidget *hbox; |
| 444 pidgin_request_choice(const char *title, const char *primary, | 444 pidgin_request_choice(const char *title, const char *primary, |
| 445 const char *secondary, unsigned int default_value, | 445 const char *secondary, unsigned int default_value, |
| 446 const char *ok_text, GCallback ok_cb, | 446 const char *ok_text, GCallback ok_cb, |
| 447 const char *cancel_text, GCallback cancel_cb, | 447 const char *cancel_text, GCallback cancel_cb, |
| 448 PurpleAccount *account, const char *who, PurpleConversation *conv, | 448 PurpleAccount *account, const char *who, PurpleConversation *conv, |
| 449 void *user_data, va_list args) | 449 const char *ui_hint, void *user_data, va_list args) |
| 450 { | 450 { |
| 451 PidginRequestData *data; | 451 PidginRequestData *data; |
| 452 GtkWidget *dialog; | 452 GtkWidget *dialog; |
| 453 GtkWidget *vbox, *vbox2; | 453 GtkWidget *vbox, *vbox2; |
| 454 GtkWidget *hbox; | 454 GtkWidget *hbox; |
| 548 | 548 |
| 549 static void * | 549 static void * |
| 550 pidgin_request_action(const char *title, const char *primary, | 550 pidgin_request_action(const char *title, const char *primary, |
| 551 const char *secondary, unsigned int default_action, | 551 const char *secondary, unsigned int default_action, |
| 552 PurpleAccount *account, const char *who, PurpleConversation *conv, | 552 PurpleAccount *account, const char *who, PurpleConversation *conv, |
| 553 void *user_data, size_t action_count, va_list actions) | 553 const char *ui_hint, void *user_data, size_t action_count, va_list actions) |
| 554 { | 554 { |
| 555 PidginRequestData *data; | 555 PidginRequestData *data; |
| 556 GtkWidget *dialog; | 556 GtkWidget *dialog; |
| 557 GtkWidget *vbox; | 557 GtkWidget *vbox; |
| 558 GtkWidget *hbox; | 558 GtkWidget *hbox; |
| 1046 pidgin_request_fields(const char *title, const char *primary, | 1046 pidgin_request_fields(const char *title, const char *primary, |
| 1047 const char *secondary, PurpleRequestFields *fields, | 1047 const char *secondary, PurpleRequestFields *fields, |
| 1048 const char *ok_text, GCallback ok_cb, | 1048 const char *ok_text, GCallback ok_cb, |
| 1049 const char *cancel_text, GCallback cancel_cb, | 1049 const char *cancel_text, GCallback cancel_cb, |
| 1050 PurpleAccount *account, const char *who, PurpleConversation *conv, | 1050 PurpleAccount *account, const char *who, PurpleConversation *conv, |
| 1051 void *user_data) | 1051 const char *ui_hint, void *user_data) |
| 1052 { | 1052 { |
| 1053 PidginRequestData *data; | 1053 PidginRequestData *data; |
| 1054 GtkWidget *win; | 1054 GtkWidget *win; |
| 1055 GtkWidget *vbox; | 1055 GtkWidget *vbox; |
| 1056 GtkWidget *vbox2; | 1056 GtkWidget *vbox2; |
| 1489 if ((data->u.file.savedialog == TRUE) && | 1489 if ((data->u.file.savedialog == TRUE) && |
| 1490 (g_file_test(data->u.file.name, G_FILE_TEST_EXISTS))) { | 1490 (g_file_test(data->u.file.name, G_FILE_TEST_EXISTS))) { |
| 1491 purple_request_action(data, NULL, _("That file already exists"), | 1491 purple_request_action(data, NULL, _("That file already exists"), |
| 1492 _("Would you like to overwrite it?"), 0, | 1492 _("Would you like to overwrite it?"), 0, |
| 1493 NULL, NULL, NULL, | 1493 NULL, NULL, NULL, |
| 1494 data, 2, | 1494 "pidgin-request-file", data, 2, |
| 1495 _("Overwrite"), G_CALLBACK(file_yes_no_cb), | 1495 _("Overwrite"), G_CALLBACK(file_yes_no_cb), |
| 1496 _("Choose New Name"), G_CALLBACK(file_yes_no_cb)); | 1496 _("Choose New Name"), G_CALLBACK(file_yes_no_cb)); |
| 1497 } else | 1497 } else |
| 1498 file_yes_no_cb(data, 1); | 1498 file_yes_no_cb(data, 1); |
| 1499 } | 1499 } |
| 1514 static void * | 1514 static void * |
| 1515 pidgin_request_file(const char *title, const char *filename, | 1515 pidgin_request_file(const char *title, const char *filename, |
| 1516 gboolean savedialog, | 1516 gboolean savedialog, |
| 1517 GCallback ok_cb, GCallback cancel_cb, | 1517 GCallback ok_cb, GCallback cancel_cb, |
| 1518 PurpleAccount *account, const char *who, PurpleConversation *conv, | 1518 PurpleAccount *account, const char *who, PurpleConversation *conv, |
| 1519 void *user_data) | 1519 const char *ui_hint, void *user_data) |
| 1520 { | 1520 { |
| 1521 PidginRequestData *data; | 1521 PidginRequestData *data; |
| 1522 GtkWidget *filesel; | 1522 GtkWidget *filesel; |
| 1523 const gchar *current_folder; | 1523 const gchar *current_folder; |
| 1524 #if GTK_CHECK_VERSION(2,4,0) | 1524 #if GTK_CHECK_VERSION(2,4,0) |
| 1613 | 1613 |
| 1614 static void * | 1614 static void * |
| 1615 pidgin_request_folder(const char *title, const char *dirname, | 1615 pidgin_request_folder(const char *title, const char *dirname, |
| 1616 GCallback ok_cb, GCallback cancel_cb, | 1616 GCallback ok_cb, GCallback cancel_cb, |
| 1617 PurpleAccount *account, const char *who, PurpleConversation *conv, | 1617 PurpleAccount *account, const char *who, PurpleConversation *conv, |
| 1618 void *user_data) | 1618 const char *ui_hint, void *user_data) |
| 1619 { | 1619 { |
| 1620 PidginRequestData *data; | 1620 PidginRequestData *data; |
| 1621 GtkWidget *dirsel; | 1621 GtkWidget *dirsel; |
| 1622 | 1622 |
| 1623 data = g_new0(PidginRequestData, 1); | 1623 data = g_new0(PidginRequestData, 1); |
