r3375 jmb - /trunk/netsurf/gtk/gtk_scaffolding.c
by netsurf@semichrome.net
Author: jmb
Date: Thu Jun 28 17:03:32 2007
New Revision: 3375
URL: http://source.netsurf-browser.org?rev=3D3375&view=3Drev
Log:
There's no referer header if the user's just hit return in the URL bar.
Modified:
trunk/netsurf/gtk/gtk_scaffolding.c
Modified: trunk/netsurf/gtk/gtk_scaffolding.c
URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/gtk_scaffolding.c?=
rev=3D3375&r1=3D3374&r2=3D3375&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/netsurf/gtk/gtk_scaffolding.c (original)
+++ trunk/netsurf/gtk/gtk_scaffolding.c Thu Jun 28 17:03:32 2007
@@ -194,7 +194,7 @@
=
if (--open_windows =3D=3D 0)
netsurf_quit =3D true;
- =
+
if (!g->being_destroyed) {
g->being_destroyed =3D 1;
nsgtk_window_destroy_browser(g->top_level);
@@ -215,7 +215,7 @@
{
int width, height;
struct browser_window *bw =3D nsgtk_get_browser_for_gui(g->top_lev=
el);
- =
+
gtk_widget_set_sensitive(GTK_WIDGET(g->back_button),
history_back_available(bw->history));
gtk_widget_set_sensitive(GTK_WIDGET(g->forward_button),
@@ -255,7 +255,7 @@
{
struct gtk_scaffolding *g =3D data;
struct browser_window *bw =3D nsgtk_get_browser_for_gui(g->top_lev=
el);
- =
+
if (!history_back_available(bw->history))
return TRUE;
=
@@ -316,14 +316,10 @@
gboolean nsgtk_window_url_activate_event(GtkWidget *widget, gpointer data)
{
struct gtk_scaffolding *g =3D data;
- char *referer =3D 0;
struct browser_window *bw =3D nsgtk_get_browser_for_gui(g->top_lev=
el);
=
- if (bw->current_content && bw->current_content->url)
- referer =3D bw->current_content->url;
-
browser_window_go(bw, gtk_entry_get_text(GTK_ENTRY(g->url_bar)),
- referer, true);
+ 0, true);
=
return TRUE;
}
@@ -350,7 +346,7 @@
char *url =3D malloc(strlen(filename) + strlen("file://") + 1);
=
sprintf(url, "file://%s", filename);
- =
+
browser_window_go(bw, url, 0, true);
=
g_free(filename);
@@ -418,7 +414,7 @@
struct gtk_scaffolding *gw =3D (struct gtk_scaffolding *)g;
struct browser_window *bw =3D nsgtk_get_browser_for_gui(gw->top_le=
vel);
float old_scale =3D nsgtk_get_scale_for_gui(gw->top_level);
- =
+
browser_window_set_scale(bw, old_scale + 0.05, true);
=
return TRUE;
@@ -524,7 +520,7 @@
{
struct gtk_history_window *hw =3D (struct gtk_history_window *)g;
struct browser_window *bw =3D nsgtk_get_browser_for_gui(hw->g->top=
_level);
- =
+
current_widget =3D widget;
current_drawable =3D widget->window;
current_gc =3D gdk_gc_new(current_drawable);
@@ -548,9 +544,9 @@
{
struct gtk_history_window *hw =3D (struct gtk_history_window *)g;
struct browser_window *bw =3D nsgtk_get_browser_for_gui(hw->g->top=
_level);
- =
+
LOG(("X=3D%g, Y=3D%g", event->x, event->y));
- =
+
history_click(bw, bw->history,
event->x, event->y, false);
=
@@ -573,7 +569,7 @@
gtk_widget_event(g_object_get_data(
G_OBJECT(widget), "hScroll"), ev);
}
- =
+
return TRUE;
}
=
@@ -586,14 +582,14 @@
GtkTable *table =3D GTK_TABLE(GET_WIDGET("centreTable"));
LOG(("Attaching viewport to scaffolding %p", g));
gtk_table_attach_defaults(table, GTK_WIDGET(vp), 0, 1, 0, 1);
- =
+
/* connect our scrollbars to the viewport */
scrollbar =3D GET_WIDGET("coreScrollHorizontal");
- gtk_viewport_set_hadjustment(vp, =
+ gtk_viewport_set_hadjustment(vp,
gtk_range_get_adjustment(GTK_RANGE(scrollbar)));
g_object_set_data(G_OBJECT(vp), "hScroll", scrollbar);
scrollbar =3D GET_WIDGET("coreScrollVertical");
- gtk_viewport_set_vadjustment(vp, =
+ gtk_viewport_set_vadjustment(vp,
gtk_range_get_adjustment(GTK_RANGE(scrollbar)));
g_object_set_data(G_OBJECT(vp), "vScroll", scrollbar);
g_signal_connect(G_OBJECT(vp), "scroll_event",
@@ -609,11 +605,11 @@
nsgtk_scaffolding *nsgtk_new_scaffolding(struct gui_window *toplevel)
{
struct gtk_scaffolding *g =3D malloc(sizeof(*g));
- =
+
LOG(("Constructing a scaffold of %p for gui_window %p", g, topleve=
l));
- =
+
g->top_level =3D toplevel;
- =
+
open_windows++;
=
/* load the window template from the glade xml file, and extract
@@ -738,9 +734,9 @@
=
/* set up the menu signal handlers */
nsgtk_attach_menu_handlers(g->xml, g);
- =
+
g->being_destroyed =3D 0;
- =
+
/* finally, show the window. */
gtk_widget_show(GTK_WIDGET(g->window));
=