Mercurial > pidgin.yaz
comparison src/gtkrequest.c @ 9506:c6ecd07aed6f
[gaim-migrate @ 10333]
Fix a crash with the <2.4 file chooser when using the X to close the
window. Also set a better default window title.
committer: Tailor Script <tailor@pidgin.im>
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Sun, 11 Jul 2004 04:09:43 +0000 |
parents | d822b19b751c |
children | ac94e3f5ac8a |
comparison
equal
deleted
inserted
replaced
9505:12ce3d23c662 | 9506:c6ecd07aed6f |
---|---|
1396 file_yes_no_cb(data, 1); | 1396 file_yes_no_cb(data, 1); |
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_cancel_cb(GtkWidget *widget, GaimGtkRequestData *data) | 1401 file_cancel_cb(GaimGtkRequestData *data) |
1402 { | 1402 { |
1403 if (data->cbs[0] != NULL) | 1403 if (data->cbs[0] != NULL) |
1404 ((GaimRequestFileCb)data->cbs[0])(data->user_data, NULL); | 1404 ((GaimRequestFileCb)data->cbs[0])(data->user_data, NULL); |
1405 | 1405 |
1406 gaim_request_close(GAIM_REQUEST_FILE, data); | 1406 gaim_request_close(GAIM_REQUEST_FILE, data); |
1445 gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(filesel), filename); | 1445 gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(filesel), filename); |
1446 } | 1446 } |
1447 g_signal_connect(G_OBJECT(GTK_FILE_CHOOSER(filesel)), "response", | 1447 g_signal_connect(G_OBJECT(GTK_FILE_CHOOSER(filesel)), "response", |
1448 G_CALLBACK(file_ok_check_if_exists_cb), data); | 1448 G_CALLBACK(file_ok_check_if_exists_cb), data); |
1449 #else /* FILECHOOSER */ | 1449 #else /* FILECHOOSER */ |
1450 filesel = gtk_file_selection_new(title ? title : ""); | 1450 filesel = gtk_file_selection_new(title ? title |
1451 : (savedialog ? _("Save File...") | |
1452 : _("Open File..."))); | |
1451 gtk_file_selection_set_filename(GTK_FILE_SELECTION(filesel), filename); | 1453 gtk_file_selection_set_filename(GTK_FILE_SELECTION(filesel), filename); |
1452 g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(filesel)), "delete_event", | 1454 g_signal_connect_swapped(G_OBJECT(GTK_FILE_SELECTION(filesel)), "delete_event", |
1453 G_CALLBACK(file_cancel_cb), data); | 1455 G_CALLBACK(file_cancel_cb), data); |
1454 g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(filesel)->cancel_button), | 1456 g_signal_connect_swapped(G_OBJECT(GTK_FILE_SELECTION(filesel)->cancel_button), |
1455 "clicked", G_CALLBACK(file_cancel_cb), data); | 1457 "clicked", G_CALLBACK(file_cancel_cb), data); |
1456 g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(filesel)->ok_button), | 1458 g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(filesel)->ok_button), "clicked", |
1457 "clicked", G_CALLBACK(file_ok_check_if_exists_cb), data); | 1459 G_CALLBACK(file_ok_check_if_exists_cb), data); |
1458 #endif /* FILECHOOSER */ | 1460 #endif /* FILECHOOSER */ |
1459 | 1461 |
1460 data->dialog = filesel; | 1462 data->dialog = filesel; |
1461 gtk_widget_show(filesel); | 1463 gtk_widget_show(filesel); |
1462 | 1464 |