fixup gtk source file names

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

gtk/Makefile.target

@@ -57,14 +57,12 @@
 # ----------------------------------------------------------------------------
 
 # S_GTK are sources purely for the GTK build
-S_GTK := font_pango.c gtk_bitmap.c gtk_gui.c gtk_schedule.c		\
-	gtk_thumbnail.c gtk_plotters.c gtk_treeview.c gtk_scaffolding.c	\
-	gtk_completion.c gtk_login.c gtk_throbber.c gtk_selection.c	\
-	gtk_history.c gtk_window.c gtk_filetype.c gtk_download.c	\
-	gtk_menu.c gtk_print.c gtk_save.c gtk_search.c gtk_tabs.c	\
-	gtk_theme.c gtk_toolbar.c sexy_icon_entry.c gtk_compat.c	\
-	gtk_cookies.c gtk_hotlist.c					\
-	$(addprefix dialogs/,gtk_options.c gtk_about.c gtk_source.c)
+S_GTK := font_pango.c bitmap.c gui.c schedule.c thumbnail.c plotters.c	\
+	treeview.c scaffolding.c completion.c login.c throbber.c	\
+	selection.c history.c window.c filetype.c download.c menu.c	\
+	print.c save.c search.c tabs.c theme.c toolbar.c		\
+	sexy_icon_entry.c compat.c cookies.c hotlist.c			\
+	$(addprefix dialogs/,options.c about.c source.c)
 S_GTK := $(addprefix gtk/,$(S_GTK)) $(addprefix utils/,container.c)
 # code in utils/container.ch is non-universal it seems
 

gtk/bitmap.c

@@ -27,9 +27,10 @@
 #include <string.h>
 #include <gdk/gdk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include "content/content.h"
-#include "gtk/gtk_bitmap.h"
-#include "gtk/gtk_scaffolding.h"
+#include "gtk/bitmap.h"
+#include "gtk/scaffolding.h"
 #include "image/bitmap.h"
 #include "utils/log.h"
 

gtk/compat.c

@@ -20,7 +20,7 @@
  * Compatibility functions for older GTK versions (implementation)
  */
 
-#include "gtk/gtk_compat.h"
+#include "gtk/compat.h"
 
 void nsgtk_widget_set_can_focus(GtkWidget *widget, gboolean can_focus)
 {

gtk/completion.c

@@ -17,7 +17,8 @@
  */
 
 #include <gtk/gtk.h>
-#include "gtk/gtk_completion.h"
+#include "gtk/completion.h"
+
 #include "content/urldb.h"
 #include "utils/log.h"
 #include "desktop/options.h"

gtk/cookies.c

@@ -24,11 +24,11 @@
 #include "desktop/cookies.h"
 #include "desktop/plotters.h"
 #include "desktop/tree.h"
-#include "gtk/gtk_gui.h"
-#include "gtk/gtk_cookies.h"
-#include "gtk/gtk_plotters.h"
-#include "gtk/gtk_scaffolding.h"
-#include "gtk/gtk_treeview.h"
+#include "gtk/gui.h"
+#include "gtk/cookies.h"
+#include "gtk/plotters.h"
+#include "gtk/scaffolding.h"
+#include "gtk/treeview.h"
 
 #define GLADE_NAME "cookies.glade"
 

gtk/dialogs/about.c

@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gtk/gtk_gui.h"
-#include "gtk/dialogs/gtk_about.h"
+#include "gtk/gui.h"
+#include "gtk/dialogs/about.h"
 #include "desktop/browser.h"
 
 GtkAboutDialog* about_dialog;

gtk/dialogs/options.c

@@ -26,15 +26,16 @@
 #include <math.h>
 #include <gtk/gtk.h>
 #include <glade/glade.h>
+
 #include "desktop/options.h"
 #include "desktop/print.h"
 #include "desktop/searchweb.h"
 #include "gtk/options.h"
-#include "gtk/gtk_gui.h"
-#include "gtk/gtk_scaffolding.h"
-#include "gtk/gtk_theme.h"
-#include "gtk/dialogs/gtk_options.h"
-#include "gtk/gtk_window.h"
+#include "gtk/gui.h"
+#include "gtk/scaffolding.h"
+#include "gtk/theme.h"
+#include "gtk/dialogs/options.h"
+#include "gtk/window.h"
 #include "utils/log.h"
 #include "utils/utils.h"
 #include "utils/messages.h"

gtk/dialogs/source.c

@@ -22,12 +22,13 @@
 #include <unistd.h>
 #include <gtk/gtk.h>
 #include <glade/glade.h>
-#include "gtk/dialogs/gtk_source.h"
-#include "gtk/dialogs/gtk_about.h"
-#include "gtk/gtk_window.h"
-#include "gtk/gtk_gui.h"
-#include "gtk/gtk_print.h"
-#include "gtk/gtk_selection.h"
+
+#include "gtk/dialogs/source.h"
+#include "gtk/dialogs/about.h"
+#include "gtk/window.h"
+#include "gtk/gui.h"
+#include "gtk/print.h"
+#include "gtk/selection.h"
 #include "gtk/options.h"
 #include "desktop/netsurf.h"
 #include "desktop/print.h"

gtk/download.c

@@ -28,12 +28,12 @@
 #include "utils/url.h"
 #include "utils/messages.h"
 #include "desktop/gui.h"
-#include "gtk/gtk_gui.h"
-#include "gtk/gtk_scaffolding.h"
+#include "gtk/gui.h"
+#include "gtk/scaffolding.h"
 #include "gtk/options.h"
-#include "gtk/gtk_download.h"
-#include "gtk/gtk_window.h"
-#include "gtk/gtk_compat.h"
+#include "gtk/download.h"
+#include "gtk/window.h"
+#include "gtk/compat.h"
 
 #define UPDATE_RATE 500 /* In milliseconds */
 

gtk/filetype.c

@@ -26,7 +26,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "gtk/gtk_filetype.h"
+#include "gtk/filetype.h"
 #include "content/fetch.h"
 #include "utils/log.h"
 #include "utils/hashtable.h"

gtk/font_pango.c

@@ -26,10 +26,11 @@
 #include <assert.h>
 #include <stdio.h>
 #include <gtk/gtk.h>
+
 #include "css/css.h"
 #include "css/utils.h"
 #include "gtk/font_pango.h"
-#include "gtk/gtk_plotters.h"
+#include "gtk/plotters.h"
 #include "render/font.h"
 #include "utils/utils.h"
 #include "utils/log.h"

gtk/gui.c

@@ -57,19 +57,19 @@
 #include "desktop/textinput.h"
 #include "desktop/tree.h"
 #include "css/utils.h"
-#include "gtk/dialogs/gtk_options.h"
-#include "gtk/gtk_completion.h"
-#include "gtk/gtk_cookies.h"
-#include "gtk/gtk_download.h"
-#include "gtk/gtk_filetype.h"
-#include "gtk/gtk_gui.h"
-#include "gtk/gtk_history.h"
-#include "gtk/gtk_hotlist.h"
-#include "gtk/gtk_throbber.h"
-#include "gtk/gtk_treeview.h"
-#include "gtk/gtk_window.h"
+#include "gtk/dialogs/options.h"
+#include "gtk/completion.h"
+#include "gtk/cookies.h"
+#include "gtk/download.h"
+#include "gtk/filetype.h"
+#include "gtk/gui.h"
+#include "gtk/history.h"
+#include "gtk/hotlist.h"
+#include "gtk/throbber.h"
+#include "gtk/treeview.h"
+#include "gtk/window.h"
 #include "gtk/options.h"
-#include "gtk/gtk_schedule.h"
+#include "gtk/schedule.h"
 
 #include "render/box.h"
 #include "render/form.h"

gtk/history.c

@@ -21,11 +21,11 @@
 #include "desktop/history_global_core.h"
 #include "desktop/plotters.h"
 #include "desktop/tree.h"
-#include "gtk/gtk_gui.h"
-#include "gtk/gtk_history.h"
-#include "gtk/gtk_plotters.h"
-#include "gtk/gtk_scaffolding.h"
-#include "gtk/gtk_treeview.h"
+#include "gtk/gui.h"
+#include "gtk/history.h"
+#include "gtk/plotters.h"
+#include "gtk/scaffolding.h"
+#include "gtk/treeview.h"
 #include "utils/log.h"
 #include "utils/utils.h"
 

gtk/hotlist.c

@@ -21,12 +21,12 @@
 #include "desktop/options.h"
 #include "desktop/plotters.h"
 #include "desktop/tree.h"
-#include "gtk/gtk_gui.h"
-#include "gtk/gtk_hotlist.h"
+#include "gtk/gui.h"
+#include "gtk/hotlist.h"
 #include "gtk/options.h"
-#include "gtk/gtk_plotters.h"
-#include "gtk/gtk_scaffolding.h"
-#include "gtk/gtk_treeview.h"
+#include "gtk/plotters.h"
+#include "gtk/scaffolding.h"
+#include "gtk/treeview.h"
 #include "utils/log.h"
 
 #define GLADE_NAME "hotlist.glade"

gtk/login.c

@@ -22,8 +22,9 @@
 #include <assert.h>
 #include <gtk/gtk.h>
 #include <glade/glade.h>
+
 #include "utils/log.h"
-#include "gtk/gtk_gui.h"
+#include "gtk/gui.h"
 #include "content/content.h"
 #include "content/hlcache.h"
 #include "content/urldb.h"

gtk/menu.c

@@ -22,7 +22,7 @@
 #include <gtk/gtk.h>
 #include <glade/glade-xml.h>
 
-#include "gtk/gtk_menu.h"
+#include "gtk/menu.h"
 #include "utils/messages.h"
 #include "utils/utils.h"
 

gtk/plotters.c

@@ -30,15 +30,16 @@
 #include <assert.h>
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
+
+#include "utils/log.h"
 #include "desktop/plotters.h"
 #include "gtk/font_pango.h"
-#include "gtk/gtk_plotters.h"
-#include "gtk/gtk_scaffolding.h"
+#include "gtk/plotters.h"
+#include "gtk/scaffolding.h"
 #include "render/font.h"
-#include "utils/log.h"
 #include "desktop/options.h"
 #include "gtk/options.h"
-#include "gtk/gtk_bitmap.h"
+#include "gtk/bitmap.h"
 
 #ifndef CAIRO_VERSION
 #error "nsgtk requires cairo"

gtk/print.c

@@ -38,9 +38,9 @@
 #include "desktop/print.h"
 #include "desktop/printer.h"
 #include "gtk/font_pango.h"
-#include "gtk/gtk_bitmap.h"
-#include "gtk/gtk_print.h"
-#include "gtk/gtk_scaffolding.h"
+#include "gtk/bitmap.h"
+#include "gtk/print.h"
+#include "gtk/scaffolding.h"
 #include "gtk/options.h"
 #include "render/font.h"
 #include "utils/log.h"

gtk/save.c

@@ -20,6 +20,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <libxml/HTMLtree.h>
+
 #include "content/content.h"
 #include "desktop/save_complete.h"
 #include "utils/utils.h"

gtk/scaffolding.c

@@ -28,7 +28,8 @@
 #include <gtk/gtk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <libxml/debugXML.h>
-#include "gtk/gtk_scaffolding.h"
+
+#include "gtk/scaffolding.h"
 #include "content/content.h"
 #include "content/hlcache.h"
 #include "css/utils.h"
@@ -51,30 +52,30 @@
 #include "desktop/selection.h"
 #include "desktop/textinput.h"
 #include "desktop/tree.h"
-#include "gtk/gtk_cookies.h"
-#include "gtk/gtk_completion.h"
-#include "gtk/dialogs/gtk_options.h"
-#include "gtk/dialogs/gtk_about.h"
-#include "gtk/dialogs/gtk_source.h"
-#include "gtk/gtk_bitmap.h"
-#include "gtk/gtk_download.h"
-#include "gtk/gtk_gui.h"
-#include "gtk/gtk_history.h"
-#include "gtk/gtk_hotlist.h"
-#include "gtk/gtk_menu.h"
-#include "gtk/gtk_plotters.h"
-#include "gtk/gtk_print.h"
-#include "gtk/gtk_schedule.h"
-#include "gtk/gtk_search.h"
-#include "gtk/gtk_tabs.h"
-#include "gtk/gtk_theme.h"
-#include "gtk/gtk_throbber.h"
-#include "gtk/gtk_toolbar.h"
-#include "gtk/gtk_treeview.h"
-#include "gtk/gtk_window.h"
+#include "gtk/cookies.h"
+#include "gtk/completion.h"
+#include "gtk/dialogs/options.h"
+#include "gtk/dialogs/about.h"
+#include "gtk/dialogs/source.h"
+#include "gtk/bitmap.h"
+#include "gtk/download.h"
+#include "gtk/gui.h"
+#include "gtk/history.h"
+#include "gtk/hotlist.h"
+#include "gtk/menu.h"
+#include "gtk/plotters.h"
+#include "gtk/print.h"
+#include "gtk/schedule.h"
+#include "gtk/search.h"
+#include "gtk/tabs.h"
+#include "gtk/theme.h"
+#include "gtk/throbber.h"
+#include "gtk/toolbar.h"
+#include "gtk/treeview.h"
+#include "gtk/window.h"
 #include "gtk/options.h"
 #include "gtk/sexy_icon_entry.h"
-#include "gtk/gtk_compat.h"
+#include "gtk/compat.h"
 #include "image/ico.h"
 #include "render/box.h"
 #include "render/font.h"

gtk/scaffolding.h

@@ -22,9 +22,10 @@
 #include <gtk/gtk.h>
 #include <glade/glade.h>
 #include <glib.h>
+
 #include "desktop/gui.h"
 #include "desktop/plotters.h"
-#include "gtk/gtk_menu.h"
+#include "gtk/menu.h"
 #include "gtk/sexy_icon_entry.h"
 
 typedef struct gtk_scaffolding nsgtk_scaffolding;

gtk/schedule.c

@@ -21,7 +21,7 @@
 #include <stdbool.h>
 
 #include "desktop/browser.h"
-#include "gtk/gtk_schedule.h"
+#include "gtk/schedule.h"
 
 #ifdef DEBUG_GTK_SCHEDULE
 #include "utils/log.h"

gtk/search.c

@@ -23,9 +23,10 @@
 #include <ctype.h>
 #include <string.h>
 #include <gdk/gdkkeysyms.h>
-#include "gtk/gtk_search.h"
-#include "gtk/gtk_scaffolding.h"
-#include "gtk/gtk_window.h"
+
+#include "gtk/search.h"
+#include "gtk/scaffolding.h"
+#include "gtk/window.h"
 #include "utils/config.h"
 #include "content/content.h"
 #include "content/hlcache.h"

gtk/search.h

@@ -20,7 +20,7 @@
 #define _NETSURF_GTK_SEARCH_H_
 
 #include <gtk/gtk.h>
-#include "gtk/gtk_scaffolding.h"
+#include "gtk/scaffolding.h"
 
 void nsgtk_search_bar_toggle_visibility(struct gtk_scaffolding * g);
 gboolean nsgtk_search_entry_changed(GtkWidget *widget, gpointer data);

gtk/selection.c

@@ -25,8 +25,8 @@
 #include "desktop/textinput.h"
 #include "desktop/selection.h"
 #include "desktop/browser.h"
-#include "gtk/gtk_selection.h"
-#include "gtk/gtk_window.h"
+#include "gtk/selection.h"
+#include "gtk/window.h"
 #include "utils/utf8.h"
  
 static GString *current_selection = NULL;

gtk/sexy_icon_entry.c

@@ -22,11 +22,11 @@
  * or write to the Free Software Foundation, Inc.,
  * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
-
-#include "gtk/sexy_icon_entry.h"
 #include <string.h>
 #include <gtk/gtk.h>
-#include "gtk/gtk_compat.h"
+
+#include "gtk/sexy_icon_entry.h"
+#include "gtk/compat.h"
 
 #define ICON_MARGIN 2
 #define MAX_ICONS 2

gtk/tabs.c

@@ -18,16 +18,16 @@
 
 #include <glade/glade.h>
 #include <string.h>
-#include "gtk/gtk_window.h"
-#include "gtk/gtk_gui.h"
+#include "gtk/window.h"
+#include "gtk/gui.h"
 #include "desktop/browser.h"
 #include "content/content.h"
 #include "desktop/options.h"
 #include "desktop/search.h"
 #include "utils/utils.h"
 #include "gtk/options.h"
-#include "gtk/gtk_search.h"
-#include "gtk/gtk_tabs.h"
+#include "gtk/search.h"
+#include "gtk/tabs.h"
 
 #define TAB_WIDTH_N_CHARS 15
 

gtk/theme.c

@@ -20,16 +20,17 @@
 #include <stdio.h>
 #include <sys/stat.h>
 #include <unistd.h>
+
 #include "content/content.h"
 #include "content/content_type.h"
 #include "content/hlcache.h"
-#include "gtk/gtk_gui.h"
-#include "gtk/gtk_scaffolding.h"
-#include "gtk/gtk_menu.h"
-#include "gtk/gtk_theme.h"
-#include "gtk/gtk_window.h"
+#include "gtk/gui.h"
+#include "gtk/scaffolding.h"
+#include "gtk/menu.h"
+#include "gtk/theme.h"
+#include "gtk/window.h"
 #include "gtk/options.h"
-#include "gtk/dialogs/gtk_options.h"
+#include "gtk/dialogs/options.h"
 #include "utils/container.h"
 #include "utils/log.h"
 #include "utils/messages.h"

gtk/theme.h

@@ -20,7 +20,7 @@
 #define _NETSURF_GTK_THEME_H_
 
 #include <gtk/gtk.h>
-#include "gtk/gtk_scaffolding.h"
+#include "gtk/scaffolding.h"
 
 typedef enum search_buttons {
 	SEARCH_BACK_BUTTON = 0,

gtk/throbber.c

@@ -24,8 +24,8 @@
 #include <libnsgif.h>
 #endif
 #include "utils/log.h"
-#include "gtk/gtk_throbber.h"
-#include "gtk/gtk_bitmap.h"
+#include "gtk/throbber.h"
+#include "gtk/bitmap.h"
 
 struct nsgtk_throbber *nsgtk_throbber = NULL;
 

gtk/thumbnail.c

@@ -31,9 +31,9 @@
 #include "content/urldb.h"
 #include "desktop/plotters.h"
 #include "desktop/browser.h"
-#include "gtk/gtk_scaffolding.h"
-#include "gtk/gtk_plotters.h"
-#include "gtk/gtk_bitmap.h"
+#include "gtk/scaffolding.h"
+#include "gtk/plotters.h"
+#include "gtk/bitmap.h"
 #include "image/bitmap.h"
 #include "render/font.h"
 #include "utils/log.h"

gtk/toolbar.c

@@ -18,13 +18,13 @@
 
 #include <gtk/gtk.h>
 #include "desktop/searchweb.h"
-#include "gtk/gtk_toolbar.h"
-#include "gtk/gtk_gui.h"
-#include "gtk/gtk_scaffolding.h"
-#include "gtk/gtk_search.h"
-#include "gtk/gtk_theme.h"
-#include "gtk/gtk_throbber.h"
-#include "gtk/gtk_window.h"
+#include "gtk/toolbar.h"
+#include "gtk/gui.h"
+#include "gtk/scaffolding.h"
+#include "gtk/search.h"
+#include "gtk/theme.h"
+#include "gtk/throbber.h"
+#include "gtk/window.h"
 #include "gtk/sexy_icon_entry.h"
 #include "utils/log.h"
 #include "utils/messages.h"

gtk/toolbar.h

@@ -20,7 +20,8 @@
 #define _NETSURF_GTK_TOOLBAR_H_
 
 #include <gtk/gtk.h>
-#include "gtk/gtk_scaffolding.h"
+
+#include "gtk/scaffolding.h"
 
 void nsgtk_toolbar_customization_init(nsgtk_scaffolding *g);
 void nsgtk_toolbar_init(nsgtk_scaffolding *g);

gtk/treeview.c

@@ -30,9 +30,9 @@
 #include "desktop/tree.h"
 #include "desktop/tree_url_node.h"
 #include "desktop/plotters.h"
-#include "gtk/gtk_gui.h"
-#include "gtk/gtk_plotters.h"
-#include "gtk/gtk_treeview.h"
+#include "gtk/gui.h"
+#include "gtk/plotters.h"
+#include "gtk/treeview.h"
 #include "utils/log.h"
 #include "utils/utils.h"
 

gtk/window.c

@@ -20,25 +20,27 @@
 #include <inttypes.h>
 #include <string.h>
 #include <limits.h>
+#include <assert.h>
+
+#include <gdk/gdkkeysyms.h>
+
 #include "content/hlcache.h"
-#include "gtk/gtk_window.h"
+#include "gtk/window.h"
 #include "desktop/browser.h"
 #include "desktop/mouse.h"
 #include "desktop/options.h"
 #include "desktop/searchweb.h"
 #include "desktop/textinput.h"
 #include "desktop/selection.h"
-#include "gtk/gtk_compat.h"
-#include "gtk/gtk_gui.h"
+#include "gtk/compat.h"
+#include "gtk/gui.h"
 #include "gtk/options.h"
-#include "gtk/gtk_scaffolding.h"
-#include "gtk/gtk_plotters.h"
-#include "gtk/gtk_schedule.h"
-#include "gtk/gtk_tabs.h"
+#include "gtk/scaffolding.h"
+#include "gtk/plotters.h"
+#include "gtk/schedule.h"
+#include "gtk/tabs.h"
 #include "utils/log.h"
 #include "utils/utils.h"
-#include <gdk/gdkkeysyms.h>
-#include <assert.h>
 
 struct gui_window {
 	/* All gui_window objects have an ultimate scaffold */

gtk/window.h

@@ -21,7 +21,7 @@
 
 #include "desktop/gui.h"
 #include "desktop/browser.h"
-#include "gtk/gtk_scaffolding.h"
+#include "gtk/scaffolding.h"
 
 
 typedef enum nsgtk_window_signals {