# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1217821495 -10800
# Node ID 1439cc16d954ed5ec2673952e24b4598d5a7f29f
# Parent  2e081c64a529501e2ad81e9c193b99b41a8b5c18# Parent  bc0f157aeb860e8cb4f5a3d6a394ad6b7e8507b0
Automated merge with ssh://hg.atheme.org//hg/audacious-plugins

diff -r 2e081c64a529 -r 1439cc16d954 src/OSS/OSS.c
--- 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)
diff -r 2e081c64a529 -r 1439cc16d954 src/OSS/configure.c
--- 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);