Mercurial > pidgin
comparison src/prefs.c @ 3485:6187c93da61a
[gaim-migrate @ 3539]
Bugfix by Chris Rankin.
Thanks, Chris!
committer: Tailor Script <tailor@pidgin.im>
author | Sean Egan <seanegan@gmail.com> |
---|---|
date | Sat, 31 Aug 2002 02:49:25 +0000 |
parents | cfbdfe334975 |
children | b79894c97bed |
comparison
equal
deleted
inserted
replaced
3484:5d1dff030d8b | 3485:6187c93da61a |
---|---|
93 GtkWidget *debugbutton = NULL; | 93 GtkWidget *debugbutton = NULL; |
94 | 94 |
95 void delete_prefs(GtkWidget *asdf, void *gdsa) { | 95 void delete_prefs(GtkWidget *asdf, void *gdsa) { |
96 int v; | 96 int v; |
97 | 97 |
98 prefs = NULL; | 98 prefs = NULL; |
99 for (v = 0; v < NUM_SOUNDS; v++) { | 99 for (v = 0; v < NUM_SOUNDS; v++) { |
100 if (sound_file_new[v] && (sound_file_new[v] != sound_file[v])) | 100 if (sound_file_new[v]) { |
101 g_free(sound_file_new[v]); | 101 g_free(sound_file_new[v]); |
102 sound_file_new[v] = NULL; | 102 sound_file_new[v] = NULL; |
103 } | 103 } |
104 sound_entry = NULL; | 104 } |
105 browser_entry = NULL; | 105 sound_entry = NULL; |
106 debugbutton=NULL; | 106 browser_entry = NULL; |
107 if(sounddialog) | 107 debugbutton=NULL; |
108 if(sounddialog) | |
108 gtk_widget_destroy(sounddialog); | 109 gtk_widget_destroy(sounddialog); |
109 g_object_unref(G_OBJECT(prefs_away_store)); | 110 g_object_unref(G_OBJECT(prefs_away_store)); |
110 } | 111 } |
111 | 112 |
112 GtkWidget *preflabel; | 113 GtkWidget *preflabel; |
113 GtkWidget *prefsnotebook; | 114 GtkWidget *prefsnotebook; |
114 GtkTreeStore *prefstree; | 115 GtkTreeStore *prefstree; |
185 if (sound_options != sound_options_new) | 186 if (sound_options != sound_options_new) |
186 set_sound_options(); | 187 set_sound_options(); |
187 for (r = 0; r < NUM_SOUNDS; r++) { | 188 for (r = 0; r < NUM_SOUNDS; r++) { |
188 if (sound_file[r]) | 189 if (sound_file[r]) |
189 g_free(sound_file[r]); | 190 g_free(sound_file[r]); |
190 sound_file[r] = sound_file_new[r]; | 191 sound_file[r] = g_strdup(sound_file_new[r]); |
191 } | 192 } |
192 if (away_options != away_options_new) | 193 if (away_options != away_options_new) |
193 set_away_options(); | 194 set_away_options(); |
194 away_resend = away_resend_new; | 195 away_resend = away_resend_new; |
195 auto_away = auto_away_new; | 196 auto_away = auto_away_new; |
869 sound_options = tmp_sound; | 870 sound_options = tmp_sound; |
870 } | 871 } |
871 | 872 |
872 static void reset_sound(GtkWidget *button, gpointer i_am_also_NULL) | 873 static void reset_sound(GtkWidget *button, gpointer i_am_also_NULL) |
873 { | 874 { |
874 | |
875 /* This just resets a sound file back to default */ | 875 /* This just resets a sound file back to default */ |
876 sound_file_new[sound_row_sel] = NULL; | 876 if (sound_file_new[sound_row_sel]) { |
877 g_free(sound_file_new[sound_row_sel]); | |
878 sound_file_new[sound_row_sel] = NULL; | |
879 } | |
877 | 880 |
878 gtk_entry_set_text(GTK_ENTRY(sound_entry), "(default)"); | 881 gtk_entry_set_text(GTK_ENTRY(sound_entry), "(default)"); |
879 } | 882 } |
880 | 883 |
881 void close_sounddialog(GtkWidget *w, GtkWidget *w2) | 884 void close_sounddialog(GtkWidget *w, GtkWidget *w2) |
903 if (file_is_dir(file, sounddialog)) | 906 if (file_is_dir(file, sounddialog)) |
904 return; | 907 return; |
905 | 908 |
906 /* Let's just be safe */ | 909 /* Let's just be safe */ |
907 if (sound_file_new[snd]) | 910 if (sound_file_new[snd]) |
908 free(sound_file_new[snd]); | 911 g_free(sound_file_new[snd]); |
909 | 912 |
910 /* Set it -- and forget it */ | 913 /* Set it -- and forget it */ |
911 sound_file_new[snd] = g_strdup(file); | 914 sound_file_new[snd] = g_strdup(file); |
912 | 915 |
913 /* Set our text entry */ | 916 /* Set our text entry */ |