diff options
Diffstat (limited to 'src/fe-gtk/fe-gtk.c')
| -rw-r--r-- | src/fe-gtk/fe-gtk.c | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/src/fe-gtk/fe-gtk.c b/src/fe-gtk/fe-gtk.c index c8a80369..3469569e 100644 --- a/src/fe-gtk/fe-gtk.c +++ b/src/fe-gtk/fe-gtk.c @@ -220,26 +220,26 @@ fe_args (int argc, char *argv[]) if (arg_show_version) { + buffer = g_strdup_printf ("%s %s", PACKAGE_NAME, PACKAGE_VERSION); #ifdef WIN32 - buffer = g_strdup_printf (DISPLAY_NAME " " PACKAGE_VERSION "\n"); gtk_init (&argc, &argv); create_msg_dialog ("Version Information", buffer); - g_free (buffer); #else - printf (PACKAGE_NAME" "PACKAGE_VERSION"\n"); + puts (buffer); #endif + g_free (buffer); return 0; } if (arg_show_autoload) { - buffer = g_strdup_printf ("%s" G_DIR_SEPARATOR_S "addons\n", get_xdir ()); + buffer = g_strdup_printf ("%s%caddons%c", get_xdir(), G_DIR_SEPARATOR, G_DIR_SEPARATOR); #ifdef WIN32 gtk_init (&argc, &argv); create_msg_dialog ("Plugin/Script Auto-load Directory", buffer); #else - printf (buffer); + puts (buffer); #endif g_free (buffer); @@ -248,12 +248,12 @@ fe_args (int argc, char *argv[]) if (arg_show_config) { - buffer = g_strdup_printf ("%s" G_DIR_SEPARATOR_S "\n", get_xdir ()); + buffer = g_strdup_printf ("%s%c", get_xdir(), G_DIR_SEPARATOR); #ifdef WIN32 gtk_init (&argc, &argv); create_msg_dialog ("User Config Directory", buffer); #else - printf (buffer); + puts (buffer); #endif g_free (buffer); @@ -908,10 +908,15 @@ fe_confirm (const char *message, void (*yesproc)(void *), void (*noproc)(void *) { /* warning, assuming fe_confirm is used by DCC only! */ struct DCC *dcc = ud; + char *filepath; if (dcc->file) - gtkutil_file_req (message, dcc_saveas_cb, ud, dcc->file, NULL, - FRF_WRITE|FRF_NOASKOVERWRITE); + { + filepath = g_build_filename (prefs.hex_dcc_dir, dcc->file, NULL); + gtkutil_file_req (message, dcc_saveas_cb, ud, filepath, NULL, + FRF_WRITE|FRF_NOASKOVERWRITE|FRF_FILTERISINITIAL); + g_free (filepath); + } } int |