comparison src/audacious/main.c @ 2570:7b1b52eb663b trunk

[svn] - Minor cleanups
author mf0102
date Sat, 24 Feb 2007 14:22:57 -0800
parents cea3528b2996
children 40407b7363f3
comparison
equal deleted inserted replaced
2569:b3ca1bfcae6c 2570:7b1b52eb663b
526 g_build_filename(bmp_paths[BMP_PATH_USER_DIR], "accels", NULL); 526 g_build_filename(bmp_paths[BMP_PATH_USER_DIR], "accels", NULL);
527 bmp_paths[BMP_PATH_LOG_FILE] = 527 bmp_paths[BMP_PATH_LOG_FILE] =
528 g_build_filename(bmp_paths[BMP_PATH_USER_DIR], "log", NULL); 528 g_build_filename(bmp_paths[BMP_PATH_USER_DIR], "log", NULL);
529 529
530 bmp_paths[BMP_PATH_GTKRC_FILE] = 530 bmp_paths[BMP_PATH_GTKRC_FILE] =
531 g_build_filename(bmp_paths[BMP_PATH_USER_DIR], "gtkrc", NULL); 531 g_build_filename(bmp_paths[BMP_PATH_USER_DIR], "gtkrc", NULL);
532 532
533 g_free(xdg_config_home); 533 g_free(xdg_config_home);
534 g_free(xdg_data_home); 534 g_free(xdg_data_home);
535 g_free(xdg_cache_home); 535 g_free(xdg_cache_home);
536 536
891 gint pos = 0; 891 gint pos = 0;
892 gint i = 0; 892 gint i = 0;
893 893
894 for (i = 0; filenames[i] != NULL; i++) 894 for (i = 0; filenames[i] != NULL; i++)
895 { 895 {
896 gchar *filename; 896 gchar *filename;
897 gchar *current_dir = g_get_current_dir(); 897 gchar *current_dir = g_get_current_dir();
898 898
899 if (filenames[i][0] == '/' || strstr(filenames[i], "://")) 899 if (filenames[i][0] == '/' || strstr(filenames[i], "://"))
900 filename = g_strdup(filenames[i]); 900 filename = g_strdup(filenames[i]);
901 else 901 else
997 997
998 // use a format string? 998 // use a format string?
999 void report_error(const gchar *error_text) 999 void report_error(const gchar *error_text)
1000 { 1000 {
1001 fprintf(stderr, error_text); 1001 fprintf(stderr, error_text);
1002 if (options.headless!=1) { 1002
1003 if (options.headless != 1)
1004 {
1003 gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(err), 1005 gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(err),
1004 error_text); 1006 error_text);
1005 gtk_dialog_run(GTK_DIALOG(err)); 1007 gtk_dialog_run(GTK_DIALOG(err));
1006 gtk_widget_hide(err); 1008 gtk_widget_hide(err);
1007 } 1009 }