comparison pidgin/gtkrequest.c @ 15501:d75099d2567e

gaim_gtk to pidgin. I hope
author Sean Egan <seanegan@gmail.com>
date Sat, 03 Feb 2007 07:23:11 +0000
parents 9c0cf4db1f4d
children 311315e979f7
comparison
equal deleted inserted replaced
15500:45ecefd0ce3a 15501:d75099d2567e
74 74
75 } file; 75 } file;
76 76
77 } u; 77 } u;
78 78
79 } GaimGtkRequestData; 79 } PidginRequestData;
80 80
81 static void 81 static void
82 generic_response_start(GaimGtkRequestData *data) 82 generic_response_start(PidginRequestData *data)
83 { 83 {
84 g_return_if_fail(data != NULL); 84 g_return_if_fail(data != NULL);
85 85
86 /* Tell the user we're doing something. */ 86 /* Tell the user we're doing something. */
87 gaim_gtk_set_cursor(GTK_WIDGET(data->dialog), GDK_WATCH); 87 pidgin_set_cursor(GTK_WIDGET(data->dialog), GDK_WATCH);
88 } 88 }
89 89
90 static void 90 static void
91 input_response_cb(GtkDialog *dialog, gint id, GaimGtkRequestData *data) 91 input_response_cb(GtkDialog *dialog, gint id, PidginRequestData *data)
92 { 92 {
93 const char *value; 93 const char *value;
94 char *multiline_value = NULL; 94 char *multiline_value = NULL;
95 95
96 generic_response_start(data); 96 generic_response_start(data);
124 124
125 gaim_request_close(GAIM_REQUEST_INPUT, data); 125 gaim_request_close(GAIM_REQUEST_INPUT, data);
126 } 126 }
127 127
128 static void 128 static void
129 action_response_cb(GtkDialog *dialog, gint id, GaimGtkRequestData *data) 129 action_response_cb(GtkDialog *dialog, gint id, PidginRequestData *data)
130 { 130 {
131 generic_response_start(data); 131 generic_response_start(data);
132 132
133 if (id < data->cb_count && data->cbs[id] != NULL) 133 if (id < data->cb_count && data->cbs[id] != NULL)
134 ((GaimRequestActionCb)data->cbs[id])(data->user_data, id); 134 ((GaimRequestActionCb)data->cbs[id])(data->user_data, id);
136 gaim_request_close(GAIM_REQUEST_INPUT, data); 136 gaim_request_close(GAIM_REQUEST_INPUT, data);
137 } 137 }
138 138
139 139
140 static void 140 static void
141 choice_response_cb(GtkDialog *dialog, gint id, GaimGtkRequestData *data) 141 choice_response_cb(GtkDialog *dialog, gint id, PidginRequestData *data)
142 { 142 {
143 GtkWidget *radio = g_object_get_data(G_OBJECT(dialog), "radio"); 143 GtkWidget *radio = g_object_get_data(G_OBJECT(dialog), "radio");
144 GSList *group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(radio)); 144 GSList *group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(radio));
145 145
146 generic_response_start(data); 146 generic_response_start(data);
221 { 221 {
222 gaim_request_field_account_set_value(field, account); 222 gaim_request_field_account_set_value(field, account);
223 } 223 }
224 224
225 static void 225 static void
226 multifield_ok_cb(GtkWidget *button, GaimGtkRequestData *data) 226 multifield_ok_cb(GtkWidget *button, PidginRequestData *data)
227 { 227 {
228 generic_response_start(data); 228 generic_response_start(data);
229 229
230 if (!GTK_WIDGET_HAS_FOCUS(button)) 230 if (!GTK_WIDGET_HAS_FOCUS(button))
231 gtk_widget_grab_focus(button); 231 gtk_widget_grab_focus(button);
236 236
237 gaim_request_close(GAIM_REQUEST_FIELDS, data); 237 gaim_request_close(GAIM_REQUEST_FIELDS, data);
238 } 238 }
239 239
240 static void 240 static void
241 multifield_cancel_cb(GtkWidget *button, GaimGtkRequestData *data) 241 multifield_cancel_cb(GtkWidget *button, PidginRequestData *data)
242 { 242 {
243 generic_response_start(data); 243 generic_response_start(data);
244 244
245 if (data->cbs[1] != NULL) 245 if (data->cbs[1] != NULL)
246 ((GaimRequestFieldsCb)data->cbs[1])(data->user_data, 246 ((GaimRequestFieldsCb)data->cbs[1])(data->user_data,
249 gaim_request_close(GAIM_REQUEST_FIELDS, data); 249 gaim_request_close(GAIM_REQUEST_FIELDS, data);
250 } 250 }
251 251
252 static void 252 static void
253 destroy_multifield_cb(GtkWidget *dialog, GdkEvent *event, 253 destroy_multifield_cb(GtkWidget *dialog, GdkEvent *event,
254 GaimGtkRequestData *data) 254 PidginRequestData *data)
255 { 255 {
256 multifield_cancel_cb(NULL, data); 256 multifield_cancel_cb(NULL, data);
257 } 257 }
258 258
259 259
278 278
279 return text; 279 return text;
280 } 280 }
281 281
282 static void * 282 static void *
283 gaim_gtk_request_input(const char *title, const char *primary, 283 pidgin_request_input(const char *title, const char *primary,
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 void *user_data) 288 void *user_data)
289 { 289 {
290 GaimGtkRequestData *data; 290 PidginRequestData *data;
291 GtkWidget *dialog; 291 GtkWidget *dialog;
292 GtkWidget *vbox; 292 GtkWidget *vbox;
293 GtkWidget *hbox; 293 GtkWidget *hbox;
294 GtkWidget *label; 294 GtkWidget *label;
295 GtkWidget *entry; 295 GtkWidget *entry;
296 GtkWidget *img; 296 GtkWidget *img;
297 GtkWidget *toolbar; 297 GtkWidget *toolbar;
298 char *label_text; 298 char *label_text;
299 char *primary_esc, *secondary_esc; 299 char *primary_esc, *secondary_esc;
300 300
301 data = g_new0(GaimGtkRequestData, 1); 301 data = g_new0(PidginRequestData, 1);
302 data->type = GAIM_REQUEST_INPUT; 302 data->type = GAIM_REQUEST_INPUT;
303 data->user_data = user_data; 303 data->user_data = user_data;
304 304
305 data->cb_count = 2; 305 data->cb_count = 2;
306 data->cbs = g_new0(GCallback, 2); 306 data->cbs = g_new0(GCallback, 2);
368 368
369 if ((data->u.input.hint != NULL) && (!strcmp(data->u.input.hint, "html"))) { 369 if ((data->u.input.hint != NULL) && (!strcmp(data->u.input.hint, "html"))) {
370 GtkWidget *frame; 370 GtkWidget *frame;
371 371
372 /* imhtml */ 372 /* imhtml */
373 frame = gaim_gtk_create_imhtml(TRUE, &entry, &toolbar, NULL); 373 frame = pidgin_create_imhtml(TRUE, &entry, &toolbar, NULL);
374 gtk_widget_set_size_request(entry, 320, 130); 374 gtk_widget_set_size_request(entry, 320, 130);
375 gtk_widget_set_name(entry, "gaim_gtkrequest_imhtml"); 375 gtk_widget_set_name(entry, "pidginrequest_imhtml");
376 if (default_value != NULL) 376 if (default_value != NULL)
377 gtk_imhtml_append_text(GTK_IMHTML(entry), default_value, GTK_IMHTML_NO_SCROLL); 377 gtk_imhtml_append_text(GTK_IMHTML(entry), default_value, GTK_IMHTML_NO_SCROLL);
378 gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE, 0); 378 gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE, 0);
379 gtk_widget_show(frame); 379 gtk_widget_show(frame);
380 } 380 }
404 gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(entry), GTK_WRAP_WORD_CHAR); 404 gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(entry), GTK_WRAP_WORD_CHAR);
405 405
406 gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 0); 406 gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 0);
407 407
408 if (gaim_prefs_get_bool("/gaim/gtk/conversations/spellcheck")) 408 if (gaim_prefs_get_bool("/gaim/gtk/conversations/spellcheck"))
409 gaim_gtk_setup_gtkspell(GTK_TEXT_VIEW(entry)); 409 pidgin_setup_gtkspell(GTK_TEXT_VIEW(entry));
410 410
411 gtk_container_add(GTK_CONTAINER(sw), entry); 411 gtk_container_add(GTK_CONTAINER(sw), entry);
412 } 412 }
413 else { 413 else {
414 entry = gtk_entry_new(); 414 entry = gtk_entry_new();
437 437
438 return data; 438 return data;
439 } 439 }
440 440
441 static void * 441 static void *
442 gaim_gtk_request_choice(const char *title, const char *primary, 442 pidgin_request_choice(const char *title, const char *primary,
443 const char *secondary, unsigned int default_value, 443 const char *secondary, unsigned int default_value,
444 const char *ok_text, GCallback ok_cb, 444 const char *ok_text, GCallback ok_cb,
445 const char *cancel_text, GCallback cancel_cb, 445 const char *cancel_text, GCallback cancel_cb,
446 void *user_data, va_list args) 446 void *user_data, va_list args)
447 { 447 {
448 GaimGtkRequestData *data; 448 PidginRequestData *data;
449 GtkWidget *dialog; 449 GtkWidget *dialog;
450 GtkWidget *vbox, *vbox2; 450 GtkWidget *vbox, *vbox2;
451 GtkWidget *hbox; 451 GtkWidget *hbox;
452 GtkWidget *label; 452 GtkWidget *label;
453 GtkWidget *img; 453 GtkWidget *img;
454 GtkWidget *radio = NULL; 454 GtkWidget *radio = NULL;
455 char *label_text; 455 char *label_text;
456 char *radio_text; 456 char *radio_text;
457 char *primary_esc, *secondary_esc; 457 char *primary_esc, *secondary_esc;
458 458
459 data = g_new0(GaimGtkRequestData, 1); 459 data = g_new0(PidginRequestData, 1);
460 data->type = GAIM_REQUEST_ACTION; 460 data->type = GAIM_REQUEST_ACTION;
461 data->user_data = user_data; 461 data->user_data = user_data;
462 462
463 data->cb_count = 2; 463 data->cb_count = 2;
464 data->cbs = g_new0(GCallback, 2); 464 data->cbs = g_new0(GCallback, 2);
540 540
541 return data; 541 return data;
542 } 542 }
543 543
544 static void * 544 static void *
545 gaim_gtk_request_action(const char *title, const char *primary, 545 pidgin_request_action(const char *title, const char *primary,
546 const char *secondary, unsigned int default_action, 546 const char *secondary, unsigned int default_action,
547 void *user_data, size_t action_count, va_list actions) 547 void *user_data, size_t action_count, va_list actions)
548 { 548 {
549 GaimGtkRequestData *data; 549 PidginRequestData *data;
550 GtkWidget *dialog; 550 GtkWidget *dialog;
551 GtkWidget *vbox; 551 GtkWidget *vbox;
552 GtkWidget *hbox; 552 GtkWidget *hbox;
553 GtkWidget *label; 553 GtkWidget *label;
554 GtkWidget *img; 554 GtkWidget *img;
555 void **buttons; 555 void **buttons;
556 char *label_text; 556 char *label_text;
557 char *primary_esc, *secondary_esc; 557 char *primary_esc, *secondary_esc;
558 int i; 558 int i;
559 559
560 data = g_new0(GaimGtkRequestData, 1); 560 data = g_new0(PidginRequestData, 1);
561 data->type = GAIM_REQUEST_ACTION; 561 data->type = GAIM_REQUEST_ACTION;
562 data->user_data = user_data; 562 data->user_data = user_data;
563 563
564 data->cb_count = action_count; 564 data->cb_count = action_count;
565 data->cbs = g_new0(GCallback, action_count); 565 data->cbs = g_new0(GCallback, action_count);
648 } 648 }
649 649
650 static void 650 static void
651 req_entry_field_changed_cb(GtkWidget *entry, GaimRequestField *field) 651 req_entry_field_changed_cb(GtkWidget *entry, GaimRequestField *field)
652 { 652 {
653 GaimGtkRequestData *req_data; 653 PidginRequestData *req_data;
654 const char *text = gtk_entry_get_text(GTK_ENTRY(entry)); 654 const char *text = gtk_entry_get_text(GTK_ENTRY(entry));
655 655
656 gaim_request_field_string_set_value(field, (*text == '\0' ? NULL : text)); 656 gaim_request_field_string_set_value(field, (*text == '\0' ? NULL : text));
657 657
658 req_data = (GaimGtkRequestData *)field->group->fields_list->ui_data; 658 req_data = (PidginRequestData *)field->group->fields_list->ui_data;
659 659
660 gtk_widget_set_sensitive(req_data->ok_button, 660 gtk_widget_set_sensitive(req_data->ok_button,
661 gaim_request_fields_all_required_filled(field->group->fields_list)); 661 gaim_request_fields_all_required_filled(field->group->fields_list));
662 } 662 }
663 663
695 optmenu = GTK_WIDGET(fld->ui_data); 695 optmenu = GTK_WIDGET(fld->ui_data);
696 break; 696 break;
697 } 697 }
698 } 698 }
699 } 699 }
700 gaim_gtk_setup_screenname_autocomplete(entry, optmenu, !strcmp(type_hint, "screenname-all")); 700 pidgin_setup_screenname_autocomplete(entry, optmenu, !strcmp(type_hint, "screenname-all"));
701 } 701 }
702 } 702 }
703 } 703 }
704 704
705 static GtkWidget * 705 static GtkWidget *
725 TRUE); 725 TRUE);
726 gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(textview), 726 gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(textview),
727 GTK_WRAP_WORD_CHAR); 727 GTK_WRAP_WORD_CHAR);
728 728
729 if (gaim_prefs_get_bool("/gaim/gtk/conversations/spellcheck")) 729 if (gaim_prefs_get_bool("/gaim/gtk/conversations/spellcheck"))
730 gaim_gtk_setup_gtkspell(GTK_TEXT_VIEW(textview)); 730 pidgin_setup_gtkspell(GTK_TEXT_VIEW(textview));
731 731
732 gtk_container_add(GTK_CONTAINER(widget), textview); 732 gtk_container_add(GTK_CONTAINER(widget), textview);
733 gtk_widget_show(textview); 733 gtk_widget_show(textview);
734 734
735 gtk_widget_set_size_request(widget, -1, 75); 735 gtk_widget_set_size_request(widget, -1, 75);
922 static GtkWidget * 922 static GtkWidget *
923 create_account_field(GaimRequestField *field) 923 create_account_field(GaimRequestField *field)
924 { 924 {
925 GtkWidget *widget; 925 GtkWidget *widget;
926 926
927 widget = gaim_gtk_account_option_menu_new( 927 widget = pidgin_account_option_menu_new(
928 gaim_request_field_account_get_default_value(field), 928 gaim_request_field_account_get_default_value(field),
929 gaim_request_field_account_get_show_all(field), 929 gaim_request_field_account_get_show_all(field),
930 G_CALLBACK(field_account_cb), 930 G_CALLBACK(field_account_cb),
931 gaim_request_field_account_get_filter(field), 931 gaim_request_field_account_get_filter(field),
932 field); 932 field);
1019 1019
1020 return sw; 1020 return sw;
1021 } 1021 }
1022 1022
1023 static void * 1023 static void *
1024 gaim_gtk_request_fields(const char *title, const char *primary, 1024 pidgin_request_fields(const char *title, const char *primary,
1025 const char *secondary, GaimRequestFields *fields, 1025 const char *secondary, GaimRequestFields *fields,
1026 const char *ok_text, GCallback ok_cb, 1026 const char *ok_text, GCallback ok_cb,
1027 const char *cancel_text, GCallback cancel_cb, 1027 const char *cancel_text, GCallback cancel_cb,
1028 void *user_data) 1028 void *user_data)
1029 { 1029 {
1030 GaimGtkRequestData *data; 1030 PidginRequestData *data;
1031 GtkWidget *win; 1031 GtkWidget *win;
1032 GtkWidget *vbox; 1032 GtkWidget *vbox;
1033 GtkWidget *vbox2; 1033 GtkWidget *vbox2;
1034 GtkWidget *hbox; 1034 GtkWidget *hbox;
1035 GtkWidget *bbox; 1035 GtkWidget *bbox;
1045 GaimRequestField *field; 1045 GaimRequestField *field;
1046 char *label_text; 1046 char *label_text;
1047 char *primary_esc, *secondary_esc; 1047 char *primary_esc, *secondary_esc;
1048 int total_fields = 0; 1048 int total_fields = 0;
1049 1049
1050 data = g_new0(GaimGtkRequestData, 1); 1050 data = g_new0(PidginRequestData, 1);
1051 data->type = GAIM_REQUEST_FIELDS; 1051 data->type = GAIM_REQUEST_FIELDS;
1052 data->user_data = user_data; 1052 data->user_data = user_data;
1053 data->u.multifield.fields = fields; 1053 data->u.multifield.fields = fields;
1054 1054
1055 fields->ui_data = data; 1055 fields->ui_data = data;
1152 group = gl->data; 1152 group = gl->data;
1153 field_list = gaim_request_field_group_get_fields(group); 1153 field_list = gaim_request_field_group_get_fields(group);
1154 1154
1155 if (gaim_request_field_group_get_title(group) != NULL) 1155 if (gaim_request_field_group_get_title(group) != NULL)
1156 { 1156 {
1157 frame = gaim_gtk_make_frame(vbox2, 1157 frame = pidgin_make_frame(vbox2,
1158 gaim_request_field_group_get_title(group)); 1158 gaim_request_field_group_get_title(group));
1159 } 1159 }
1160 else 1160 else
1161 frame = vbox2; 1161 frame = vbox2;
1162 1162
1380 1380
1381 return data; 1381 return data;
1382 } 1382 }
1383 1383
1384 static void 1384 static void
1385 file_yes_no_cb(GaimGtkRequestData *data, gint id) 1385 file_yes_no_cb(PidginRequestData *data, gint id)
1386 { 1386 {
1387 /* Only call the callback if yes was selected, otherwise the request 1387 /* Only call the callback if yes was selected, otherwise the request
1388 * (eg. file transfer) will be cancelled, then when a new filename is chosen 1388 * (eg. file transfer) will be cancelled, then when a new filename is chosen
1389 * things go BOOM */ 1389 * things go BOOM */
1390 if (id == 1) { 1390 if (id == 1) {
1391 if (data->cbs[1] != NULL) 1391 if (data->cbs[1] != NULL)
1392 ((GaimRequestFileCb)data->cbs[1])(data->user_data, data->u.file.name); 1392 ((GaimRequestFileCb)data->cbs[1])(data->user_data, data->u.file.name);
1393 gaim_request_close(data->type, data); 1393 gaim_request_close(data->type, data);
1394 } else { 1394 } else {
1395 gaim_gtk_clear_cursor(GTK_WIDGET(data->dialog)); 1395 pidgin_clear_cursor(GTK_WIDGET(data->dialog));
1396 } 1396 }
1397 } 1397 }
1398 1398
1399 #if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */ 1399 #if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
1400 static void 1400 static void
1401 file_ok_check_if_exists_cb(GtkWidget *widget, gint response, GaimGtkRequestData *data) 1401 file_ok_check_if_exists_cb(GtkWidget *widget, gint response, PidginRequestData *data)
1402 { 1402 {
1403 gchar *current_folder; 1403 gchar *current_folder;
1404 1404
1405 generic_response_start(data); 1405 generic_response_start(data);
1406 1406
1423 } 1423 }
1424 1424
1425 #else /* FILECHOOSER */ 1425 #else /* FILECHOOSER */
1426 1426
1427 static void 1427 static void
1428 file_ok_check_if_exists_cb(GtkWidget *button, GaimGtkRequestData *data) 1428 file_ok_check_if_exists_cb(GtkWidget *button, PidginRequestData *data)
1429 { 1429 {
1430 const gchar *name; 1430 const gchar *name;
1431 gchar *current_folder; 1431 gchar *current_folder;
1432 1432
1433 generic_response_start(data); 1433 generic_response_start(data);
1434 1434
1435 name = gtk_file_selection_get_filename(GTK_FILE_SELECTION(data->dialog)); 1435 name = gtk_file_selection_get_filename(GTK_FILE_SELECTION(data->dialog));
1436 1436
1437 /* If name is a directory then change directories */ 1437 /* If name is a directory then change directories */
1438 if (data->type == GAIM_REQUEST_FILE) { 1438 if (data->type == GAIM_REQUEST_FILE) {
1439 if (gaim_gtk_check_if_dir(name, GTK_FILE_SELECTION(data->dialog))) 1439 if (pidgin_check_if_dir(name, GTK_FILE_SELECTION(data->dialog)))
1440 return; 1440 return;
1441 } 1441 }
1442 1442
1443 current_folder = g_path_get_dirname(name); 1443 current_folder = g_path_get_dirname(name);
1444 1444
1474 file_yes_no_cb(data, 1); 1474 file_yes_no_cb(data, 1);
1475 } 1475 }
1476 1476
1477 #if !GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */ 1477 #if !GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
1478 static void 1478 static void
1479 file_cancel_cb(GaimGtkRequestData *data) 1479 file_cancel_cb(PidginRequestData *data)
1480 { 1480 {
1481 generic_response_start(data); 1481 generic_response_start(data);
1482 1482
1483 if (data->cbs[0] != NULL) 1483 if (data->cbs[0] != NULL)
1484 ((GaimRequestFileCb)data->cbs[0])(data->user_data, NULL); 1484 ((GaimRequestFileCb)data->cbs[0])(data->user_data, NULL);
1486 gaim_request_close(data->type, data); 1486 gaim_request_close(data->type, data);
1487 } 1487 }
1488 #endif /* FILECHOOSER */ 1488 #endif /* FILECHOOSER */
1489 1489
1490 static void * 1490 static void *
1491 gaim_gtk_request_file(const char *title, const char *filename, 1491 pidgin_request_file(const char *title, const char *filename,
1492 gboolean savedialog, 1492 gboolean savedialog,
1493 GCallback ok_cb, GCallback cancel_cb, 1493 GCallback ok_cb, GCallback cancel_cb,
1494 void *user_data) 1494 void *user_data)
1495 { 1495 {
1496 GaimGtkRequestData *data; 1496 PidginRequestData *data;
1497 GtkWidget *filesel; 1497 GtkWidget *filesel;
1498 const gchar *current_folder; 1498 const gchar *current_folder;
1499 #if GTK_CHECK_VERSION(2,4,0) 1499 #if GTK_CHECK_VERSION(2,4,0)
1500 gboolean folder_set = FALSE; 1500 gboolean folder_set = FALSE;
1501 #endif 1501 #endif
1502 1502
1503 data = g_new0(GaimGtkRequestData, 1); 1503 data = g_new0(PidginRequestData, 1);
1504 data->type = GAIM_REQUEST_FILE; 1504 data->type = GAIM_REQUEST_FILE;
1505 data->user_data = user_data; 1505 data->user_data = user_data;
1506 data->cb_count = 2; 1506 data->cb_count = 2;
1507 data->cbs = g_new0(GCallback, 2); 1507 data->cbs = g_new0(GCallback, 2);
1508 data->cbs[0] = cancel_cb; 1508 data->cbs[0] = cancel_cb;
1584 1584
1585 return (void *)data; 1585 return (void *)data;
1586 } 1586 }
1587 1587
1588 static void * 1588 static void *
1589 gaim_gtk_request_folder(const char *title, const char *dirname, 1589 pidgin_request_folder(const char *title, const char *dirname,
1590 GCallback ok_cb, GCallback cancel_cb, 1590 GCallback ok_cb, GCallback cancel_cb,
1591 void *user_data) 1591 void *user_data)
1592 { 1592 {
1593 GaimGtkRequestData *data; 1593 PidginRequestData *data;
1594 GtkWidget *dirsel; 1594 GtkWidget *dirsel;
1595 1595
1596 data = g_new0(GaimGtkRequestData, 1); 1596 data = g_new0(PidginRequestData, 1);
1597 data->type = GAIM_REQUEST_FOLDER; 1597 data->type = GAIM_REQUEST_FOLDER;
1598 data->user_data = user_data; 1598 data->user_data = user_data;
1599 data->cb_count = 2; 1599 data->cb_count = 2;
1600 data->cbs = g_new0(GCallback, 2); 1600 data->cbs = g_new0(GCallback, 2);
1601 data->cbs[0] = cancel_cb; 1601 data->cbs[0] = cancel_cb;
1633 1633
1634 return (void *)data; 1634 return (void *)data;
1635 } 1635 }
1636 1636
1637 static void 1637 static void
1638 gaim_gtk_close_request(GaimRequestType type, void *ui_handle) 1638 pidgin_close_request(GaimRequestType type, void *ui_handle)
1639 { 1639 {
1640 GaimGtkRequestData *data = (GaimGtkRequestData *)ui_handle; 1640 PidginRequestData *data = (PidginRequestData *)ui_handle;
1641 1641
1642 g_free(data->cbs); 1642 g_free(data->cbs);
1643 1643
1644 gtk_widget_destroy(data->dialog); 1644 gtk_widget_destroy(data->dialog);
1645 1645
1651 g_free(data); 1651 g_free(data);
1652 } 1652 }
1653 1653
1654 static GaimRequestUiOps ops = 1654 static GaimRequestUiOps ops =
1655 { 1655 {
1656 gaim_gtk_request_input, 1656 pidgin_request_input,
1657 gaim_gtk_request_choice, 1657 pidgin_request_choice,
1658 gaim_gtk_request_action, 1658 pidgin_request_action,
1659 gaim_gtk_request_fields, 1659 pidgin_request_fields,
1660 gaim_gtk_request_file, 1660 pidgin_request_file,
1661 gaim_gtk_close_request, 1661 pidgin_close_request,
1662 gaim_gtk_request_folder 1662 pidgin_request_folder
1663 }; 1663 };
1664 1664
1665 GaimRequestUiOps * 1665 GaimRequestUiOps *
1666 gaim_gtk_request_get_ui_ops(void) 1666 pidgin_request_get_ui_ops(void)
1667 { 1667 {
1668 return &ops; 1668 return &ops;
1669 } 1669 }