move about and preferences window handling to more sensible position

gtk/Makefile.target

@@ -109,7 +109,7 @@ S_GTK := font_pango.c bitmap.c gui.c schedule.c thumbnail.c plotters.c	\
 	selection.c history.c window.c fetch.c download.c menu.c	\
 	print.c search.c tabs.c theme.c toolbar.c gettext.c		\
 	compat.c cookies.c hotlist.c viewdata.c viewsource.c		\
-	$(addprefix dialogs/,preferences.c about.c)
+	preferences.c about.c
 
 S_GTK := $(addprefix gtk/,$(S_GTK)) $(addprefix utils/,container.c)
 # code in utils/container.ch is non-universal it seems

gtk/about.c

@@ -17,7 +17,7 @@
  */
 
 /**
- * \file gtk/dialogs/about.c
+ * \file gtk/about.c
  *
  * Implementation of gtk about dialog.
  */
@@ -32,7 +32,7 @@
 
 #include "gtk/compat.h"
 #include "gtk/gui.h"
-#include "gtk/dialogs/about.h"
+#include "gtk/about.h"
 
 /**
  * About dialog information button click.

gtk/preferences.c

@@ -33,7 +33,7 @@
 #include "gtk/gui.h"
 #include "gtk/scaffolding.h"
 #include "gtk/theme.h"
-#include "gtk/dialogs/preferences.h"
+#include "gtk/preferences.h"
 
 /* private prefs */
 struct ppref {
@@ -1065,7 +1065,7 @@ nsgtk_preferences_dialogPreferences_destroy(GtkDialog *dlg, struct ppref *priv)
 }
 
 
-/* exported interface documented in gtk/dialogs/preferences.h */
+/* exported interface documented in gtk/preferences.h */
 GtkWidget* nsgtk_preferences(struct browser_window *bw, GtkWindow *parent)
 {
 	GError *error = NULL;
@@ -1127,7 +1127,7 @@ GtkWidget* nsgtk_preferences(struct browser_window *bw, GtkWindow *parent)
 	return GTK_WIDGET(priv->dialog);
 }
 
-/* exported interface documented in gtk/dialogs/preferences.h */
+/* exported interface documented in gtk/preferences.h */
 void nsgtk_preferences_theme_add(const char *themename)
 {
 	struct ppref *priv = &ppref;

gtk/scaffolding.c

@@ -51,8 +51,8 @@
 #include "gtk/compat.h"
 #include "gtk/cookies.h"
 #include "gtk/completion.h"
-#include "gtk/dialogs/preferences.h"
-#include "gtk/dialogs/about.h"
+#include "gtk/preferences.h"
+#include "gtk/about.h"
 #include "gtk/viewsource.h"
 #include "gtk/bitmap.h"
 #include "gtk/gui.h"

gtk/theme.c

@@ -39,7 +39,7 @@
 #include "gtk/menu.h"
 #include "gtk/theme.h"
 #include "gtk/window.h"
-#include "gtk/dialogs/preferences.h"
+#include "gtk/preferences.h"
 
 enum image_sets {
 	IMAGE_SET_MAIN_MENU = 0,

gtk/viewdata.c

@@ -43,7 +43,7 @@
 #include "content/hlcache.h"
 #include "content/content.h"
 
-#include "gtk/dialogs/about.h"
+#include "gtk/about.h"
 #include "gtk/fetch.h"
 #include "gtk/compat.h"
 #include "gtk/gui.h"