Expand tilde in adblock_init, closing #200

3 files changed, 5 insertions, 2 deletions

diff --git a/src/adblock.c b/src/adblock.c
index b96ca725..b6d16527 100644
--- a/src/adblock.c
+++ b/src/adblock.c
@@ -824,6 +824,8 @@ adblock_init() {
   if (!GET_BOOL("adblocker"))
     return false;
   char *filterlist = GET_CHAR("adblocker-filterlist");
+  char buffer[PATH_MAX];
+  filterlist = util_expand_home(buffer, filterlist, PATH_MAX);
   if (filterlist == NULL)
     return false;
   if (!g_file_test(filterlist, G_FILE_TEST_EXISTS)) {
diff --git a/src/callback.c b/src/callback.c
index 33f14600..dfa5c54c 100644
--- a/src/callback.c
+++ b/src/callback.c
@@ -160,8 +160,9 @@ callback_key_press(GtkWidget *w, GdkEventKey *e) {
   }
 
   if (e->keyval == GDK_KEY_Escape) {
-    if (dwb.state.mode & COMPLETION_MODE)
+    if (dwb.state.mode & COMPLETION_MODE) {
       completion_clean_completion(true);
+    }
     else 
       dwb_change_mode(NORMAL_MODE, true);
     ret = false;
diff --git a/src/dwb.c b/src/dwb.c
index f2d4ff47..46a78cd5 100644
--- a/src/dwb.c
+++ b/src/dwb.c
@@ -1820,7 +1820,7 @@ dwb_prompt_snooper_cb(GtkWidget *w, GdkEventKey *e, int *state) {
     return false;
   switch (e->keyval) {
     case GDK_KEY_Return:       *state = 0; ret = true; break;
-    case GDK_KEY_Escape:  ret = true; break;
+    case GDK_KEY_Escape:  *state = -1; ret = true; break;
     default:              return false;
   }
   dwb.state.mode &= ~CONFIRM;