~/.irssi to ~/.silc. Removed upgrade.

diff --git a/apps/irssi/src/core/core.c b/apps/irssi/src/core/core.c
index b4e6d6e0627f9607eb01ffb00d5e3410476cc07b..7125344ff0bfc08b79db1cdabe509fa39c6d1959 100644 (file)
--- a/apps/irssi/src/core/core.c
+++ b/apps/irssi/src/core/core.c
@@ -155,8 +155,8 @@ static void sig_init_finished(void)
 void core_init_paths(int argc, char *argv[])
 {
        static struct poptOption options[] = {
-               { "config", 0, POPT_ARG_STRING, NULL, 0, "Configuration file location (~/.irssi/config)", "PATH" },
-               { "home", 0, POPT_ARG_STRING, NULL, 0, "Irssi home dir location (~/.irssi)", "PATH" },
+               { "config", 0, POPT_ARG_STRING, NULL, 0, "Configuration file location (~/.silc/config)", "PATH" },
+               { "home", 0, POPT_ARG_STRING, NULL, 0, "Irssi home dir location (~/.silc)", "PATH" },
                { NULL, '\0', 0, NULL }
        };
        const char *home;

diff --git a/apps/irssi/src/core/session.c b/apps/irssi/src/core/session.c
index 004cd4f737022110f4f837ce969d44cded2913cb..7ebd8f82b956ef60a21bd2eab624d4b42787c1ac 100644 (file)
--- a/apps/irssi/src/core/session.c
+++ b/apps/irssi/src/core/session.c
@@ -357,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);
@@ -372,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);