mirror of
https://github.com/irssi/irssi.git
synced 2025-02-02 15:08:01 -05:00
Clean up commented out stuff and fix merge issues
This commit is contained in:
parent
26f3049a86
commit
cc759e1179
@ -6,7 +6,7 @@
|
|||||||
#define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
|
#define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
|
||||||
#define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
|
#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_PORT 6667
|
||||||
#define DEFAULT_SERVER_ADD_TLS_PORT 6697
|
#define DEFAULT_SERVER_ADD_TLS_PORT 6697
|
||||||
|
@ -308,8 +308,8 @@ PERL_SCRIPT_REC *perl_script_load_data(const char *data)
|
|||||||
/* Unload perl script */
|
/* Unload perl script */
|
||||||
void perl_script_unload(PERL_SCRIPT_REC *script)
|
void perl_script_unload(PERL_SCRIPT_REC *script)
|
||||||
{
|
{
|
||||||
GSList* link;
|
GSList *link;
|
||||||
g_return_if_fail(script != NULL);
|
g_return_if_fail(script != NULL);
|
||||||
|
|
||||||
perl_script_destroy_package(script);
|
perl_script_destroy_package(script);
|
||||||
|
|
||||||
@ -322,9 +322,6 @@ void perl_script_unload(PERL_SCRIPT_REC *script)
|
|||||||
g_slist_free(link);
|
g_slist_free(link);
|
||||||
perl_script_unref(script);
|
perl_script_unref(script);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* perl_scripts = g_slist_remove(perl_scripts, script);
|
|
||||||
perl_script_unref(script);*/
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Enter a perl script (signal or input source) */
|
/* Enter a perl script (signal or input source) */
|
||||||
|
Loading…
Reference in New Issue
Block a user