diff options
| author | Emanuele Aina <emanuele.aina@collabora.com> | 2013-03-28 19:32:45 +0800 |
|---|---|---|
| committer | Emanuele Aina <emanuele.aina@collabora.com> | 2013-04-01 18:23:44 +0800 |
| commit | 15460fa9ae4e6a19e8b6e971014deb50746d90ee (patch) | |
| tree | 18db9db5b9ea32420080dcc8b8332f4998f9d365 /nautilus-sendto-plugin | |
| parent | 5c440c4e08f8102a9b73244697e69ad4855dbdef (diff) | |
| download | gsoc2013-empathy-15460fa9ae4e6a19e8b6e971014deb50746d90ee.tar gsoc2013-empathy-15460fa9ae4e6a19e8b6e971014deb50746d90ee.tar.gz gsoc2013-empathy-15460fa9ae4e6a19e8b6e971014deb50746d90ee.tar.bz2 gsoc2013-empathy-15460fa9ae4e6a19e8b6e971014deb50746d90ee.tar.lz gsoc2013-empathy-15460fa9ae4e6a19e8b6e971014deb50746d90ee.tar.xz gsoc2013-empathy-15460fa9ae4e6a19e8b6e971014deb50746d90ee.tar.zst gsoc2013-empathy-15460fa9ae4e6a19e8b6e971014deb50746d90ee.zip | |
Use a flat namespace for internal includes
Directly add the libempathy, libempathy-gtk and extensions directories
to the include search path. This decouples header inclusions from their
location and helps when reorganizing the source files layout.
https://bugzilla.gnome.org/show_bug.cgi?id=696950
Diffstat (limited to 'nautilus-sendto-plugin')
| -rw-r--r-- | nautilus-sendto-plugin/Makefile.am | 3 | ||||
| -rw-r--r-- | nautilus-sendto-plugin/empathy-nautilus-sendto.c | 22 |
2 files changed, 13 insertions, 12 deletions
diff --git a/nautilus-sendto-plugin/Makefile.am b/nautilus-sendto-plugin/Makefile.am index 171ba2ed2..a28415cc1 100644 --- a/nautilus-sendto-plugin/Makefile.am +++ b/nautilus-sendto-plugin/Makefile.am @@ -2,7 +2,8 @@ plugindir = $(libdir)/nautilus-sendto/plugins INCLUDES = \ -I$(top_builddir) \ - -I$(top_srcdir) \ + -I$(top_srcdir)/libempathy \ + -I$(top_srcdir)/libempathy-gtk \ -DLOCALEDIR=\""$(datadir)/locale"\" \ $(NST_CFLAGS) \ $(WARN_CFLAGS) \ diff --git a/nautilus-sendto-plugin/empathy-nautilus-sendto.c b/nautilus-sendto-plugin/empathy-nautilus-sendto.c index fde281dd5..1ae728546 100644 --- a/nautilus-sendto-plugin/empathy-nautilus-sendto.c +++ b/nautilus-sendto-plugin/empathy-nautilus-sendto.c @@ -29,17 +29,17 @@ #include <telepathy-glib/telepathy-glib.h> -#include "libempathy/empathy-contact.h" -#include "libempathy/empathy-debug.h" -#include "libempathy/empathy-ft-factory.h" -#include "libempathy/empathy-ft-handler.h" - -#include "libempathy-gtk/empathy-roster-model.h" -#include "libempathy-gtk/empathy-roster-model-manager.h" -#include "libempathy-gtk/empathy-contact-chooser.h" -#include "libempathy-gtk/empathy-ui-utils.h" -#include "libempathy-gtk/empathy-roster-view.h" -#include "libempathy-gtk/empathy-roster-contact.h" +#include "empathy-contact.h" +#include "empathy-debug.h" +#include "empathy-ft-factory.h" +#include "empathy-ft-handler.h" + +#include "empathy-roster-model.h" +#include "empathy-roster-model-manager.h" +#include "empathy-contact-chooser.h" +#include "empathy-ui-utils.h" +#include "empathy-roster-view.h" +#include "empathy-roster-contact.h" #include "nautilus-sendto-plugin.h" |