# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1176579499 0
# Node ID 85cb31e3d4d862e4b108beeca267492cdb354c83
# Parent  1f6ea380fb0998cab039d0c1ad14effdab04098c# Parent  6853853036a6f7ffaa250db894cbf066498d6866
merge of '1a3995ffd4f7ad079f6377453aed4c3823216afb'
     and 'fe79374b11b306c85cecac28ff894ce7814984e9'

diff -r 1f6ea380fb09 -r 85cb31e3d4d8 pidgin/plugins/musicmessaging/Makefile.am
--- a/pidgin/plugins/musicmessaging/Makefile.am	Sat Apr 14 17:58:13 2007 +0000
+++ b/pidgin/plugins/musicmessaging/Makefile.am	Sat Apr 14 19:38:19 2007 +0000
@@ -1,14 +1,14 @@
 EXTRA_DIST = \
 	music.png
 
-musicmessagingdir = $(libdir)/gaim
+musicmessagingdir = $(libdir)/pidgin
 
 musicmessaging_la_LDFLAGS = -module -avoid-version
 
 if PLUGINS
 if ENABLE_DBUS
 
-musicmessagingpixdir = $(datadir)/pixmaps/gaim/buttons
+musicmessagingpixdir = $(datadir)/pixmaps/pidgin/buttons
 musicmessagingpix_DATA = music.png
 
 musicmessaging_LTLIBRARIES = musicmessaging.la
diff -r 1f6ea380fb09 -r 85cb31e3d4d8 pidgin/plugins/musicmessaging/musicmessaging.c
--- a/pidgin/plugins/musicmessaging/musicmessaging.c	Sat Apr 14 17:58:13 2007 +0000
+++ b/pidgin/plugins/musicmessaging/musicmessaging.c	Sat Apr 14 19:38:19 2007 +0000
@@ -683,7 +683,7 @@
 static void
 init_plugin(PurplePlugin *plugin) {
 	purple_prefs_add_none("/plugins/gtk/musicmessaging");
-	purple_prefs_add_string("/plugins/gtk/musicmessaging/editor_path", "/usr/local/bin/gscore");
+	purple_prefs_add_string("/plugins/gtk/musicmessaging/editor_path", "/usr/bin/gscore");
 }
 
 PURPLE_INIT_PLUGIN(musicmessaging, init_plugin, info);