Mercurial > audlegacy
changeset 1179:1eef4fd1aeb5 trunk
[svn] - make the scrobbler preferences appear in the main window; this does not work yet because I need to debug apparently!
| author | nenolod |
|---|---|
| date | Sun, 11 Jun 2006 20:33:45 -0700 |
| parents | ae173b6e65a3 |
| children | 4f232f256771 |
| files | ChangeLog Plugins/General/scrobbler/Makefile.in Plugins/General/scrobbler/xmms_scrobbler.c |
| diffstat | 3 files changed, 15 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun Jun 11 20:33:14 2006 -0700 +++ b/ChangeLog Sun Jun 11 20:33:45 2006 -0700 @@ -1,3 +1,12 @@ +2006-06-12 03:33:14 +0000 William Pitcock <nenolod@nenolod.net> + revision [1266] + - oops + + + Changes: Modified: + +1 -1 trunk/audacious/prefswin.c + + 2006-06-12 03:29:09 +0000 William Pitcock <nenolod@nenolod.net> revision [1264] - grr again
--- a/Plugins/General/scrobbler/Makefile.in Sun Jun 11 20:33:14 2006 -0700 +++ b/Plugins/General/scrobbler/Makefile.in Sun Jun 11 20:33:45 2006 -0700 @@ -28,7 +28,7 @@ tags/vorbis.c \ tags/wma.c -CFLAGS += -fPIC -DPIC $(GTK_CFLAGS) $(CURL_CFLAGS) -I../../../intl -I../../.. +CFLAGS += -fPIC -DPIC $(GTK_CFLAGS) $(BEEP_DEFINES) $(CURL_CFLAGS) -I../../../intl -I../../.. OBJECTS = ${SOURCES:.c=.o}
--- a/Plugins/General/scrobbler/xmms_scrobbler.c Sun Jun 11 20:33:14 2006 -0700 +++ b/Plugins/General/scrobbler/xmms_scrobbler.c Sun Jun 11 20:33:45 2006 -0700 @@ -1,3 +1,5 @@ +#include "config.h" + #include <glib.h> #include <glib/gi18n.h> @@ -23,6 +25,7 @@ #include "config.h" #include "fmt.h" #include "tags/include/unicode.h" +#include "configure.h" #define XS_CS xmms_scrobbler.xmms_session @@ -59,9 +62,9 @@ ConfigDb *cfgfile; going = 1; GError **moo = NULL; - GtkDialog *cfgdlg = create_cfgdlg(); + GtkWidget *cfgdlg = create_cfgdlg(); - prefswin_page_new(cfgdlg, "Last.FM Client", IMAGES_DIR "audioscrobbler.png"); + prefswin_page_new(cfgdlg, "Last.FM Client", DATA_DIR "/images/audioscrobbler.png"); if ((cfgfile = bmp_cfg_db_open()) != NULL) { bmp_cfg_db_get_string(cfgfile, "audioscrobbler", "username",