Switch from GPLv2 to GPLv2+

[fw/altos] / ao-tools / ao-view / aoview_main.c

diff --git a/ao-tools/ao-view/aoview_main.c b/ao-tools/ao-view/aoview_main.c
index 64c1c0273a90c2c5e857af4b53d5fa07077a41db..a197b3e66c16fe5d7dce95e41f0a1a45c32aa0a8 100644 (file)
--- a/ao-tools/ao-view/aoview_main.c
+++ b/ao-tools/ao-view/aoview_main.c
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -31,7 +32,6 @@ static void destroy_event(GtkWidget *widget, gpointer data)
        gtk_main_quit();
 }
 
-extern int _Xdebug;
 char *aoview_tty = NULL;
 
 int main(int argc, char **argv)
@@ -42,13 +42,12 @@ int main(int argc, char **argv)
 
        static struct option long_options[] = {
                { "tty", 1, 0, 'T'},
-               { "sync", 0, 0, 's'},
                { 0, 0, 0, 0 }
        };
        for (;;) {
                int c, temp;
 
-               c = getopt_long_only(argc, argv, "sT:", long_options, &temp);
+               c = getopt_long_only(argc, argv, "T:", long_options, &temp);
                if (c == -1)
                        break;
 
@@ -56,9 +55,6 @@ int main(int argc, char **argv)
                case 'T':
                        aoview_tty = optarg;
                        break;
-               case 's':
-                       _Xdebug = 1;
-                       break;
                default:
                        usage();
                }
@@ -86,6 +82,8 @@ int main(int argc, char **argv)
 
        aoview_voice_init(xml);
 
+       aoview_channel_init(xml);
+
        aoview_dev_dialog_init(xml);
 
        aoview_state_init(xml);