Merge branch 'single-client'
authorDaniel Carl <danielcarl@gmx.de>
Wed, 13 Mar 2013 23:54:28 +0000 (00:54 +0100)
committerDaniel Carl <danielcarl@gmx.de>
Wed, 13 Mar 2013 23:54:28 +0000 (00:54 +0100)
Conflicts:
src/url_history.c

1  2 
src/completion.c

@@@ -80,11 -84,11 +84,12 @@@ gboolean completion_complete(Client* c
          );
          g_list_free(source);
      } else if (!strncmp(input, ":tabopen ", 9)) {
-         source = url_history_get_all();
-         vp.comps.completions = completion_init_completion(
-             vp.comps.completions, source, (Comp_Func)util_strcasestr, &input[9], ":tabopen "
+         url_history_get_all(&source);
+         c->comps.completions = completion_init_completion(
+             c,
+             c->comps.completions, source, (Comp_Func)util_strcasestr, &input[9], ":tabopen "
          );
 +        g_list_free(source);
      } else {
          source = g_hash_table_get_keys(core.behave.commands);
          source = g_list_sort(source, (GCompareFunc)g_strcmp0);