Rename web_extensions to web-extensions

[chorizo.git] / src / browser.c

diff --git a/src/browser.c b/src/browser.c
index e1dd0c4cadf2213fdc418b8d13eb117c95741c28..3edab07a13fda9d52749ce92c4909ded8b48ea26 100644 (file)
--- a/src/browser.c
+++ b/src/browser.c
@@ -707,7 +707,7 @@ grab_feeds_finished(GObject *object, GAsyncResult *result, gpointer data) {
                                           GTK_ENTRY_ICON_SECONDARY,
                                           "application-rss+xml-symbolic");
         gtk_entry_set_icon_activatable(GTK_ENTRY(c->location),
-                                       GTK_ENTRY_ICON_PRIMARY, TRUE);
+                                       GTK_ENTRY_ICON_SECONDARY, TRUE);
     } else {
         gtk_entry_set_icon_from_icon_name(GTK_ENTRY(c->location),
                                           GTK_ENTRY_ICON_SECONDARY, NULL);
@@ -794,7 +794,7 @@ init_default_web_context(void) {
         WEBKIT_PROCESS_MODEL_MULTIPLE_SECONDARY_PROCESSES;
     webkit_web_context_set_process_model(wc, model);
 
-    p = g_build_filename(g_get_user_data_dir(), __NAME__, "web_extensions",
+    p = g_build_filename(g_get_user_data_dir(), __NAME__, "web-extensions",
                          NULL);
     webkit_web_context_set_web_extensions_directory(wc, p);
     g_free(p);
@@ -860,11 +860,12 @@ search_init(struct Client *c, int direction) {
     const gchar *contents = gtk_entry_get_text(GTK_ENTRY(c->location));
     if (strcspn(contents, "s/")) {
         gtk_entry_set_text(GTK_ENTRY(c->location), "s/");
+        gtk_editable_set_position(GTK_EDITABLE(c->location), -1);
+    } else {
+        search(c, 0);
+        search(c, -1);
+        search(c, direction);
     }
-    gtk_editable_set_position(GTK_EDITABLE(c->location), -1);
-    search(c, 0);
-    search(c, -1);
-    search(c, direction);
 }
 
 int