[hackers] [surf] adding fixes from thomas_adam. Thanks :) || Enno Boland (tox)

changeset: 171:150f5c9b19dc
tag: tip
user: Enno Boland (tox) <tox_AT_s01.de>
date: Tue Dec 15 17:16:01 2009 +0100
files: surf.1 surf.c
description:
adding fixes from thomas_adam. Thanks :)

diff -r f1085a2335af -r 150f5c9b19dc surf.1
--- a/surf.1 Mon Nov 09 00:05:45 2009 +0100
+++ b/surf.1 Tue Dec 15 17:16:01 2009 +0100
@@ -26,6 +26,8 @@
 Prints xid to standard output. This can be used to script the browser by using
 .BR xprop(1).
 .SH USAGE
+.B Escape
+Stops loading current page or stops download.
 .TP
 .B Ctrl\-h
 Walks back the history.
@@ -51,6 +53,12 @@
 .B Ctrl\-/
 Opens the search-bar.
 .TP
+.B Ctrl\-n
+Go to next search result.
+.TP
+.B Ctrl\-Shift\-n
+Go to previous search result.
+.TP
 .B Ctrl\-g
 Opens the URL-bar.
 .TP
diff -r f1085a2335af -r 150f5c9b19dc surf.c
--- a/surf.c Mon Nov 09 00:05:45 2009 +0100
+++ b/surf.c Tue Dec 15 17:16:01 2009 +0100
@@ -467,7 +467,19 @@
         }
         else {
                 c->win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+ /* TA: 20091214: Despite what the GNOME docs say, the ICCCM
+ * is always correct, so we should still call this function.
+ * But when doing so, we *must* differentiate between a
+ * WM_CLASS and a resource on the window. By convention, the
+ * window class (WM_CLASS) is capped, while the resource is in
+ * lowercase. Both these values come as a pair.
+ */
                 gtk_window_set_wmclass(GTK_WINDOW(c->win), "surf", "surf");
+
+ /* TA: 20091214: And set the role here as well -- so that
+ * sessions can pick this up.
+ */
+ gtk_window_set_role(GTK_WINDOW(c->win), "Surf");
         }
         gtk_window_set_default_size(GTK_WINDOW(c->win), 800, 600);
         g_signal_connect(G_OBJECT(c->win), "destroy", G_CALLBACK(destroywin), c);
@@ -684,6 +696,7 @@
 setup(void) {
         SoupSession *s;
         char *proxy;
+ char *new_proxy;
         SoupURI *puri;
 
         /* clean up any zombies immediately */
@@ -709,9 +722,13 @@
         soup_session_add_feature(s, SOUP_SESSION_FEATURE(cookies));
         g_signal_connect(cookies, "changed", G_CALLBACK(changecookie), NULL);
         if((proxy = getenv("http_proxy")) && strcmp(proxy, "")) {
- puri = soup_uri_new(proxy);
+ new_proxy = g_strrstr(proxy, "http://") ? g_strdup(proxy) :
+ g_strdup_printf("http://%s", proxy);
+
+ puri = soup_uri_new(new_proxy);
                 g_object_set(G_OBJECT(s), "proxy-uri", puri, NULL);
                 soup_uri_free(puri);
+ g_free(new_proxy);
         }
         reloadcookies();
 }
Received on Tue Dec 15 2009 - 16:15:26 UTC