comparison: gtk/gtkrequest.c
gtk/gtkrequest.c
- changeset 15405
- 4caa3012d974
- parent 15390
- d429e03fc755
- child 20470
- 77693555855f
- child 20472
- 6a6d2ef151e6
equal
deleted
inserted
replaced
| 15404:169e1ad5d3f6 | 15405:4caa3012d974 |
|---|---|
| 1413 | 1413 |
| 1414 data->u.file.name = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(data->dialog)); | 1414 data->u.file.name = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(data->dialog)); |
| 1415 current_folder = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(data->dialog)); | 1415 current_folder = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(data->dialog)); |
| 1416 if (current_folder != NULL) { | 1416 if (current_folder != NULL) { |
| 1417 if (data->u.file.savedialog) { | 1417 if (data->u.file.savedialog) { |
| 1418 gaim_prefs_set_string("/gaim/gtk/filelocations/last_save_folder", current_folder); | 1418 gaim_prefs_set_path("/gaim/gtk/filelocations/last_save_folder", current_folder); |
| 1419 } else { | 1419 } else { |
| 1420 gaim_prefs_set_string("/gaim/gtk/filelocations/last_open_folder", current_folder); | 1420 gaim_prefs_set_path("/gaim/gtk/filelocations/last_open_folder", current_folder); |
| 1421 } | 1421 } |
| 1422 g_free(current_folder); | 1422 g_free(current_folder); |
| 1423 } | 1423 } |
| 1424 | 1424 |
| 1425 #else /* FILECHOOSER */ | 1425 #else /* FILECHOOSER */ |
| 1453 data->u.file.name = g_strdup(current_folder); | 1453 data->u.file.name = g_strdup(current_folder); |
| 1454 } | 1454 } |
| 1455 | 1455 |
| 1456 if (current_folder != NULL) { | 1456 if (current_folder != NULL) { |
| 1457 if (data->u.file.savedialog) { | 1457 if (data->u.file.savedialog) { |
| 1458 gaim_prefs_set_string("/gaim/gtk/filelocations/last_save_folder", current_folder); | 1458 gaim_prefs_set_path("/gaim/gtk/filelocations/last_save_folder", current_folder); |
| 1459 } else { | 1459 } else { |
| 1460 gaim_prefs_set_string("/gaim/gtk/filelocations/last_open_folder", current_folder); | 1460 gaim_prefs_set_path("/gaim/gtk/filelocations/last_open_folder", current_folder); |
| 1461 } | 1461 } |
| 1462 g_free(current_folder); | 1462 g_free(current_folder); |
| 1463 } | 1463 } |
| 1464 | 1464 |
| 1465 #endif /* FILECHOOSER */ | 1465 #endif /* FILECHOOSER */ |
| 1522 GTK_RESPONSE_ACCEPT, | 1522 GTK_RESPONSE_ACCEPT, |
| 1523 NULL); | 1523 NULL); |
| 1524 gtk_dialog_set_default_response(GTK_DIALOG(filesel), GTK_RESPONSE_ACCEPT); | 1524 gtk_dialog_set_default_response(GTK_DIALOG(filesel), GTK_RESPONSE_ACCEPT); |
| 1525 | 1525 |
| 1526 if (savedialog) { | 1526 if (savedialog) { |
| 1527 current_folder = gaim_prefs_get_string("/gaim/gtk/filelocations/last_save_folder"); | 1527 current_folder = gaim_prefs_get_path("/gaim/gtk/filelocations/last_save_folder"); |
| 1528 } else { | 1528 } else { |
| 1529 current_folder = gaim_prefs_get_string("/gaim/gtk/filelocations/last_open_folder"); | 1529 current_folder = gaim_prefs_get_path("/gaim/gtk/filelocations/last_open_folder"); |
| 1530 } | 1530 } |
| 1531 | 1531 |
| 1532 if ((filename != NULL) && (*filename != '\0')) { | 1532 if ((filename != NULL) && (*filename != '\0')) { |
| 1533 if (savedialog) | 1533 if (savedialog) |
| 1534 gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(filesel), filename); | 1534 gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(filesel), filename); |
| 1557 #else /* FILECHOOSER */ | 1557 #else /* FILECHOOSER */ |
| 1558 filesel = gtk_file_selection_new( | 1558 filesel = gtk_file_selection_new( |
| 1559 title ? title : (savedialog ? _("Save File...") | 1559 title ? title : (savedialog ? _("Save File...") |
| 1560 : _("Open File..."))); | 1560 : _("Open File..."))); |
| 1561 if (savedialog) { | 1561 if (savedialog) { |
| 1562 current_folder = gaim_prefs_get_string("/gaim/gtk/filelocations/last_save_folder"); | 1562 current_folder = gaim_prefs_get_path("/gaim/gtk/filelocations/last_save_folder"); |
| 1563 } else { | 1563 } else { |
| 1564 current_folder = gaim_prefs_get_string("/gaim/gtk/filelocations/last_open_folder"); | 1564 current_folder = gaim_prefs_get_path("/gaim/gtk/filelocations/last_open_folder"); |
| 1565 } | 1565 } |
| 1566 if (current_folder != NULL) { | 1566 if (current_folder != NULL) { |
| 1567 gchar *path = g_strdup_printf("%s%s", current_folder, G_DIR_SEPARATOR_S); | 1567 gchar *path = g_strdup_printf("%s%s", current_folder, G_DIR_SEPARATOR_S); |
| 1568 gtk_file_selection_set_filename(GTK_FILE_SELECTION(filesel), path); | 1568 gtk_file_selection_set_filename(GTK_FILE_SELECTION(filesel), path); |
| 1569 g_free(path); | 1569 g_free(path); |
