[Xfce4-commits] [apps/parole] 01/01: cpplint: Include the directory when naming .h files [build/include_subdir] [4]
noreply at xfce.org
noreply at xfce.org
Wed May 31 04:19:32 CEST 2017
This is an automated email from the git hooks/post-receive script.
b l u e s a b r e p u s h e d a c o m m i t t o b r a n c h m a s t e r
in repository apps/parole.
commit 98ba29a1d91124b9fbf86337373d5dbc2c66c2ef
Author: Sean Davis <smd.seandavis at gmail.com>
Date: Tue May 30 22:19:07 2017 -0400
cpplint: Include the directory when naming .h files [build/include_subdir] [4]
---
src/common/parole-common.c | 2 +-
src/common/parole-rc-utils.c | 2 +-
src/common/parole-screensaver.c | 2 +-
src/dbus/parole-dbus.c | 6 ++--
src/gst/parole-gst.c | 20 +++++++------
src/gst/parole-gst.h | 4 +--
src/main.c | 13 +++++----
src/misc/parole-debug.c | 9 +++---
src/misc/parole-file.c | 2 +-
src/misc/parole-filters.c | 9 ++++--
src/misc/parole-filters.h | 2 +-
src/misc/parole-pl-parser.c | 11 ++++----
src/misc/parole-provider-player.c | 7 +++--
src/misc/parole-provider-player.h | 6 ++--
src/misc/parole-provider-plugin.c | 2 +-
src/misc/parole-provider-plugin.h | 5 ++--
src/misc/parole-stream.c | 5 ++--
src/misc/parole.h.in | 16 +++++------
src/parole-about.c | 2 +-
src/parole-builder.c | 5 ++--
src/parole-button.c | 7 +++--
src/parole-clutter.c | 7 +++--
src/parole-conf-dialog.c | 17 ++++++------
src/parole-conf.c | 12 ++++----
src/parole-disc.c | 8 ++++--
src/parole-mediachooser.c | 18 ++++++------
src/parole-mediachooser.h | 2 +-
src/parole-medialist.c | 38 +++++++++++++------------
src/parole-medialist.h | 3 +-
src/parole-module.c | 6 ++--
src/parole-module.h | 5 ++--
src/parole-open-location.c | 11 +++++---
src/parole-player.c | 54 +++++++++++++++++++-----------------
src/parole-player.h | 3 +-
src/parole-plugin-player.c | 14 ++++++----
src/parole-plugins-manager.c | 21 +++++++-------
src/parole-plugins-manager.h | 3 +-
src/parole-shortcuts.c | 10 ++++---
src/parole-subtitle-encoding.c | 2 +-
src/parole-utils.c | 4 +--
src/parole-utils.h | 2 +-
src/parole-vis.c | 2 +-
src/plugins/mpris2/mpris2-plugin.c | 4 +--
src/plugins/mpris2/mpris2-provider.c | 4 +--
src/plugins/mpris2/mpris2-provider.h | 5 ++--
src/plugins/notify/notify-plugin.c | 2 +-
src/plugins/notify/notify-provider.c | 6 ++--
src/plugins/notify/notify-provider.h | 2 +-
src/plugins/sample/sample-plugin.c | 4 +--
src/plugins/sample/sample-provider.c | 2 +-
src/plugins/sample/sample-provider.h | 2 +-
src/plugins/tray/tray-plugin.c | 2 +-
src/plugins/tray/tray-provider.c | 7 ++---
src/plugins/tray/tray-provider.h | 2 +-
54 files changed, 231 insertions(+), 190 deletions(-)
diff --git a/src/common/parole-common.c b/src/common/parole-common.c
index 7f62bd4..c154f44 100644
--- a/src/common/parole-common.c
+++ b/src/common/parole-common.c
@@ -32,7 +32,7 @@
#include <libxfce4util/libxfce4util.h>
-#include "parole-common.h"
+#include "src/common/parole-common.h"
gboolean
parole_widget_reparent(GtkWidget *widget, GtkWidget *new_parent) {
diff --git a/src/common/parole-rc-utils.c b/src/common/parole-rc-utils.c
index d6218ea..7a4afdd 100644
--- a/src/common/parole-rc-utils.c
+++ b/src/common/parole-rc-utils.c
@@ -30,7 +30,7 @@
#include <glib.h>
-#include "parole-rc-utils.h"
+#include "src/common/parole-rc-utils.h"
XfceRc *
parole_get_resource_file(const gchar *group, gboolean readonly) {
diff --git a/src/common/parole-screensaver.c b/src/common/parole-screensaver.c
index d49e49e..d923052 100644
--- a/src/common/parole-screensaver.c
+++ b/src/common/parole-screensaver.c
@@ -34,7 +34,7 @@
#include <libxfce4util/libxfce4util.h>
-#include "parole-screensaver.h"
+#include "src/common/parole-screensaver.h"
#define RESET_SCREENSAVER_TIMEOUT 6
diff --git a/src/dbus/parole-dbus.c b/src/dbus/parole-dbus.c
index 0b6b44e..0d9663e 100644
--- a/src/dbus/parole-dbus.c
+++ b/src/dbus/parole-dbus.c
@@ -28,12 +28,12 @@
#include <stdlib.h>
#include <string.h>
+#include <glib.h>
+
#include <dbus/dbus.h>
#include <dbus/dbus-glib-lowlevel.h>
-#include <glib.h>
-
-#include "parole-dbus.h"
+#include "src/dbus/parole-dbus.h"
static void
proxy_destroy_cb(DBusGConnection *bus) {
diff --git a/src/gst/parole-gst.c b/src/gst/parole-gst.c
index 2f5d3d0..89ce3ff 100644
--- a/src/gst/parole-gst.c
+++ b/src/gst/parole-gst.c
@@ -31,7 +31,7 @@
#include <glib.h>
-#include "parole-gst.h"
+#include <gst/gst.h>
#if GST_CHECK_VERSION(1, 0, 0)
#include <gst/video/videooverlay.h>
@@ -46,19 +46,21 @@
#include <gst/pbutils/missing-plugins.h>
#include <gst/pbutils/install-plugins.h>
-#include <gst/video/video.h>
#include <gst/tag/tag.h>
+#include <gst/video/video.h>
+
+#include <gdk/gdkx.h>
#include <libxfce4util/libxfce4util.h>
-#include <gdk/gdkx.h>
+#include "src/gst/gst-enum-types.h"
+#include "src/gst/gstmarshal.h"
-#include "common/parole-common.h"
+#include "src/common/parole-common.h"
-#include "parole-utils.h"
+#include "src/parole-utils.h"
-#include "gst-enum-types.h"
-#include "gstmarshal.h"
+#include "src/gst/parole-gst.h"
#define HIDE_WINDOW_CURSOR_TIMEOUT 3.0f
@@ -1519,7 +1521,7 @@ parole_gst_bus_event(GstBus *bus, GstMessage *msg, gpointer data) {
ctx = gst_install_plugins_context_new();
#ifdef GDK_WINDOWING_X11
- if (gtk_widget_get_window (GTK_WIDGET (gst)) != NULL && gtk_widget_get_realized(GTK_WIDGET(gst))) {
+ if (gtk_widget_get_window(GTK_WIDGET(gst)) != NULL && gtk_widget_get_realized(GTK_WIDGET(gst))) {
gst_install_plugins_context_set_xid(ctx,
gdk_x11_window_get_xid(gtk_widget_get_window(GTK_WIDGET(gst))));
}
@@ -1842,7 +1844,7 @@ parole_gst_conf_notify_cb(GObject *object, GParamSpec *spec, ParoleGst *gst) {
parole_gst_set_subtitle_font(gst);
} else if (!g_strcmp0("subtitle-encoding", spec->name)) {
parole_gst_set_subtitle_encoding(gst);
- } else if (!g_strcmp0 ("brightness", spec->name) || !g_strcmp0 ("hue", spec->name) || !g_strcmp0("contrast", spec->name) || !g_strcmp0("saturation", spec->name)) {
+ } else if (!g_strcmp0("brightness", spec->name) || !g_strcmp0("hue", spec->name) || !g_strcmp0("contrast", spec->name) || !g_strcmp0("saturation", spec->name)) {
gst->priv->update_color_balance = TRUE;
if ( gst->priv->state >= GST_STATE_PAUSED )
diff --git a/src/gst/parole-gst.h b/src/gst/parole-gst.h
index 996825e..6f669b7 100644
--- a/src/gst/parole-gst.h
+++ b/src/gst/parole-gst.h
@@ -27,8 +27,8 @@
#include <gst/gst.h>
#include <gtk/gtk.h>
-#include <src/misc/parole-stream.h>
-#include <src/misc/parole-enum-types.h>
+#include "src/misc/parole-enum-types.h"
+#include "src/misc/parole-stream.h"
G_BEGIN_DECLS
diff --git a/src/main.c b/src/main.c
index ce367d9..c094cd4 100644
--- a/src/main.c
+++ b/src/main.c
@@ -46,12 +46,13 @@
#include <X11/X.h>
#include <X11/Xlib.h>
-#include "parole-player.h"
-#include "parole-plugins-manager.h"
-#include "parole-utils.h"
-#include "parole-dbus.h"
-#include "parole-builder.h"
-#include "parole-conf.h"
+#include "src/dbus/parole-dbus.h"
+
+#include "src/parole-builder.h"
+#include "src/parole-conf.h"
+#include "src/parole-player.h"
+#include "src/parole-plugins-manager.h"
+#include "src/parole-utils.h"
static void G_GNUC_NORETURN
show_version(void) {
diff --git a/src/misc/parole-debug.c b/src/misc/parole-debug.c
index 3f0d321..2f2858d 100644
--- a/src/misc/parole-debug.c
+++ b/src/misc/parole-debug.c
@@ -24,14 +24,15 @@
#include <config.h>
#endif
-#include <glib.h>
-#include <glib-object.h>
-#include <glib/gprintf.h>
#include <stdio.h>
#include <string.h>
#include <stdarg.h>
-#include "parole-debug.h"
+#include <glib.h>
+#include <glib-object.h>
+#include <glib/gprintf.h>
+
+#include "src/misc/parole-debug.h"
#if defined(DEBUG) && defined(G_HAVE_ISO_VARARGS)
diff --git a/src/misc/parole-file.c b/src/misc/parole-file.c
index 709466e..e6accee 100644
--- a/src/misc/parole-file.c
+++ b/src/misc/parole-file.c
@@ -35,7 +35,7 @@
#include <taglib/tag_c.h>
#endif
-#include "parole-file.h"
+#include "src/misc/parole-file.h"
#define PAROLE_FILE_GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE((o), PAROLE_TYPE_FILE, ParoleFilePrivate))
diff --git a/src/misc/parole-filters.c b/src/misc/parole-filters.c
index fdd281d..21d3eea 100644
--- a/src/misc/parole-filters.c
+++ b/src/misc/parole-filters.c
@@ -28,13 +28,16 @@
#include <stdlib.h>
#include <string.h>
-#include <libxfce4util/libxfce4util.h>
#include <glib.h>
-#include "parole-filters.h"
-#include "parole-pl-parser.h"
+#include <libxfce4util/libxfce4util.h>
+
#include "data/mime/parole-mime-types.h"
+#include "src/misc/parole-pl-parser.h"
+
+#include "src/misc/parole-filters.h"
+
static char *playlist_file_extensions[] = {
"*.asx",
"*.m3u",
diff --git a/src/misc/parole-filters.h b/src/misc/parole-filters.h
index 5740faf..ffd323d 100644
--- a/src/misc/parole-filters.h
+++ b/src/misc/parole-filters.h
@@ -29,7 +29,7 @@
#include <gtk/gtk.h>
-#include "parole-file.h"
+#include "src/misc/parole-file.h"
G_BEGIN_DECLS
diff --git a/src/misc/parole-pl-parser.c b/src/misc/parole-pl-parser.c
index ee86f89..e467357 100644
--- a/src/misc/parole-pl-parser.c
+++ b/src/misc/parole-pl-parser.c
@@ -41,14 +41,15 @@
#include <gio/gio.h>
#include <glib.h>
+
#include <libxfce4util/libxfce4util.h>
-#include "parole-file.h"
+#include "src/misc/parole-debug.h"
+#include "src/misc/parole-enum-types.h"
+#include "src/misc/parole-file.h"
+#include "src/misc/parole-filters.h"
-#include "parole-pl-parser.h"
-#include "parole-filters.h"
-#include "parole-debug.h"
-#include "parole-enum-types.h"
+#include "src/misc/parole-pl-parser.h"
typedef struct {
GSList *list;
diff --git a/src/misc/parole-provider-player.c b/src/misc/parole-provider-player.c
index 4242dfd..a6a44fa 100644
--- a/src/misc/parole-provider-player.c
+++ b/src/misc/parole-provider-player.c
@@ -24,9 +24,10 @@
#include <config.h>
#endif
-#include "parole-provider-player.h"
-#include "parole-marshal.h"
-#include "parole-enum-types.h"
+#include "src/misc/parole-enum-types.h"
+#include "src/misc/parole-marshal.h"
+
+#include "src/misc/parole-provider-player.h"
static void parole_provider_player_base_init(gpointer klass);
static void parole_provider_player_class_init(gpointer klass);
diff --git a/src/misc/parole-provider-player.h b/src/misc/parole-provider-player.h
index f19e6bb..8367711 100644
--- a/src/misc/parole-provider-player.h
+++ b/src/misc/parole-provider-player.h
@@ -28,8 +28,10 @@
#define SRC_MISC_PAROLE_PROVIDER_PLAYER_H_
#include <gtk/gtk.h>
-#include "parole-stream.h"
-#include "parole-player.h"
+
+#include "src/misc/parole-stream.h"
+
+#include "src/parole-player.h"
G_BEGIN_DECLS
diff --git a/src/misc/parole-provider-plugin.c b/src/misc/parole-provider-plugin.c
index ca72eaf..7604603 100644
--- a/src/misc/parole-provider-plugin.c
+++ b/src/misc/parole-provider-plugin.c
@@ -24,7 +24,7 @@
#include <config.h>
#endif
-#include "parole-provider-plugin.h"
+#include "src/misc/parole-provider-plugin.h"
GType
parole_provider_plugin_get_type(void) {
diff --git a/src/misc/parole-provider-plugin.h b/src/misc/parole-provider-plugin.h
index 0a60cb2..bfbaa0c 100644
--- a/src/misc/parole-provider-plugin.h
+++ b/src/misc/parole-provider-plugin.h
@@ -28,8 +28,9 @@
#define SRC_MISC_PAROLE_PROVIDER_PLUGIN_H_
#include <gtk/gtk.h>
-#include <src/misc/parole-stream.h>
-#include <src/misc/parole-provider-player.h>
+
+#include "src/misc/parole-stream.h"
+#include "src/misc/parole-provider-player.h"
G_BEGIN_DECLS
diff --git a/src/misc/parole-stream.c b/src/misc/parole-stream.c
index 2883f49..338ec87 100644
--- a/src/misc/parole-stream.c
+++ b/src/misc/parole-stream.c
@@ -31,8 +31,9 @@
#include <glib.h>
#include <glib/gstdio.h>
-#include "parole-stream.h"
-#include "parole-enum-types.h"
+#include "src/misc/parole-enum-types.h"
+
+#include "src/misc/parole-stream.h"
#define PAROLE_STREAM_GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE((o), PAROLE_TYPE_STREAM, ParoleStreamPrivate))
diff --git a/src/misc/parole.h.in b/src/misc/parole.h.in
index 0ff82e8..df9d975 100644
--- a/src/misc/parole.h.in
+++ b/src/misc/parole.h.in
@@ -27,16 +27,16 @@
#include <glib-object.h>
-#include <src/misc/parole-provider-plugin.h>
-#include <src/misc/parole-provider-player.h>
-#include <src/misc/parole-file.h>
-#include <src/misc/parole-stream.h>
-#include <src/misc/parole-pl-parser.h>
-#include <src/misc/parole-filters.h>
-#include <src/misc/parole-debug.h>
-
#include <libxfce4util/libxfce4util.h>
+#include "src/misc/parole-debug.h"
+#include "src/misc/parole-file.h"
+#include "src/misc/parole-filters.h"
+#include "src/misc/parole-pl-parser.h"
+#include "src/misc/parole-provider-player.h"
+#include "src/misc/parole-provider-plugin.h"
+#include "src/misc/parole-stream.h"
+
#define PAROLE_MAJOR_VERSION @PAROLE_VERSION_MAJOR@
#define PAROLE_MINOR_VERSION @PAROLE_VERSION_MINOR@
#define PAROLE_MICRO_VERSION @PAROLE_VERSION_MICRO@
diff --git a/src/parole-about.c b/src/parole-about.c
index 259df17..11a3330 100644
--- a/src/parole-about.c
+++ b/src/parole-about.c
@@ -33,7 +33,7 @@
#endif
#include <libxfce4util/libxfce4util.h>
-#include "parole-about.h"
+#include "src/parole-about.h"
/**
diff --git a/src/parole-builder.c b/src/parole-builder.c
index 37e5788..5bedf52 100644
--- a/src/parole-builder.c
+++ b/src/parole-builder.c
@@ -30,8 +30,9 @@
#include <libxfce4util/libxfce4util.h>
-#include "interfaces/parole_ui.h"
-#include "parole-builder.h"
+#include "data/interfaces/parole_ui.h"
+
+#include "src/parole-builder.h"
/**
diff --git a/src/parole-button.c b/src/parole-button.c
index b182bd6..989a14d 100644
--- a/src/parole-button.c
+++ b/src/parole-button.c
@@ -47,9 +47,10 @@
#include <libxfce4util/libxfce4util.h>
-#include "parole-button.h"
-#include "parole-debug.h"
-#include "enum-gtypes.h"
+#include "src/misc/parole-debug.h"
+
+#include "src/enum-gtypes.h"
+#include "src/parole-button.h"
static void parole_button_finalize(GObject *object);
diff --git a/src/parole-clutter.c b/src/parole-clutter.c
index 9b7417f..7ae1e42 100644
--- a/src/parole-clutter.c
+++ b/src/parole-clutter.c
@@ -31,9 +31,10 @@
#include <libxfce4util/libxfce4util.h>
-#include "gst/gst-enum-types.h"
-#include "parole-gst.h"
-#include "parole-clutter.h"
+#include "src/gst/gst-enum-types.h"
+#include "src/gst/parole-gst.h"
+
+#include "src/parole-clutter.h"
#define PAROLE_CLUTTER_GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE((o), PAROLE_TYPE_CLUTTER, ParoleClutterPrivate))
diff --git a/src/parole-conf-dialog.c b/src/parole-conf-dialog.c
index c65460c..f6e7bc1 100644
--- a/src/parole-conf-dialog.c
+++ b/src/parole-conf-dialog.c
@@ -28,16 +28,17 @@
#include <stdlib.h>
#include <string.h>
-#include <src/misc/parole.h>
+#include "data/interfaces/parole-settings_ui.h"
-#include "interfaces/parole-settings_ui.h"
+#include "src/gst/parole-gst.h"
-#include "parole-gst.h"
-#include "parole-builder.h"
-#include "parole-conf-dialog.h"
-#include "parole-conf.h"
-#include "parole-vis.h"
-#include "parole-subtitle-encoding.h"
+#include "src/misc/parole.h"
+
+#include "src/parole-builder.h"
+#include "src/parole-conf.h"
+#include "src/parole-conf-dialog.h"
+#include "src/parole-subtitle-encoding.h"
+#include "src/parole-vis.h"
/*
* GtkBuilder Callbacks
diff --git a/src/parole-conf.c b/src/parole-conf.c
index a6f7b32..6f1be3f 100644
--- a/src/parole-conf.c
+++ b/src/parole-conf.c
@@ -32,12 +32,14 @@
#include <xfconf/xfconf.h>
-#include "parole-conf.h"
-#include "parole-rc-utils.h"
-#include "enum-gtypes.h"
+#include "src/common/parole-rc-utils.h"
-#include "gst/parole-gst.h"
-#include "gst/gst-enum-types.h"
+#include "src/gst/parole-gst.h"
+#include "src/gst/gst-enum-types.h"
+
+#include "src/enum-gtypes.h"
+
+#include "src/parole-conf.h"
static gpointer parole_conf_object = NULL;
diff --git a/src/parole-disc.c b/src/parole-disc.c
index fda0122..211ecd8 100644
--- a/src/parole-disc.c
+++ b/src/parole-disc.c
@@ -42,9 +42,11 @@
#include <libxfce4util/libxfce4util.h>
-#include "parole-disc.h"
-#include "parole-builder.h"
-#include "gmarshal.h"
+#include "src/gmarshal.h"
+#include "src/parole-builder.h"
+
+#include "src/parole-disc.h"
+
static void parole_disc_finalize(GObject *object);
diff --git a/src/parole-mediachooser.c b/src/parole-mediachooser.c
index e4b0a73..4e114b6 100644
--- a/src/parole-mediachooser.c
+++ b/src/parole-mediachooser.c
@@ -31,17 +31,19 @@
#include <gtk/gtk.h>
#include <glib.h>
-#include <src/misc/parole-file.h>
+#include "data/interfaces/mediachooser_ui.h"
-#include "interfaces/mediachooser_ui.h"
+#include "src/common/parole-common.h"
+#include "src/common/parole-rc-utils.h"
-#include "parole-mediachooser.h"
-#include "parole-builder.h"
-#include "parole-filters.h"
-#include "parole-rc-utils.h"
-#include "parole-utils.h"
+#include "src/misc/parole-file.h"
+#include "src/misc/parole-filters.h"
+
+#include "src/parole-builder.h"
+#include "src/parole-utils.h"
+
+#include "src/parole-mediachooser.h"
-#include "common/parole-common.h"
/*
* GtkBuilder Callbacks
diff --git a/src/parole-mediachooser.h b/src/parole-mediachooser.h
index 369a1e7..a4ba407 100644
--- a/src/parole-mediachooser.h
+++ b/src/parole-mediachooser.h
@@ -26,7 +26,7 @@
#include <glib-object.h>
#include <gtk/gtk.h>
-#include "parole-conf.h"
+#include "src/parole-conf.h"
G_BEGIN_DECLS
diff --git a/src/parole-medialist.c b/src/parole-medialist.c
index eb03c1e..669db60 100644
--- a/src/parole-medialist.c
+++ b/src/parole-medialist.c
@@ -38,24 +38,26 @@
#include <libxfce4util/libxfce4util.h>
-#include <src/misc/parole-file.h>
+#include "data/interfaces/playlist_ui.h"
+#include "data/interfaces/save-playlist_ui.h"
-#include "interfaces/playlist_ui.h"
-#include "interfaces/save-playlist_ui.h"
+#include "src/common/parole-common.h"
-#include "parole-builder.h"
-#include "parole-player.h"
-#include "parole-medialist.h"
-#include "parole-mediachooser.h"
-#include "parole-open-location.h"
-#include "parole-conf.h"
+#include "src/dbus/parole-dbus.h"
-#include "parole-filters.h"
-#include "parole-pl-parser.h"
-#include "parole-utils.h"
-#include "parole-dbus.h"
+#include "src/misc/parole-file.h"
+#include "src/misc/parole-filters.h"
+#include "src/misc/parole-pl-parser.h"
+
+#include "src/parole-builder.h"
+#include "src/parole-conf.h"
+#include "src/parole-mediachooser.h"
+#include "src/parole-open-location.h"
+#include "src/parole-player.h"
+#include "src/parole-utils.h"
+
+#include "src/parole-medialist.h"
-#include "common/parole-common.h"
#define PAROLE_AUTO_SAVED_PLAYLIST "xfce4/parole/auto-saved-playlist.m3u"
@@ -613,7 +615,7 @@ parole_media_list_get_first_selected_file(ParoleMediaList *list) {
row = parole_media_list_get_first_selected_row(list);
- if ( gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->store), &iter, gtk_tree_row_reference_get_path(row)) ) {
+ if (gtk_tree_model_get_iter(GTK_TREE_MODEL(list->priv->store), &iter, gtk_tree_row_reference_get_path(row))) {
gtk_tree_model_get(GTK_TREE_MODEL(list->priv->store), &iter, DATA_COL, &file, -1);
}
@@ -680,7 +682,7 @@ gboolean parole_media_list_query_tooltip(GtkWidget *widget,
ParoleMediaList *list) {
GtkTreePath *path;
- if (gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (list->priv->view), x, y, &path, NULL, NULL, NULL)) {
+ if (gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(list->priv->view), x, y, &path, NULL, NULL, NULL)) {
GtkTreeIter iter;
if (path && gtk_tree_model_get_iter(GTK_TREE_MODEL(list->priv->store), &iter, path)) {
@@ -1086,7 +1088,7 @@ static void
parole_media_list_add_open_containing_folder(ParoleMediaList *list, GtkWidget *menu, gint x, gint y) {
GtkTreePath *path;
- if (gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (list->priv->view), x, y, &path, NULL, NULL, NULL)) {
+ if (gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(list->priv->view), x, y, &path, NULL, NULL, NULL)) {
GtkTreeIter iter;
if (path && gtk_tree_model_get_iter(GTK_TREE_MODEL(list->priv->store), &iter, path)) {
@@ -1964,7 +1966,7 @@ static gboolean parole_media_list_dbus_add_files(ParoleMediaList *list,
gchar **in_files, gboolean enqueue,
GError **error);
-#include "org.parole.media.list.h"
+#include "src/org.parole.media.list.h"
/*
* DBus server implementation
diff --git a/src/parole-medialist.h b/src/parole-medialist.h
index a57c96e..e75d0a5 100644
--- a/src/parole-medialist.h
+++ b/src/parole-medialist.h
@@ -24,7 +24,8 @@
#define SRC_PAROLE_MEDIALIST_H_
#include <gtk/gtk.h>
-#include <src/misc/parole-file.h>
+
+#include "src/misc/parole-file.h"
G_BEGIN_DECLS
diff --git a/src/parole-module.c b/src/parole-module.c
index 0d652c2..0b2feaf 100644
--- a/src/parole-module.c
+++ b/src/parole-module.c
@@ -28,10 +28,12 @@
#include <stdlib.h>
#include <string.h>
-#include <src/misc/parole-provider-plugin.h>
#include <libxfce4util/libxfce4util.h>
-#include "parole-module.h"
+#include "src/misc/parole-provider-plugin.h"
+
+#include "src/parole-module.h"
+
static void parole_provider_module_plugin_init(ParoleProviderPluginIface *iface);
diff --git a/src/parole-module.h b/src/parole-module.h
index f252370..512e456 100644
--- a/src/parole-module.h
+++ b/src/parole-module.h
@@ -24,9 +24,10 @@
#define SRC_PAROLE_MODULE_H_
#include <glib-object.h>
-#include <src/misc/parole.h>
-#include "parole-plugin-player.h"
+#include "src/misc/parole.h"
+
+#include "src/parole-plugin-player.h"
G_BEGIN_DECLS
diff --git a/src/parole-open-location.c b/src/parole-open-location.c
index 7983774..c28c2b9 100644
--- a/src/parole-open-location.c
+++ b/src/parole-open-location.c
@@ -30,11 +30,14 @@
#include <libxfce4util/libxfce4util.h>
-#include "parole-open-location.h"
-#include "parole-rc-utils.h"
-#include "parole-builder.h"
+#include "data/interfaces/open-location_ui.h"
+
+#include "src/common/parole-rc-utils.h"
+
+#include "src/parole-builder.h"
+
+#include "src/parole-open-location.h"
-#include "interfaces/open-location_ui.h"
static void parole_open_location_finalize(GObject *object);
diff --git a/src/parole-player.c b/src/parole-player.c
index 66e01d4..df98556 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -46,35 +46,37 @@
#include <dbus/dbus-glib.h>
-#include <src/misc/parole-file.h>
-
-#include "parole-builder.h"
-#include "parole-about.h"
-#include "parole-shortcuts.h"
-
-#include "parole-player.h"
-#include "parole-gst.h"
-#include "parole-dbus.h"
-#include "parole-mediachooser.h"
-#include "parole-medialist.h"
-#include "parole-filters.h"
-#include "parole-disc.h"
-#include "parole-screensaver.h"
-#include "parole-conf-dialog.h"
-#include "parole-conf.h"
-#include "parole-rc-utils.h"
-#include "parole-utils.h"
-#include "parole-debug.h"
-#include "parole-button.h"
-#include "enum-gtypes.h"
+#include "src/common/parole-common.h"
+#include "src/common/parole-rc-utils.h"
+#include "src/common/parole-screensaver.h"
+
+#include "src/dbus/parole-dbus.h"
+
+#include "src/gst/gst-enum-types.h"
+#include "src/gst/parole-gst.h"
+
+#include "src/misc/parole-debug.h"
+#include "src/misc/parole-file.h"
+#include "src/misc/parole-filters.h"
+
+#include "src/enum-gtypes.h"
+#include "src/parole-about.h"
+#include "src/parole-builder.h"
+#include "src/parole-button.h"
#ifdef HAVE_CLUTTER
-#include "parole-clutter.h"
+#include "src/parole-clutter.h"
#endif
-#include "gst/gst-enum-types.h"
+#include "src/parole-conf.h"
+#include "src/parole-conf-dialog.h"
+#include "src/parole-disc.h"
+#include "src/parole-mediachooser.h"
+#include "src/parole-medialist.h"
+#include "src/parole-shortcuts.h"
+#include "src/parole-utils.h"
-#include "common/parole-common.h"
+#include "src/parole-player.h"
int GTK_ICON_SIZE_ARTWORK_FALLBACK;
@@ -1295,7 +1297,7 @@ parole_player_save_uri(ParolePlayer *player, const ParoleStream *stream) {
if (lines) {
for (i = 0; lines[i]; i++) {
- if (!g_strcmp0 (lines[i], uri)) {
+ if (!g_strcmp0(lines[i], uri)) {
save = FALSE;
break;
}
@@ -3850,7 +3852,7 @@ static gboolean parole_player_dbus_play_disc(ParolePlayer *player,
gchar *in_device,
GError **error);
-#include "org.parole.media.player.h"
+#include "src/org.parole.media.player.h"
/*
* DBus server implementation
diff --git a/src/parole-player.h b/src/parole-player.h
index 242d7e3..87c720e 100644
--- a/src/parole-player.h
+++ b/src/parole-player.h
@@ -24,7 +24,8 @@
#define SRC_PAROLE_PLAYER_H_
#include <glib-object.h>
-#include "parole-medialist.h"
+
+#include "src/parole-medialist.h"
G_BEGIN_DECLS
diff --git a/src/parole-plugin-player.c b/src/parole-plugin-player.c
index 39a116c..feb242b 100644
--- a/src/parole-plugin-player.c
+++ b/src/parole-plugin-player.c
@@ -28,14 +28,16 @@
#include <stdlib.h>
#include <string.h>
-#include <src/misc/parole-provider-player.h>
+#include "src/dbus/parole-dbus.h"
-#include "parole-dbus.h"
-#include "parole-plugin-player.h"
-#include "parole-plugins-manager.h"
-#include "parole-medialist.h"
+#include "src/gst/parole-gst.h"
+
+#include "src/misc/parole-provider-player.h"
+
+#include "src/parole-medialist.h"
+#include "src/parole-plugin-player.h"
+#include "src/parole-plugins-manager.h"
-#include "gst/parole-gst.h"
static void parole_plugin_player_iface_init(ParoleProviderPlayerIface *iface);
diff --git a/src/parole-plugins-manager.c b/src/parole-plugins-manager.c
index a774390..5a89ca4 100644
--- a/src/parole-plugins-manager.c
+++ b/src/parole-plugins-manager.c
@@ -30,25 +30,26 @@
#include <glib.h>
-
#ifdef XFCE_DISABLE_DEPRECATED
#undef XFCE_DISABLE_DEPRECATED
#endif
#include <libxfce4util/libxfce4util.h>
#include <libxfce4ui/libxfce4ui.h>
-#include <src/misc/parole-provider-plugin.h>
+#include "data/interfaces/plugins_ui.h"
+
+#include "src/common/parole-common.h"
+
+#include "src/gst/parole-gst.h"
-#include "interfaces/plugins_ui.h"
+#include "src/misc/parole-provider-plugin.h"
-#include "parole-builder.h"
-#include "parole-utils.h"
-#include "parole-plugins-manager.h"
-#include "parole-module.h"
-#include "parole-conf.h"
+#include "src/parole-builder.h"
+#include "src/parole-utils.h"
+#include "src/parole-module.h"
+#include "src/parole-conf.h"
-#include "gst/parole-gst.h"
-#include "common/parole-common.h"
+#include "src/parole-plugins-manager.h"
#define PAROLE_PLUGIN_EXT = ".desktop"
diff --git a/src/parole-plugins-manager.h b/src/parole-plugins-manager.h
index 6238459..782b920 100644
--- a/src/parole-plugins-manager.h
+++ b/src/parole-plugins-manager.h
@@ -24,7 +24,8 @@
#define SRC_PAROLE_PLUGINS_MANAGER_H_
#include <glib-object.h>
-#include <src/misc/parole-provider-player.h>
+
+#include "src/misc/parole-provider-player.h"
G_BEGIN_DECLS
diff --git a/src/parole-shortcuts.c b/src/parole-shortcuts.c
index 240b050..1f88f31 100644
--- a/src/parole-shortcuts.c
+++ b/src/parole-shortcuts.c
@@ -28,11 +28,13 @@
#include <libxfce4util/libxfce4util.h>
-#include "parole-shortcuts.h"
-#include "parole-rc-utils.h"
-#include "parole-builder.h"
+#include "data/interfaces/shortcuts_ui.h"
-#include "interfaces/shortcuts_ui.h"
+#include "src/common/parole-rc-utils.h"
+
+#include "src/parole-builder.h"
+
+#include "src/parole-shortcuts.h"
static void parole_shortcuts_finalize(GObject *object);
diff --git a/src/parole-subtitle-encoding.c b/src/parole-subtitle-encoding.c
index d4e02cf..9dcc1c1 100644
--- a/src/parole-subtitle-encoding.c
+++ b/src/parole-subtitle-encoding.c
@@ -38,7 +38,7 @@
#include <glib.h>
#include <libxfce4util/libxfce4util.h>
-#include "parole-subtitle-encoding.h"
+#include "src/parole-subtitle-encoding.h"
typedef enum {
SUBTITLE_ENCODING_CURRENT_LOCALE,
diff --git a/src/parole-utils.c b/src/parole-utils.c
index 2b774c8..ad95c7e 100644
--- a/src/parole-utils.c
+++ b/src/parole-utils.c
@@ -46,9 +46,9 @@
#include <libxfce4util/libxfce4util.h>
-#include <src/misc/parole.h>
+#include "src/misc/parole.h"
-#include "parole-utils.h"
+#include "src/parole-utils.h"
/* List from xine-lib's demux_sputext.c */
static const char subtitle_ext[][4] = {
diff --git a/src/parole-utils.h b/src/parole-utils.h
index 95f70d2..2157d13 100644
--- a/src/parole-utils.h
+++ b/src/parole-utils.h
@@ -26,7 +26,7 @@
#include <gtk/gtk.h>
#include <gdk/gdk.h>
-#include <src/misc/parole-file.h>
+#include "src/misc/parole-file.h"
gint thunar_file_compare_by_name (ParoleFile *file_a,
ParoleFile *file_b,
diff --git a/src/parole-vis.c b/src/parole-vis.c
index 4be084c..b6d33be 100644
--- a/src/parole-vis.c
+++ b/src/parole-vis.c
@@ -31,7 +31,7 @@
#include <gst/gst.h>
#include <glib.h>
-#include "parole-vis.h"
+#include "src/parole-vis.h"
static gboolean
parole_vis_filter(GstPluginFeature *feature, gpointer data) {
diff --git a/src/plugins/mpris2/mpris2-plugin.c b/src/plugins/mpris2/mpris2-plugin.c
index 3ff8d16..6e05239 100644
--- a/src/plugins/mpris2/mpris2-plugin.c
+++ b/src/plugins/mpris2/mpris2-plugin.c
@@ -24,9 +24,9 @@
#include <config.h>
#endif
-#include <src/misc/parole.h>
+#include "src/misc/parole.h"
-#include "mpris2-provider.h"
+#include "src/plugins/mpris2/mpris2-provider.h"
G_MODULE_EXPORT GType parole_plugin_initialize(ParoleProviderPlugin *plugin);
diff --git a/src/plugins/mpris2/mpris2-provider.c b/src/plugins/mpris2/mpris2-provider.c
index d5ad438..c85f547 100644
--- a/src/plugins/mpris2/mpris2-provider.c
+++ b/src/plugins/mpris2/mpris2-provider.c
@@ -24,10 +24,10 @@
#include <config.h>
#endif
-#include "mpris2-provider.h"
-
#include <gst/tag/tag.h>
+#include "src/plugins/mpris2/mpris2-provider.h"
+
static void mpris2_provider_iface_init(ParoleProviderPluginIface *iface);
static void mpris2_provider_finalize(GObject *object);
diff --git a/src/plugins/mpris2/mpris2-provider.h b/src/plugins/mpris2/mpris2-provider.h
index 8b4f432..81f8122 100644
--- a/src/plugins/mpris2/mpris2-provider.h
+++ b/src/plugins/mpris2/mpris2-provider.h
@@ -23,8 +23,9 @@
#ifndef SRC_PLUGINS_MPRIS2_MPRIS2_PROVIDER_H_
#define SRC_PLUGINS_MPRIS2_MPRIS2_PROVIDER_H_
-#include <src/misc/parole.h>
-#include <src/parole-conf.h>
+#include "src/misc/parole.h"
+
+#include "src/parole-conf.h"
G_BEGIN_DECLS
diff --git a/src/plugins/notify/notify-plugin.c b/src/plugins/notify/notify-plugin.c
index 4e4ed53..135a484 100644
--- a/src/plugins/notify/notify-plugin.c
+++ b/src/plugins/notify/notify-plugin.c
@@ -26,7 +26,7 @@
#include <libxfce4util/libxfce4util.h>
-#include "notify-provider.h"
+#include "src/plugins/notify/notify-provider.h"
G_MODULE_EXPORT GType parole_plugin_initialize(ParoleProviderPlugin *plugin);
diff --git a/src/plugins/notify/notify-provider.c b/src/plugins/notify/notify-provider.c
index 0265990..8b17507 100644
--- a/src/plugins/notify/notify-provider.c
+++ b/src/plugins/notify/notify-provider.c
@@ -27,11 +27,11 @@
#include <glib.h>
#include <gtk/gtk.h>
-#include <src/misc/parole.h>
-
#include <libnotify/notify.h>
-#include "notify-provider.h"
+#include "src/misc/parole.h"
+
+#include "src/plugins/notify/notify-provider.h"
static void notify_provider_iface_init(ParoleProviderPluginIface *iface);
static void notify_provider_finalize(GObject *object);
diff --git a/src/plugins/notify/notify-provider.h b/src/plugins/notify/notify-provider.h
index 10f6965..30c5dda 100644
--- a/src/plugins/notify/notify-provider.h
+++ b/src/plugins/notify/notify-provider.h
@@ -23,7 +23,7 @@
#ifndef SRC_PLUGINS_NOTIFY_NOTIFY_PROVIDER_H_
#define SRC_PLUGINS_NOTIFY_NOTIFY_PROVIDER_H_
-#include <src/misc/parole.h>
+#include "src/misc/parole.h"
G_BEGIN_DECLS
diff --git a/src/plugins/sample/sample-plugin.c b/src/plugins/sample/sample-plugin.c
index 34f59f5..e895233 100644
--- a/src/plugins/sample/sample-plugin.c
+++ b/src/plugins/sample/sample-plugin.c
@@ -24,9 +24,9 @@
#include <config.h>
#endif
-#include <src/misc/parole.h>
+#include "src/misc/parole.h"
-#include "sample-provider.h"
+#include "src/plugins/sample/sample-provider.h"
G_MODULE_EXPORT GType parole_plugin_initialize(ParoleProviderPlugin *plugin);
diff --git a/src/plugins/sample/sample-provider.c b/src/plugins/sample/sample-provider.c
index 4f2cb6c..5bbcf7e 100644
--- a/src/plugins/sample/sample-provider.c
+++ b/src/plugins/sample/sample-provider.c
@@ -24,7 +24,7 @@
#include <config.h>
#endif
-#include "sample-provider.h"
+#include "src/plugins/sample/sample-provider.h"
static void sample_provider_iface_init(ParoleProviderPluginIface *iface);
static void sample_provider_finalize(GObject *object);
diff --git a/src/plugins/sample/sample-provider.h b/src/plugins/sample/sample-provider.h
index f5835be..1da7533 100644
--- a/src/plugins/sample/sample-provider.h
+++ b/src/plugins/sample/sample-provider.h
@@ -23,7 +23,7 @@
#ifndef SRC_PLUGINS_SAMPLE_SAMPLE_PROVIDER_H_
#define SRC_PLUGINS_SAMPLE_SAMPLE_PROVIDER_H_
-#include <src/misc/parole.h>
+#include "src/misc/parole.h"
G_BEGIN_DECLS
diff --git a/src/plugins/tray/tray-plugin.c b/src/plugins/tray/tray-plugin.c
index 9186b2b..e560b1f 100644
--- a/src/plugins/tray/tray-plugin.c
+++ b/src/plugins/tray/tray-plugin.c
@@ -26,7 +26,7 @@
#include <libxfce4util/libxfce4util.h>
-#include "tray-provider.h"
+#include "src/plugins/tray/tray-provider.h"
G_MODULE_EXPORT GType parole_plugin_initialize(ParoleProviderPlugin *plugin);
diff --git a/src/plugins/tray/tray-provider.c b/src/plugins/tray/tray-provider.c
index b3bcfdc..ad86f25 100644
--- a/src/plugins/tray/tray-provider.c
+++ b/src/plugins/tray/tray-provider.c
@@ -27,14 +27,13 @@
#include <glib.h>
#include <gtk/gtk.h>
-#include <src/misc/parole.h>
-
#include <libxfce4util/libxfce4util.h>
#include <libxfce4ui/libxfce4ui.h>
-
#include <xfconf/xfconf.h>
-#include "tray-provider.h"
+#include "src/misc/parole.h"
+
+#include "src/plugins/tray/tray-provider.h"
static void tray_provider_iface_init(ParoleProviderPluginIface *iface);
static void tray_provider_finalize(GObject *object);
diff --git a/src/plugins/tray/tray-provider.h b/src/plugins/tray/tray-provider.h
index bbf32d8..3658b94 100644
--- a/src/plugins/tray/tray-provider.h
+++ b/src/plugins/tray/tray-provider.h
@@ -23,7 +23,7 @@
#ifndef SRC_PLUGINS_TRAY_TRAY_PROVIDER_H_
#define SRC_PLUGINS_TRAY_TRAY_PROVIDER_H_
-#include <src/misc/parole.h>
+#include "src/misc/parole.h"
G_BEGIN_DECLS
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list