diff options
| author | Xan Lopez <xlopez@igalia.com> | 2011-06-30 01:55:28 +0800 |
|---|---|---|
| committer | Xan Lopez <xlopez@igalia.com> | 2011-06-30 01:55:28 +0800 |
| commit | 4c444c0f7693b9a0f3058729bea04832b66d6214 (patch) | |
| tree | d91f6fafd638bd19c9421fd1eaf56dde5db12741 /src/Makefile.am | |
| parent | 7628d25419c00d95da3e104ad6f132f4607b78c0 (diff) | |
| download | gsoc2013-epiphany-4c444c0f7693b9a0f3058729bea04832b66d6214.tar gsoc2013-epiphany-4c444c0f7693b9a0f3058729bea04832b66d6214.tar.gz gsoc2013-epiphany-4c444c0f7693b9a0f3058729bea04832b66d6214.tar.bz2 gsoc2013-epiphany-4c444c0f7693b9a0f3058729bea04832b66d6214.tar.lz gsoc2013-epiphany-4c444c0f7693b9a0f3058729bea04832b66d6214.tar.xz gsoc2013-epiphany-4c444c0f7693b9a0f3058729bea04832b66d6214.tar.zst gsoc2013-epiphany-4c444c0f7693b9a0f3058729bea04832b66d6214.zip | |
Merge EphyApplication into Ephy(Embed)Shell
We want to use EphyApplication from embed/ too, so instead of
following the EphyEmbedShell/EphyShell pattern just fold the code into
the Shell itself. This makes sense since both classes have basically
the same function, and we can easily leave the non-embed code in
EphyShell and move to EphyEmbedShell the bits we want to be global.
The better name would be EphyCoreApplication/EphyApplication for the
resulting object, but we can do this later.
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 4492b3bcf..98cdf0100 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -40,7 +40,6 @@ NOINST_H_FILES = \ window-commands.h INST_H_FILES = \ - ephy-application.h \ ephy-extension.h \ ephy-extensions-manager.h \ ephy-link.h \ @@ -53,7 +52,6 @@ INST_H_FILES = \ libephymain_la_SOURCES = \ ephy-action-helper.c \ - ephy-application.c \ ephy-completion-model.c \ ephy-completion-model.h \ ephy-encoding-dialog.c \ @@ -258,7 +256,6 @@ EPHY_GIR_H_FILES = \ $(top_srcdir)/lib/widgets/ephy-download-widget.h \ $(top_srcdir)/lib/widgets/ephy-search-entry.h \ $(top_srcdir)/src/bookmarks/ephy-bookmarks.h \ - $(top_srcdir)/src/ephy-application.h \ $(top_srcdir)/src/ephy-extension.h \ $(top_srcdir)/src/ephy-extensions-manager.h \ $(top_srcdir)/src/ephy-find-toolbar.h \ @@ -290,7 +287,6 @@ EPHY_GIR_C_FILES = \ $(top_srcdir)/lib/widgets/ephy-download-widget.c \ $(top_srcdir)/lib/widgets/ephy-search-entry.c \ $(top_srcdir)/src/bookmarks/ephy-bookmarks.c \ - $(top_srcdir)/src/ephy-application.c \ $(top_srcdir)/src/ephy-extension.c \ $(top_srcdir)/src/ephy-extensions-manager.c \ $(top_srcdir)/src/ephy-find-toolbar.c \ |