diff options
author | Vincent Sanders <vince@kyllikki.org> | 2014-09-22 23:18:03 +0100 |
---|---|---|
committer | Vincent Sanders <vince@kyllikki.org> | 2014-09-22 23:18:03 +0100 |
commit | e825f384370ec0c939f5b2c8d741b796b3eb98e9 (patch) | |
tree | 47380b8d441e461ca512da11aee9cc65dd7bdef3 /gtk | |
parent | 9487076f2ad1298b1122155170949cb59156d9b9 (diff) | |
download | netsurf-e825f384370ec0c939f5b2c8d741b796b3eb98e9.tar.gz netsurf-e825f384370ec0c939f5b2c8d741b796b3eb98e9.tar.bz2 |
move about and preferences window handling to more sensible position
Diffstat (limited to 'gtk')
-rw-r--r-- | gtk/Makefile.target | 2 | ||||
-rw-r--r-- | gtk/about.c (renamed from gtk/dialogs/about.c) | 4 | ||||
-rw-r--r-- | gtk/about.h (renamed from gtk/dialogs/about.h) | 0 | ||||
-rw-r--r-- | gtk/preferences.c (renamed from gtk/dialogs/preferences.c) | 6 | ||||
-rw-r--r-- | gtk/preferences.h (renamed from gtk/dialogs/preferences.h) | 0 | ||||
-rw-r--r-- | gtk/scaffolding.c | 4 | ||||
-rw-r--r-- | gtk/theme.c | 2 | ||||
-rw-r--r-- | gtk/viewdata.c | 2 |
8 files changed, 10 insertions, 10 deletions
diff --git a/gtk/Makefile.target b/gtk/Makefile.target index 05865ff74..8fed107fd 100644 --- a/gtk/Makefile.target +++ b/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 diff --git a/gtk/dialogs/about.c b/gtk/about.c index 99df137cc..84fb067c4 100644 --- a/gtk/dialogs/about.c +++ b/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. diff --git a/gtk/dialogs/about.h b/gtk/about.h index bf3c9f58d..bf3c9f58d 100644 --- a/gtk/dialogs/about.h +++ b/gtk/about.h diff --git a/gtk/dialogs/preferences.c b/gtk/preferences.c index f38c7e9bc..0255b4beb 100644 --- a/gtk/dialogs/preferences.c +++ b/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; diff --git a/gtk/dialogs/preferences.h b/gtk/preferences.h index 3ef33ca30..3ef33ca30 100644 --- a/gtk/dialogs/preferences.h +++ b/gtk/preferences.h diff --git a/gtk/scaffolding.c b/gtk/scaffolding.c index 7f40d62a2..4706c6f60 100644 --- a/gtk/scaffolding.c +++ b/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" diff --git a/gtk/theme.c b/gtk/theme.c index dd034ac8b..8612c3948 100644 --- a/gtk/theme.c +++ b/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, diff --git a/gtk/viewdata.c b/gtk/viewdata.c index 47af0fa31..1d419a39e 100644 --- a/gtk/viewdata.c +++ b/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" |