changeset 5612:9cd94a5bec8e

[gaim-migrate @ 6018] tweak tweaky tweak committer: Tailor Script <[e-mail]>

--- a/src/gaimrc.c	Sat May 31 16:26:53 2003 +0000
+++ b/src/gaimrc.c	Sat May 31 17:06:43 2003 +0000
@@ -592,11 +592,15 @@
 	switch (gaim_account_get_protocol(account)) {
 		case GAIM_PROTO_TOC:
 		case GAIM_PROTO_OSCAR:
-		case GAIM_PROTO_JABBER:
 			gaim_account_set_string(account, "server", p->value[0]);
 			gaim_account_set_int(account, "port", atoi(p->value[1]));
 			break;
 
+		case GAIM_PROTO_JABBER:
+			gaim_account_set_string(account, "connect_server", p->value[1]);
+			gaim_account_set_int(account, "port", atoi(p->value[0]));
+			break;
+
 		case GAIM_PROTO_MSN:
 		case GAIM_PROTO_NAPSTER:
 		case GAIM_PROTO_YAHOO:
@@ -605,6 +609,7 @@
 			break;
 
 		case GAIM_PROTO_IRC:
+			/* XXX: fix this */
 			gaim_account_set_string(account, "server", p->value[0]);
 			gaim_account_set_int(account, "port", atoi(p->value[1]));
 			gaim_account_set_string(account, "charset", p->value[2]);

--- a/src/gtkprefs.c	Sat May 31 16:26:53 2003 +0000
+++ b/src/gtkprefs.c	Sat May 31 17:06:43 2003 +0000
@@ -1807,18 +1807,17 @@
 	GtkTreeIter iter;
 	GtkTreePath *path = gtk_tree_path_new_from_string(pth);
 	const char *pref;
-	gint soundnum;
 
 	gtk_tree_model_get_iter (model, &iter, path);
 	gtk_tree_model_get (model, &iter,
-						0, &pref,
-						2, &soundnum,
+						2, &pref,
 						-1);
 
 	gaim_prefs_set_bool(pref, gtk_cell_renderer_toggle_get_active(cell));
 
 	gtk_list_store_set(GTK_LIST_STORE (model), &iter,
-					   0, !gtk_cell_renderer_toggle_get_active(cell));
+					   0, !gtk_cell_renderer_toggle_get_active(cell),
+					   -1);
 
 	gtk_tree_path_free(path);
 }
@@ -1929,7 +1928,7 @@
 
 	if (! gtk_tree_selection_get_selected (sel, &model, &iter))
 		return;
-	gtk_tree_model_get_value (model, &iter, 2, &val);
+	gtk_tree_model_get_value (model, &iter, 3, &val);
 	sound_row_sel = g_value_get_uint(&val);
 	file = gaim_sound_get_event_file(sound_row_sel);
 	if (sound_entry)
@@ -1962,7 +1961,7 @@
 	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW(sw), GTK_SHADOW_IN);
 
 	gtk_box_pack_start(GTK_BOX(ret), sw, TRUE, TRUE, 0);
-	event_store = gtk_list_store_new (3, G_TYPE_BOOLEAN, G_TYPE_STRING, G_TYPE_UINT);
+	event_store = gtk_list_store_new (4, G_TYPE_BOOLEAN, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT);
 
 	for (j=0; j < GAIM_NUM_SOUNDS; j++) {
 		const char *pref = gaim_sound_get_event_option(j);
@@ -1972,9 +1971,11 @@
 
 		gtk_list_store_append (event_store, &iter);
 		gtk_list_store_set(event_store, &iter,
-				   0, pref,
+				   0, gaim_prefs_get_bool(pref),
 				   1, _(gaim_sound_get_event_label(j)),
-				   2, j, -1);
+				   2, pref,
+				   3, j,
+				   -1);
 	}
 
 	event_view = gtk_tree_view_new_with_model (GTK_TREE_MODEL(event_store));

--- a/src/prefs.c	Sat May 31 16:26:53 2003 +0000
+++ b/src/prefs.c	Sat May 31 17:06:43 2003 +0000
@@ -147,6 +147,9 @@
 	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/use_beep", FALSE);
+	gaim_prefs_add_bool("/core/sound/use_custom", FALSE);
+	gaim_prefs_add_string("/core/sound/command", "");
 	gaim_prefs_add_bool("/core/sound/while_away", FALSE);
 }
 

--- a/src/sound.c	Sat May 31 16:26:53 2003 +0000
+++ b/src/sound.c	Sat May 31 17:06:43 2003 +0000
@@ -79,8 +79,8 @@
 static struct gaim_sound_event sounds[GAIM_NUM_SOUNDS] = {
 	{N_("Buddy logs in"), "/gaim/gtk/sound/login", "arrive.wav"},
 	{N_("Buddy logs out"), "/gaim/gtk/sound/logout", "leave.wav"},
-	{N_("Message received"), "/gaim/gtk/sound/message_recv", "receive.wav"},
-	{N_("Message received begins conversation"), "/gaim/gtk/sound/first_message_recv", "receive.wav"},
+	{N_("Message received"), "/gaim/gtk/sound/im_recv", "receive.wav"},
+	{N_("Message received begins conversation"), "/gaim/gtk/sound/first_im_recv", "receive.wav"},
 	{N_("Message sent"), "/gaim/gtk/sound/send_im", "send.wav"},
 	{N_("Person enters chat"), "/gaim/gtk/sound/join_chat", "arrive.wav"},
 	{N_("Person leaves chat"), "/gaim/gtk/sound/left_chat", "leave.wav"},