aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Merge branch 'master' into osx-functional

Browse Source
This commit is contained in:
James Booth 2015-10-13 20:47:48 +01:00
commit 56900945fb
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
install-all.sh
View File

@ -77,7 +77,7 @@ install_lib_mesode()
echo echo
echo Profanity installer... installing libmesode echo Profanity installer... installing libmesode
echo echo
git clone git@github.com:boothj5/libmesode.git git clone https://github.com/boothj5/libmesode.git
cd libmesode cd libmesode
./bootstrap.sh ./bootstrap.sh
./configure --prefix=$1 ./configure --prefix=$1
@ -117,7 +117,7 @@ cyg_install_lib_mesode()
echo echo
echo Profanity installer... installing libmesode echo Profanity installer... installing libmesode
echo echo
git clone git@github.com:boothj5/libmesode.git git clone https://github.com/boothj5/libmesode.git
cd libmesode cd libmesode
./bootstrap.sh ./bootstrap.sh
./bootstrap.sh # second call seems to fix problem on cygwin ./bootstrap.sh # second call seems to fix problem on cygwin

5
src/command/commands.c
View File

@ -2689,12 +2689,15 @@ cmd_form(ProfWin *window, const char * const command, gchar **args)
if (confwin->form) { if (confwin->form) {
cmd_autocomplete_remove_form_fields(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); ProfWin *new_current = (ProfWin*)wins_get_muc(confwin->roomjid);
if (!new_current) { if (!new_current) {
new_current = wins_get_console(); new_current = wins_get_console();
} }
ui_ev_focus_win(new_current); ui_ev_focus_win(new_current);
wins_close_by_num(num);
} }
return TRUE; return TRUE;