Merged from silc_1_0_branch.

[silc.git] / apps / irssi / src / core / session.c

diff --git a/apps/irssi/src/core/session.c b/apps/irssi/src/core/session.c
index 7e7b0afa1cf21567fa2868de2f454c88d251aefb..7ebd8f82b956ef60a21bd2eab624d4b42787c1ac 100644 (file)
--- a/apps/irssi/src/core/session.c
+++ b/apps/irssi/src/core/session.c
@@ -39,6 +39,7 @@ static char **session_args;
 
 void session_set_binary(const char *path)
 {
+       const char *envpath;
        char **paths, **tmp;
         char *str;
 
@@ -59,10 +60,10 @@ void session_set_binary(const char *path)
        }
 
        /* we'll need to find it from path. */
-       str = g_getenv("PATH");
-       if (str == NULL) return;
+       envpath = g_getenv("PATH");
+       if (envpath == NULL) return;
 
-       paths = g_strsplit(str, ":", -1);
+       paths = g_strsplit(envpath, ":", -1);
        for (tmp = paths; *tmp != NULL; tmp++) {
                 str = g_strconcat(*tmp, G_DIR_SEPARATOR_S, path, NULL);
                if (access(str, X_OK) == 0) {
@@ -145,6 +146,7 @@ static void session_save_channel(CHANNEL_REC *channel, CONFIG_REC *config,
        node = config_node_section(node, NULL, NODE_TYPE_BLOCK);
 
        config_node_set_str(config, node, "name", channel->name);
+       config_node_set_str(config, node, "visible_name", channel->visible_name);
        config_node_set_str(config, node, "topic", channel->topic);
        config_node_set_str(config, node, "topic_by", channel->topic_by);
        config_node_set_int(config, node, "topic_time", channel->topic_time);
@@ -180,6 +182,8 @@ static void session_save_server(SERVER_REC *server, CONFIG_REC *config,
        config_node_set_str(config, node, "password", server->connrec->password);
        config_node_set_str(config, node, "nick", server->nick);
 
+       config_node_set_bool(config, node, "use_ssl", server->connrec->use_ssl);
+
        handle = g_io_channel_unix_get_fd(net_sendbuffer_handle(server->handle));
        config_node_set_int(config, node, "handle", handle);
 
@@ -214,13 +218,14 @@ static void session_restore_channel_nicks(CHANNEL_REC *channel,
 static void session_restore_channel(SERVER_REC *server, CONFIG_NODE *node)
 {
         CHANNEL_REC *channel;
-       const char *name;
+       const char *name, *visible_name;
 
        name = config_node_get_str(node, "name", NULL);
        if (name == NULL)
                return;
 
-       channel = CHAT_PROTOCOL(server)->channel_create(server, name, TRUE);
+       visible_name = config_node_get_str(node, "visible_name", NULL);
+       channel = CHAT_PROTOCOL(server)->channel_create(server, name, visible_name, TRUE);
        channel->topic = g_strdup(config_node_get_str(node, "topic", NULL));
        channel->topic_by = g_strdup(config_node_get_str(node, "topic_by", NULL));
        channel->topic_time = config_node_get_int(node, "topic_time", 0);
@@ -273,12 +278,13 @@ static void session_restore_server(CONFIG_NODE *node)
                                  chatnet, password, nick);
        if (conn != NULL) {
                conn->reconnection = TRUE;
+               conn->connect_handle = g_io_channel_unix_new(handle);
 
-               server = proto->server_connect(conn);
-                server->handle = net_sendbuffer_create(g_io_channel_unix_new(handle), 0);
+               server = proto->server_init_connect(conn);
                server->session_reconnect = TRUE;
-
                signal_emit("session restore server", 2, server, node);
+
+               proto->server_connect(server);
        }
 }
 
@@ -351,7 +357,7 @@ void session_init(void)
         session_file = NULL;
        args_register(options);
 
-       command_bind("upgrade", NULL, (SIGNAL_FUNC) cmd_upgrade);
+       /*command_bind("upgrade", NULL, (SIGNAL_FUNC) cmd_upgrade);*/
 
        signal_add("session save", (SIGNAL_FUNC) sig_session_save);
        signal_add("session restore", (SIGNAL_FUNC) sig_session_restore);
@@ -366,7 +372,7 @@ void session_deinit(void)
 {
        g_free_not_null(irssi_binary);
 
-        command_unbind("upgrade", (SIGNAL_FUNC) cmd_upgrade);
+        /*command_unbind("upgrade", (SIGNAL_FUNC) cmd_upgrade);*/
 
        signal_remove("session save", (SIGNAL_FUNC) sig_session_save);
        signal_remove("session restore", (SIGNAL_FUNC) sig_session_restore);