Mercurial > audlegacy
changeset 2506:630910fd140f trunk
[svn] - changed plugin directory to ~/.local/share/audacious/Plugins (seems more logical to me)
- updated migrate_config.sh to reflect the change
- reindented a bit
| author | mf0102 |
|---|---|
| date | Mon, 12 Feb 2007 08:13:53 -0800 |
| parents | 87c53f0e9e0d |
| children | e07c141dd326 |
| files | ChangeLog migrate_config.sh src/audacious/build_stamp.c src/audacious/main.c |
| diffstat | 4 files changed, 24 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Feb 12 07:18:47 2007 -0800 +++ b/ChangeLog Mon Feb 12 08:13:53 2007 -0800 @@ -1,3 +1,10 @@ +2007-02-12 15:18:47 +0000 Giacomo Lozito <james@develia.org> + revision [4020] + - added set volume hook + trunk/src/audacious/input.c | 7 +++++++ + 1 file changed, 7 insertions(+) + + 2007-02-12 12:34:56 +0000 Giacomo Lozito <james@develia.org> revision [4018] - convert filename string to utf8 for playlist->title (closes bug #789)
--- a/migrate_config.sh Mon Feb 12 07:18:47 2007 -0800 +++ b/migrate_config.sh Mon Feb 12 08:13:53 2007 -0800 @@ -14,15 +14,15 @@ rm -fr "$XDG_CACHE_HOME/audacious" mkdir -p "$XDG_CONFIG_HOME/audacious" -mkdir -p "$XDG_CONFIG_HOME/audacious/Plugins" +mkdir -p "$XDG_DATA_HOME/audacious/Plugins" mkdir -p "$XDG_DATA_HOME/audacious/Skins" mkdir -p "$XDG_CACHE_HOME/audacious/thumbs" -mv "$HOME/$BMP_RCPATH/config" "$XDG_CONFIG_HOME/audacious/" +mv "$HOME/$BMP_RCPATH/config" "$XDG_CONFIG_HOME/audacious/" mv "$HOME/$BMP_RCPATH/playlist.xspf" "$XDG_CONFIG_HOME/audacious/" -mv "$HOME/$BMP_RCPATH/Plugins" "$XDG_CONFIG_HOME/audacious/" -mv "$HOME/$BMP_RCPATH/Skins" "$XDG_DATA_HOME/audacious/" -mv "$HOME/$BMP_RCPATH/accels" "$XDG_CONFIG_HOME/audacious/" -mv "$HOME/$BMP_RCPATH/log" "$XDG_CONFIG_HOME/audacious/" +mv "$HOME/$BMP_RCPATH/Plugins" "$XDG_DATA_HOME/audacious/" +mv "$HOME/$BMP_RCPATH/Skins" "$XDG_DATA_HOME/audacious/" +mv "$HOME/$BMP_RCPATH/accels" "$XDG_CONFIG_HOME/audacious/" +mv "$HOME/$BMP_RCPATH/log" "$XDG_CONFIG_HOME/audacious/" echo "Conversion done. Please move the remaining files manually."
--- a/src/audacious/build_stamp.c Mon Feb 12 07:18:47 2007 -0800 +++ b/src/audacious/build_stamp.c Mon Feb 12 08:13:53 2007 -0800 @@ -1,2 +1,2 @@ #include <glib.h> -const gchar *svn_stamp = "20070212-4018"; +const gchar *svn_stamp = "20070212-4020";
--- a/src/audacious/main.c Mon Feb 12 07:18:47 2007 -0800 +++ b/src/audacious/main.c Mon Feb 12 08:13:53 2007 -0800 @@ -504,9 +504,9 @@ g_build_filename(xdg_config_home, "audacious", NULL); bmp_paths[BMP_PATH_USER_SKIN_DIR] = g_build_filename(xdg_data_home, "audacious", "Skins", NULL); - // FIXME: Think of something better for Plugins, XDG is missing this bmp_paths[BMP_PATH_USER_PLUGIN_DIR] = - g_build_filename(bmp_paths[BMP_PATH_USER_DIR], "Plugins", NULL); + g_build_filename(xdg_data_home, "audacious", "Plugins", NULL); + bmp_paths[BMP_PATH_SKIN_THUMB_DIR] = g_build_filename(xdg_cache_home, "audacious", "thumbs", NULL); @@ -527,7 +527,7 @@ g_build_filename(bmp_paths[BMP_PATH_USER_DIR], "log", NULL); bmp_paths[BMP_PATH_GTKRC_FILE] = - g_build_filename(bmp_paths[BMP_PATH_USER_DIR], "gtkrc", NULL); + g_build_filename(bmp_paths[BMP_PATH_USER_DIR], "gtkrc", NULL); g_free(xdg_config_home); g_free(xdg_data_home); @@ -977,9 +977,9 @@ static gboolean aud_headless_iteration(gpointer unused) { - audcore_generic_events(); - free_vis_data(); - return TRUE; + audcore_generic_events(); + free_vis_data(); + return TRUE; } gint @@ -1189,16 +1189,16 @@ // if we are running headless else { - GMainLoop *loop; + GMainLoop *loop; mainwin_set_info_text(); playlist_start_get_info_thread(); starting_up = FALSE; - loop = g_main_loop_new(NULL, TRUE); - g_timeout_add(10, aud_headless_iteration, NULL); - g_main_loop_run(loop); + loop = g_main_loop_new(NULL, TRUE); + g_timeout_add(10, aud_headless_iteration, NULL); + g_main_loop_run(loop); return EXIT_SUCCESS; }