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 2016-03-01 00:04:17 +00:00
commit 79e3ce2734
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ui/window.c
View File

@ -350,7 +350,7 @@ win_get_string(ProfWin *window)
{ {
ProfPluginWin *pluginwin = (ProfPluginWin*)window; ProfPluginWin *pluginwin = (ProfPluginWin*)window;
GString *gstring = g_string_new(""); GString *gstring = g_string_new("");
g_string_append_printf(gstring, "%s plugin", pluginwin->tag); g_string_append_printf(gstring, "Plugin: %s", pluginwin->tag);
char *res = gstring->str; char *res = gstring->str;
g_string_free(gstring, FALSE); g_string_free(gstring, FALSE);
return res; return res;

20
src/window_list.c
View File

@ -389,6 +389,11 @@ wins_get_by_string(char *str)
return (ProfWin*)privwin; return (ProfWin*)privwin;
} }
ProfPluginWin *pluginwin = wins_get_plugin(str);
if (pluginwin) {
return (ProfWin*)pluginwin;
}
return NULL; return NULL;
} }
@ -539,6 +544,13 @@ wins_close_by_num(int i)
autocomplete_remove(wins_close_ac, "xmlconsole"); autocomplete_remove(wins_close_ac, "xmlconsole");
break; break;
} }
case WIN_PLUGIN:
{
ProfPluginWin *pluginwin = (ProfPluginWin*)window;
autocomplete_remove(wins_ac, pluginwin->tag);
autocomplete_remove(wins_close_ac, pluginwin->tag);
break;
}
case WIN_MUC_CONFIG: case WIN_MUC_CONFIG:
default: default:
break; break;
@ -640,10 +652,12 @@ wins_new_plugin(const char * const tag)
{ {
GList *keys = g_hash_table_get_keys(windows); GList *keys = g_hash_table_get_keys(windows);
int result = get_next_available_win_num(keys); int result = get_next_available_win_num(keys);
ProfWin *new = win_create_plugin(tag);
g_hash_table_insert(windows, GINT_TO_POINTER(result), new);
g_list_free(keys); g_list_free(keys);
return new; ProfWin *newwin = win_create_plugin(tag);
g_hash_table_insert(windows, GINT_TO_POINTER(result), newwin);
autocomplete_add(wins_ac, tag);
autocomplete_add(wins_close_ac, tag);
return newwin;
} }
gboolean gboolean