Switch to a new GitHub fork mglocker/irssi-icb which updates to

irssi-icb-0.17 and includes our ports patches.

ok sthen
This commit is contained in:
mglocker 2016-06-24 14:52:20 +00:00
parent 8fa9c7ec12
commit 7c8a74ffcc
4 changed files with 6 additions and 73 deletions

View File

@ -1,13 +1,12 @@
# $OpenBSD: Makefile,v 1.40 2016/06/12 06:32:15 mglocker Exp $
# $OpenBSD: Makefile,v 1.41 2016/06/24 14:52:20 mglocker Exp $
COMMENT= ICB plugin for irssi
GH_ACCOUNT= ailin-nemui
GH_ACCOUNT= mglocker
GH_PROJECT= irssi-icb
GH_COMMIT= 8f7060835355d5f620a5d3b75a45336ab8efefd9
GH_COMMIT= c4e2ea8939b5b75d1941ebe3335475482d218838
DISTNAME= irssi-icb-0.16pre20160307
REVISION= 0
DISTNAME= irssi-icb-0.17
CATEGORIES= net

View File

@ -1,2 +1,2 @@
SHA256 (irssi-icb-0.16pre20160307.tar.gz) = 8wF8r+PHxcVjs2U8QqRnly1hR7CFWN3/RHyvKWe0IT4=
SIZE (irssi-icb-0.16pre20160307.tar.gz) = 22893
SHA256 (irssi-icb-0.17.tar.gz) = cBnWtokNi8ysWY1xMLSMKvzXUXAhON4S8dxo9iqebMw=
SIZE (irssi-icb-0.17.tar.gz) = 23084

View File

@ -1,50 +0,0 @@
$OpenBSD: patch-src_core_icb-commands_c,v 1.3 2016/06/12 06:32:15 mglocker Exp $
--- src/core/icb-commands.c.orig Mon Mar 7 09:54:15 2016
+++ src/core/icb-commands.c Sun Jun 12 06:49:09 2016
@@ -19,6 +19,7 @@
*/
#include "module.h"
+#include "../fe-common/core/fe-windows.h"
#include "icb-commands.h"
#include "icb-servers.h"
@@ -101,6 +102,24 @@ static void cmd_beep(const char *data, ICB_SERVER_REC
}
}
+static void cmd_window(const char *data, ICB_SERVER_REC *server)
+{
+ CMD_ICB_SERVER(server);
+
+ /*
+ * Return an error in case the '/window close' command has been
+ * issued in your active ICB group window. In ICB you always
+ * need to be joined to one group.
+ */
+ if (*data != '\0' && (*data == 'c' || *data == 'C')) {
+ if (!strcmp(window_get_active_name(active_win),
+ server->group->name)) {
+ cmd_return_error(CMDERR_ILLEGAL_PROTO);
+ signal_stop();
+ }
+ }
+}
+
void icb_commands_init(void)
{
char **cmd;
@@ -116,6 +135,7 @@ void icb_commands_init(void)
command_bind_icb("kick", NULL, (SIGNAL_FUNC) cmd_boot);
command_bind_icb("g", NULL, (SIGNAL_FUNC) cmd_group);
command_bind_icb("beep", NULL, (SIGNAL_FUNC) cmd_beep);
+ command_bind_icb("window", NULL, (SIGNAL_FUNC) cmd_window);
command_set_options("connect", "+icbnet");
}
@@ -134,4 +154,5 @@ void icb_commands_deinit(void)
command_unbind("kick", (SIGNAL_FUNC) cmd_boot);
command_unbind("g", (SIGNAL_FUNC) cmd_group);
command_unbind("beep", (SIGNAL_FUNC) cmd_beep);
+ command_unbind("window", (SIGNAL_FUNC) cmd_window);
}

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-src_fe-common_fe-icb_c,v 1.7 2016/03/13 14:36:58 sthen Exp $
--- src/fe-common/fe-icb.c.orig Mon Mar 7 08:54:15 2016
+++ src/fe-common/fe-icb.c Sun Mar 13 14:35:33 2016
@@ -120,8 +120,12 @@ static void event_personal(ICB_SERVER_REC *server, con
char **args;
args = icb_split(data, 2);
+#if IRSSI_VERSION_DATE > 20141206
signal_emit("message private", 5, server, args[1], args[0], "",
server->nick);
+#else
+ signal_emit("message private", 4, server, args[1], args[0], "");
+#endif
icb_split_free(args);
}