Mercurial > audlegacy-plugins
changeset 2862:1439cc16d954
Automated merge with ssh://hg.atheme.org//hg/audacious-plugins
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Mon, 04 Aug 2008 06:44:55 +0300 |
| parents | 2e081c64a529 (current diff) bc0f157aeb86 (diff) |
| children | dd8b44fbfd6f |
| files | |
| diffstat | 2 files changed, 22 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/src/OSS/OSS.c Sun Aug 03 15:28:02 2008 +0200 +++ b/src/OSS/OSS.c Mon Aug 04 06:44:55 2008 +0300 @@ -27,31 +27,31 @@ OSSConfig oss_cfg; +static GtkWidget *about_dialog = NULL; + static void oss_about(void) { - static GtkWidget *dialog; - - if (dialog != NULL) + if (about_dialog != NULL) return; - dialog = audacious_info_dialog(_("About OSS Driver"), - _("Audacious OSS Driver\n\n " - "This program is free software; you can redistribute it and/or modify\n" - "it under the terms of the GNU General Public License as published by\n" - "the Free Software Foundation; either version 2 of the License, or\n" - "(at your option) any later version.\n" - "\n" - "This program is distributed in the hope that it will be useful,\n" - "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" - "GNU General Public License for more details.\n" - "\n" - "You should have received a copy of the GNU General Public License\n" - "along with this program; if not, write to the Free Software\n" - "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n" - "USA."), _("Ok"), FALSE, NULL, NULL); - g_signal_connect(G_OBJECT(dialog), "destroy", - G_CALLBACK(gtk_widget_destroyed), &dialog); + about_dialog = audacious_info_dialog(_("About OSS Driver"), + _("Audacious OSS Driver\n\n " + "This program is free software; you can redistribute it and/or modify\n" + "it under the terms of the GNU General Public License as published by\n" + "the Free Software Foundation; either version 2 of the License, or\n" + "(at your option) any later version.\n" + "\n" + "This program is distributed in the hope that it will be useful,\n" + "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" + "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" + "GNU General Public License for more details.\n" + "\n" + "You should have received a copy of the GNU General Public License\n" + "along with this program; if not, write to the Free Software\n" + "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n" + "USA."), _("Ok"), FALSE, NULL, NULL); + g_signal_connect(G_OBJECT(about_dialog), "destroy", + G_CALLBACK(gtk_widget_destroyed), &about_dialog); } static void oss_init(void)
--- a/src/OSS/configure.c Sun Aug 03 15:28:02 2008 +0200 +++ b/src/OSS/configure.c Mon Aug 04 06:44:55 2008 +0300 @@ -72,6 +72,7 @@ if (oss_cfg.alt_mixer_device[0] != '/') oss_cfg.use_alt_mixer_device = FALSE; + /* Save configuration */ db = aud_cfg_db_open(); aud_cfg_db_set_int(db, "OSS", "audio_device", oss_cfg.audio_device);