GNOME.org
 

[totem] Fix includes in plugins

commit 7d0c35463544c1147efc539f4a6799bd1624c0b9
Author: Philip Withnall <philip tecnocode co uk>
Date:   Sun Sep 5 12:18:11 2010 +0100

    Fix includes in plugins
    
    There's no need to add an include CPP flag for the backend directory. It's
    clearer to explicitly state that BVW is in the backend directory.

 src/plugins/bemused/Makefile.am                    |    3 ---
 src/plugins/bemused/totem-bemused.c                |    2 +-
 src/plugins/chapters/Makefile.am                   |    3 ---
 src/plugins/chapters/totem-chapters.c              |    2 +-
 src/plugins/mythtv/Makefile.am                     |    3 ---
 src/plugins/mythtv/totem-mythtv.c                  |   11 +++++------
 src/plugins/properties/Makefile.am                 |    3 ---
 .../properties/bacon-video-widget-properties.c     |    8 +++++---
 src/plugins/publish/Makefile.am                    |    3 ---
 src/plugins/skipto/Makefile.am                     |    3 ---
 src/plugins/skipto/totem-skipto.c                  |    4 ++--
 src/plugins/skipto/totem-time-entry.c              |    2 +-
 src/totem-fullscreen.h                             |    2 +-
 src/totem-private.h                                |    2 +-
 14 files changed, 17 insertions(+), 34 deletions(-)
---
diff --git a/src/plugins/bemused/Makefile.am b/src/plugins/bemused/Makefile.am
index b9ae84d..29153bb 100644
--- a/src/plugins/bemused/Makefile.am
+++ b/src/plugins/bemused/Makefile.am
@@ -7,9 +7,6 @@ plugin_in_files = bemused.totem-plugin.in
 
 libbemused_la_SOURCES = totem-bemused.c
 libbemused_la_LDFLAGS = $(plugin_ldflags)
-libbemused_la_CPPFLAGS = \
-	$(AM_CPPFLAGS)			\
-	-I$(top_srcdir)/src/backend
 libbemused_la_LIBADD = $(BEMUSED_LIBS)
 libbemused_la_CFLAGS = \
 	$(plugin_cflags)	\
diff --git a/src/plugins/bemused/totem-bemused.c b/src/plugins/bemused/totem-bemused.c
index e24f457..584b4d3 100644
--- a/src/plugins/bemused/totem-bemused.c
+++ b/src/plugins/bemused/totem-bemused.c
@@ -45,7 +45,7 @@
 #include <bluetooth/sdp_lib.h>
 
 //FIXME we shouldn't use the video widget directly
-#include "bacon-video-widget.h"
+#include "backend/bacon-video-widget.h"
 #include "totem-plugin.h"
 #include "totem.h"
 
diff --git a/src/plugins/chapters/Makefile.am b/src/plugins/chapters/Makefile.am
index 27ac9f8..f3cf885 100644
--- a/src/plugins/chapters/Makefile.am
+++ b/src/plugins/chapters/Makefile.am
@@ -19,9 +19,6 @@ libchapters_la_SOURCES = \
 	totem-edit-chapter.h
 libchapters_la_LDFLAGS = $(plugin_ldflags)
 libchapters_la_LIBADD = $(CHAPTERS_LIBS)
-libchapters_la_CPPFLAGS = \
-	$(AM_CPPFLAGS)			\
-	-I$(top_srcdir)/src/backend
 libchapters_la_CFLAGS = \
 	$(plugin_cflags)	\
 	$(CHAPTERS_CFLAGS)
diff --git a/src/plugins/chapters/totem-chapters.c b/src/plugins/chapters/totem-chapters.c
index 9802812..499847c 100644
--- a/src/plugins/chapters/totem-chapters.c
+++ b/src/plugins/chapters/totem-chapters.c
@@ -35,7 +35,7 @@
 #include <unistd.h>
 #include <math.h>
 
-#include "bacon-video-widget.h"
+#include "backend/bacon-video-widget.h"
 #include "totem-plugin.h"
 #include "totem-dirs.h"
 #include "totem-interface.h"
diff --git a/src/plugins/mythtv/Makefile.am b/src/plugins/mythtv/Makefile.am
index 831d0cb..ce6fb36 100644
--- a/src/plugins/mythtv/Makefile.am
+++ b/src/plugins/mythtv/Makefile.am
@@ -7,9 +7,6 @@ plugin_in_files = mythtv.totem-plugin.in
 
 libtotem_mythtv_la_SOURCES = totem-mythtv.c
 libtotem_mythtv_la_LDFLAGS = $(plugin_ldflags)
-libtotem_mythtv_la_CPPFLAGS = \
-	$(AM_CPPFLAGS)			\
-	-I$(top_srcdir)/src/backend
 libtotem_mythtv_la_LIBADD = $(GMYTH_LIBS)
 libtotem_mythtv_la_CFLAGS = \
 	$(plugin_cflags)	\
diff --git a/src/plugins/mythtv/totem-mythtv.c b/src/plugins/mythtv/totem-mythtv.c
index 5baafd3..e839987 100644
--- a/src/plugins/mythtv/totem-mythtv.c
+++ b/src/plugins/mythtv/totem-mythtv.c
@@ -33,12 +33,6 @@
 #include <gmodule.h>
 #include <string.h>
 
-#include "totem-video-list.h"
-#include "totem-cell-renderer-video.h"
-#include "video-utils.h"
-#include "totem-plugin.h"
-#include "totem.h"
-
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include <gmyth/gmyth_backendinfo.h>
@@ -48,6 +42,11 @@
 #include <gmyth/gmyth_util.h>
 #include <gmyth_upnp.h>
 
+#include "totem-video-list.h"
+#include "totem-cell-renderer-video.h"
+#include "backend/video-utils.h"
+#include "totem-plugin.h"
+#include "totem.h"
 
 #define TOTEM_TYPE_MYTHTV_PLUGIN		(totem_mythtv_plugin_get_type ())
 #define TOTEM_MYTHTV_PLUGIN(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), TOTEM_TYPE_MYTHTV_PLUGIN, TotemMythtvPlugin))
diff --git a/src/plugins/properties/Makefile.am b/src/plugins/properties/Makefile.am
index 69e133e..9e7a6f2 100644
--- a/src/plugins/properties/Makefile.am
+++ b/src/plugins/properties/Makefile.am
@@ -14,9 +14,6 @@ libmovie_properties_la_CFLAGS = $(plugin_cflags)
 libbaconvideowidgetproperties_la_SOURCES = \
 	bacon-video-widget-properties.c	\
 	bacon-video-widget-properties.h
-libbaconvideowidgetproperties_la_CPPFLAGS = \
-	$(AM_CPPFLAGS)			\
-	-I$(top_srcdir)/src/backend
 libbaconvideowidgetproperties_la_CFLAGS = \
 	$(DEPENDENCY_CFLAGS)	\
 	$(WARN_CFLAGS)
diff --git a/src/plugins/properties/bacon-video-widget-properties.c b/src/plugins/properties/bacon-video-widget-properties.c
index 9308b00..dc2d6af 100644
--- a/src/plugins/properties/bacon-video-widget-properties.c
+++ b/src/plugins/properties/bacon-video-widget-properties.c
@@ -21,15 +21,17 @@
  */
 
 #include "config.h"
-#include "bacon-video-widget-properties.h"
-#include "bacon-video-widget.h"
 
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <string.h>
-#include "video-utils.h"
+
+#include "backend/bacon-video-widget.h"
+#include "backend/video-utils.h"
 #include "totem-interface.h"
 
+#include "bacon-video-widget-properties.h"
+
 /* used in bacon_video_widget_properties_update() */
 #define UPDATE_FROM_STRING(type, name) \
 	do { \
diff --git a/src/plugins/publish/Makefile.am b/src/plugins/publish/Makefile.am
index d6d56e9..c5a5180 100644
--- a/src/plugins/publish/Makefile.am
+++ b/src/plugins/publish/Makefile.am
@@ -12,9 +12,6 @@ EXTRA_DIST += $(ui_DATA)
 libpublish_la_SOURCES = totem-publish.c
 libpublish_la_LDFLAGS = $(plugin_ldflags)
 libpublish_la_LIBADD = $(LIBEPC_LIBS)
-libpublish_la_CPPFLAGS = \
-	$(AM_CPPFLAGS)			\
-	-I$(top_srcdir)/src/backend
 libpublish_la_CFLAGS = \
 	$(plugin_cflags)	\
 	$(LIBEPC_CFLAGS)
diff --git a/src/plugins/skipto/Makefile.am b/src/plugins/skipto/Makefile.am
index bbe21d7..eb3cf66 100644
--- a/src/plugins/skipto/Makefile.am
+++ b/src/plugins/skipto/Makefile.am
@@ -16,9 +16,6 @@ libskipto_la_SOURCES = \
 	totem-skipto.c		\
 	totem-skipto.h
 libskipto_la_LDFLAGS = $(plugin_ldflags)
-libskipto_la_CPPFLAGS = \
-	$(AM_CPPFLAGS)			\
-	-I$(top_srcdir)/src/backend
 libskipto_la_CFLAGS = $(plugin_cflags)
 
 -include $(top_srcdir)/git.mk
diff --git a/src/plugins/skipto/totem-skipto.c b/src/plugins/skipto/totem-skipto.c
index 4f2f03d..54e8e27 100644
--- a/src/plugins/skipto/totem-skipto.c
+++ b/src/plugins/skipto/totem-skipto.c
@@ -39,8 +39,8 @@
 #include "totem-dirs.h"
 #include "totem-skipto.h"
 #include "totem-uri.h"
-#include "video-utils.h"
-#include "bacon-video-widget.h"
+#include "backend/video-utils.h"
+#include "backend/bacon-video-widget.h"
 
 static void totem_skipto_dispose	(GObject *object);
 
diff --git a/src/plugins/skipto/totem-time-entry.c b/src/plugins/skipto/totem-time-entry.c
index a5e5816..0aafe0c 100644
--- a/src/plugins/skipto/totem-time-entry.c
+++ b/src/plugins/skipto/totem-time-entry.c
@@ -30,7 +30,7 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 
-#include "video-utils.h"
+#include "backend/video-utils.h"
 #include "totem-time-entry.h"
 
 static gboolean output_cb (GtkSpinButton *self, gpointer user_data);
diff --git a/src/totem-fullscreen.h b/src/totem-fullscreen.h
index 7033e98..4366cec 100644
--- a/src/totem-fullscreen.h
+++ b/src/totem-fullscreen.h
@@ -27,7 +27,7 @@
 #include <glib-object.h>
 #include <gtk/gtk.h>
 
-#include "bacon-video-widget.h"
+#include "backend/bacon-video-widget.h"
 
 #define TOTEM_TYPE_FULLSCREEN            (totem_fullscreen_get_type ())
 #define TOTEM_FULLSCREEN(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
diff --git a/src/totem-private.h b/src/totem-private.h
index 5d62477..653bac1 100644
--- a/src/totem-private.h
+++ b/src/totem-private.h
@@ -32,7 +32,7 @@
 #include <gio/gio.h>
 
 #include "totem-playlist.h"
-#include "bacon-video-widget.h"
+#include "backend/bacon-video-widget.h"
 #include "totem-open-location.h"
 #include "totem-fullscreen.h"
 #include "totem-plugins-engine.h"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]