# HG changeset patch
# User Yoshiki Yazawa <yaz@honeyplanet.jp>
# Date 1242901022 -32400
# Node ID 38b491487bd87ceec76fa3dbb26cbb7ef1d7e36a
# Parent  34d54dc5576d6ba72bf2f0e9689627496c25d54e
renamed dbus symbol to audlegacy

diff -r 34d54dc5576d -r 38b491487bd8 src/audlegacy/objects.xml
--- a/src/audlegacy/objects.xml	Sat Mar 28 19:27:30 2009 +0900
+++ b/src/audlegacy/objects.xml	Thu May 21 19:17:02 2009 +0900
@@ -93,7 +93,7 @@
 
 <node name="/">
     <!-- Audacious General Information -->
-    <interface name="org.atheme.audacious">
+    <interface name="org.atheme.audlegacy">
         <!-- Audacious version -->
         <method name="Version">
             <arg type="s" direction="out" name="version"/>
diff -r 34d54dc5576d -r 38b491487bd8 src/audlegacy/signals.c
--- a/src/audlegacy/signals.c	Sat Mar 28 19:27:30 2009 +0900
+++ b/src/audlegacy/signals.c	Thu May 21 19:17:02 2009 +0900
@@ -96,7 +96,7 @@
 
     sigemptyset(&waitset);
     sigaddset(&waitset, SIGPIPE);
-    sigaddset(&waitset, SIGSEGV);  
+    sigaddset(&waitset, SIGSEGV);
     sigaddset(&waitset, SIGINT);
     sigaddset(&waitset, SIGTERM);
 
@@ -186,7 +186,7 @@
 
     sigemptyset(&waitset);
     sigaddset(&waitset, SIGPIPE);
-    sigaddset(&waitset, SIGSEGV);  
+    sigaddset(&waitset, SIGSEGV);
     sigaddset(&waitset, SIGINT);
     sigaddset(&waitset, SIGTERM);
 
@@ -251,9 +251,9 @@
     return old_action.sa_handler;
 }
 
-/* 
+/*
  * A version of signal() that works more reliably across different
- * platforms. It: 
+ * platforms. It:
  * a. restarts interrupted system calls
  * b. does not reset the handler
  * c. blocks the same signal within the handler
@@ -268,8 +268,8 @@
 }
 
 
-/* sets up blocking signals for pthreads. 
- * linuxthreads sucks and needs this to make sigwait(2) work 
+/* sets up blocking signals for pthreads.
+ * linuxthreads sucks and needs this to make sigwait(2) work
  * correctly. --nenolod
  *
  * correction -- this trick does not work on linuxthreads.
@@ -282,12 +282,12 @@
 
     sigemptyset(&blockset);
     sigaddset(&blockset, SIGPIPE);
-    sigaddset(&blockset, SIGSEGV);  
+    sigaddset(&blockset, SIGSEGV);
     sigaddset(&blockset, SIGINT);
     sigaddset(&blockset, SIGTERM);
 
     if(pthread_sigmask(SIG_BLOCK, &blockset, NULL))
-        g_print("pthread_sigmask() failed.\n");    
+        g_print("pthread_sigmask() failed.\n");
 }
 
 static gboolean
@@ -310,33 +310,33 @@
 static void
 signal_session_quit_cb(EggSMClient *client, gpointer user_data)
 {
-    g_print("Session quit requested. Saving state and shutting down.\n");    
+    g_print("Session quit requested. Saving state and shutting down.\n");
     aud_quit();
 }
 
 static void
 signal_session_save_cb(EggSMClient *client, const char *state_dir, gpointer user_data)
 {
-    g_print("Session save requested. Saving state.\n");    
+    g_print("Session save requested. Saving state.\n");
     aud_config_save();
 }
 #endif
 
-void 
+void
 signal_handlers_init(void)
 {
 #ifdef USE_EGGSM
     EggSMClient *client;
 
     client = egg_sm_client_get ();
-    if (client != NULL) 
+    if (client != NULL)
     {
         egg_sm_client_set_mode (EGG_SM_CLIENT_MODE_NORMAL);
         g_signal_connect (client, "quit",
                           G_CALLBACK (signal_session_quit_cb), NULL);
         g_signal_connect (client, "save-state",
                           G_CALLBACK (signal_session_save_cb), NULL);
-    
+
     }
 #endif
 
diff -r 34d54dc5576d -r 38b491487bd8 src/libaudclient/audctrl.c
--- a/src/libaudclient/audctrl.c	Sat Mar 28 19:27:30 2009 +0900
+++ b/src/libaudclient/audctrl.c	Thu May 21 19:17:02 2009 +0900
@@ -54,7 +54,7 @@
         data++;
     }
 
-    org_atheme_audacious_playlist_add(proxy, (gpointer)glist, &error);
+    org_atheme_audlegacy_playlist_add(proxy, (gpointer)glist, &error);
 
     g_list_free(glist);
     glist = NULL;
@@ -73,7 +73,7 @@
  **/
 gchar *audacious_remote_get_version(DBusGProxy *proxy) {
     char *string = NULL;
-    org_atheme_audacious_version(proxy, &string, &error);
+    org_atheme_audlegacy_version(proxy, &string, &error);
     g_clear_error(&error);
 
     return (string ? string : NULL);
@@ -89,7 +89,7 @@
 void audacious_remote_playlist_add(DBusGProxy *proxy, GList *list) {
 	GList *iter;
 	for (iter = list; iter != NULL; iter = g_list_next(iter))
-		org_atheme_audacious_playlist_add(proxy, iter->data, &error);
+		org_atheme_audlegacy_playlist_add(proxy, iter->data, &error);
 	g_clear_error(&error);
 }
 
@@ -101,7 +101,7 @@
  * Deletes a playlist entry.
  **/
 void audacious_remote_playlist_delete(DBusGProxy *proxy, guint pos) {
-    org_atheme_audacious_delete(proxy, pos, &error);
+    org_atheme_audlegacy_delete(proxy, pos, &error);
     g_clear_error(&error);
 }
 
@@ -112,7 +112,7 @@
  * Tells audacious to begin playback.
  **/
 void audacious_remote_play(DBusGProxy *proxy) {
-    org_atheme_audacious_play(proxy, &error);
+    org_atheme_audlegacy_play(proxy, &error);
     g_clear_error(&error);
 }
 
@@ -123,7 +123,7 @@
  * Tells audacious to pause.
  **/
 void audacious_remote_pause(DBusGProxy *proxy) {
-    org_atheme_audacious_pause(proxy, &error);
+    org_atheme_audlegacy_pause(proxy, &error);
     g_clear_error(&error);
 }
 
@@ -134,7 +134,7 @@
  * Tells audacious to stop.
  **/
 void audacious_remote_stop(DBusGProxy *proxy) {
-    org_atheme_audacious_stop(proxy, &error);
+    org_atheme_audlegacy_stop(proxy, &error);
     g_clear_error(&error);
 }
 
@@ -148,7 +148,7 @@
  **/
 gboolean audacious_remote_is_playing(DBusGProxy *proxy) {
     gboolean is_playing = FALSE;
-    org_atheme_audacious_playing(proxy, &is_playing, &error);
+    org_atheme_audlegacy_playing(proxy, &is_playing, &error);
     g_clear_error(&error);
     return is_playing;
 }
@@ -163,7 +163,7 @@
  **/
 gboolean audacious_remote_is_paused(DBusGProxy *proxy) {
     gboolean is_paused = FALSE;
-    org_atheme_audacious_paused(proxy, &is_paused, &error);
+    org_atheme_audlegacy_paused(proxy, &is_paused, &error);
     g_clear_error(&error);
     return is_paused;
 }
@@ -178,7 +178,7 @@
  **/
 gint audacious_remote_get_playlist_pos(DBusGProxy *proxy) {
     guint pos = 0;
-    org_atheme_audacious_position(proxy, &pos, &error);
+    org_atheme_audlegacy_position(proxy, &pos, &error);
     g_clear_error(&error);
     return pos;
 }
@@ -191,7 +191,7 @@
  * Tells audacious to jump to a different playlist position.
  **/
 void audacious_remote_set_playlist_pos(DBusGProxy *proxy, guint pos) {
-    org_atheme_audacious_jump (proxy, pos, &error);
+    org_atheme_audlegacy_jump (proxy, pos, &error);
     g_clear_error(&error);
 }
 
@@ -205,7 +205,7 @@
  **/
 gint audacious_remote_get_playlist_length(DBusGProxy *proxy) {
     gint len = 0;
-    org_atheme_audacious_length(proxy, &len, &error);
+    org_atheme_audlegacy_length(proxy, &len, &error);
     g_clear_error(&error);
     return len;
 }
@@ -217,7 +217,7 @@
  * Clears the playlist.
  **/
 void audacious_remote_playlist_clear(DBusGProxy *proxy) {
-    org_atheme_audacious_clear(proxy, &error);
+    org_atheme_audlegacy_clear(proxy, &error);
     g_clear_error(&error);
 }
 
@@ -231,7 +231,7 @@
  **/
 gint audacious_remote_get_output_time(DBusGProxy *proxy) {
     guint time = 0;
-    org_atheme_audacious_time(proxy, &time, &error);
+    org_atheme_audlegacy_time(proxy, &time, &error);
     g_clear_error(&error);
     return time;
 }
@@ -244,7 +244,7 @@
  * Tells audacious to seek to a new time position.
  **/
 void audacious_remote_jump_to_time(DBusGProxy *proxy, guint pos) {
-    org_atheme_audacious_seek (proxy, pos, &error);
+    org_atheme_audlegacy_seek (proxy, pos, &error);
     g_clear_error(&error);    
 }
 
@@ -257,7 +257,7 @@
  * Queries audacious about the current volume.
  **/
 void audacious_remote_get_volume(DBusGProxy *proxy, gint * vl, gint * vr) {
-    org_atheme_audacious_volume(proxy, vl, vr, &error);
+    org_atheme_audlegacy_volume(proxy, vl, vr, &error);
     g_clear_error(&error);
 }
 
@@ -287,7 +287,7 @@
  **/
 gint audacious_remote_get_balance(DBusGProxy *proxy) {
     gint balance = 50;
-    org_atheme_audacious_balance(proxy, &balance,  &error);
+    org_atheme_audlegacy_balance(proxy, &balance,  &error);
     g_clear_error(&error);
     return balance;
 }
@@ -301,7 +301,7 @@
  * Sets the volume for the left and right channels in Audacious.
  **/
 void audacious_remote_set_volume(DBusGProxy *proxy, gint vl, gint vr) {
-    org_atheme_audacious_set_volume(proxy, vl, vr,  &error);
+    org_atheme_audlegacy_set_volume(proxy, vl, vr,  &error);
     g_clear_error(&error);
 }
 
@@ -368,7 +368,7 @@
  **/
 gchar *audacious_remote_get_playlist_file(DBusGProxy *proxy, guint pos) {
     gchar *out = NULL;
-    org_atheme_audacious_song_filename(proxy, pos, &out, &error);
+    org_atheme_audlegacy_song_filename(proxy, pos, &out, &error);
     g_clear_error(&error);
     return out;
 }
@@ -384,7 +384,7 @@
  **/
 gchar *audacious_remote_get_playlist_title(DBusGProxy *proxy, guint pos) {
     gchar *out = NULL;
-    org_atheme_audacious_song_title(proxy, pos, &out, &error);
+    org_atheme_audlegacy_song_title(proxy, pos, &out, &error);
     g_clear_error(&error);
     return out;
 }
@@ -400,7 +400,7 @@
  **/
 gint audacious_remote_get_playlist_time(DBusGProxy *proxy, guint pos) {
     gint out = 0;
-    org_atheme_audacious_song_frames(proxy, pos, &out, &error);
+    org_atheme_audlegacy_song_frames(proxy, pos, &out, &error);
     g_clear_error(&error);
     return out;
 }
@@ -416,7 +416,7 @@
  **/
 void audacious_remote_get_info(DBusGProxy *proxy, gint *rate, gint *freq,
                                gint *nch) {
-    org_atheme_audacious_info(proxy, rate, freq, nch, &error);
+    org_atheme_audlegacy_info(proxy, rate, freq, nch, &error);
     g_clear_error(&error);
 }
 
@@ -428,7 +428,7 @@
  * Toggles the main window's visibility.
  **/
 void audacious_remote_main_win_toggle(DBusGProxy *proxy, gboolean show) {
-    org_atheme_audacious_show_main_win(proxy, show, &error);
+    org_atheme_audlegacy_show_main_win(proxy, show, &error);
     g_clear_error(&error);
 }
 
@@ -440,7 +440,7 @@
  * Toggles the playlist window's visibility.
  **/
 void audacious_remote_pl_win_toggle(DBusGProxy *proxy, gboolean show) {
-    org_atheme_audacious_show_playlist(proxy, show, &error);
+    org_atheme_audlegacy_show_playlist(proxy, show, &error);
     g_clear_error(&error);
 }
 
@@ -452,7 +452,7 @@
  * Toggles the equalizer window's visibility.
  **/
 void audacious_remote_eq_win_toggle(DBusGProxy *proxy, gboolean show) {
-    org_atheme_audacious_show_equalizer(proxy, show, &error);
+    org_atheme_audlegacy_show_equalizer(proxy, show, &error);
     g_clear_error(&error);
 }
 
@@ -466,7 +466,7 @@
  **/
 gboolean audacious_remote_is_main_win(DBusGProxy *proxy) {
     gboolean visible = TRUE;
-    org_atheme_audacious_main_win_visible(proxy, &visible, &error);
+    org_atheme_audlegacy_main_win_visible(proxy, &visible, &error);
     g_clear_error(&error);
     return visible;
 }
@@ -481,7 +481,7 @@
  **/
 gboolean audacious_remote_is_pl_win(DBusGProxy *proxy) {
     gboolean visible = TRUE;
-    org_atheme_audacious_playlist_visible(proxy, &visible, &error);
+    org_atheme_audlegacy_playlist_visible(proxy, &visible, &error);
     g_clear_error(&error);
     return visible;
 }
@@ -496,7 +496,7 @@
  **/
 gboolean audacious_remote_is_eq_win(DBusGProxy *proxy) {
     gboolean visible = FALSE;
-    org_atheme_audacious_equalizer_visible(proxy, &visible, &error);
+    org_atheme_audlegacy_equalizer_visible(proxy, &visible, &error);
     g_clear_error(&error);
     return visible;
 }
@@ -519,7 +519,7 @@
  * Tells audacious to show/hide the preferences pane.
  **/
 void audacious_remote_toggle_prefs_box(DBusGProxy *proxy, gboolean show) {
-    org_atheme_audacious_show_prefs_box(proxy, show, &error);
+    org_atheme_audlegacy_show_prefs_box(proxy, show, &error);
     g_clear_error(&error);
 }
 
@@ -541,7 +541,7 @@
  * Tells audacious to show/hide the about box.
  **/
 void audacious_remote_toggle_about_box(DBusGProxy *proxy, gboolean show) {
-    org_atheme_audacious_show_about_box(proxy, show, &error);
+    org_atheme_audlegacy_show_about_box(proxy, show, &error);
     g_clear_error(&error);
 }
 
@@ -553,7 +553,7 @@
  * Tells audacious to toggle the always-on-top feature.
  **/
 void audacious_remote_toggle_aot(DBusGProxy *proxy, gboolean ontop) {
-    org_atheme_audacious_toggle_aot(proxy, ontop, &error);
+    org_atheme_audlegacy_toggle_aot(proxy, ontop, &error);
 	g_clear_error(&error);
 }
 
@@ -564,7 +564,7 @@
  * Tells audacious to display the open files pane.
  **/
 void audacious_remote_eject(DBusGProxy *proxy) {
-    org_atheme_audacious_eject(proxy, &error);
+    org_atheme_audlegacy_eject(proxy, &error);
     g_clear_error(&error);
 }
 
@@ -575,7 +575,7 @@
  * Tells audacious to move backwards in the playlist.
  **/
 void audacious_remote_playlist_prev(DBusGProxy *proxy) {
-    org_atheme_audacious_reverse(proxy, &error);
+    org_atheme_audlegacy_reverse(proxy, &error);
     g_clear_error(&error);
 }
 
@@ -586,7 +586,7 @@
  * Tells audacious to move forward in the playlist.
  **/
 void audacious_remote_playlist_next(DBusGProxy *proxy) {
-    org_atheme_audacious_advance(proxy, &error);
+    org_atheme_audlegacy_advance(proxy, &error);
     g_clear_error(&error);
 }
 
@@ -599,7 +599,7 @@
  **/
 void audacious_remote_playlist_add_url_string(DBusGProxy *proxy,
                                               gchar *string) {
-    org_atheme_audacious_add_url(proxy, string, &error);
+    org_atheme_audlegacy_add_url(proxy, string, &error);
     g_clear_error(&error);
 }
 
@@ -613,7 +613,7 @@
  **/
 gboolean audacious_remote_is_running(DBusGProxy *proxy) {
     char *string = NULL;
-    org_atheme_audacious_version(proxy, &string, &error);
+    org_atheme_audlegacy_version(proxy, &string, &error);
     g_clear_error(&error);
     if(string) {
         g_free(string);
@@ -630,7 +630,7 @@
  * Tells audacious to toggle the repeat feature.
  **/
 void audacious_remote_toggle_repeat(DBusGProxy *proxy) {
-    org_atheme_audacious_toggle_repeat(proxy, &error);
+    org_atheme_audlegacy_toggle_repeat(proxy, &error);
     g_clear_error(&error);
 }
 
@@ -641,7 +641,7 @@
  * Tells audacious to toggle the shuffle feature.
  **/
 void audacious_remote_toggle_shuffle(DBusGProxy *proxy) {
-    org_atheme_audacious_toggle_shuffle (proxy, &error);
+    org_atheme_audlegacy_toggle_shuffle (proxy, &error);
     g_clear_error(&error);    
 }
 
@@ -655,7 +655,7 @@
  **/
 gboolean audacious_remote_is_repeat(DBusGProxy *proxy) {
     gboolean is_repeat;
-    org_atheme_audacious_repeat(proxy, &is_repeat, &error);
+    org_atheme_audlegacy_repeat(proxy, &is_repeat, &error);
     g_clear_error(&error);
     return is_repeat;
 }
@@ -670,7 +670,7 @@
  **/
 gboolean audacious_remote_is_shuffle(DBusGProxy *proxy) {
     gboolean is_shuffle;
-    org_atheme_audacious_shuffle(proxy, &is_shuffle, &error);
+    org_atheme_audlegacy_shuffle(proxy, &is_shuffle, &error);
     g_clear_error(&error);
     return is_shuffle;
 }
@@ -684,7 +684,7 @@
  * Queries audacious about the equalizer settings.
  **/
 void audacious_remote_get_eq(DBusGProxy *proxy, gdouble *preamp, GArray **bands) {
-    org_atheme_audacious_get_eq(proxy, preamp, bands, &error);
+    org_atheme_audlegacy_get_eq(proxy, preamp, bands, &error);
     g_clear_error(&error);
 }
 
@@ -699,7 +699,7 @@
 gdouble audacious_remote_get_eq_preamp(DBusGProxy *proxy) {
     gdouble preamp = 0.0;
 
-    org_atheme_audacious_get_eq_preamp(proxy, &preamp, &error);
+    org_atheme_audlegacy_get_eq_preamp(proxy, &preamp, &error);
     g_clear_error(&error);
 
     return preamp;
@@ -717,7 +717,7 @@
 gdouble audacious_remote_get_eq_band(DBusGProxy *proxy, gint band) {
     gdouble value = 0.0;
 
-    org_atheme_audacious_get_eq_band(proxy, band, &value, &error);
+    org_atheme_audlegacy_get_eq_band(proxy, band, &value, &error);
     g_clear_error(&error);
 
     return value;
@@ -732,7 +732,7 @@
  * Tells audacious to set the equalizer up using the provided values.
  **/
 void audacious_remote_set_eq(DBusGProxy *proxy, gdouble preamp, GArray *bands) {
-    org_atheme_audacious_set_eq(proxy, preamp, bands, &error);
+    org_atheme_audlegacy_set_eq(proxy, preamp, bands, &error);
     g_clear_error(&error);
 }
 
@@ -744,7 +744,7 @@
  * Tells audacious to set the equalizer's preamp setting.
  **/
 void audacious_remote_set_eq_preamp(DBusGProxy *proxy, gdouble preamp) {
-    org_atheme_audacious_set_eq_preamp(proxy, preamp, &error);
+    org_atheme_audlegacy_set_eq_preamp(proxy, preamp, &error);
     g_clear_error(&error);
 }
 
@@ -757,7 +757,7 @@
  * Tells audacious to set an equalizer band's setting.
  **/
 void audacious_remote_set_eq_band(DBusGProxy *proxy, gint band, gdouble value) {
-    org_atheme_audacious_set_eq_band(proxy, band, value, &error);
+    org_atheme_audlegacy_set_eq_band(proxy, band, value, &error);
     g_clear_error(&error);
 }
 
@@ -768,7 +768,7 @@
  * Tells audacious to quit.
  **/
 void audacious_remote_quit(DBusGProxy *proxy) {
-    org_atheme_audacious_quit(proxy, &error);
+    org_atheme_audlegacy_quit(proxy, &error);
     g_clear_error(&error);
 }
 
@@ -779,7 +779,7 @@
  * Tells audacious to either play or pause.
  **/
 void audacious_remote_play_pause(DBusGProxy *proxy) {
-    org_atheme_audacious_play_pause(proxy, &error);
+    org_atheme_audlegacy_play_pause(proxy, &error);
 }
 
 /**
@@ -792,7 +792,7 @@
  **/
 void audacious_remote_playlist_ins_url_string(DBusGProxy *proxy,
                                               gchar *string, guint pos) {
-    org_atheme_audacious_playlist_ins_url_string (proxy, string, pos, &error);
+    org_atheme_audlegacy_playlist_ins_url_string (proxy, string, pos, &error);
     g_clear_error(&error);
 }
 
@@ -804,7 +804,7 @@
  * Tells audacious to add a playlist entry to the playqueue.
  **/
 void audacious_remote_playqueue_add(DBusGProxy *proxy, guint pos) {
-    org_atheme_audacious_playqueue_add (proxy, pos, &error);
+    org_atheme_audlegacy_playqueue_add (proxy, pos, &error);
     g_clear_error(&error);
 }
 
@@ -816,7 +816,7 @@
  * Tells audacious to remove a playlist entry from the playqueue.
  **/
 void audacious_remote_playqueue_remove(DBusGProxy *proxy, guint pos) {
-    org_atheme_audacious_playqueue_remove (proxy, pos, &error);
+    org_atheme_audlegacy_playqueue_remove (proxy, pos, &error);
     g_clear_error(&error);
 }
 
@@ -831,7 +831,7 @@
 gint audacious_remote_get_playqueue_length(DBusGProxy *proxy) {
     gint len = 0;
     // this returns the lenght of the playlist, NOT the length of the playqueue
-    org_atheme_audacious_length(proxy, &len, &error);
+    org_atheme_audlegacy_length(proxy, &len, &error);
     g_clear_error(&error);
     return len;
 }
@@ -843,7 +843,7 @@
  * Tells audacious to toggle the no-playlist-advance feature.
  **/
 void audacious_remote_toggle_advance(DBusGProxy *proxy) {
-    org_atheme_audacious_toggle_auto_advance(proxy, &error);
+    org_atheme_audlegacy_toggle_auto_advance(proxy, &error);
     g_clear_error(&error);
 }
 
@@ -857,7 +857,7 @@
  **/
 gboolean audacious_remote_is_advance(DBusGProxy *proxy) {
     gboolean is_advance = FALSE;
-    org_atheme_audacious_auto_advance(proxy, &is_advance, &error);
+    org_atheme_audlegacy_auto_advance(proxy, &is_advance, &error);
     g_clear_error(&error);
     return is_advance;
 }
@@ -869,7 +869,7 @@
  * Tells audacious to display the main window and become the selected window.
  **/
 void audacious_remote_activate(DBusGProxy *proxy) {
-    org_atheme_audacious_activate(proxy, &error);
+    org_atheme_audlegacy_activate(proxy, &error);
     g_clear_error(&error);
 }
 
@@ -891,7 +891,7 @@
  * Tells audacious to show/hide the Jump-to-File pane.
  **/
 void audacious_remote_toggle_jtf_box(DBusGProxy *proxy, gboolean show) {
-    org_atheme_audacious_show_jtf_box(proxy, show, &error);
+    org_atheme_audlegacy_show_jtf_box(proxy, show, &error);
     g_clear_error(&error);
 }
 
@@ -903,7 +903,7 @@
  * Tells audacious to show the filebrowser dialog.
  **/
 void audacious_remote_toggle_filebrowser(DBusGProxy *proxy, gboolean show) {
-    org_atheme_audacious_show_filebrowser(proxy, show, &error);
+    org_atheme_audlegacy_show_filebrowser(proxy, show, &error);
     g_clear_error(&error);
 }
 
@@ -914,7 +914,7 @@
  * Tells audacious to clear the playqueue.
  **/
 void audacious_remote_playqueue_clear(DBusGProxy *proxy) {
-    org_atheme_audacious_playqueue_clear(proxy, &error);
+    org_atheme_audlegacy_playqueue_clear(proxy, &error);
     g_clear_error(&error);
 }
 
@@ -929,7 +929,7 @@
  **/
 gboolean audacious_remote_playqueue_is_queued(DBusGProxy *proxy, guint pos) {
     gboolean is_queued;
-    org_atheme_audacious_playqueue_is_queued (proxy, pos, &is_queued, &error);
+    org_atheme_audlegacy_playqueue_is_queued (proxy, pos, &is_queued, &error);
     g_clear_error(&error);
     return is_queued;
 }
@@ -945,7 +945,7 @@
  **/
 gint audacious_remote_get_playqueue_queue_position(DBusGProxy *proxy, guint pos) {
     guint qpos = 0;
-    org_atheme_audacious_queue_get_queue_pos (proxy, pos, &qpos, &error);
+    org_atheme_audlegacy_queue_get_queue_pos (proxy, pos, &qpos, &error);
     g_clear_error(&error);
     return qpos;
 }
@@ -961,7 +961,7 @@
  **/
 gint audacious_remote_get_playqueue_list_position(DBusGProxy *proxy, guint qpos) {
     guint pos = 0;
-    org_atheme_audacious_queue_get_list_pos (proxy, qpos, &pos, &error);
+    org_atheme_audlegacy_queue_get_list_pos (proxy, qpos, &pos, &error);
     g_clear_error(&error);
     return pos;
 }
@@ -975,7 +975,7 @@
  **/
 void audacious_remote_playlist_enqueue_to_temp(DBusGProxy *proxy,
                                                gchar *string) {
-    org_atheme_audacious_playlist_enqueue_to_temp(proxy, string, &error);
+    org_atheme_audlegacy_playlist_enqueue_to_temp(proxy, string, &error);
 	g_clear_error(&error);
 }
 
@@ -994,7 +994,7 @@
     GValue value = {};
     gchar *s = NULL;
 
-    org_atheme_audacious_song_tuple(proxy, pos, field, &value, &error);
+    org_atheme_audlegacy_song_tuple(proxy, pos, field, &value, &error);
 
     g_clear_error(&error);
 
@@ -1036,7 +1036,7 @@
  * Toggles the equalizer.
  **/
 void audacious_remote_eq_activate(DBusGProxy *proxy, gboolean active) {
-    org_atheme_audacious_equalizer_activate (proxy, active, &error);
+    org_atheme_audlegacy_equalizer_activate (proxy, active, &error);
     g_clear_error(&error);
 }
 
@@ -1050,7 +1050,7 @@
  **/
 gchar **audacious_remote_get_tuple_fields(DBusGProxy *proxy) {
     gchar **res = NULL;
-    org_atheme_audacious_get_tuple_fields (proxy, &res, &error);
+    org_atheme_audlegacy_get_tuple_fields (proxy, &res, &error);
     g_clear_error(&error);
     return res;
 }