Tweak cli output and fix related warnings

This commit is contained in:
TingPing 2013-07-27 00:03:16 -04:00
parent 2cbe758c80
commit 93cfa353e7
1 changed files with 7 additions and 7 deletions

View File

@ -220,26 +220,26 @@ fe_args (int argc, char *argv[])
if (arg_show_version) if (arg_show_version)
{ {
buffer = g_strdup_printf ("%s %s", PACKAGE_NAME, PACKAGE_VERSION);
#ifdef WIN32 #ifdef WIN32
buffer = g_strdup_printf (DISPLAY_NAME " " PACKAGE_VERSION "\n");
gtk_init (&argc, &argv); gtk_init (&argc, &argv);
create_msg_dialog ("Version Information", buffer); create_msg_dialog ("Version Information", buffer);
g_free (buffer);
#else #else
printf (PACKAGE_NAME" "PACKAGE_VERSION"\n"); puts (buffer);
#endif #endif
g_free (buffer);
return 0; return 0;
} }
if (arg_show_autoload) 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 #ifdef WIN32
gtk_init (&argc, &argv); gtk_init (&argc, &argv);
create_msg_dialog ("Plugin/Script Auto-load Directory", buffer); create_msg_dialog ("Plugin/Script Auto-load Directory", buffer);
#else #else
printf (buffer); puts (buffer);
#endif #endif
g_free (buffer); g_free (buffer);
@ -248,12 +248,12 @@ fe_args (int argc, char *argv[])
if (arg_show_config) 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 #ifdef WIN32
gtk_init (&argc, &argv); gtk_init (&argc, &argv);
create_msg_dialog ("User Config Directory", buffer); create_msg_dialog ("User Config Directory", buffer);
#else #else
printf (buffer); puts (buffer);
#endif #endif
g_free (buffer); g_free (buffer);