diff --git a/gtk/Makefile.target b/gtk/Makefile.target index ef9c97978..9fd780a7c 100644 --- a/gtk/Makefile.target +++ b/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 diff --git a/gtk/gtk_bitmap.c b/gtk/bitmap.c similarity index 99% rename from gtk/gtk_bitmap.c rename to gtk/bitmap.c index 1e9f6b40e..5dafb129e 100644 --- a/gtk/gtk_bitmap.c +++ b/gtk/bitmap.c @@ -27,9 +27,10 @@ #include #include #include + #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" diff --git a/gtk/gtk_bitmap.h b/gtk/bitmap.h similarity index 100% rename from gtk/gtk_bitmap.h rename to gtk/bitmap.h diff --git a/gtk/gtk_compat.c b/gtk/compat.c similarity index 98% rename from gtk/gtk_compat.c rename to gtk/compat.c index f6ca5c3c4..822459474 100644 --- a/gtk/gtk_compat.c +++ b/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) { diff --git a/gtk/gtk_compat.h b/gtk/compat.h similarity index 100% rename from gtk/gtk_compat.h rename to gtk/compat.h diff --git a/gtk/gtk_completion.c b/gtk/completion.c similarity index 98% rename from gtk/gtk_completion.c rename to gtk/completion.c index 8566f1c6d..80a4693e4 100644 --- a/gtk/gtk_completion.c +++ b/gtk/completion.c @@ -17,7 +17,8 @@ */ #include -#include "gtk/gtk_completion.h" +#include "gtk/completion.h" + #include "content/urldb.h" #include "utils/log.h" #include "desktop/options.h" diff --git a/gtk/gtk_completion.h b/gtk/completion.h similarity index 100% rename from gtk/gtk_completion.h rename to gtk/completion.h diff --git a/gtk/gtk_cookies.c b/gtk/cookies.c similarity index 96% rename from gtk/gtk_cookies.c rename to gtk/cookies.c index 12fa9cc14..6427a1b06 100644 --- a/gtk/gtk_cookies.c +++ b/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" diff --git a/gtk/gtk_cookies.h b/gtk/cookies.h similarity index 100% rename from gtk/gtk_cookies.h rename to gtk/cookies.h diff --git a/gtk/dialogs/gtk_about.c b/gtk/dialogs/about.c similarity index 98% rename from gtk/dialogs/gtk_about.c rename to gtk/dialogs/about.c index eb7417127..14ddf624c 100644 --- a/gtk/dialogs/gtk_about.c +++ b/gtk/dialogs/about.c @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -#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; diff --git a/gtk/dialogs/gtk_about.h b/gtk/dialogs/about.h similarity index 100% rename from gtk/dialogs/gtk_about.h rename to gtk/dialogs/about.h diff --git a/gtk/dialogs/gtk_options.c b/gtk/dialogs/options.c similarity index 99% rename from gtk/dialogs/gtk_options.c rename to gtk/dialogs/options.c index dae0c8581..0587c3cae 100644 --- a/gtk/dialogs/gtk_options.c +++ b/gtk/dialogs/options.c @@ -26,15 +26,16 @@ #include #include #include + #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" diff --git a/gtk/dialogs/gtk_options.h b/gtk/dialogs/options.h similarity index 100% rename from gtk/dialogs/gtk_options.h rename to gtk/dialogs/options.h diff --git a/gtk/dialogs/gtk_source.c b/gtk/dialogs/source.c similarity index 98% rename from gtk/dialogs/gtk_source.c rename to gtk/dialogs/source.c index b7dec945b..7c58a014e 100644 --- a/gtk/dialogs/gtk_source.c +++ b/gtk/dialogs/source.c @@ -22,12 +22,13 @@ #include #include #include -#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" diff --git a/gtk/dialogs/gtk_source.h b/gtk/dialogs/source.h similarity index 100% rename from gtk/dialogs/gtk_source.h rename to gtk/dialogs/source.h diff --git a/gtk/gtk_download.c b/gtk/download.c similarity index 99% rename from gtk/gtk_download.c rename to gtk/download.c index a91f25188..990176a24 100644 --- a/gtk/gtk_download.c +++ b/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 */ diff --git a/gtk/gtk_download.h b/gtk/download.h similarity index 100% rename from gtk/gtk_download.h rename to gtk/download.h diff --git a/gtk/gtk_filetype.c b/gtk/filetype.c similarity index 99% rename from gtk/gtk_filetype.c rename to gtk/filetype.c index 51b632db8..b172f5191 100644 --- a/gtk/gtk_filetype.c +++ b/gtk/filetype.c @@ -26,7 +26,7 @@ #include #include -#include "gtk/gtk_filetype.h" +#include "gtk/filetype.h" #include "content/fetch.h" #include "utils/log.h" #include "utils/hashtable.h" diff --git a/gtk/gtk_filetype.h b/gtk/filetype.h similarity index 100% rename from gtk/gtk_filetype.h rename to gtk/filetype.h diff --git a/gtk/font_pango.c b/gtk/font_pango.c index 0671d12fb..d512ae69f 100644 --- a/gtk/font_pango.c +++ b/gtk/font_pango.c @@ -26,10 +26,11 @@ #include #include #include + #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" diff --git a/gtk/gtk_gui.c b/gtk/gui.c similarity index 98% rename from gtk/gtk_gui.c rename to gtk/gui.c index 399cf138f..98a0c3322 100644 --- a/gtk/gtk_gui.c +++ b/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" diff --git a/gtk/gtk_gui.h b/gtk/gui.h similarity index 100% rename from gtk/gtk_gui.h rename to gtk/gui.h diff --git a/gtk/gtk_history.c b/gtk/history.c similarity index 97% rename from gtk/gtk_history.c rename to gtk/history.c index 09f945963..b5c019f76 100644 --- a/gtk/gtk_history.c +++ b/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" diff --git a/gtk/gtk_history.h b/gtk/history.h similarity index 100% rename from gtk/gtk_history.h rename to gtk/history.h diff --git a/gtk/gtk_hotlist.c b/gtk/hotlist.c similarity index 97% rename from gtk/gtk_hotlist.c rename to gtk/hotlist.c index 98e0b217e..6a821d7a3 100644 --- a/gtk/gtk_hotlist.c +++ b/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" diff --git a/gtk/gtk_hotlist.h b/gtk/hotlist.h similarity index 100% rename from gtk/gtk_hotlist.h rename to gtk/hotlist.h diff --git a/gtk/gtk_login.c b/gtk/login.c similarity index 99% rename from gtk/gtk_login.c rename to gtk/login.c index 4b9f15333..44ef399af 100644 --- a/gtk/gtk_login.c +++ b/gtk/login.c @@ -22,8 +22,9 @@ #include #include #include + #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" diff --git a/gtk/gtk_menu.c b/gtk/menu.c similarity index 99% rename from gtk/gtk_menu.c rename to gtk/menu.c index d8063e356..99bfde997 100644 --- a/gtk/gtk_menu.c +++ b/gtk/menu.c @@ -22,7 +22,7 @@ #include #include -#include "gtk/gtk_menu.h" +#include "gtk/menu.h" #include "utils/messages.h" #include "utils/utils.h" diff --git a/gtk/gtk_menu.h b/gtk/menu.h similarity index 100% rename from gtk/gtk_menu.h rename to gtk/menu.h diff --git a/gtk/gtk_plotters.c b/gtk/plotters.c similarity index 99% rename from gtk/gtk_plotters.c rename to gtk/plotters.c index 1428710ec..460a65a6f 100644 --- a/gtk/gtk_plotters.c +++ b/gtk/plotters.c @@ -30,15 +30,16 @@ #include #include #include + +#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" diff --git a/gtk/gtk_plotters.h b/gtk/plotters.h similarity index 100% rename from gtk/gtk_plotters.h rename to gtk/plotters.h diff --git a/gtk/gtk_print.c b/gtk/print.c similarity index 99% rename from gtk/gtk_print.c rename to gtk/print.c index f08880157..5f518e266 100644 --- a/gtk/gtk_print.c +++ b/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" diff --git a/gtk/gtk_print.h b/gtk/print.h similarity index 100% rename from gtk/gtk_print.h rename to gtk/print.h diff --git a/gtk/gtk_save.c b/gtk/save.c similarity index 99% rename from gtk/gtk_save.c rename to gtk/save.c index fc03499ea..a67a7e6d0 100644 --- a/gtk/gtk_save.c +++ b/gtk/save.c @@ -20,6 +20,7 @@ #include #include #include + #include "content/content.h" #include "desktop/save_complete.h" #include "utils/utils.h" diff --git a/gtk/gtk_scaffolding.c b/gtk/scaffolding.c similarity index 99% rename from gtk/gtk_scaffolding.c rename to gtk/scaffolding.c index a79469a51..573eec70a 100644 --- a/gtk/gtk_scaffolding.c +++ b/gtk/scaffolding.c @@ -28,7 +28,8 @@ #include #include #include -#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" diff --git a/gtk/gtk_scaffolding.h b/gtk/scaffolding.h similarity index 99% rename from gtk/gtk_scaffolding.h rename to gtk/scaffolding.h index 76483e96b..7e6983aa9 100644 --- a/gtk/gtk_scaffolding.h +++ b/gtk/scaffolding.h @@ -22,9 +22,10 @@ #include #include #include + #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; diff --git a/gtk/gtk_schedule.c b/gtk/schedule.c similarity index 99% rename from gtk/gtk_schedule.c rename to gtk/schedule.c index a3f866d3d..9491ccb67 100644 --- a/gtk/gtk_schedule.c +++ b/gtk/schedule.c @@ -21,7 +21,7 @@ #include #include "desktop/browser.h" -#include "gtk/gtk_schedule.h" +#include "gtk/schedule.h" #ifdef DEBUG_GTK_SCHEDULE #include "utils/log.h" diff --git a/gtk/gtk_schedule.h b/gtk/schedule.h similarity index 100% rename from gtk/gtk_schedule.h rename to gtk/schedule.h diff --git a/gtk/gtk_search.c b/gtk/search.c similarity index 98% rename from gtk/gtk_search.c rename to gtk/search.c index 30075be02..b4127eefb 100644 --- a/gtk/gtk_search.c +++ b/gtk/search.c @@ -23,9 +23,10 @@ #include #include #include -#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" diff --git a/gtk/gtk_search.h b/gtk/search.h similarity index 98% rename from gtk/gtk_search.h rename to gtk/search.h index 981ea5bfd..869a3cd8a 100644 --- a/gtk/gtk_search.h +++ b/gtk/search.h @@ -20,7 +20,7 @@ #define _NETSURF_GTK_SEARCH_H_ #include -#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); diff --git a/gtk/gtk_selection.c b/gtk/selection.c similarity index 98% rename from gtk/gtk_selection.c rename to gtk/selection.c index 334b552e5..68ab88f71 100644 --- a/gtk/gtk_selection.c +++ b/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; diff --git a/gtk/gtk_selection.h b/gtk/selection.h similarity index 100% rename from gtk/gtk_selection.h rename to gtk/selection.h diff --git a/gtk/sexy_icon_entry.c b/gtk/sexy_icon_entry.c index adf4abc2c..b71e92ebe 100644 --- a/gtk/sexy_icon_entry.c +++ b/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 #include -#include "gtk/gtk_compat.h" + +#include "gtk/sexy_icon_entry.h" +#include "gtk/compat.h" #define ICON_MARGIN 2 #define MAX_ICONS 2 diff --git a/gtk/gtk_tabs.c b/gtk/tabs.c similarity index 98% rename from gtk/gtk_tabs.c rename to gtk/tabs.c index 5c2563c1a..07e6b3365 100644 --- a/gtk/gtk_tabs.c +++ b/gtk/tabs.c @@ -18,16 +18,16 @@ #include #include -#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 diff --git a/gtk/gtk_tabs.h b/gtk/tabs.h similarity index 100% rename from gtk/gtk_tabs.h rename to gtk/tabs.h diff --git a/gtk/gtk_theme.c b/gtk/theme.c similarity index 99% rename from gtk/gtk_theme.c rename to gtk/theme.c index 98fc03410..dc5eb5ee4 100644 --- a/gtk/gtk_theme.c +++ b/gtk/theme.c @@ -20,16 +20,17 @@ #include #include #include + #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" diff --git a/gtk/gtk_theme.h b/gtk/theme.h similarity index 97% rename from gtk/gtk_theme.h rename to gtk/theme.h index 833379d36..117207037 100644 --- a/gtk/gtk_theme.h +++ b/gtk/theme.h @@ -20,7 +20,7 @@ #define _NETSURF_GTK_THEME_H_ #include -#include "gtk/gtk_scaffolding.h" +#include "gtk/scaffolding.h" typedef enum search_buttons { SEARCH_BACK_BUTTON = 0, diff --git a/gtk/gtk_throbber.c b/gtk/throbber.c similarity index 98% rename from gtk/gtk_throbber.c rename to gtk/throbber.c index 5f79a2182..987b9dd42 100644 --- a/gtk/gtk_throbber.c +++ b/gtk/throbber.c @@ -24,8 +24,8 @@ #include #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; diff --git a/gtk/gtk_throbber.h b/gtk/throbber.h similarity index 100% rename from gtk/gtk_throbber.h rename to gtk/throbber.h diff --git a/gtk/gtk_thumbnail.c b/gtk/thumbnail.c similarity index 97% rename from gtk/gtk_thumbnail.c rename to gtk/thumbnail.c index 59727727c..53d62fe30 100644 --- a/gtk/gtk_thumbnail.c +++ b/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" diff --git a/gtk/gtk_toolbar.c b/gtk/toolbar.c similarity index 99% rename from gtk/gtk_toolbar.c rename to gtk/toolbar.c index ab463a103..b8ad9bcdb 100644 --- a/gtk/gtk_toolbar.c +++ b/gtk/toolbar.c @@ -18,13 +18,13 @@ #include #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" diff --git a/gtk/gtk_toolbar.h b/gtk/toolbar.h similarity index 98% rename from gtk/gtk_toolbar.h rename to gtk/toolbar.h index 7d483578b..bcad5cd7e 100644 --- a/gtk/gtk_toolbar.h +++ b/gtk/toolbar.h @@ -20,7 +20,8 @@ #define _NETSURF_GTK_TOOLBAR_H_ #include -#include "gtk/gtk_scaffolding.h" + +#include "gtk/scaffolding.h" void nsgtk_toolbar_customization_init(nsgtk_scaffolding *g); void nsgtk_toolbar_init(nsgtk_scaffolding *g); diff --git a/gtk/gtk_treeview.c b/gtk/treeview.c similarity index 99% rename from gtk/gtk_treeview.c rename to gtk/treeview.c index c896fc7e6..a84a502c6 100644 --- a/gtk/gtk_treeview.c +++ b/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" diff --git a/gtk/gtk_treeview.h b/gtk/treeview.h similarity index 100% rename from gtk/gtk_treeview.h rename to gtk/treeview.h diff --git a/gtk/gtk_window.c b/gtk/window.c similarity index 99% rename from gtk/gtk_window.c rename to gtk/window.c index a45faa595..d3ab49d3e 100644 --- a/gtk/gtk_window.c +++ b/gtk/window.c @@ -20,25 +20,27 @@ #include #include #include +#include + +#include + #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 -#include struct gui_window { /* All gui_window objects have an ultimate scaffold */ diff --git a/gtk/gtk_window.h b/gtk/window.h similarity index 98% rename from gtk/gtk_window.h rename to gtk/window.h index 27bbe5945..abb722212 100644 --- a/gtk/gtk_window.h +++ b/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 {