changeset 4708:c2886b393206

completely remove skin getting/setting

--- a/src/audacious/main.c	Mon Jul 07 23:13:55 2008 +0200
+++ b/src/audacious/main.c	Mon Jul 07 23:54:10 2008 +0200
@@ -59,7 +59,6 @@
 #include "pluginenum.h"
 #include "signals.h"
 #include "legacy/ui_manager.h"
-#include "legacy/ui_skin.h"
 #include "util.h"
 #include "vfs.h"
 
@@ -77,7 +76,6 @@
     gint session;
     gboolean play, stop, pause, fwd, rew, play_pause, show_jump_box;
     gboolean enqueue, mainwin, remote, activate;
-    gboolean load_skins;
     gboolean no_log;
     gboolean enqueue_to_temp;
     gboolean version;
@@ -288,37 +286,29 @@
 #ifdef USE_DBUS
     if (is_running)
     {
-        if (options.load_skins)
-        {
-            audacious_remote_set_skin(session, filenames[0]);
-            skin_install_skin(filenames[0]);
-        }
-        else
-        {
-            GList *i;
+        GList *i;
 
-            if (options.enqueue_to_temp)
-                audacious_remote_playlist_enqueue_to_temp(session, filenames[0]);
+        if (options.enqueue_to_temp)
+            audacious_remote_playlist_enqueue_to_temp(session, filenames[0]);
 
-            if (options.enqueue && options.play)
-                pos = audacious_remote_get_playlist_length(session);
+        if (options.enqueue && options.play)
+            pos = audacious_remote_get_playlist_length(session);
 
-            if (!options.enqueue)
-            {
-                audacious_remote_playlist_clear(session);
-                audacious_remote_stop(session);
-            }
+        if (!options.enqueue)
+        {
+            audacious_remote_playlist_clear(session);
+            audacious_remote_stop(session);
+        }
 
-            for (i = fns; i != NULL; i = i->next)
-                audacious_remote_playlist_add_url_string(session, i->data);
+        for (i = fns; i != NULL; i = i->next)
+            audacious_remote_playlist_add_url_string(session, i->data);
 
-            if (options.enqueue && options.play &&
-                audacious_remote_get_playlist_length(session) > pos)
-                audacious_remote_set_playlist_pos(session, pos);
+        if (options.enqueue && options.play &&
+            audacious_remote_get_playlist_length(session) > pos)
+            audacious_remote_set_playlist_pos(session, pos);
 
-            if (!options.enqueue)
-                audacious_remote_play(session);
-        }
+        if (!options.enqueue)
+            audacious_remote_play(session);
     }
     else /* !is_running */
 #endif

--- a/src/audtool/handlers_general.c	Mon Jul 07 23:13:55 2008 +0200
+++ b/src/audtool/handlers_general.c	Mon Jul 07 23:54:10 2008 +0200
@@ -270,28 +270,6 @@
     }
 }
 
-void get_skin(gint argc, gchar **argv)
-{
-    gchar *skin = NULL;
-    skin = audacious_remote_get_skin(dbus_proxy);
-    audtool_report("%s", skin);
-    g_free(skin);
-}
-
-void set_skin(gint argc, gchar **argv)
-{
-    if (argc < 2)
-    {
-        audtool_whine_args(argv[0], "<skin>");
-        exit(1);
-    }
-
-    if(!argv[1] || !strcmp(argv[1], ""))
-       return;
-
-    audacious_remote_set_skin(dbus_proxy, argv[1]);
-}
-
 void get_version(gint argc, gchar **argv)
 {
     gchar *version = NULL;

--- a/src/audtool/main.c	Mon Jul 07 23:13:55 2008 +0200
+++ b/src/audtool/main.c	Mon Jul 07 23:54:10 2008 +0200
@@ -131,8 +131,6 @@
 
 	{"activate", activate, "activates and raises audacious", 0},
 	{"always-on-top", toggle_aot, "on/off always on top", 1},
-    {"get-skin", get_skin, "gets skin", 0},
-    {"set-skin", set_skin, "sets skin", 1},
     {"version", get_version, "shows audaciuos version", 0},
 	{"shutdown", shutdown_audacious_server, "shuts down audacious", 0},
 

--- a/src/libaudclient/audctrl.c	Mon Jul 07 23:13:55 2008 +0200
+++ b/src/libaudclient/audctrl.c	Mon Jul 07 23:54:10 2008 +0200
@@ -358,33 +358,6 @@
 }
 
 /**
- * audacious_remote_get_skin:
- * @proxy: DBus proxy for audacious
- *
- * Queries Audacious about it's skin.
- *
- * Return value: A path to the currently selected skin.
- **/
-gchar *audacious_remote_get_skin(DBusGProxy *proxy) {
-    gchar *skin = NULL;
-    org_atheme_audacious_get_skin (proxy, &skin, &error);
-    g_clear_error(&error);
-    return skin;
-}
-
-/**
- * audacious_remote_set_skin:
- * @proxy: DBus proxy for audacious
- * @skinfile: Path to a skinfile to use with Audacious.
- *
- * Tells audacious to start using the skinfile provided.
- **/
-void audacious_remote_set_skin(DBusGProxy *proxy, gchar *skinfile) {
-    org_atheme_audacious_set_skin(proxy, skinfile, &error);
-	g_clear_error(&error);
-}
-
-/**
  * audacious_remote_get_playlist_file:
  * @proxy: DBus proxy for audacious
  * @pos: The playlist position to query for.