1
0
mirror of https://github.com/irssi/irssi.git synced 2024-07-21 03:14:16 -04:00

Clean up commented out stuff and fix merge issues

This commit is contained in:
aquanight 2020-07-10 18:27:54 -06:00
parent 26f3049a86
commit cc759e1179
2 changed files with 3 additions and 6 deletions

View File

@ -6,7 +6,7 @@
#define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
#define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
#define IRSSI_ABI_VERSION 29
#define IRSSI_ABI_VERSION 30
#define DEFAULT_SERVER_ADD_PORT 6667
#define DEFAULT_SERVER_ADD_TLS_PORT 6697

View File

@ -308,8 +308,8 @@ PERL_SCRIPT_REC *perl_script_load_data(const char *data)
/* Unload perl script */
void perl_script_unload(PERL_SCRIPT_REC *script)
{
GSList* link;
g_return_if_fail(script != NULL);
GSList *link;
g_return_if_fail(script != NULL);
perl_script_destroy_package(script);
@ -322,9 +322,6 @@ void perl_script_unload(PERL_SCRIPT_REC *script)
g_slist_free(link);
perl_script_unref(script);
}
/* perl_scripts = g_slist_remove(perl_scripts, script);
perl_script_unref(script);*/
}
/* Enter a perl script (signal or input source) */