From 80b2aa0fadf5f2085a5cc17063a06aef4680f625 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Spiekerk=C3=B6tter?= Date: Thu, 1 Oct 2015 15:41:51 +0200 Subject: [PATCH 1/2] updated intaller to clone libmsode over https --- install-all.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install-all.sh b/install-all.sh index bd5093dd..a2852a9d 100755 --- a/install-all.sh +++ b/install-all.sh @@ -82,7 +82,7 @@ install_lib_mesode() echo echo Profanity installer... installing libmesode echo - git clone git@github.com:boothj5/libmesode.git + git clone https://github.com/boothj5/libmesode.git cd libmesode ./bootstrap.sh ./configure --prefix=$1 @@ -110,7 +110,7 @@ cyg_install_lib_mesode() echo echo Profanity installer... installing libmesode echo - git clone git@github.com:boothj5/libmesode.git + git clone https://github.com/boothj5/libmesode.git cd libmesode ./bootstrap.sh ./bootstrap.sh # second call seems to fix problem on cygwin From ecbcecea7d0e20bd7ff12ead58cc4e735c7ee98b Mon Sep 17 00:00:00 2001 From: James Booth Date: Tue, 13 Oct 2015 20:46:59 +0100 Subject: [PATCH 2/2] Fixed closing room config windows --- src/command/commands.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/command/commands.c b/src/command/commands.c index 7df1477a..c34c7cc3 100644 --- a/src/command/commands.c +++ b/src/command/commands.c @@ -2689,12 +2689,15 @@ cmd_form(ProfWin *window, const char * const command, gchar **args) if (confwin->form) { cmd_autocomplete_remove_form_fields(confwin->form); } - wins_close_current(); + + int num = wins_get_num(window); + ProfWin *new_current = (ProfWin*)wins_get_muc(confwin->roomjid); if (!new_current) { new_current = wins_get_console(); } ui_ev_focus_win(new_current); + wins_close_by_num(num); } return TRUE;