Switch to GPL v3

[disorder] / disobedience / disobedience.c

diff --git a/disobedience/disobedience.c b/disobedience/disobedience.c
index 53aea5683021110bff1af0b3a5d3185122b5eacf..ab51bb3e9a9cce2a17f361e503c586b740ccd693 100644 (file)
--- a/disobedience/disobedience.c
+++ b/disobedience/disobedience.c
@@ -2,20 +2,18 @@
  * This file is part of DisOrder.
  * Copyright (C) 2006, 2007, 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/disobedience.c
  * @brief Main Disobedience program
@@ -379,32 +377,32 @@ static void help(void) {
 
 static void version_completed(void attribute((unused)) *v,
                               const char attribute((unused)) *err,
-                              const char *version) {
+                              const char *ver) {
   long major, minor, patch, dev;
 
-  if(!version) {
+  if(!ver) {
     server_version = 0;
     server_version_bytes = 0;
     return;
   }
-  server_version = version;
+  server_version = ver;
   server_version_bytes = 0;
-  major = strtol(version, (char **)&version, 10);
-  if(*version != '.')
+  major = strtol(ver, (char **)&ver, 10);
+  if(*ver != '.')
     return;
-  ++version;
-  minor = strtol(version, (char **)&version, 10);
-  if(*version == '.') {
-    ++version;
-    patch = strtol(version, (char **)&version, 10);
+  ++ver;
+  minor = strtol(ver, (char **)&ver, 10);
+  if(*ver == '.') {
+    ++ver;
+    patch = strtol(ver, (char **)&ver, 10);
   } else
     patch = 0;
-  if(*version) {
-    if(*version == '+') {
+  if(*ver) {
+    if(*ver == '+') {
       dev = 1;
-      ++version;
+      ++ver;
     }
-    if(*version)
+    if(*ver)
       dev = 2;
   } else
     dev = 0;
@@ -422,6 +420,8 @@ void logged_in(void) {
   periodic_fast(0);
   /* Recheck server version */
   disorder_eclient_version(client, version_completed, 0);
+  disorder_eclient_enable_connect(client);
+  disorder_eclient_enable_connect(logclient);
 }
 
 int main(int argc, char **argv) {