From 673e7680af503c5d6d0d03fb8e1c339a3cd0c3eb Mon Sep 17 00:00:00 2001
From: Sebastien Helleu <flashcode@flashtux.org>
Date: Mon, 11 Jul 2005 12:14:57 +0000
Subject: [PATCH] Fixed bug with IRC URL on command line (irc://)

---
 ChangeLog                    | 3 ++-
 src/irc/irc-server.c         | 8 ++++----
 weechat/ChangeLog            | 3 ++-
 weechat/src/irc/irc-server.c | 8 ++++----
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 199c53363..d740c93ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,11 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
-ChangeLog - 2005-07-09
+ChangeLog - 2005-07-11
 
 
 Versoin 0.1.4 (under dev!):
+   * fixed bug with IRC URL on command line (irc://)
    * new keyboard management: keys are setup in config file, new command
      /key was added and some new default keys were added
    * added seconds in infobar time (optional thanks to new setting)
diff --git a/src/irc/irc-server.c b/src/irc/irc-server.c
index b917b4ca0..b2922018a 100644
--- a/src/irc/irc-server.c
+++ b/src/irc/irc-server.c
@@ -150,7 +150,7 @@ server_init_with_url (char *irc_url, t_irc_server *server)
     else
         return -1;
     
-    url = strdup (irc_url);
+    url = strdup (pos);
     pos_server = strchr (url, '@');
     if (pos_server)
     {
@@ -161,13 +161,13 @@ server_init_with_url (char *irc_url, t_irc_server *server)
             free (url);
             return -1;
         }
-        pos2 = strchr (pos, ':');
+        pos2 = strchr (url, ':');
         if (pos2)
         {
             pos2[0] = '\0';
             server->password = strdup (pos2 + 1);
         }
-        server->nick1 = strdup (pos);
+        server->nick1 = strdup (url);
     }
     else
     {
@@ -182,7 +182,7 @@ server_init_with_url (char *irc_url, t_irc_server *server)
             free (url);
             return -1;
         }
-        pos_server = url + 6;
+        pos_server = url;
     }
     if (!pos_server[0])
     {
diff --git a/weechat/ChangeLog b/weechat/ChangeLog
index 199c53363..d740c93ee 100644
--- a/weechat/ChangeLog
+++ b/weechat/ChangeLog
@@ -1,10 +1,11 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
-ChangeLog - 2005-07-09
+ChangeLog - 2005-07-11
 
 
 Versoin 0.1.4 (under dev!):
+   * fixed bug with IRC URL on command line (irc://)
    * new keyboard management: keys are setup in config file, new command
      /key was added and some new default keys were added
    * added seconds in infobar time (optional thanks to new setting)
diff --git a/weechat/src/irc/irc-server.c b/weechat/src/irc/irc-server.c
index b917b4ca0..b2922018a 100644
--- a/weechat/src/irc/irc-server.c
+++ b/weechat/src/irc/irc-server.c
@@ -150,7 +150,7 @@ server_init_with_url (char *irc_url, t_irc_server *server)
     else
         return -1;
     
-    url = strdup (irc_url);
+    url = strdup (pos);
     pos_server = strchr (url, '@');
     if (pos_server)
     {
@@ -161,13 +161,13 @@ server_init_with_url (char *irc_url, t_irc_server *server)
             free (url);
             return -1;
         }
-        pos2 = strchr (pos, ':');
+        pos2 = strchr (url, ':');
         if (pos2)
         {
             pos2[0] = '\0';
             server->password = strdup (pos2 + 1);
         }
-        server->nick1 = strdup (pos);
+        server->nick1 = strdup (url);
     }
     else
     {
@@ -182,7 +182,7 @@ server_init_with_url (char *irc_url, t_irc_server *server)
             free (url);
             return -1;
         }
-        pos_server = url + 6;
+        pos_server = url;
     }
     if (!pos_server[0])
     {