Mercurial > pidgin.yaz
comparison finch/gntsound.c @ 19296:2ec9d975a37d
merge of '2a491439465c5e397575898b7acc45446c9e2eeb'
and '8c7ff33a8a8e1839194829073ff671638fd0b1be'
| author | Richard Nelson <wabz@pidgin.im> |
|---|---|
| date | Fri, 17 Aug 2007 00:35:12 +0000 |
| parents | ed80bace0934 |
| children | b748d2408661 |
comparison
equal
deleted
inserted
replaced
| 19293:758b71dcd354 | 19296:2ec9d975a37d |
|---|---|
| 444 if (purple_prefs_get_bool(make_pref("/mute"))) | 444 if (purple_prefs_get_bool(make_pref("/mute"))) |
| 445 return; | 445 return; |
| 446 | 446 |
| 447 method = purple_prefs_get_string(make_pref("/method")); | 447 method = purple_prefs_get_string(make_pref("/method")); |
| 448 | 448 |
| 449 if (!strcmp(method, "none")) { | 449 if (!strcmp(method, "nosound")) { |
| 450 return; | 450 return; |
| 451 } else if (!strcmp(method, "beep")) { | 451 } else if (!strcmp(method, "beep")) { |
| 452 beep(); | 452 beep(); |
| 453 return; | 453 return; |
| 454 } | 454 } |
| 745 g_free(e->file); | 745 g_free(e->file); |
| 746 e->file = NULL; | 746 e->file = NULL; |
| 747 } | 747 } |
| 748 if (pref_dialog->selector) | 748 if (pref_dialog->selector) |
| 749 gnt_widget_destroy(pref_dialog->selector); | 749 gnt_widget_destroy(pref_dialog->selector); |
| 750 g_free(pref_dialog->original_profile); | |
| 750 g_free(pref_dialog); | 751 g_free(pref_dialog); |
| 751 pref_dialog = NULL; | 752 pref_dialog = NULL; |
| 752 } | 753 } |
| 753 | 754 |
| 754 static void | 755 static void |