Remove remaining stuff about "view source mode"

[chorizo.git] / browser.c

diff --git a/browser.c b/browser.c
index 3ed7b7b0ff4792ea1bf89f7f32d56c5142653ad0..b2b4f0f90f17e31c049fa86e7a8d1a4ec975b241 100644 (file)
--- a/browser.c
+++ b/browser.c
@@ -64,7 +64,7 @@ struct DownloadManager
 } dm;
 
 
-static gchar *accepted_language = "en-US";
+static const gchar *accepted_language[2] = { NULL, NULL };
 static gint clients = 0;
 static gboolean cooperative_alone = TRUE;
 static gboolean cooperative_instances = TRUE;
@@ -78,7 +78,6 @@ static gchar *home_uri = "about:blank";
 static GHashTable *keywords = NULL;
 static gboolean language_is_set = FALSE;
 static gchar *search_text = NULL;
-static gboolean show_all_requests = FALSE;
 static gboolean tabbed_automagic = TRUE;
 static gchar *user_agent = NULL;
 
@@ -155,13 +154,6 @@ client_new(const gchar *uri)
        c->web_view = webkit_web_view_new();
        wc = webkit_web_view_get_context(WEBKIT_WEB_VIEW(c->web_view));
 
-       /* XXX I really do want to enable this option. However, I get
-        * reproducible crashes with it enabled. I've seen bug reports from
-        * 2010 about this... WebKit crashes in libpixman, so maybe it's not
-        * a WebKit issue.
-        * Yeah, well. I'll turn it off for now. */
-       /*webkit_web_view_set_full_content_zoom(WEBKIT_WEB_VIEW(c->web_view), TRUE);*/
-
        webkit_web_view_set_zoom_level(WEBKIT_WEB_VIEW(c->web_view), global_zoom);
        g_signal_connect(G_OBJECT(c->web_view), "notify::title",
                         G_CALLBACK(changed_title), c);
@@ -186,13 +178,9 @@ client_new(const gchar *uri)
        g_signal_connect(G_OBJECT(c->web_view), "mouse-target-changed",
                         G_CALLBACK(hover_web_view), c);
 
-       if (!language_is_set)
+       if (!language_is_set && accepted_language[0] != NULL)
        {
-               /* XXX make this pretty */
-               const gchar *languages[2];
-               languages[0] = accepted_language;
-               languages[1] = NULL;
-               webkit_web_context_set_preferred_languages(wc, languages);
+               webkit_web_context_set_preferred_languages(wc, accepted_language);
                language_is_set = TRUE;
        }
 
@@ -235,8 +223,6 @@ client_new(const gchar *uri)
        if (uri != NULL)
        {
                f = ensure_uri_scheme(uri);
-               if (show_all_requests)
-                       fprintf(stderr, "====> %s\n", uri);
                webkit_web_view_load_uri(WEBKIT_WEB_VIEW(c->web_view), f);
                g_free(f);
        }
@@ -416,7 +402,8 @@ download_handle(WebKitDownload *download, gchar *suggested_filename, gpointer da
                downloads_indicated++;
                g_timeout_add(500, download_reset_indicator, c);
 
-               tb = gtk_tool_button_new_from_stock(GTK_STOCK_DELETE);
+               tb = gtk_tool_button_new(NULL, NULL);
+               gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(tb), "gtk-delete");
                gtk_tool_button_set_label(GTK_TOOL_BUTTON(tb), suggested_filename);
                gtk_toolbar_insert(GTK_TOOLBAR(dm.toolbar), tb, 0);
                gtk_widget_show_all(dm.toolbar);
@@ -480,8 +467,7 @@ downloadmanager_setup(void)
        dm.scroll = gtk_scrolled_window_new(NULL, NULL);
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(dm.scroll),
                                       GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-       gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(dm.scroll),
-                                             dm.toolbar);
+       gtk_container_add(GTK_CONTAINER(dm.scroll), dm.toolbar);
 
        gtk_container_add(GTK_CONTAINER(dm.win), dm.scroll);
 }
@@ -512,7 +498,7 @@ grab_environment_configuration(void)
 
        e = g_getenv(__NAME_UPPERCASE__"_ACCEPTED_LANGUAGE");
        if (e != NULL)
-               accepted_language = g_strdup(e);
+               accepted_language[0] = g_strdup(e);
 
        e = g_getenv(__NAME_UPPERCASE__"_DOWNLOAD_DIR");
        if (e != NULL)
@@ -629,8 +615,6 @@ key_location(GtkWidget *widget, GdkEvent *event, gpointer data)
                                        else if (!keywords_try_search(WEBKIT_WEB_VIEW(c->web_view), t))
                                        {
                                                f = ensure_uri_scheme(t);
-                                               if (show_all_requests)
-                                                       fprintf(stderr, "====> %s\n", f);
                                                webkit_web_view_load_uri(WEBKIT_WEB_VIEW(c->web_view), f);
                                                g_free(f);
                                        }
@@ -653,7 +637,6 @@ key_web_view(GtkWidget *widget, GdkEvent *event, gpointer data)
        struct Client *c = (struct Client *)data;
        gchar *f;
        gfloat z;
-       gboolean b;
 
        if (event->type == GDK_KEY_PRESS)
        {
@@ -666,15 +649,11 @@ key_web_view(GtkWidget *widget, GdkEvent *event, gpointer data)
                                        return TRUE;
                                case GDK_KEY_w:  /* home (left hand) */
                                        f = ensure_uri_scheme(home_uri);
-                                       if (show_all_requests)
-                                               fprintf(stderr, "====> %s\n", f);
                                        webkit_web_view_load_uri(WEBKIT_WEB_VIEW(c->web_view), f);
                                        g_free(f);
                                        return TRUE;
                                case GDK_KEY_e:  /* new tab (left hand) */
                                        f = ensure_uri_scheme(home_uri);
-                                       if (show_all_requests)
-                                               fprintf(stderr, "====> %s\n", f);
                                        client_new(f);
                                        g_free(f);
                                        return TRUE;
@@ -682,16 +661,6 @@ key_web_view(GtkWidget *widget, GdkEvent *event, gpointer data)
                                        webkit_web_view_reload_bypass_cache(WEBKIT_WEB_VIEW(
                                                                            c->web_view));
                                        return TRUE;
-#if 0
-                               case GDK_KEY_s:  /* toggle source view (left hand) */
-                                       b = webkit_web_view_get_view_source_mode(WEBKIT_WEB_VIEW(
-                                                                                c->web_view));
-                                       b = !b;
-                                       webkit_web_view_set_view_source_mode(WEBKIT_WEB_VIEW(
-                                                                            c->web_view), b);
-                                       webkit_web_view_reload(WEBKIT_WEB_VIEW(c->web_view));
-                                       return TRUE;
-#endif
                                case GDK_KEY_d:  /* download manager (left hand) */
                                        gtk_widget_show_all(dm.win);
                                        return TRUE;
@@ -811,8 +780,6 @@ keywords_try_search(WebKitWebView *web_view, const gchar *t)
                if (val != NULL)
                {
                        uri = g_strdup_printf((gchar *)val, tokens[1]);
-                       if (show_all_requests)
-                               fprintf(stderr, "====> %s\n", uri);
                        webkit_web_view_load_uri(web_view, uri);
                        g_free(uri);
                        ret = TRUE;
@@ -922,7 +889,7 @@ main(int argc, char **argv)
 
        grab_environment_configuration();
 
-       while ((opt = getopt(argc, argv, "e:rCT")) != -1)
+       while ((opt = getopt(argc, argv, "e:CT")) != -1)
        {
                switch (opt)
                {
@@ -930,9 +897,6 @@ main(int argc, char **argv)
                                embed = atol(optarg);
                                tabbed_automagic = FALSE;
                                break;
-                       case 'r':
-                               show_all_requests = TRUE;
-                               break;
                        case 'C':
                                cooperative_instances = FALSE;
                                break;