# HG changeset patch
# User Nathan Walp <nwalp@pidgin.im>
# Date 1054396506 0
# Node ID eaf058fc47a5114d4aa916ffeca14c65b4e891d8
# Parent  bb8f0a1498311735bb4546c36da4885c398e1316
[gaim-migrate @ 6013]
la la la

committer: Tailor Script <tailor@pidgin.im>

diff -r bb8f0a149831 -r eaf058fc47a5 plugins/docklet/docklet.c
--- a/plugins/docklet/docklet.c	Sat May 31 15:51:12 2003 +0000
+++ b/plugins/docklet/docklet.c	Sat May 31 15:55:06 2003 +0000
@@ -29,6 +29,7 @@
 /* includes */
 #include <gtk/gtk.h>
 #include "gtkplugin.h"
+#include "gtkaccount.h"
 #include "gaim.h"
 #include "sound.h"
 #include "prefs.h"
@@ -148,7 +149,7 @@
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu), entry);
 
 	gaim_new_item_from_stock(menu, _("File Transfers..."), GAIM_STOCK_FILE_TRANSFER, G_CALLBACK(gaim_show_xfer_dialog), NULL, 0, 0, NULL);
-	gaim_new_item_from_stock(menu, _("Accounts..."), GAIM_STOCK_ACCOUNTS, G_CALLBACK(account_editor), NULL, 0, 0, NULL);
+	gaim_new_item_from_stock(menu, _("Accounts..."), GAIM_STOCK_ACCOUNTS, G_CALLBACK(gaim_gtk_account_dialog_show), NULL, 0, 0, NULL);
 	gaim_new_item_from_stock(menu, _("Preferences..."), GTK_STOCK_PREFERENCES, G_CALLBACK(gaim_gtk_prefs_show), NULL, 0, 0, NULL);
 
 	gaim_separator(menu);
diff -r bb8f0a149831 -r eaf058fc47a5 src/prefs.c
--- a/src/prefs.c	Sat May 31 15:51:12 2003 +0000
+++ b/src/prefs.c	Sat May 31 15:55:06 2003 +0000
@@ -144,6 +144,9 @@
 
 	/* Sound */
 	gaim_prefs_add_none("/core/sound");
+	gaim_prefs_add_bool("/core/sound/use_sys_default", TRUE);
+	gaim_prefs_add_bool("/core/sound/use_esd", FALSE);
+	gaim_prefs_add_bool("/core/sound/use_arts", FALSE);
 	gaim_prefs_add_bool("/core/sound/while_away", FALSE);
 }