Switch to GPL v3

[disorder] / disobedience / menu.c

diff --git a/disobedience/menu.c b/disobedience/menu.c
index 868c9dce8f2358f2a668d359bc38a8f747d41efc..283c0d1bb54ec4af7db3de27f3b1aff2f5bdbf88 100644 (file)
--- a/disobedience/menu.c
+++ b/disobedience/menu.c
@@ -2,20 +2,18 @@
  * This file is part of DisOrder.
  * Copyright (C) 2006-2008 Richard Kettlewell
  *
- * This program is free software; you can redistribute it and/or modify
+ * 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; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 /** @file disobedience/menu.c
  * @brief Main menu
@@ -31,7 +29,7 @@ static GtkWidget *properties_widget;
 GtkItemFactory *mainmenufactory;
 
 static void about_popup_got_version(void *v,
-                                    const char *error,
+                                    const char *err,
                                     const char *value);
 
 /** @brief Called when the quit option is activated