summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick McDermott <pj@pehjota.net>2017-11-01 12:36:03 (EDT)
committer Patrick McDermott <pj@pehjota.net>2017-11-01 12:36:03 (EDT)
commit70fa295f32b86a6f575320665fd4541b5d969098 (patch)
tree0a7d091362c3e3028cbd4961da73df8208467d70
parentf735fa8b547993130d7b5bad10e8e7e0efe61e70 (diff)
downloadmarquee-70fa295f32b86a6f575320665fd4541b5d969098.zip
marquee-70fa295f32b86a6f575320665fd4541b5d969098.tar.gz
marquee-70fa295f32b86a6f575320665fd4541b5d969098.tar.bz2
src/about*, src/view-source.*: Move under src/schemes/
-rw-r--r--src/application.c4
-rw-r--r--src/local.mk4
-rw-r--r--src/schemes/about.c (renamed from src/about.c)6
-rw-r--r--src/schemes/about.h (renamed from src/about.h)2
-rw-r--r--src/schemes/about/local.mk (renamed from src/about/local.mk)0
-rw-r--r--src/schemes/about/marquee.c (renamed from src/about/marquee.c)4
-rw-r--r--src/schemes/about/paths.h (renamed from src/about/paths.h)2
-rw-r--r--src/schemes/about/preferences.c (renamed from src/about/preferences.c)8
-rw-r--r--src/schemes/about/version.c (renamed from src/about/version.c)4
-rw-r--r--src/schemes/view-source.c (renamed from src/view-source.c)6
-rw-r--r--src/schemes/view-source.h (renamed from src/view-source.h)2
11 files changed, 20 insertions, 22 deletions
diff --git a/src/application.c b/src/application.c
index 7c2725c..2dbd61a 100644
--- a/src/application.c
+++ b/src/application.c
@@ -30,10 +30,10 @@
#include <gtk/gtk.h>
#include <webkit2/webkit2.h>
-#include "about.h"
#include "config.h"
#include "download.h"
-#include "view-source.h"
+#include "schemes/about.h"
+#include "schemes/view-source.h"
#include "window.h"
struct MqApplication {
diff --git a/src/local.mk b/src/local.mk
index 5df9c43..897b684 100644
--- a/src/local.mk
+++ b/src/local.mk
@@ -1,5 +1,4 @@
marquee_SOURCES += \
- %reldir%/about.c \
%reldir%/application.c \
%reldir%/config.c \
%reldir%/download.c \
@@ -9,11 +8,10 @@ marquee_SOURCES += \
%reldir%/tab-label.c \
%reldir%/tab-page.c \
%reldir%/tree.c \
- %reldir%/view-source.c \
%reldir%/web-view.c \
%reldir%/window.c
-include %reldir%/about/local.mk
+include %reldir%/schemes/local.mk
include %reldir%/toolbars/local.mk
include %reldir%/utils/local.mk
include %reldir%/web-view-schemes/local.mk
diff --git a/src/about.c b/src/schemes/about.c
index 0adf321..49104a7 100644
--- a/src/about.c
+++ b/src/schemes/about.c
@@ -25,10 +25,10 @@
#include <webkit2/webkit2.h>
+#include "../application.h"
+#include "../utils/resources.h"
+#include "../utils/string.h"
#include "about/paths.h"
-#include "application.h"
-#include "utils/resources.h"
-#include "utils/string.h"
void
mq_about_request(WebKitURISchemeRequest *request, MqApplication *application)
diff --git a/src/about.h b/src/schemes/about.h
index 41fb65f..ae224b8 100644
--- a/src/about.h
+++ b/src/schemes/about.h
@@ -25,7 +25,7 @@
#include <glib.h>
#include <webkit2/webkit2.h>
-#include "application.h"
+#include "../application.h"
void
mq_about_request(WebKitURISchemeRequest *request, MqApplication *application);
diff --git a/src/about/local.mk b/src/schemes/about/local.mk
index f2825f4..f2825f4 100644
--- a/src/about/local.mk
+++ b/src/schemes/about/local.mk
diff --git a/src/about/marquee.c b/src/schemes/about/marquee.c
index 8c46f0f..1ecbe08 100644
--- a/src/about/marquee.c
+++ b/src/schemes/about/marquee.c
@@ -22,9 +22,9 @@
#include <glib.h>
#include <webkit2/webkit2.h>
-#include "paths.h"
-#include "../application.h"
+#include "../../application.h"
#include "../about.h"
+#include "../paths.h"
static const gchar *document =
"<!doctype html>"
diff --git a/src/about/paths.h b/src/schemes/about/paths.h
index 2c9c0ad..1208162 100644
--- a/src/about/paths.h
+++ b/src/schemes/about/paths.h
@@ -24,7 +24,7 @@
#include <glib.h>
-#include "../application.h"
+#include "../../application.h"
void
mq_about_version_response(MqApplication *application, GHashTable *query,
diff --git a/src/about/preferences.c b/src/schemes/about/preferences.c
index f68aa8a..669dd62 100644
--- a/src/about/preferences.c
+++ b/src/schemes/about/preferences.c
@@ -22,11 +22,11 @@
#include <glib.h>
#include <webkit2/webkit2.h>
-#include "paths.h"
+#include "../../application.h"
+#include "../../config.h"
+#include "../../utils/html.h"
#include "../about.h"
-#include "../application.h"
-#include "../config.h"
-#include "../utils/html.h"
+#include "paths.h"
static void
save_pref(gchar *key, gchar *value, MqConfig *config)
diff --git a/src/about/version.c b/src/schemes/about/version.c
index ff6a5cc..8045ade 100644
--- a/src/about/version.c
+++ b/src/schemes/about/version.c
@@ -26,9 +26,9 @@
#include <glib.h>
#include <webkit2/webkit2.h>
+#include "../../application.h"
+#include "../../utils/html.h"
#include "../about.h"
-#include "../application.h"
-#include "../utils/html.h"
#include "paths.h"
extern const char *PACKAGE_VERSION_GIT;
diff --git a/src/view-source.c b/src/schemes/view-source.c
index 6ebc52d..b6cce86 100644
--- a/src/view-source.c
+++ b/src/schemes/view-source.c
@@ -26,9 +26,9 @@
#include <glib.h>
#include <webkit2/webkit2.h>
-#include "application.h"
-#include "utils/resources.h"
-#include "utils/string.h"
+#include "../application.h"
+#include "../utils/resources.h"
+#include "../utils/string.h"
typedef struct {
WebKitURISchemeRequest *request;
diff --git a/src/view-source.h b/src/schemes/view-source.h
index ba50d3d..1f948e5 100644
--- a/src/view-source.h
+++ b/src/schemes/view-source.h
@@ -25,7 +25,7 @@
#include <glib.h>
#include <webkit2/webkit2.h>
-#include "application.h"
+#include "../application.h"
void
mq_view_source_request(WebKitURISchemeRequest *request,