diff options
| -rw-r--r-- | src/local.mk | 8 | ||||
| -rw-r--r-- | src/tab.c | 4 | ||||
| -rw-r--r-- | src/toolbars/find-toolbar.c (renamed from src/find-toolbar.c) | 2 | ||||
| -rw-r--r-- | src/toolbars/find-toolbar.h (renamed from src/find-toolbar.h) | 8 | ||||
| -rw-r--r-- | src/toolbars/local.mk | 5 | ||||
| -rw-r--r-- | src/toolbars/navigation-toolbar.c (renamed from src/navigation-toolbar.c) | 16 | ||||
| -rw-r--r-- | src/toolbars/navigation-toolbar.h (renamed from src/navigation-toolbar.h) | 10 | ||||
| -rw-r--r-- | src/toolbars/navigation/back-forward-button-box.c (renamed from src/back-forward-button-box.c) | 2 | ||||
| -rw-r--r-- | src/toolbars/navigation/back-forward-button-box.h (renamed from src/back-forward-button-box.h) | 8 | ||||
| -rw-r--r-- | src/toolbars/navigation/home-button.c (renamed from src/home-button.c) | 4 | ||||
| -rw-r--r-- | src/toolbars/navigation/home-button.h (renamed from src/home-button.h) | 10 | ||||
| -rw-r--r-- | src/toolbars/navigation/local.mk | 6 | ||||
| -rw-r--r-- | src/toolbars/navigation/main-menu.c (renamed from src/main-menu.c) | 6 | ||||
| -rw-r--r-- | src/toolbars/navigation/main-menu.h (renamed from src/main-menu.h) | 12 | ||||
| -rw-r--r-- | src/toolbars/navigation/stop-reload-button.c (renamed from src/stop-reload-button.c) | 2 | ||||
| -rw-r--r-- | src/toolbars/navigation/stop-reload-button.h (renamed from src/stop-reload-button.h) | 8 | ||||
| -rw-r--r-- | src/toolbars/navigation/uri-entry.c (renamed from src/uri-entry.c) | 2 | ||||
| -rw-r--r-- | src/toolbars/navigation/uri-entry.h (renamed from src/uri-entry.h) | 8 |
18 files changed, 63 insertions, 58 deletions
diff --git a/src/local.mk b/src/local.mk index fb75b51..cd42327 100644 --- a/src/local.mk +++ b/src/local.mk @@ -5,16 +5,10 @@ marquee_SOURCES += \ %reldir%/web-settings.c \ %reldir%/window.c \ %reldir%/tab.c \ - %reldir%/navigation-toolbar.c \ - %reldir%/back-forward-button-box.c \ - %reldir%/stop-reload-button.c \ - %reldir%/uri-entry.c \ - %reldir%/home-button.c \ - %reldir%/main-menu.c \ - %reldir%/find-toolbar.c \ %reldir%/web-view.c \ %reldir%/html.c \ %reldir%/gpl-3-0.c \ %reldir%/about.c include %reldir%/about/local.mk +include %reldir%/toolbars/local.mk @@ -25,8 +25,8 @@ #include <gtk/gtk.h> -#include "find-toolbar.h" -#include "navigation-toolbar.h" +#include "toolbars/find-toolbar.h" +#include "toolbars/navigation-toolbar.h" #include "web-view.h" static void diff --git a/src/find-toolbar.c b/src/toolbars/find-toolbar.c index 3ef245b..0b16ea1 100644 --- a/src/find-toolbar.c +++ b/src/toolbars/find-toolbar.c @@ -25,7 +25,7 @@ #include <gtk/gtk.h> #include <webkit2/webkit2.h> -#include "web-view.h" +#include "../web-view.h" struct _MqFindToolbar { GtkRevealer parent_instance; diff --git a/src/find-toolbar.h b/src/toolbars/find-toolbar.h index 916a9c6..386cab4 100644 --- a/src/find-toolbar.h +++ b/src/toolbars/find-toolbar.h @@ -22,14 +22,14 @@ typedef struct _MqFindToolbar MqFindToolbar; typedef struct _MqFindToolbarClass MqFindToolbarClass; -#ifndef MQ_FIND_TOOLBAR_H -#define MQ_FIND_TOOLBAR_H +#ifndef MQ_TOOLBARS_FIND_TOOLBAR_H +#define MQ_TOOLBARS_FIND_TOOLBAR_H #include <glib.h> #include <gtk/gtk.h> #include <webkit2/webkit2.h> -#include "web-view.h" +#include "../web-view.h" G_BEGIN_DECLS @@ -58,4 +58,4 @@ mq_find_toolbar_reveal(MqFindToolbar *find_toolbar); G_END_DECLS -#endif /* MQ_FIND_TOOLBAR_H */ +#endif /* MQ_TOOLBARS_FIND_TOOLBAR_H */ diff --git a/src/toolbars/local.mk b/src/toolbars/local.mk new file mode 100644 index 0000000..ccfb75a --- /dev/null +++ b/src/toolbars/local.mk @@ -0,0 +1,5 @@ +marquee_SOURCES += \ + %reldir%/navigation-toolbar.c \ + %reldir%/find-toolbar.c + +include %reldir%/navigation/local.mk diff --git a/src/navigation-toolbar.c b/src/toolbars/navigation-toolbar.c index 655b076..8a6ecfe 100644 --- a/src/navigation-toolbar.c +++ b/src/toolbars/navigation-toolbar.c @@ -25,15 +25,15 @@ #include <gtk/gtk.h> #include <webkit2/webkit2.h> -#include "back-forward-button-box.h" -#include "config.h" +#include "../config.h" +#include "../tab.h" +#include "../web-view.h" #include "find-toolbar.h" -#include "home-button.h" -#include "main-menu.h" -#include "stop-reload-button.h" -#include "tab.h" -#include "uri-entry.h" -#include "web-view.h" +#include "navigation/back-forward-button-box.h" +#include "navigation/home-button.h" +#include "navigation/main-menu.h" +#include "navigation/stop-reload-button.h" +#include "navigation/uri-entry.h" struct _MqNavigationToolbar { GtkToolbar parent_instance; diff --git a/src/navigation-toolbar.h b/src/toolbars/navigation-toolbar.h index eb9a0a3..efaf2f6 100644 --- a/src/navigation-toolbar.h +++ b/src/toolbars/navigation-toolbar.h @@ -22,15 +22,15 @@ typedef struct _MqNavigationToolbar MqNavigationToolbar; typedef struct _MqNavigationToolbarClass MqNavigationToolbarClass; -#ifndef MQ_NAVIGATION_TOOLBAR_H -#define MQ_NAVIGATION_TOOLBAR_H +#ifndef MQ_TOOLBARS_NAVIGATION_TOOLBAR_H +#define MQ_TOOLBARS_NAVIGATION_TOOLBAR_H #include <glib.h> #include <gtk/gtk.h> +#include "../tab.h" +#include "../web-view.h" #include "find-toolbar.h" -#include "tab.h" -#include "web-view.h" G_BEGIN_DECLS @@ -59,4 +59,4 @@ mq_navigation_toolbar_new(MqConfig *config, MqTab *tab, G_END_DECLS -#endif /* MQ_NAVIGATION_TOOLBAR_H */ +#endif /* MQ_TOOLBARS_NAVIGATION_TOOLBAR_H */ diff --git a/src/back-forward-button-box.c b/src/toolbars/navigation/back-forward-button-box.c index 656c4b6..491b939 100644 --- a/src/back-forward-button-box.c +++ b/src/toolbars/navigation/back-forward-button-box.c @@ -25,7 +25,7 @@ #include <gtk/gtk.h> #include <webkit2/webkit2.h> -#include "web-view.h" +#include "../../web-view.h" struct _MqBackForwardButtonBox { GtkToolItem parent_instance; diff --git a/src/back-forward-button-box.h b/src/toolbars/navigation/back-forward-button-box.h index ea0fcab..a11c4de 100644 --- a/src/back-forward-button-box.h +++ b/src/toolbars/navigation/back-forward-button-box.h @@ -22,13 +22,13 @@ typedef struct _MqBackForwardButtonBox MqBackForwardButtonBox; typedef struct _MqBackForwardButtonBoxClass MqBackForwardButtonBoxClass; -#ifndef MQ_BACK_FORWARD_BUTTON_BOX_H -#define MQ_BACK_FORWARD_BUTTON_BOX_H +#ifndef MQ_TOOLBARS_NAVIGATION_BACK_FORWARD_BUTTON_BOX_H +#define MQ_TOOLBARS_NAVIGATION_BACK_FORWARD_BUTTON_BOX_H #include <glib.h> #include <gtk/gtk.h> -#include "web-view.h" +#include "../../web-view.h" G_BEGIN_DECLS @@ -56,4 +56,4 @@ mq_back_forward_button_box_new(MqWebView *web_view); G_END_DECLS -#endif /* MQ_BACK_FORWARD_BUTTON_BOX_H */ +#endif /* MQ_TOOLBARS_NAVIGATION_BACK_FORWARD_BUTTON_BOX_H */ diff --git a/src/home-button.c b/src/toolbars/navigation/home-button.c index bc44853..a9d5f75 100644 --- a/src/home-button.c +++ b/src/toolbars/navigation/home-button.c @@ -25,8 +25,8 @@ #include <gtk/gtk.h> #include <webkit2/webkit2.h> -#include "config.h" -#include "web-view.h" +#include "../../config.h" +#include "../../web-view.h" struct _MqHomeButton { GtkToolButton parent_instance; diff --git a/src/home-button.h b/src/toolbars/navigation/home-button.h index ee6f968..0eae927 100644 --- a/src/home-button.h +++ b/src/toolbars/navigation/home-button.h @@ -22,14 +22,14 @@ typedef struct _MqHomeButton MqHomeButton; typedef struct _MqHomeButtonClass MqHomeButtonClass; -#ifndef MQ_HOME_BUTTON_H -#define MQ_HOME_BUTTON_H +#ifndef MQ_TOOLBARS_NAVIGATION_HOME_BUTTON_H +#define MQ_TOOLBARS_NAVIGATION_HOME_BUTTON_H #include <glib.h> #include <gtk/gtk.h> -#include "config.h" -#include "web-view.h" +#include "../../config.h" +#include "../../web-view.h" G_BEGIN_DECLS @@ -53,4 +53,4 @@ mq_home_button_new(MqConfig *config, MqWebView *web_view); G_END_DECLS -#endif /* MQ_HOME_BUTTON_H */ +#endif /* MQ_TOOLBARS_NAVIGATION_HOME_BUTTON_H */ diff --git a/src/toolbars/navigation/local.mk b/src/toolbars/navigation/local.mk new file mode 100644 index 0000000..38f3213 --- /dev/null +++ b/src/toolbars/navigation/local.mk @@ -0,0 +1,6 @@ +marquee_SOURCES += \ + %reldir%/back-forward-button-box.c \ + %reldir%/stop-reload-button.c \ + %reldir%/uri-entry.c \ + %reldir%/home-button.c \ + %reldir%/main-menu.c diff --git a/src/main-menu.c b/src/toolbars/navigation/main-menu.c index 96c0310..ad6809b 100644 --- a/src/main-menu.c +++ b/src/toolbars/navigation/main-menu.c @@ -25,9 +25,9 @@ #include <gtk/gtk.h> #include <webkit2/webkit2.h> -#include "find-toolbar.h" -#include "tab.h" -#include "web-view.h" +#include "../../tab.h" +#include "../../web-view.h" +#include "../find-toolbar.h" struct _MqMainMenu { GtkToolButton parent_instance; diff --git a/src/main-menu.h b/src/toolbars/navigation/main-menu.h index 971f56e..e1e85da 100644 --- a/src/main-menu.h +++ b/src/toolbars/navigation/main-menu.h @@ -22,15 +22,15 @@ typedef struct _MqMainMenu MqMainMenu; typedef struct _MqMainMenuClass MqMainMenuClass; -#ifndef MQ_MAIN_MENU_H -#define MQ_MAIN_MENU_H +#ifndef MQ_TOOLBARS_NAVIGATION_MAIN_MENU_H +#define MQ_TOOLBARS_NAVIGATION_MAIN_MENU_H #include <glib.h> #include <gtk/gtk.h> -#include "find-toolbar.h" -#include "tab.h" -#include "web-view.h" +#include "../../tab.h" +#include "../../web-view.h" +#include "../find-toolbar.h" G_BEGIN_DECLS @@ -54,4 +54,4 @@ mq_main_menu_new(MqTab *tab, MqFindToolbar *find_toolbar, MqWebView *web_view); G_END_DECLS -#endif /* MQ_MAIN_MENU_H */ +#endif /* MQ_TOOLBARS_NAVIGATION_MAIN_MENU_H */ diff --git a/src/stop-reload-button.c b/src/toolbars/navigation/stop-reload-button.c index 315a313..1adaeeb 100644 --- a/src/stop-reload-button.c +++ b/src/toolbars/navigation/stop-reload-button.c @@ -25,7 +25,7 @@ #include <gtk/gtk.h> #include <webkit2/webkit2.h> -#include "web-view.h" +#include "../../web-view.h" struct _MqStopReloadButton { GtkToolButton parent_instance; diff --git a/src/stop-reload-button.h b/src/toolbars/navigation/stop-reload-button.h index 18d8f91..2b85109 100644 --- a/src/stop-reload-button.h +++ b/src/toolbars/navigation/stop-reload-button.h @@ -22,13 +22,13 @@ typedef struct _MqStopReloadButton MqStopReloadButton; typedef struct _MqStopReloadButtonClass MqStopReloadButtonClass; -#ifndef MQ_STOP_RELOAD_BUTTON_H -#define MQ_STOP_RELOAD_BUTTON_H +#ifndef MQ_TOOLBARS_NAVIGATION_STOP_RELOAD_BUTTON_H +#define MQ_TOOLBARS_NAVIGATION_STOP_RELOAD_BUTTON_H #include <glib.h> #include <gtk/gtk.h> -#include "web-view.h" +#include "../../web-view.h" G_BEGIN_DECLS @@ -56,4 +56,4 @@ mq_stop_reload_button_new(MqWebView *web_view); G_END_DECLS -#endif /* MQ_STOP_RELOAD_BUTTON_H */ +#endif /* MQ_TOOLBARS_NAVIGATION_STOP_RELOAD_BUTTON_H */ diff --git a/src/uri-entry.c b/src/toolbars/navigation/uri-entry.c index 1dcf4c9..8ae818a 100644 --- a/src/uri-entry.c +++ b/src/toolbars/navigation/uri-entry.c @@ -25,7 +25,7 @@ #include <gtk/gtk.h> #include <webkit2/webkit2.h> -#include "web-view.h" +#include "../../web-view.h" struct _MqUriEntry { GtkToolItem parent_instance; diff --git a/src/uri-entry.h b/src/toolbars/navigation/uri-entry.h index 68e0494..248ba22 100644 --- a/src/uri-entry.h +++ b/src/toolbars/navigation/uri-entry.h @@ -22,13 +22,13 @@ typedef struct _MqUriEntry MqUriEntry; typedef struct _MqUriEntryClass MqUriEntryClass; -#ifndef MQ_URI_ENTRY_H -#define MQ_URI_ENTRY_H +#ifndef MQ_TOOLBARS_NAVIGATION_URI_ENTRY_H +#define MQ_TOOLBARS_NAVIGATION_URI_ENTRY_H #include <glib.h> #include <gtk/gtk.h> -#include "web-view.h" +#include "../../web-view.h" G_BEGIN_DECLS @@ -52,4 +52,4 @@ mq_uri_entry_new(MqWebView *web_view, const gchar *uri); G_END_DECLS -#endif /* MQ_URI_ENTRY_H */ +#endif /* MQ_TOOLBARS_NAVIGATION_URI_ENTRY_H */ |