# HG changeset patch # User Rob Flynn # Date 975576254 0 # Node ID 581b3e015036fd3e226a0ccd3408d47b8ad2ba87 # Parent f81cf8c2db0557ee77c5331f1b3c5176663d0c30 [gaim-migrate @ 1185] Sound stuff is finished. I'm a moron. committer: Tailor Script diff -r f81cf8c2db05 -r 581b3e015036 src/prefs.c --- a/src/prefs.c Thu Nov 30 08:38:11 2000 +0000 +++ b/src/prefs.c Thu Nov 30 09:24:14 2000 +0000 @@ -62,6 +62,7 @@ static GtkWidget *sounddialog = NULL; static GtkWidget *prefdialog = NULL; static GtkWidget *debugbutton = NULL; + GtkWidget *prefs_away_list = NULL; GtkWidget *prefs_away_menu = NULL; GtkWidget *preftree = NULL; @@ -942,11 +943,22 @@ sound_file[snd] = g_strdup(file); save_prefs(); + + /* Set our text entry */ + gtk_entry_set_text(GTK_ENTRY(sndent[snd]), sound_file[snd]); /* Close the window! It's getting cold in here! */ close_sounddialog(NULL, sounddialog); } +static void reset_sound(GtkWidget *button, int snd) { + + /* This just resets a sound file back to default */ + g_free(sound_file[snd]); + + gtk_entry_set_text(GTK_ENTRY(sndent[snd]), "(default)"); +} + static void sel_sound(GtkWidget *button, int snd) { char *buf = g_malloc(BUF_LEN); @@ -987,6 +999,11 @@ gaim_button(label, &sound_options, opt, hbox); + button = gtk_button_new_with_label(_("Reset")); + gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); + gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(reset_sound), (void *)snd); + gtk_widget_show(button); + button = gtk_button_new_with_label(_("Choose")); gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(sel_sound), (void *)snd); @@ -994,10 +1011,12 @@ entry = gtk_entry_new(); gtk_entry_set_editable(GTK_ENTRY(entry), FALSE); + if (sound_file[snd]) gtk_entry_set_text(GTK_ENTRY(entry), sound_file[snd]); else gtk_entry_set_text(GTK_ENTRY(entry), "(default)"); + gtk_box_pack_end(GTK_BOX(hbox), entry, FALSE, FALSE, 0); sndent[snd] = entry; gtk_widget_show(entry); @@ -1771,7 +1790,7 @@ aol_icon(prefs->window); gtk_container_border_width(GTK_CONTAINER(prefs), 10); gtk_window_set_title(GTK_WINDOW(prefs), _("Gaim - Preferences")); - gtk_widget_set_usize(prefs, 630, 550); + gtk_widget_set_usize(prefs, 670, 550); gtk_signal_connect(GTK_OBJECT(prefs), "destroy", GTK_SIGNAL_FUNC(delete_prefs), NULL);