Update project URL (partially lost during merge)

Merge r3071 into gtk_window.c after gtk frames merge (again, lost in merge)

svn path=/trunk/netsurf/; revision=3076

6 files changed, 9 insertions, 8 deletions

diff --git a/gtk/gtk_scaffolding.c b/gtk/gtk_scaffolding.c
index 22235e0ca..9460c91d6 100644
--- a/gtk/gtk_scaffolding.c
+++ b/gtk/gtk_scaffolding.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of NetSurf, http://netsurf.sourceforge.net/
+ * This file is part of NetSurf, http://netsurf-browser.org/
  * Licensed under the GNU General Public License,
  *                http://www.opensource.org/licenses/gpl-license
  * Copyright 2006 Rob Kendrick <rjek@rjek.com>
@@ -297,7 +297,7 @@ gboolean nsgtk_window_reload_button_clicked(GtkWidget *widget, gpointer data)
 gboolean nsgtk_window_home_button_clicked(GtkWidget *widget, gpointer data)
 {
         struct gtk_scaffolding *g = data;
-        static const char *addr = "http://netsurf.sourceforge.net/";
+        static const char *addr = "http://netsurf-browser.org/";
         struct browser_window *bw = nsgtk_get_browser_for_gui(g->top_level);
 
         if (option_homepage_url != NULL)
diff --git a/gtk/gtk_scaffolding.h b/gtk/gtk_scaffolding.h
index 38014807b..d32b380fc 100644
--- a/gtk/gtk_scaffolding.h
+++ b/gtk/gtk_scaffolding.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of NetSurf, http://netsurf.sourceforge.net/
+ * This file is part of NetSurf, http://netsurf-browser.org/
  * Licensed under the GNU General Public License,
  *                http://www.opensource.org/licenses/gpl-license
  * Copyright 2005 James Bursa <bursa@users.sourceforge.net>
diff --git a/gtk/gtk_schedule.h b/gtk/gtk_schedule.h
index ec675b9ac..2c5d618e7 100644
--- a/gtk/gtk_schedule.h
+++ b/gtk/gtk_schedule.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of NetSurf, http://netsurf.sourceforge.net/
+ * This file is part of NetSurf, http://netsurf-browser.org/
  * Licensed under the GNU General Public License,
  *                http://www.opensource.org/licenses/gpl-license
  * Copyright 2006 Daniel Silverstone <dsilvers@digital-scurf.org>
diff --git a/gtk/gtk_window.c b/gtk/gtk_window.c
index 4a87a2776..618637f62 100644
--- a/gtk/gtk_window.c
+++ b/gtk/gtk_window.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of NetSurf, http://netsurf.sourceforge.net/
+ * This file is part of NetSurf, http://netsurf-browser.org/
  * Licensed under the GNU General Public License,
  *                http://www.opensource.org/licenses/gpl-license
  * Copyright 2006 Daniel Silverstone <dsilvers@digital-scurf.org>
@@ -412,7 +412,7 @@ void nsgtk_window_reflow_content(struct gui_window *g)
         
         LOG(("Doing reformat"));
         
-        content_reformat(g->bw->current_content,
+        browser_window_reformat(g->bw,
                          g->target_width, g->target_height);
 
         if (nsgtk_scaffolding_is_busy(g->scaffold) || updated)
diff --git a/gtk/gtk_window.h b/gtk/gtk_window.h
index 78cacc1d1..24aa5cd74 100644
--- a/gtk/gtk_window.h
+++ b/gtk/gtk_window.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of NetSurf, http://netsurf.sourceforge.net/
+ * This file is part of NetSurf, http://netsurf-browser.org/
  * Licensed under the GNU General Public License,
  *                http://www.opensource.org/licenses/gpl-license
  * Copyright 2006 Daniel Silverstone <dsilvers@digital-scurf.org>
diff --git a/gtk/options.h b/gtk/options.h
index 3796a1c43..545be330d 100644
--- a/gtk/options.h
+++ b/gtk/options.h
@@ -1,4 +1,5 @@
-/* This s file is part of NetSurf, http://netsurf-browser.org/
+/*
+ * This file is part of NetSurf, http://netsurf-browser.org/
  * Licensed under the GNU General Public License,
  *                http://www.opensource.org/licenses/gpl-license
  * Copyright 2006 Rob Kendrick <rjek@rjek.com>