[Xfce4-commits] <parole:master> Better directory structure
Tekk
noreply at xfce.org
Mon Jul 23 01:24:48 CEST 2012
Updating branch refs/heads/master
to 2b0367c13ab9f96f5ce9e221f4c08e8cdbae7fa5 (commit)
from 94b5bd7c98ea42c0749d8c428ff054fca7e41c66 (commit)
commit 2b0367c13ab9f96f5ce9e221f4c08e8cdbae7fa5
Author: Tekk <tekk at parlementum.net>
Date: Sun Jul 15 20:31:21 2012 -0400
Better directory structure
ChangeLog | 20 ++++++------
Makefile.am | 7 +----
configure.ac.in | 20 ++++++------
docs/plugin-api/Makefile.am | 6 ++--
docs/plugin-api/parole-plugins-tut.sgml | 2 +-
docs/plugin-api/tmpl/Parole-Plugins-unused.sgml | 2 +-
po/POTFILES.in | 4 +-
po/ar.po | 10 +++---
po/ast.po | 10 +++---
po/ca.po | 10 +++---
po/cs.po | 10 +++---
po/da.po | 10 +++---
po/de.po | 10 +++---
po/el.po | 10 +++---
po/en_GB.po | 10 +++---
po/es.po | 10 +++---
po/eu.po | 10 +++---
po/fr.po | 10 +++---
po/gl.po | 10 +++---
po/he.po | 10 +++---
po/hr.po | 10 +++---
po/hu.po | 10 +++---
po/id.po | 10 +++---
po/is.po | 10 +++---
po/it.po | 10 +++---
po/ja.po | 10 +++---
po/ko.po | 10 +++---
po/lt.po | 10 +++---
po/lv.po | 10 +++---
po/nl.po | 10 +++---
po/nn.po | 10 +++---
po/pl.po | 10 +++---
po/pt.po | 10 +++---
po/pt_BR.po | 10 +++---
po/ru.po | 10 +++---
po/sk.po | 10 +++---
po/sv.po | 10 +++---
po/te.po | 10 +++---
po/th.po | 10 +++---
po/tr.po | 10 +++---
po/ug.po | 10 +++---
po/uk.po | 10 +++---
po/zh_CN.po | 10 +++---
po/zh_TW.po | 10 +++---
src/Makefile.am | 30 ++++++++++++--------
{common => src/common}/Makefile.am | 2 +-
{common => src/common}/parole-common.c | 0
{common => src/common}/parole-common.h | 0
{common => src/common}/parole-rc-utils.c | 0
{common => src/common}/parole-rc-utils.h | 4 +-
{common => src/common}/parole-screensaver.c | 0
{common => src/common}/parole-screensaver.h | 0
{dbus => src/dbus}/Makefile.am | 2 +-
{dbus => src/dbus}/parole-dbus.c | 0
{dbus => src/dbus}/parole-dbus.h | 0
{gst => src/gst}/Makefile.am | 11 ++++---
{gst => src/gst}/gstmarshal.list | 0
{gst => src/gst}/parole-gst.c | 0
{gst => src/gst}/parole-gst.h | 4 +-
{parole => src/misc}/Makefile.am | 1 +
{parole => src/misc}/parole-debug.c | 0
{parole => src/misc}/parole-debug.h | 0
{parole => src/misc}/parole-file.c | 0
{parole => src/misc}/parole-file.h | 0
{parole => src/misc}/parole-filters.c | 0
{parole => src/misc}/parole-filters.h | 2 +-
{parole => src/misc}/parole-marshal.list | 0
{parole => src/misc}/parole-pl-parser.c | 2 +-
{parole => src/misc}/parole-pl-parser.h | 0
{parole => src/misc}/parole-provider-player.c | 2 +-
{parole => src/misc}/parole-provider-player.h | 2 +-
{parole => src/misc}/parole-provider-plugin.c | 2 +-
{parole => src/misc}/parole-provider-plugin.h | 4 +-
{parole => src/misc}/parole-stream.c | 0
{parole => src/misc}/parole-stream.h | 0
{parole => src/misc}/parole.h.in | 14 ++++----
src/parole-mediachooser.c | 2 +-
src/parole-medialist.c | 4 +-
src/parole-module.c | 2 +-
src/parole-module.h | 2 +-
src/parole-player.c | 2 +-
src/parole-plugin-player.c | 2 +-
src/parole-plugins-manager.c | 2 +-
src/parole-plugins-manager.h | 2 +-
src/parole-utils.c | 2 +-
src/parole-utils.h | 2 +-
{plugins => src/plugins}/Makefile.am | 0
{plugins => src/plugins}/power-manager/Makefile.am | 5 ++-
.../plugins}/power-manager/power-manager-plugin.c | 0
.../power-manager/power-manager-provider.c | 0
.../power-manager/power-manager-provider.h | 2 +-
.../power-manager/power-manager.desktop.in | 0
{plugins => src/plugins}/properties/Makefile.am | 3 +-
.../plugins}/properties/stream-properties-plugin.c | 0
.../properties/stream-properties-provider.c | 0
.../properties/stream-properties-provider.h | 2 +-
.../properties/stream-properties.desktop.in | 0
{plugins => src/plugins}/sample/Makefile.am | 1 +
{plugins => src/plugins}/sample/sample-plugin.c | 2 +-
{plugins => src/plugins}/sample/sample-provider.c | 0
{plugins => src/plugins}/sample/sample-provider.h | 2 +-
{plugins => src/plugins}/tray/Makefile.am | 3 +-
.../plugins}/tray/system-tray.desktop.in | 0
{plugins => src/plugins}/tray/tray-plugin.c | 0
{plugins => src/plugins}/tray/tray-provider.c | 4 +-
{plugins => src/plugins}/tray/tray-provider.h | 2 +-
106 files changed, 284 insertions(+), 277 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 25a9e1c..a6e4724 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -116,15 +116,15 @@
* Provides a dialog to load/unload plugins.
* data/interfaces/ Mark some gtk labels as non-translatable+default
respone of some buttons in the dialogs.
- * parole/parole-rc-utils.{c,h} added function to load list entries+
+ * src/misc/parole-rc-utils.{c,h} added function to load list entries+
Split the configuration file into groups.
2009-07-23: 23:00 Ali aliov at xfce.org
- * parole/parole-gst.c Only emit media progressed signal when the
+ * src/misc/parole-gst.c Only emit media progressed signal when the
state is playing.
- * parole/parole-pl-parser.{c,h} added a playlist parser code based
+ * src/misc/parole-pl-parser.{c,h} added a playlist parser code based
on code from totem and from xfmedia.
- * parole/parole-filters.c added filters for playlist files.
+ * src/misc/parole-filters.c added filters for playlist files.
* po/POTFILES.in updates.
* delete the common dir as it is useless.
* Change ParoleMediaFile to ParoleFile as it doesn't only describe
@@ -135,7 +135,7 @@
2009-07-19: 01:00 Ali aliov at xfce.org
* Parole now can play DVD/VCD.
- * parole/parole-stream.c no need to hold a reference to
+ * src/misc/parole-stream.c no need to hold a reference to
ParoleMediaFile object.
* Change the flag of dbus_request_name to
DBUS_NAME_FLAG_ALLOW_REPLACEMENT to make the -i (new instance)
@@ -149,13 +149,13 @@
* No need to install the interface files anymore.
* Rename src dir to parole.
* Gtk doc for plugin api (not yet complete).
- * parole/parole-player.c stop gst when the stream finishes
+ * src/misc/parole-player.c stop gst when the stream finishes
and no remaining media left in the list.
- * parole/parole-player.c rename the media file shown in the media list
+ * src/misc/parole-player.c rename the media file shown in the media list
when we get a tag message from gst.
- * parole/parole-stream.c Handle tag messages.
- * parole/parole-module.{c,h} added a GTypeModule subclass
- * parole/parole-mediafile.c expose GObject properties.
+ * src/misc/parole-stream.c Handle tag messages.
+ * src/misc/parole-module.{c,h} added a GTypeModule subclass
+ * src/misc/parole-mediafile.c expose GObject properties.
to handle plugins.
* put some code in the common dir.
* update POTFILES.in+README+TODO.
diff --git a/Makefile.am b/Makefile.am
index 8993042..1029dad 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,13 +2,8 @@ ACLOCAL_AMFLAGS = -I m4
SUBDIRS = \
data \
- parole \
- common \
- gst \
- dbus \
- src \
- plugins \
docs \
+ src \
po
diff --git a/configure.ac.in b/configure.ac.in
index 67568da..93cbd7d 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -214,17 +214,17 @@ data/icons/48x48/Makefile
data/icons/scalable/Makefile
data/mime/Makefile
data/desktop/Makefile
-parole/Makefile
-parole/parole.h
-common/Makefile
-gst/Makefile
-dbus/Makefile
src/Makefile
-plugins/Makefile
-plugins/sample/Makefile
-plugins/properties/Makefile
-plugins/tray/Makefile
-plugins/power-manager/Makefile
+src/misc/Makefile
+src/misc/parole.h
+src/common/Makefile
+src/gst/Makefile
+src/dbus/Makefile
+src/plugins/Makefile
+src/plugins/sample/Makefile
+src/plugins/properties/Makefile
+src/plugins/tray/Makefile
+src/plugins/power-manager/Makefile
docs/Makefile
docs/plugin-api/version.xml
docs/plugin-api/Makefile
diff --git a/docs/plugin-api/Makefile.am b/docs/plugin-api/Makefile.am
index 0ea1d96..26379f9 100644
--- a/docs/plugin-api/Makefile.am
+++ b/docs/plugin-api/Makefile.am
@@ -41,8 +41,8 @@ FIXXREF_OPTIONS=
# Used for dependencies. The docs will be rebuilt if any of these change.
# e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
# e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
-CFILE_GLOB=$(top_srcdir)/parole/*.c
-HFILE_GLOB=$(top_srcdir)/parole/*.h
+CFILE_GLOB=$(top_srcdir)/src/misc/*.c
+HFILE_GLOB=$(top_srcdir)/src/misc/*.h
# Header files to ignore when scanning.
# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
@@ -75,7 +75,7 @@ GTKDOC_LIBS= \
$(GLIB_LIBS) \
$(GOBJECT_LIBS) \
$(TAGLIBC_LIBS) \
- $(top_builddir)/parole/libparole.la
+ $(top_builddir)/src/misc/libparole.la
if ENABLE_GTK_DOC
include $(top_srcdir)/gtk-doc.make
diff --git a/docs/plugin-api/parole-plugins-tut.sgml b/docs/plugin-api/parole-plugins-tut.sgml
index a33959c..216b226 100644
--- a/docs/plugin-api/parole-plugins-tut.sgml
+++ b/docs/plugin-api/parole-plugins-tut.sgml
@@ -47,7 +47,7 @@ parole_plugin_shutdown (void)
#ifndef SAMPLE_PROVIDER_H_
#define SAMPLE_PROVIDER_H_
-#include <parole/parole.h>
+#include <src/misc/parole.h>
G_BEGIN_DECLS
diff --git a/docs/plugin-api/tmpl/Parole-Plugins-unused.sgml b/docs/plugin-api/tmpl/Parole-Plugins-unused.sgml
index 86f6ab7..fa8070d 100644
--- a/docs/plugin-api/tmpl/Parole-Plugins-unused.sgml
+++ b/docs/plugin-api/tmpl/Parole-Plugins-unused.sgml
@@ -68,7 +68,7 @@ parole_plugin_shutdown (void)
#ifndef SAMPLE_PROVIDER_H_
#define SAMPLE_PROVIDER_H_
-#include <parole/parole.h>
+#include <src/misc/parole.h>
G_BEGIN_DECLS
diff --git a/po/POTFILES.in b/po/POTFILES.in
index acd215c..38d1b41 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -20,8 +20,8 @@ src/parole-subtitle-encoding.c
src/parole-open-location.c
src/parole-disc-menu.c
src/parole-plugins-manager.c
-parole/parole-filters.c
-parole/parole-pl-parser.c
+src/misc/parole-filters.c
+src/misc/parole-pl-parser.c
plugins/properties/stream-properties-plugin.c
plugins/properties/stream-properties-provider.c
plugins/properties/stream-properties-provider.h
diff --git a/po/ar.po b/po/ar.po
index ed1263a..ff7fce7 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -693,23 +693,23 @@ msgstr "زر الموقع"
msgid "No installed plugins found on this system"
msgstr "لم يتم رصد أي ملحق متبث في جهازك"
-#: ../parole/parole-filters.c:64
+#: ../src/misc/parole-filters.c:64
msgid "Audio"
msgstr "ملف صوتي"
-#: ../parole/parole-filters.c:90
+#: ../src/misc/parole-filters.c:90
msgid "Video"
msgstr "فيديو"
-#: ../parole/parole-filters.c:115
+#: ../src/misc/parole-filters.c:115
msgid "Audio and video"
msgstr "ملف صوتي و فيديو"
-#: ../parole/parole-filters.c:144
+#: ../src/misc/parole-filters.c:144
msgid "All supported files"
msgstr "Tكل الملفات المدعومة"
-#: ../parole/parole-filters.c:171
+#: ../src/misc/parole-filters.c:171
msgid "Playlist files"
msgstr "قائمة القراءة"
diff --git a/po/ast.po b/po/ast.po
index 5045cfb..a146ef6 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -639,23 +639,23 @@ msgstr "Desconocíu"
msgid "No installed plugins found on this system"
msgstr ""
-#: ../parole/parole-filters.c:64
+#: ../src/misc/parole-filters.c:64
msgid "Audio"
msgstr "Audio"
-#: ../parole/parole-filters.c:90
+#: ../src/misc/parole-filters.c:90
msgid "Video"
msgstr "Video"
-#: ../parole/parole-filters.c:115
+#: ../src/misc/parole-filters.c:115
msgid "Audio and video"
msgstr "Audio y video"
-#: ../parole/parole-filters.c:144
+#: ../src/misc/parole-filters.c:144
msgid "All supported files"
msgstr "Tolos ficheros soportaos"
-#: ../parole/parole-filters.c:171
+#: ../src/misc/parole-filters.c:171
msgid "Playlist files"
msgstr "Ficheros de llistes de reproducción"
diff --git a/po/ca.po b/po/ca.po
index b1577be..816c836 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -729,23 +729,23 @@ msgstr "Vés al lloc web"
msgid "No installed plugins found on this system"
msgstr "No s'han trobat connectors al sistema"
-#: ../parole/parole-filters.c:64
+#: ../src/misc/parole-filters.c:64
msgid "Audio"
msgstr "Àudio"
-#: ../parole/parole-filters.c:90
+#: ../src/misc/parole-filters.c:90
msgid "Video"
msgstr "Vídeo"
-#: ../parole/parole-filters.c:115
+#: ../src/misc/parole-filters.c:115
msgid "Audio and video"
msgstr "Àudio i vídeo"
-#: ../parole/parole-filters.c:144
+#: ../src/misc/parole-filters.c:144
msgid "All supported files"
msgstr "Tots els fitxers compatibles"
-#: ../parole/parole-filters.c:171
+#: ../src/misc/parole-filters.c:171
msgid "Playlist files"
msgstr "Fitxers de llistes de reproducció"
diff --git a/po/cs.po b/po/cs.po
index 66f6192..a8ea17b 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -725,23 +725,23 @@ msgstr "Navštívit webovou stránku"
msgid "No installed plugins found on this system"
msgstr "V systému nebyly nalezeny žádné zásuvné moduly"
-#: ../parole/parole-filters.c:64
+#: ../src/misc/parole-filters.c:64
msgid "Audio"
msgstr "Audio"
-#: ../parole/parole-filters.c:90
+#: ../src/misc/parole-filters.c:90
msgid "Video"
msgstr "Video"
-#: ../parole/parole-filters.c:115
+#: ../src/misc/parole-filters.c:115
msgid "Audio and video"
msgstr "Audio a video"
-#: ../parole/parole-filters.c:144
+#: ../src/misc/parole-filters.c:144
msgid "All supported files"
msgstr "Všechny podporované soubory"
-#: ../parole/parole-filters.c:171
+#: ../src/misc/parole-filters.c:171
msgid "Playlist files"
msgstr "Soubory seznamů médií"
diff --git a/po/da.po b/po/da.po
index e9450f0..2ef6dc0 100644
--- a/po/da.po
+++ b/po/da.po
@@ -686,23 +686,23 @@ msgstr "Besøg netsted"
msgid "No installed plugins found on this system"
msgstr "Ingen installerede udvidelsesmoduler fundet på dette system"
-#: ../parole/parole-filters.c:64
+#: ../src/misc/parole-filters.c:64
msgid "Audio"
msgstr "Lyd"
-#: ../parole/parole-filters.c:90
+#: ../src/misc/parole-filters.c:90
msgid "Video"
msgstr "Video"
-#: ../parole/parole-filters.c:115
+#: ../src/misc/parole-filters.c:115
msgid "Audio and video"
msgstr "Lyd og video"
-#: ../parole/parole-filters.c:144
+#: ../src/misc/parole-filters.c:144
msgid "All supported files"
msgstr "Alle understøttede filer"
-#: ../parole/parole-filters.c:171
+#: ../src/misc/parole-filters.c:171
msgid "Playlist files"
msgstr "Spillelistefiler"
diff --git a/po/de.po b/po/de.po
index 1512b87..3beccbf 100644
--- a/po/de.po
+++ b/po/de.po
@@ -686,23 +686,23 @@ msgstr "Web-Seite besuchen"
msgid "No installed plugins found on this system"
msgstr "Keine installierten Erweiterungen gefunden"
-#: ../parole/parole-filters.c:64
+#: ../src/misc/parole-filters.c:64
msgid "Audio"
msgstr "Audio"
-#: ../parole/parole-filters.c:90
+#: ../src/misc/parole-filters.c:90
msgid "Video"
msgstr "Video"
-#: ../parole/parole-filters.c:115
+#: ../src/misc/parole-filters.c:115
msgid "Audio and video"
msgstr "Audio und Video"
-#: ../parole/parole-filters.c:144
+#: ../src/misc/parole-filters.c:144
msgid "All supported files"
msgstr "Unterstützte Dateien"
-#: ../parole/parole-filters.c:171
+#: ../src/misc/parole-filters.c:171
msgid "Playlist files"
msgstr "Wiedergabelisten-Dateien"
diff --git a/po/el.po b/po/el.po
index 9520459..a58bda2 100644
--- a/po/el.po
+++ b/po/el.po
@@ -697,23 +697,23 @@ msgstr "Επίσκεψη στην ιστοσελίδα"
msgid "No installed plugins found on this system"
msgstr "Δεν βρέθηκαν εγκατεστημένα πρόσθετα στο σύστημα"
-#: ../parole/parole-filters.c:64
+#: ../src/misc/parole-filters.c:64
msgid "Audio"
msgstr "Ήχος"
-#: ../parole/parole-filters.c:90
+#: ../src/misc/parole-filters.c:90
msgid "Video"
msgstr "Εικόνα"
-#: ../parole/parole-filters.c:115
+#: ../src/misc/parole-filters.c:115
msgid "Audio and video"
msgstr "Ήχος και εικόνα"
-#: ../parole/parole-filters.c:144
+#: ../src/misc/parole-filters.c:144
msgid "All supported files"
msgstr "Όλα τα υποστηριζόμενα αρχεία"
-#: ../parole/parole-filters.c:171
+#: ../src/misc/parole-filters.c:171
msgid "Playlist files"
msgstr "Αρχεία λίστας αναπαραγωγής"
diff --git a/po/en_GB.po b/po/en_GB.po
index b4e9486..ca05133 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -688,23 +688,23 @@ msgstr "Visit Website"
msgid "No installed plugins found on this system"
msgstr "No installed plugins found on this system"
-#: ../parole/parole-filters.c:64
+#: ../src/misc/parole-filters.c:64
msgid "Audio"
msgstr "Audio"
-#: ../parole/parole-filters.c:90
+#: ../src/misc/parole-filters.c:90
msgid "Video"
msgstr "Video"
-#: ../parole/parole-filters.c:115
+#: ../src/misc/parole-filters.c:115
msgid "Audio and video"
msgstr "Audio and video"
-#: ../parole/parole-filters.c:144
+#: ../src/misc/parole-filters.c:144
msgid "All supported files"
msgstr "All supported files"
-#: ../parole/parole-filters.c:171
+#: ../src/misc/parole-filters.c:171
msgid "Playlist files"
msgstr "Playlist files"
diff --git a/po/es.po b/po/es.po
index 62447eb..351538c 100644
--- a/po/es.po
+++ b/po/es.po
@@ -683,23 +683,23 @@ msgstr "Ir al sitio web"
msgid "No installed plugins found on this system"
msgstr "No hay complementos instalados en el sistema"
-#: ../parole/parole-filters.c:64
+#: ../src/misc/parole-filters.c:64
msgid "Audio"
msgstr "Audio"
-#: ../parole/parole-filters.c:90
+#: ../src/misc/parole-filters.c:90
msgid "Video"
msgstr "Video"
-#: ../parole/parole-filters.c:115
+#: ../src/misc/parole-filters.c:115
msgid "Audio and video"
msgstr "Audio y video"
-#: ../parole/parole-filters.c:144
+#: ../src/misc/parole-filters.c:144
msgid "All supported files"
msgstr "Todos los archivos soportados"
-#: ../parole/parole-filters.c:171
+#: ../src/misc/parole-filters.c:171
msgid "Playlist files"
msgstr "Lista de archivos"
diff --git a/po/eu.po b/po/eu.po
index 25794f4..43d5beb 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -684,23 +684,23 @@ msgstr "Ikusi webgunea"
msgid "No installed plugins found on this system"
msgstr "Ez da instalaturiko pluginik aurkitu sistema honetan"
-#: ../parole/parole-filters.c:64
+#: ../src/misc/parole-filters.c:64
msgid "Audio"
msgstr "Audioa"
-#: ../parole/parole-filters.c:90
+#: ../src/misc/parole-filters.c:90
msgid "Video"
msgstr "Bideoa"
-#: ../parole/parole-filters.c:115
+#: ../src/misc/parole-filters.c:115
msgid "Audio and video"
msgstr "Audio eta bideoa"
-#: ../parole/parole-filters.c:144
+#: ../src/misc/parole-filters.c:144
msgid "All supported files"
msgstr "Onartutako fitxategi guztiak"
-#: ../parole/parole-filters.c:171
+#: ../src/misc/parole-filters.c:171
msgid "Playlist files"
msgstr "Erreprodukzio-zerrenda fitxategiak"
diff --git a/po/fr.po b/po/fr.po
index bb3cfef..8c53220 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -697,23 +697,23 @@ msgstr "Visiter le Site Web"
msgid "No installed plugins found on this system"
msgstr "Aucun plugin installé n'a été détecté"
-#: ../parole/parole-filters.c:64
+#: ../src/misc/parole-filters.c:64
msgid "Audio"
msgstr "Audio"
-#: ../parole/parole-filters.c:90
+#: ../src/misc/parole-filters.c:90
msgid "Video"
msgstr "Vidéo"
-#: ../parole/parole-filters.c:115
+#: ../src/misc/parole-filters.c:115
msgid "Audio and video"
msgstr "Audio et vidéo"
-#: ../parole/parole-filters.c:144
+#: ../src/misc/parole-filters.c:144
msgid "All supported files"
msgstr "Tous les fichiers pris en charge"
-#: ../parole/parole-filters.c:171
+#: ../src/misc/parole-filters.c:171
msgid "Playlist files"
msgstr "Listes de lecture"
diff --git a/po/gl.po b/po/gl.po
index ddd6909..517b40b 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -691,23 +691,23 @@ msgstr "Visitar o sitio web"
msgid "No installed plugins found on this system"
msgstr "Non se atoparon engadidos instalados neste sistema"
-#: ../parole/parole-filters.c:64
+#: ../src/misc/parole-filters.c:64
msgid "Audio"
msgstr "Son"
-#: ../parole/parole-filters.c:90
+#: ../src/misc/parole-filters.c:90
msgid "Video"
msgstr "Vídeo"
-#: ../parole/parole-filters.c:115
+#: ../src/misc/parole-filters.c:115
msgid "Audio and video"
msgstr "Son e vídeo"
-#: ../parole/parole-filters.c:144
+#: ../src/misc/parole-filters.c:144
msgid "All supported files"
msgstr "Todos os ficheiros soportados"
-#: ../parole/parole-filters.c:171
+#: ../src/misc/parole-filters.c:171
msgid "Playlist files"
msgstr "Ficheiros de listas de reprodución"
diff --git a/po/he.po b/po/he.po
index a6d75a1..031be00 100644
--- a/po/he.po
+++ b/po/he.po
@@ -692,23 +692,23 @@ msgstr "ביקור באתר"
msgid "No installed plugins found on this system"
msgstr "לא נמצאו תוספים מותקנים במערכת זו"
-#: ../parole/parole-filters.c:64
+#: ../src/misc/parole-filters.c:64
msgid "Audio"
msgstr "שמע"
-#: ../parole/parole-filters.c:90
+#: ../src/misc/parole-filters.c:90
msgid "Video"
msgstr "וידאו"
-#: ../parole/parole-filters.c:115
+#: ../src/misc/parole-filters.c:115
msgid "Audio and video"
msgstr "שמע ווידאו"
-#: ../parole/parole-filters.c:144
+#: ../src/misc/parole-filters.c:144
msgid "All supported files"
msgstr "כל הקבצים הנתמכים"
-#: ../parole/parole-filters.c:171
+#: ../src/misc/parole-filters.c:171
msgid "Playlist files"
msgstr "קובצי רשימות השמעה"
diff --git a/po/hr.po b/po/hr.po
index 74da2cc..f15b171 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -686,23 +686,23 @@ msgstr "Posjetite web stranicu"
msgid "No installed plugins found on this system"
msgstr "Nijedan instalirani priključak nije pronađen na ovom sustavu"
-#: ../parole/parole-filters.c:64
+#: ../src/misc/parole-filters.c:64
msgid "Audio"
msgstr "Audio"
-#: ../parole/parole-filters.c:90
+#: ../src/misc/parole-filters.c:90
msgid "Video"
msgstr "Video"
-#: ../parole/parole-filters.c:115
+#: ../src/misc/parole-filters.c:115
msgid "Audio and video"
msgstr "Audio i video"
-#: ../parole/parole-filters.c:144
+#: ../src/misc/parole-filters.c:144
msgid "All supported files"
msgstr "Sve podržane datoteke"
-#: ../parole/parole-filters.c:171
+#: ../src/misc/parole-filters.c:171
msgid "Playlist files"
msgstr "Datoteke liste izvođenja"
diff --git a/po/hu.po b/po/hu.po
index 8c07330..a6b7745 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -694,23 +694,23 @@ msgstr "Honlap felkeresése"
msgid "No installed plugins found on this system"
msgstr "Nem találhatók telepített bővítmények a rendszeren"
-#: ../parole/parole-filters.c:64
+#: ../src/misc/parole-filters.c:64
msgid "Audio"
msgstr "Hang"
-#: ../parole/parole-filters.c:90
+#: ../src/misc/parole-filters.c:90
msgid "Video"
msgstr "Videó"
-#: ../parole/parole-filters.c:115
+#: ../src/misc/parole-filters.c:115
msgid "Audio and video"
msgstr "Hang és videó"
-#: ../parole/parole-filters.c:144
+#: ../src/misc/parole-filters.c:144
msgid "All supported files"
msgstr "Minden támogatott fájl"
-#: ../parole/parole-filters.c:171
+#: ../src/misc/parole-filters.c:171
msgid "Playlist files"
msgstr "Lejátszólista-fájlok"
diff --git a/po/id.po b/po/id.po
index 3b7377e..196b4a1 100644
--- a/po/id.po
+++ b/po/id.po
@@ -683,23 +683,23 @@ msgstr "Kunjungi Situs Web"
msgid "No installed plugins found on this system"
msgstr "Tak ada plugin terinstal yang ditemukan di sistem ini"
-#: ../parole/parole-filters.c:64
+#: ../src/misc/parole-filters.c:64
msgid "Audio"
msgstr "Audio"
-#: ../parole/parole-filters.c:90
+#: ../src/misc/parole-filters.c:90
msgid "Video"
msgstr "Video"
-#: ../parole/parole-filters.c:115
+#: ../src/misc/parole-filters.c:115
msgid "Audio and video"
msgstr "Audio dan video"
-#: ../parole/parole-filters.c:144
+#: ../src/misc/parole-filters.c:144
msgid "All supported files"
msgstr "Semua berkas yang didukung"
-#: ../parole/parole-filters.c:171
+#: ../src/misc/parole-filters.c:171
msgid "Playlist files"
msgstr "Berkas senarai putar"
diff --git a/po/is.po b/po/is.po
index bae52f6..544f246 100644
--- a/po/is.po
+++ b/po/is.po
@@ -681,23 +681,23 @@ msgstr "Fara á heimasíðu"
msgid "No installed plugins found on this system"
msgstr ""
-#: ../parole/parole-filters.c:64
+#: ../src/misc/parole-filters.c:64
msgid "Audio"
msgstr "Hljóð"
-#: ../parole/parole-filters.c:90
+#: ../src/misc/parole-filters.c:90
msgid "Video"
msgstr "Myndskeið"
-#: ../parole/parole-filters.c:115
+#: ../src/misc/parole-filters.c:115
msgid "Audio and video"
msgstr "Hljóð og mynd"
-#: ../parole/parole-filters.c:144
+#: ../src/misc/parole-filters.c:144
msgid "All supported files"
msgstr "Allar studdar skrár"
-#: ../parole/parole-filters.c:171
+#: ../src/misc/parole-filters.c:171
msgid "Playlist files"
msgstr "Lagalistaskrár"
diff --git a/po/it.po b/po/it.po
index a8b88fb..677c659 100644
--- a/po/it.po
+++ b/po/it.po
@@ -693,23 +693,23 @@ msgstr "Visita il sito"
msgid "No installed plugins found on this system"
msgstr "Non sono installati plugin in questo sistema"
-#: ../parole/parole-filters.c:64
+#: ../src/misc/parole-filters.c:64
msgid "Audio"
msgstr "Audio"
-#: ../parole/parole-filters.c:90
+#: ../src/misc/parole-filters.c:90
msgid "Video"
msgstr "Video"
-#: ../parole/parole-filters.c:115
+#: ../src/misc/parole-filters.c:115
msgid "Audio and video"
msgstr "Audio e video"
-#: ../parole/parole-filters.c:144
+#: ../src/misc/parole-filters.c:144
msgid "All supported files"
msgstr "Tutti i file supportati"
-#: ../parole/parole-filters.c:171
+#: ../src/misc/parole-filters.c:171
msgid "Playlist files"
msgstr "File della scaletta"
diff --git a/po/ja.po b/po/ja.po
index 0f21187..f9bb1fe 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -729,23 +729,23 @@ msgstr "ウェブサイトへ"
msgid "No installed plugins found on this system"
msgstr "インストールされているプラグインが見つかりません"
-#: ../parole/parole-filters.c:64
+#: ../src/misc/parole-filters.c:64
msgid "Audio"
msgstr "オーディオ"
-#: ../parole/parole-filters.c:90
+#: ../src/misc/parole-filters.c:90
msgid "Video"
msgstr "ビデオ"
-#: ../parole/parole-filters.c:115
+#: ../src/misc/parole-filters.c:115
msgid "Audio and video"
msgstr "オーディオとビデオ"
-#: ../parole/parole-filters.c:144
+#: ../src/misc/parole-filters.c:144
msgid "All supported files"
msgstr "すべてのサポートファイル"
-#: ../parole/parole-filters.c:171
+#: ../src/misc/parole-filters.c:171
msgid "Playlist files"
msgstr "プレイリストファイル"
diff --git a/po/ko.po b/po/ko.po
index c917141..6fcc7f8 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -729,23 +729,23 @@ msgstr "웹사이트 방문하기"
msgid "No installed plugins found on this system"
msgstr "이 시스템에 설치한 플러그인을 찾을 수 없습니다"
-#: ../parole/parole-filters.c:64
+#: ../src/misc/parole-filters.c:64
msgid "Audio"
msgstr "음악"
-#: ../parole/parole-filters.c:90
+#: ../src/misc/parole-filters.c:90
msgid "Video"
msgstr "동영상"
-#: ../parole/parole-filters.c:115
+#: ../src/misc/parole-filters.c:115
msgid "Audio and video"
msgstr "음악과 동영상"
-#: ../parole/parole-filters.c:144
+#: ../src/misc/parole-filters.c:144
msgid "All supported files"
msgstr "지원하는 모든 파일"
-#: ../parole/parole-filters.c:171
+#: ../src/misc/parole-filters.c:171
msgid "Playlist files"
msgstr "재생목록 파일"
diff --git a/po/lt.po b/po/lt.po
index 53f0045..934e096 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -695,23 +695,23 @@ msgstr "Aplankyti tinklalapį"
msgid "No installed plugins found on this system"
msgstr "Sistemoj įdiegtų įskiepių nerasta"
-#: ../parole/parole-filters.c:64
+#: ../src/misc/parole-filters.c:64
msgid "Audio"
msgstr "Garsas"
-#: ../parole/parole-filters.c:90
+#: ../src/misc/parole-filters.c:90
msgid "Video"
msgstr "Vaizdas"
-#: ../parole/parole-filters.c:115
+#: ../src/misc/parole-filters.c:115
msgid "Audio and video"
msgstr "Garsas ir vaizdas"
-#: ../parole/parole-filters.c:144
+#: ../src/misc/parole-filters.c:144
msgid "All supported files"
msgstr "Visi palaikomi failai"
-#: ../parole/parole-filters.c:171
+#: ../src/misc/parole-filters.c:171
msgid "Playlist files"
msgstr "Grojaraščio failai"
diff --git a/po/lv.po b/po/lv.po
index 25c726e..0a13997 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -687,23 +687,23 @@ msgstr "Nezināms"
msgid "No installed plugins found on this system"
msgstr "Nav atrasti instalēti spraudņi uz sistēmas"
-#: ../parole/parole-filters.c:64
+#: ../src/misc/parole-filters.c:64
msgid "Audio"
msgstr "Skaņa"
-#: ../parole/parole-filters.c:90
+#: ../src/misc/parole-filters.c:90
msgid "Video"
msgstr "Video"
-#: ../parole/parole-filters.c:115
+#: ../src/misc/parole-filters.c:115
msgid "Audio and video"
msgstr "Skaņa un video"
-#: ../parole/parole-filters.c:144
+#: ../src/misc/parole-filters.c:144
msgid "All supported files"
msgstr "Visi atbalstītie faili"
-#: ../parole/parole-filters.c:171
+#: ../src/misc/parole-filters.c:171
msgid "Playlist files"
msgstr "Repertuāra faili"
diff --git a/po/nl.po b/po/nl.po
index 769d6af..01d7513 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -701,23 +701,23 @@ msgstr "Webstek bezoeken"
msgid "No installed plugins found on this system"
msgstr "Geen geïnstalleerde plugins gevonden op dit systeem"
-#: ../parole/parole-filters.c:64
+#: ../src/misc/parole-filters.c:64
msgid "Audio"
msgstr "Audio"
-#: ../parole/parole-filters.c:90
+#: ../src/misc/parole-filters.c:90
msgid "Video"
msgstr "Video"
-#: ../parole/parole-filters.c:115
+#: ../src/misc/parole-filters.c:115
msgid "Audio and video"
msgstr "Audio en video"
-#: ../parole/parole-filters.c:144
+#: ../src/misc/parole-filters.c:144
msgid "All supported files"
msgstr "Alle ondersteunde bestanden"
-#: ../parole/parole-filters.c:171
+#: ../src/misc/parole-filters.c:171
msgid "Playlist files"
msgstr "Speellijstbestanden"
diff --git a/po/nn.po b/po/nn.po
index d78fcda..a770783 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -728,23 +728,23 @@ msgstr "Besøk nettstaden"
msgid "No installed plugins found on this system"
msgstr "Ingen tillegg er installerte på denne maskina"
-#: ../parole/parole-filters.c:64
+#: ../src/misc/parole-filters.c:64
msgid "Audio"
msgstr "Lyd"
-#: ../parole/parole-filters.c:90
+#: ../src/misc/parole-filters.c:90
msgid "Video"
msgstr "Video"
-#: ../parole/parole-filters.c:115
+#: ../src/misc/parole-filters.c:115
msgid "Audio and video"
msgstr "Lyd og video"
-#: ../parole/parole-filters.c:144
+#: ../src/misc/parole-filters.c:144
msgid "All supported files"
msgstr "Alle støtta filer"
-#: ../parole/parole-filters.c:171
+#: ../src/misc/parole-filters.c:171
msgid "Playlist files"
msgstr "Spelelistefiler"
diff --git a/po/pl.po b/po/pl.po
index 9ca9174..1b5e2a8 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -699,23 +699,23 @@ msgstr "Odwiedź stronę"
msgid "No installed plugins found on this system"
msgstr "Brak zainstalowanych wtyczek"
-#: ../parole/parole-filters.c:64
+#: ../src/misc/parole-filters.c:64
msgid "Audio"
msgstr "Pliki dźwiękowe"
-#: ../parole/parole-filters.c:90
+#: ../src/misc/parole-filters.c:90
msgid "Video"
msgstr "Pliki wideo"
-#: ../parole/parole-filters.c:115
+#: ../src/misc/parole-filters.c:115
msgid "Audio and video"
msgstr "Pliki dźwiękowe i wideo"
-#: ../parole/parole-filters.c:144
+#: ../src/misc/parole-filters.c:144
msgid "All supported files"
msgstr "Wszystkie obsługiwane pliki"
-#: ../parole/parole-filters.c:171
+#: ../src/misc/parole-filters.c:171
msgid "Playlist files"
msgstr "Pliki list odtwarzania"
diff --git a/po/pt.po b/po/pt.po
index 7cdc928..b63469d 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -724,23 +724,23 @@ msgstr "Visitar sítio web"
msgid "No installed plugins found on this system"
msgstr "Não foram encontrados \"plugins\" neste sistema"
-#: ../parole/parole-filters.c:64
+#: ../src/misc/parole-filters.c:64
msgid "Audio"
msgstr "Áudio"
-#: ../parole/parole-filters.c:90
+#: ../src/misc/parole-filters.c:90
msgid "Video"
msgstr "Vídeo"
-#: ../parole/parole-filters.c:115
+#: ../src/misc/parole-filters.c:115
msgid "Audio and video"
msgstr "Áudio e vídeo"
-#: ../parole/parole-filters.c:144
+#: ../src/misc/parole-filters.c:144
msgid "All supported files"
msgstr "Todos os ficheiros suportados"
-#: ../parole/parole-filters.c:171
+#: ../src/misc/parole-filters.c:171
msgid "Playlist files"
msgstr "Listas de reprodução"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 572e8da..f20f304 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -726,23 +726,23 @@ msgstr "Visitar website"
msgid "No installed plugins found on this system"
msgstr "Não foram encontrados plugins neste sistema"
-#: ../parole/parole-filters.c:64
+#: ../src/misc/parole-filters.c:64
msgid "Audio"
msgstr "Áudio"
-#: ../parole/parole-filters.c:90
+#: ../src/misc/parole-filters.c:90
msgid "Video"
msgstr "Vídeo"
-#: ../parole/parole-filters.c:115
+#: ../src/misc/parole-filters.c:115
msgid "Audio and video"
msgstr "Áudio e vídeo"
-#: ../parole/parole-filters.c:144
+#: ../src/misc/parole-filters.c:144
msgid "All supported files"
msgstr "Todos os arquivos suportados"
-#: ../parole/parole-filters.c:171
+#: ../src/misc/parole-filters.c:171
msgid "Playlist files"
msgstr "Arquivos de lista de reprodução"
diff --git a/po/ru.po b/po/ru.po
index f2d7755..52e11eb 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -691,23 +691,23 @@ msgstr "Посетить Вебсайт"
msgid "No installed plugins found on this system"
msgstr "В Вашей системе нет установленых модулей"
-#: ../parole/parole-filters.c:64
+#: ../src/misc/parole-filters.c:64
msgid "Audio"
msgstr "Звук"
-#: ../parole/parole-filters.c:90
+#: ../src/misc/parole-filters.c:90
msgid "Video"
msgstr "Видео"
-#: ../parole/parole-filters.c:115
+#: ../src/misc/parole-filters.c:115
msgid "Audio and video"
msgstr "Звук и видео"
-#: ../parole/parole-filters.c:144
+#: ../src/misc/parole-filters.c:144
msgid "All supported files"
msgstr "Все поддерживаемые файлы"
-#: ../parole/parole-filters.c:171
+#: ../src/misc/parole-filters.c:171
msgid "Playlist files"
msgstr "Файлы списков воспроизведения"
diff --git a/po/sk.po b/po/sk.po
index 88d0c59..6749c24 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -692,23 +692,23 @@ msgstr "Navštíviť webovú stránku"
msgid "No installed plugins found on this system"
msgstr "V systéme neboli nájdené žiadne zásuvné moduly"
-#: ../parole/parole-filters.c:64
+#: ../src/misc/parole-filters.c:64
msgid "Audio"
msgstr "Audio"
-#: ../parole/parole-filters.c:90
+#: ../src/misc/parole-filters.c:90
msgid "Video"
msgstr "Video"
-#: ../parole/parole-filters.c:115
+#: ../src/misc/parole-filters.c:115
msgid "Audio and video"
msgstr "Audio a video"
-#: ../parole/parole-filters.c:144
+#: ../src/misc/parole-filters.c:144
msgid "All supported files"
msgstr "Všetky podporované súbory"
-#: ../parole/parole-filters.c:171
+#: ../src/misc/parole-filters.c:171
msgid "Playlist files"
msgstr "Súbory zoznamov skladieb"
diff --git a/po/sv.po b/po/sv.po
index 104ca39..25bfd38 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -645,23 +645,23 @@ msgstr "Okänd"
msgid "No installed plugins found on this system"
msgstr ""
-#: ../parole/parole-filters.c:64
+#: ../src/misc/parole-filters.c:64
msgid "Audio"
msgstr "Ljud"
-#: ../parole/parole-filters.c:90
+#: ../src/misc/parole-filters.c:90
msgid "Video"
msgstr "Video"
-#: ../parole/parole-filters.c:115
+#: ../src/misc/parole-filters.c:115
msgid "Audio and video"
msgstr "Ljud och video"
-#: ../parole/parole-filters.c:144
+#: ../src/misc/parole-filters.c:144
msgid "All supported files"
msgstr "Alla filer som stöds"
-#: ../parole/parole-filters.c:171
+#: ../src/misc/parole-filters.c:171
msgid "Playlist files"
msgstr "Spellistefiler"
diff --git a/po/te.po b/po/te.po
index e79c3a1..2957710 100644
--- a/po/te.po
+++ b/po/te.po
@@ -681,23 +681,23 @@ msgstr "వెబ్సైటుని సందర్శించండి"
msgid "No installed plugins found on this system"
msgstr ""
-#: ../parole/parole-filters.c:64
+#: ../src/misc/parole-filters.c:64
msgid "Audio"
msgstr "ఆడియో"
-#: ../parole/parole-filters.c:90
+#: ../src/misc/parole-filters.c:90
msgid "Video"
msgstr "వీడియో"
-#: ../parole/parole-filters.c:115
+#: ../src/misc/parole-filters.c:115
msgid "Audio and video"
msgstr "ఆడియో మరియు వీడియో"
-#: ../parole/parole-filters.c:144
+#: ../src/misc/parole-filters.c:144
msgid "All supported files"
msgstr ""
-#: ../parole/parole-filters.c:171
+#: ../src/misc/parole-filters.c:171
msgid "Playlist files"
msgstr ""
diff --git a/po/th.po b/po/th.po
index 65fc60e..70572ce 100644
--- a/po/th.po
+++ b/po/th.po
@@ -685,23 +685,23 @@ msgstr "เยี่ยมเว็บไซต์"
msgid "No installed plugins found on this system"
msgstr "ไม่เจอปลั๊กอินที่ติดตั้งบนระบบนี้"
-#: ../parole/parole-filters.c:64
+#: ../src/misc/parole-filters.c:64
msgid "Audio"
msgstr "เสียง"
-#: ../parole/parole-filters.c:90
+#: ../src/misc/parole-filters.c:90
msgid "Video"
msgstr "วิดีโอ"
-#: ../parole/parole-filters.c:115
+#: ../src/misc/parole-filters.c:115
msgid "Audio and video"
msgstr "เสียงและวิดีโอ"
-#: ../parole/parole-filters.c:144
+#: ../src/misc/parole-filters.c:144
msgid "All supported files"
msgstr "ไฟล์สนับสนุนทั้งหมด"
-#: ../parole/parole-filters.c:171
+#: ../src/misc/parole-filters.c:171
msgid "Playlist files"
msgstr "ไฟล์รายการเล่น"
diff --git a/po/tr.po b/po/tr.po
index 5218eac..68e52ad 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -680,23 +680,23 @@ msgstr "Web Sitesini Aç"
msgid "No installed plugins found on this system"
msgstr "Sistemde kurulu eklenti bulunamadı"
-#: ../parole/parole-filters.c:64
+#: ../src/misc/parole-filters.c:64
msgid "Audio"
msgstr "Ses"
-#: ../parole/parole-filters.c:90
+#: ../src/misc/parole-filters.c:90
msgid "Video"
msgstr "Video"
-#: ../parole/parole-filters.c:115
+#: ../src/misc/parole-filters.c:115
msgid "Audio and video"
msgstr "Ses ve video"
-#: ../parole/parole-filters.c:144
+#: ../src/misc/parole-filters.c:144
msgid "All supported files"
msgstr "Tüm desteklenen dosyalar"
-#: ../parole/parole-filters.c:171
+#: ../src/misc/parole-filters.c:171
msgid "Playlist files"
msgstr "Oynatma listesi dosyaları"
diff --git a/po/ug.po b/po/ug.po
index a67f03a..63e22e0 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -649,23 +649,23 @@ msgstr "نامەلۇم"
msgid "No installed plugins found on this system"
msgstr "سىستېمىغا تېخى قىستۇرما ئورنىتىلماپتۇ"
-#: ../parole/parole-filters.c:64
+#: ../src/misc/parole-filters.c:64
msgid "Audio"
msgstr "ئۈن"
-#: ../parole/parole-filters.c:90
+#: ../src/misc/parole-filters.c:90
msgid "Video"
msgstr "سىن"
-#: ../parole/parole-filters.c:115
+#: ../src/misc/parole-filters.c:115
msgid "Audio and video"
msgstr "ئۈن ۋە سىن"
-#: ../parole/parole-filters.c:144
+#: ../src/misc/parole-filters.c:144
msgid "All supported files"
msgstr "چالالايدىغان ھۆججەتلەر"
-#: ../parole/parole-filters.c:171
+#: ../src/misc/parole-filters.c:171
msgid "Playlist files"
msgstr "Playlist ھۆججىتى"
diff --git a/po/uk.po b/po/uk.po
index aea2f7e..d9073e0 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -691,23 +691,23 @@ msgstr "Відвідати сайт"
msgid "No installed plugins found on this system"
msgstr "У Вашій системі не знайдено встановлених модулів"
-#: ../parole/parole-filters.c:64
+#: ../src/misc/parole-filters.c:64
msgid "Audio"
msgstr "Аудіо"
-#: ../parole/parole-filters.c:90
+#: ../src/misc/parole-filters.c:90
msgid "Video"
msgstr "Відео"
-#: ../parole/parole-filters.c:115
+#: ../src/misc/parole-filters.c:115
msgid "Audio and video"
msgstr "Аудіо та відео"
-#: ../parole/parole-filters.c:144
+#: ../src/misc/parole-filters.c:144
msgid "All supported files"
msgstr "Всі підтримувані файли"
-#: ../parole/parole-filters.c:171
+#: ../src/misc/parole-filters.c:171
msgid "Playlist files"
msgstr "Файли списків відтворення"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 318766b..43c0e3a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -691,23 +691,23 @@ msgstr "访问网站"
msgid "No installed plugins found on this system"
msgstr "系统中未发现已安装的插件"
-#: ../parole/parole-filters.c:64
+#: ../src/misc/parole-filters.c:64
msgid "Audio"
msgstr "音频"
-#: ../parole/parole-filters.c:90
+#: ../src/misc/parole-filters.c:90
msgid "Video"
msgstr "视频"
-#: ../parole/parole-filters.c:115
+#: ../src/misc/parole-filters.c:115
msgid "Audio and video"
msgstr "音频和视频"
-#: ../parole/parole-filters.c:144
+#: ../src/misc/parole-filters.c:144
msgid "All supported files"
msgstr "所有支持的文件"
-#: ../parole/parole-filters.c:171
+#: ../src/misc/parole-filters.c:171
msgid "Playlist files"
msgstr "播放列表文件"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 6cd653c..c8302cc 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -726,23 +726,23 @@ msgstr "造訪網站"
msgid "No installed plugins found on this system"
msgstr "此系統找不到安裝的插件"
-#: ../parole/parole-filters.c:64
+#: ../src/misc/parole-filters.c:64
msgid "Audio"
msgstr "音訊"
-#: ../parole/parole-filters.c:90
+#: ../src/misc/parole-filters.c:90
msgid "Video"
msgstr "視訊"
-#: ../parole/parole-filters.c:115
+#: ../src/misc/parole-filters.c:115
msgid "Audio and video"
msgstr "音訊與視訊"
-#: ../parole/parole-filters.c:144
+#: ../src/misc/parole-filters.c:144
msgid "All supported files"
msgstr "所有支援的檔案"
-#: ../parole/parole-filters.c:171
+#: ../src/misc/parole-filters.c:171
msgid "Playlist files"
msgstr "播放清單檔案"
diff --git a/src/Makefile.am b/src/Makefile.am
index 82f0eb5..4c480e3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,17 +1,23 @@
bin_PROGRAMS = parole
+SUBDIRS = \
+ misc \
+ common \
+ gst \
+ dbus \
+ plugins
INCLUDES = \
-I$(top_srcdir) \
- -I$(top_srcdir)/parole \
+ -I$(top_srcdir)/src/misc \
-I$(top_srcdir)/data \
-I$(top_srcdir)/data/mime \
- -I$(top_srcdir)/gst \
- -I$(top_srcdir)/dbus \
- -I$(top_srcdir)/common \
+ -I$(top_srcdir)/src/gst \
+ -I$(top_srcdir)/src/dbus \
+ -I$(top_srcdir)/src/common \
-DLOCALEDIR=\"$(localedir)\" \
-DG_LOG_DOMAIN=\"parole\" \
-DPAROLE_PLUGINS_DIR=\"$(libdir)/parole-$(PAROLE_VERSION_API)\"\
- -DPAROLE_PLUGINS_DATA_DIR=\"$(datadir)/parole/parole-plugins-$(PAROLE_VERSION_API)\"\
+ -DPAROLE_PLUGINS_DATA_DIR=\"$(datadir)/src/misc/parole-plugins-$(PAROLE_VERSION_API)\"\
-DPAROLE_COMPILATION \
$(GTHREAD_CFLAGS) \
$(GIO_CFLAGS) \
@@ -70,12 +76,12 @@ parole_SOURCES = \
parole-plugin-player.c \
parole-plugin-player.h
-parole_LDADD = \
- $(top_builddir)/parole/libparole.la \
- $(top_builddir)/dbus/libparoledbus.la \
- $(top_builddir)/gst/libparolegst.la \
- $(top_builddir)/common/libparolecommon.la\
- $(top_builddir)/common/libparolescreensaver.la\
+parole_LDADD = \
+ $(top_builddir)/src/misc/libparole.la \
+ $(top_builddir)/src/dbus/libparoledbus.la \
+ $(top_builddir)/src/gst/libparolegst.la \
+ $(top_builddir)/src/common/libparolecommon.la \
+ $(top_builddir)/src/common/libparolescreensaver.la \
$(GTHREAD_LIBS) \
$(GIO_LIBS) \
$(GMODULE_LIBS) \
@@ -84,7 +90,7 @@ parole_LDADD = \
$(GST_VIDEO_LIBS) \
$(GST_INTERFACES_LIBS) \
$(TAGLIBC_LIBS)
-
+
parole_glib_enum_headers = \
parole-conf.h \
parole-button.h
diff --git a/common/Makefile.am b/src/common/Makefile.am
similarity index 96%
rename from common/Makefile.am
rename to src/common/Makefile.am
index bd51b3b..fe06330 100644
--- a/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -7,7 +7,7 @@ libparolecommon_la_SOURCES = \
parole-common.h \
parole-rc-utils.c \
parole-rc-utils.h
-
+
libparolecommon_la_CFLAGS = \
$(GTK_CFLAGS) \
$(LIBXFCE4UTIL_CFLAGS)
diff --git a/common/parole-common.c b/src/common/parole-common.c
similarity index 100%
rename from common/parole-common.c
rename to src/common/parole-common.c
diff --git a/common/parole-common.h b/src/common/parole-common.h
similarity index 100%
rename from common/parole-common.h
rename to src/common/parole-common.h
diff --git a/common/parole-rc-utils.c b/src/common/parole-rc-utils.c
similarity index 100%
rename from common/parole-rc-utils.c
rename to src/common/parole-rc-utils.c
diff --git a/common/parole-rc-utils.h b/src/common/parole-rc-utils.h
similarity index 95%
rename from common/parole-rc-utils.h
rename to src/common/parole-rc-utils.h
index 827f071..8492a78 100644
--- a/common/parole-rc-utils.h
+++ b/src/common/parole-rc-utils.h
@@ -23,8 +23,8 @@
#include <libxfce4util/libxfce4util.h>
-#define PAROLE_RESOURCE_FILE "xfce4/parole/parole-media-player.rc"
-#define PAROLE_HISTORY_FILE "xfce4/parole/history"
+#define PAROLE_RESOURCE_FILE "xfce4/src/misc/parole-media-player.rc"
+#define PAROLE_HISTORY_FILE "xfce4/src/misc/history"
#define PAROLE_RC_GROUP_GENERAL "General"
#define PAROLE_RC_GROUP_PLUGINS "Plugins"
diff --git a/common/parole-screensaver.c b/src/common/parole-screensaver.c
similarity index 100%
rename from common/parole-screensaver.c
rename to src/common/parole-screensaver.c
diff --git a/common/parole-screensaver.h b/src/common/parole-screensaver.h
similarity index 100%
rename from common/parole-screensaver.h
rename to src/common/parole-screensaver.h
diff --git a/dbus/Makefile.am b/src/dbus/Makefile.am
similarity index 98%
rename from dbus/Makefile.am
rename to src/dbus/Makefile.am
index d04e3b1..41f3719 100644
--- a/dbus/Makefile.am
+++ b/src/dbus/Makefile.am
@@ -4,6 +4,6 @@ noinst_LTLIBRARIES = \
libparoledbus_la_SOURCES = \
parole-dbus.c \
parole-dbus.h
-
+
libparoledbus_la_CFLAGS = \
$(DBUS_GLIB_CFLAGS)
diff --git a/dbus/parole-dbus.c b/src/dbus/parole-dbus.c
similarity index 100%
rename from dbus/parole-dbus.c
rename to src/dbus/parole-dbus.c
diff --git a/dbus/parole-dbus.h b/src/dbus/parole-dbus.h
similarity index 100%
rename from dbus/parole-dbus.h
rename to src/dbus/parole-dbus.h
diff --git a/gst/Makefile.am b/src/gst/Makefile.am
similarity index 92%
rename from gst/Makefile.am
rename to src/gst/Makefile.am
index 393edc3..299b7d5 100644
--- a/gst/Makefile.am
+++ b/src/gst/Makefile.am
@@ -3,8 +3,9 @@ noinst_LTLIBRARIES = \
INCLUDES = \
-I$(top_srcdir) \
- -I$(top_srcdir)/common \
- -I$(top_srcdir)/parole \
+ -I$(top_srcdir)/src \
+ -I$(top_srcdir)/src/common \
+ -I$(top_srcdir)/src/misc \
-DLOCALEDIR=\"$(localedir)\" \
-DPAROLE_COMPILATION \
-DG_LOG_DOMAIN=\"parole-gst\"
@@ -19,7 +20,7 @@ libparolegst_la_SOURCES = \
$(GENERATED_FILES) \
parole-gst.c \
parole-gst.h
-
+
libparolegst_la_CFLAGS = \
$(GST_VIDEO_CFLAGS) \
$(GST_INTERFACES_CFLAGS) \
@@ -27,8 +28,8 @@ libparolegst_la_CFLAGS = \
$(LIBXFCE4GUI_CFLAGS)
libparolegst_la_LIBADD = \
- $(top_builddir)/parole/libparole.la\
- $(top_builddir)/common/libparolecommon.la
+ $(top_builddir)/src/misc/libparole.la\
+ $(top_builddir)/src/common/libparolecommon.la
parole_glib_enum_headers = \
parole-gst.h
diff --git a/gst/gstmarshal.list b/src/gst/gstmarshal.list
similarity index 100%
rename from gst/gstmarshal.list
rename to src/gst/gstmarshal.list
diff --git a/gst/parole-gst.c b/src/gst/parole-gst.c
similarity index 100%
rename from gst/parole-gst.c
rename to src/gst/parole-gst.c
diff --git a/gst/parole-gst.h b/src/gst/parole-gst.h
similarity index 98%
rename from gst/parole-gst.h
rename to src/gst/parole-gst.h
index cb3265f..12e009c 100644
--- a/gst/parole-gst.h
+++ b/src/gst/parole-gst.h
@@ -25,8 +25,8 @@
#include <gst/gst.h>
#include <gtk/gtk.h>
-#include <parole/parole-stream.h>
-#include <parole/parole-enum-types.h>
+#include <src/misc/parole-stream.h>
+#include <src/misc/parole-enum-types.h>
G_BEGIN_DECLS
diff --git a/parole/Makefile.am b/src/misc/Makefile.am
similarity index 98%
rename from parole/Makefile.am
rename to src/misc/Makefile.am
index 57bbb69..ca8dd59 100644
--- a/parole/Makefile.am
+++ b/src/misc/Makefile.am
@@ -3,6 +3,7 @@ noinst_LTLIBRARIES = \
INCLUDES = \
-I$(top_srcdir) \
+ -I$(top_srcdir)/src \
-DLOCALEDIR=\"$(localedir)\" \
-DPAROLE_COMPILATION
diff --git a/parole/parole-debug.c b/src/misc/parole-debug.c
similarity index 100%
rename from parole/parole-debug.c
rename to src/misc/parole-debug.c
diff --git a/parole/parole-debug.h b/src/misc/parole-debug.h
similarity index 100%
rename from parole/parole-debug.h
rename to src/misc/parole-debug.h
diff --git a/parole/parole-file.c b/src/misc/parole-file.c
similarity index 100%
rename from parole/parole-file.c
rename to src/misc/parole-file.c
diff --git a/parole/parole-file.h b/src/misc/parole-file.h
similarity index 100%
rename from parole/parole-file.h
rename to src/misc/parole-file.h
diff --git a/parole/parole-filters.c b/src/misc/parole-filters.c
similarity index 100%
rename from parole/parole-filters.c
rename to src/misc/parole-filters.c
diff --git a/parole/parole-filters.h b/src/misc/parole-filters.h
similarity index 97%
rename from parole/parole-filters.h
rename to src/misc/parole-filters.h
index b1ee170..ab7ae0f 100644
--- a/parole/parole-filters.h
+++ b/src/misc/parole-filters.h
@@ -27,7 +27,7 @@
#include <gtk/gtk.h>
-#include <parole/parole-file.h>
+#include "parole-file.h"
G_BEGIN_DECLS
diff --git a/parole/parole-marshal.list b/src/misc/parole-marshal.list
similarity index 100%
rename from parole/parole-marshal.list
rename to src/misc/parole-marshal.list
diff --git a/parole/parole-pl-parser.c b/src/misc/parole-pl-parser.c
similarity index 99%
rename from parole/parole-pl-parser.c
rename to src/misc/parole-pl-parser.c
index d5cb667..d846ac0 100644
--- a/parole/parole-pl-parser.c
+++ b/src/misc/parole-pl-parser.c
@@ -40,7 +40,7 @@
#include <gio/gio.h>
#include <libxfce4util/libxfce4util.h>
-#include <parole/parole-file.h>
+#include "parole-file.h"
#include "parole-pl-parser.h"
#include "parole-filters.h"
diff --git a/parole/parole-pl-parser.h b/src/misc/parole-pl-parser.h
similarity index 100%
rename from parole/parole-pl-parser.h
rename to src/misc/parole-pl-parser.h
diff --git a/parole/parole-provider-player.c b/src/misc/parole-provider-player.c
similarity index 99%
rename from parole/parole-provider-player.c
rename to src/misc/parole-provider-player.c
index e5ee1e2..02c1ff1 100644
--- a/parole/parole-provider-player.c
+++ b/src/misc/parole-provider-player.c
@@ -22,7 +22,7 @@
#include <config.h>
#endif
-#include "parole/parole-provider-player.h"
+#include "parole-provider-player.h"
#include "parole-marshal.h"
#include "parole-enum-types.h"
diff --git a/parole/parole-provider-player.h b/src/misc/parole-provider-player.h
similarity index 99%
rename from parole/parole-provider-player.h
rename to src/misc/parole-provider-player.h
index 2d2c451..8055044 100644
--- a/parole/parole-provider-player.h
+++ b/src/misc/parole-provider-player.h
@@ -26,7 +26,7 @@
#define __PAROLE_PROVIDER_PLAYER_H__
#include <gtk/gtk.h>
-#include <parole/parole-stream.h>
+#include "parole-stream.h"
G_BEGIN_DECLS
diff --git a/parole/parole-provider-plugin.c b/src/misc/parole-provider-plugin.c
similarity index 98%
rename from parole/parole-provider-plugin.c
rename to src/misc/parole-provider-plugin.c
index 4ee63d8..74662d3 100644
--- a/parole/parole-provider-plugin.c
+++ b/src/misc/parole-provider-plugin.c
@@ -22,7 +22,7 @@
#include <config.h>
#endif
-#include "parole/parole-provider-plugin.h"
+#include "parole-provider-plugin.h"
GType
parole_provider_plugin_get_type (void)
diff --git a/parole/parole-provider-plugin.h b/src/misc/parole-provider-plugin.h
similarity index 96%
rename from parole/parole-provider-plugin.h
rename to src/misc/parole-provider-plugin.h
index 5474025..a312613 100644
--- a/parole/parole-provider-plugin.h
+++ b/src/misc/parole-provider-plugin.h
@@ -26,8 +26,8 @@
#define __PAROLE_PROVIDER_PLUGIN_H__
#include <gtk/gtk.h>
-#include <parole/parole-stream.h>
-#include <parole/parole-provider-player.h>
+#include <src/misc/parole-stream.h>
+#include <src/misc/parole-provider-player.h>
G_BEGIN_DECLS
diff --git a/parole/parole-stream.c b/src/misc/parole-stream.c
similarity index 100%
rename from parole/parole-stream.c
rename to src/misc/parole-stream.c
diff --git a/parole/parole-stream.h b/src/misc/parole-stream.h
similarity index 100%
rename from parole/parole-stream.h
rename to src/misc/parole-stream.h
diff --git a/parole/parole.h.in b/src/misc/parole.h.in
similarity index 95%
rename from parole/parole.h.in
rename to src/misc/parole.h.in
index 64f8fdd..6ebf479 100644
--- a/parole/parole.h.in
+++ b/src/misc/parole.h.in
@@ -25,13 +25,13 @@
#include <glib-object.h>
-#include <parole/parole-provider-plugin.h>
-#include <parole/parole-provider-player.h>
-#include <parole/parole-file.h>
-#include <parole/parole-stream.h>
-#include <parole/parole-pl-parser.h>
-#include <parole/parole-filters.h>
-#include <parole/parole-debug.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>
diff --git a/src/parole-mediachooser.c b/src/parole-mediachooser.c
index 4cc66cb..3028af0 100644
--- a/src/parole-mediachooser.c
+++ b/src/parole-mediachooser.c
@@ -31,7 +31,7 @@
#include <libxfce4util/libxfce4util.h>
-#include <parole/parole-file.h>
+#include <src/misc/parole-file.h>
#include "interfaces/mediachooser_ui.h"
diff --git a/src/parole-medialist.c b/src/parole-medialist.c
index a641860..cdd75dc 100644
--- a/src/parole-medialist.c
+++ b/src/parole-medialist.c
@@ -36,7 +36,7 @@
#include <libxfce4util/libxfce4util.h>
-#include <parole/parole-file.h>
+#include <src/misc/parole-file.h>
#include "interfaces/playlist_ui.h"
#include "interfaces/save-playlist_ui.h"
@@ -56,7 +56,7 @@
#include "common/parole-common.h"
-#define PAROLE_AUTO_SAVED_PLAYLIST "xfce4/parole/auto-saved-playlist.m3u"
+#define PAROLE_AUTO_SAVED_PLAYLIST "xfce4/src/misc/auto-saved-playlist.m3u"
typedef struct
{
diff --git a/src/parole-module.c b/src/parole-module.c
index ab87c22..3a04ad5 100644
--- a/src/parole-module.c
+++ b/src/parole-module.c
@@ -26,7 +26,7 @@
#include <stdlib.h>
#include <string.h>
-#include <parole/parole-provider-plugin.h>
+#include <src/misc/parole-provider-plugin.h>
#include <libxfce4util/libxfce4util.h>
#include "parole-module.h"
diff --git a/src/parole-module.h b/src/parole-module.h
index 4c26a56..46fc57e 100644
--- a/src/parole-module.h
+++ b/src/parole-module.h
@@ -22,7 +22,7 @@
#define __PAROLE_MODULE_H
#include <glib-object.h>
-#include <parole/parole.h>
+#include <src/misc/parole.h>
#include "parole-plugin-player.h"
diff --git a/src/parole-player.c b/src/parole-player.c
index 2f7e14b..c47e881 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -42,7 +42,7 @@
#include <dbus/dbus-glib.h>
-#include <parole/parole-file.h>
+#include <src/misc/parole-file.h>
#include "parole-builder.h"
#include "parole-about.h"
diff --git a/src/parole-plugin-player.c b/src/parole-plugin-player.c
index d173efe..57c9041 100644
--- a/src/parole-plugin-player.c
+++ b/src/parole-plugin-player.c
@@ -26,7 +26,7 @@
#include <stdlib.h>
#include <string.h>
-#include <parole/parole-provider-player.h>
+#include <src/misc/parole-provider-player.h>
#include "parole-plugin-player.h"
#include "parole-plugins-manager.h"
diff --git a/src/parole-plugins-manager.c b/src/parole-plugins-manager.c
index 6ced7c8..a0452e8 100644
--- a/src/parole-plugins-manager.c
+++ b/src/parole-plugins-manager.c
@@ -35,7 +35,7 @@
#include <libxfce4util/libxfce4util.h>
#include <libxfcegui4/libxfcegui4.h>
-#include <parole/parole-provider-plugin.h>
+#include <src/misc/parole-provider-plugin.h>
#include "interfaces/plugins_ui.h"
diff --git a/src/parole-plugins-manager.h b/src/parole-plugins-manager.h
index b51708a..6f16718 100644
--- a/src/parole-plugins-manager.h
+++ b/src/parole-plugins-manager.h
@@ -22,7 +22,7 @@
#define __PAROLE_PLUGINS_MANAGER_H
#include <glib-object.h>
-#include <parole/parole-provider-player.h>
+#include <src/misc/parole-provider-player.h>
G_BEGIN_DECLS
diff --git a/src/parole-utils.c b/src/parole-utils.c
index c4413e9..4db5e30 100644
--- a/src/parole-utils.c
+++ b/src/parole-utils.c
@@ -44,7 +44,7 @@
#include <libxfce4util/libxfce4util.h>
-#include <parole/parole.h>
+#include <src/misc/parole.h>
#include "parole-utils.h"
diff --git a/src/parole-utils.h b/src/parole-utils.h
index bdded3f..85f1c25 100644
--- a/src/parole-utils.h
+++ b/src/parole-utils.h
@@ -24,7 +24,7 @@
#include <gtk/gtk.h>
#include <gdk/gdk.h>
-#include <parole/parole-file.h>
+#include <src/misc/parole-file.h>
gint thunar_file_compare_by_name (ParoleFile *file_a,
ParoleFile *file_b,
diff --git a/plugins/Makefile.am b/src/plugins/Makefile.am
similarity index 100%
rename from plugins/Makefile.am
rename to src/plugins/Makefile.am
diff --git a/plugins/power-manager/Makefile.am b/src/plugins/power-manager/Makefile.am
similarity index 88%
rename from plugins/power-manager/Makefile.am
rename to src/plugins/power-manager/Makefile.am
index 7e0cb2b..f37d31e 100644
--- a/plugins/power-manager/Makefile.am
+++ b/src/plugins/power-manager/Makefile.am
@@ -1,6 +1,7 @@
INCLUDES = \
-I$(top_builddir) \
-I$(top_srcdir) \
+ -I$(top_srcdir)/src \
-DG_LOG_DOMAIN=\"power-manager_plugin\" \
-DLIBEXECDIR=\"$(libexecdir)\" \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\"
@@ -21,7 +22,7 @@ power_manager_plugin_la_CFLAGS = \
$(GTK_CFLAGS) \
$(LIBXFCE4UTIL_CFLAGS) \
$(DBUS_GLIB_CFLAGS)
-
+
power_manager_plugin_la_LDFLAGS = \
-avoid-version \
@@ -33,7 +34,7 @@ power_manager_plugin_la_LDFLAGS = \
# .desktop file
#
desktop_in_files = power-manager.desktop.in
-desktopdir = $(datadir)/parole/parole-plugins-$(PAROLE_VERSION_API)
+desktopdir = $(datadir)/src/misc/parole-plugins-$(PAROLE_VERSION_API)
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
diff --git a/plugins/power-manager/power-manager-plugin.c b/src/plugins/power-manager/power-manager-plugin.c
similarity index 100%
rename from plugins/power-manager/power-manager-plugin.c
rename to src/plugins/power-manager/power-manager-plugin.c
diff --git a/plugins/power-manager/power-manager-provider.c b/src/plugins/power-manager/power-manager-provider.c
similarity index 100%
rename from plugins/power-manager/power-manager-provider.c
rename to src/plugins/power-manager/power-manager-provider.c
diff --git a/plugins/power-manager/power-manager-provider.h b/src/plugins/power-manager/power-manager-provider.h
similarity index 98%
rename from plugins/power-manager/power-manager-provider.h
rename to src/plugins/power-manager/power-manager-provider.h
index e5a1e99..cfc0544 100644
--- a/plugins/power-manager/power-manager-provider.h
+++ b/src/plugins/power-manager/power-manager-provider.h
@@ -21,7 +21,7 @@
#ifndef PM_PROVIDER_H_
#define PM_PROVIDER_H_
-#include <parole/parole.h>
+#include <src/misc/parole.h>
G_BEGIN_DECLS
diff --git a/plugins/power-manager/power-manager.desktop.in b/src/plugins/power-manager/power-manager.desktop.in
similarity index 100%
rename from plugins/power-manager/power-manager.desktop.in
rename to src/plugins/power-manager/power-manager.desktop.in
diff --git a/plugins/properties/Makefile.am b/src/plugins/properties/Makefile.am
similarity index 90%
rename from plugins/properties/Makefile.am
rename to src/plugins/properties/Makefile.am
index f4169d0..ba0e741 100644
--- a/plugins/properties/Makefile.am
+++ b/src/plugins/properties/Makefile.am
@@ -1,6 +1,7 @@
INCLUDES = \
-I$(top_builddir) \
-I$(top_srcdir) \
+ -I$(top_srcdir)/src \
-DG_LOG_DOMAIN=\"stream_properties\" \
-DLIBEXECDIR=\"$(libexecdir)\" \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\"
@@ -35,7 +36,7 @@ stream_properties_la_LDFLAGS = \
# .desktop file
#
desktop_in_files = stream-properties.desktop.in
-desktopdir = $(datadir)/parole/parole-plugins-$(PAROLE_VERSION_API)
+desktopdir = $(datadir)/src/misc/parole-plugins-$(PAROLE_VERSION_API)
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
diff --git a/plugins/properties/stream-properties-plugin.c b/src/plugins/properties/stream-properties-plugin.c
similarity index 100%
rename from plugins/properties/stream-properties-plugin.c
rename to src/plugins/properties/stream-properties-plugin.c
diff --git a/plugins/properties/stream-properties-provider.c b/src/plugins/properties/stream-properties-provider.c
similarity index 100%
rename from plugins/properties/stream-properties-provider.c
rename to src/plugins/properties/stream-properties-provider.c
diff --git a/plugins/properties/stream-properties-provider.h b/src/plugins/properties/stream-properties-provider.h
similarity index 98%
rename from plugins/properties/stream-properties-provider.h
rename to src/plugins/properties/stream-properties-provider.h
index fd1add7..268cb44 100644
--- a/plugins/properties/stream-properties-provider.h
+++ b/src/plugins/properties/stream-properties-provider.h
@@ -21,7 +21,7 @@
#ifndef STREAM_PROPERTIES_PROVIDER_H_
#define STREAM_PROPERTIES_PROVIDER_H_
-#include <parole/parole.h>
+#include <src/misc/parole.h>
G_BEGIN_DECLS
diff --git a/plugins/properties/stream-properties.desktop.in b/src/plugins/properties/stream-properties.desktop.in
similarity index 100%
rename from plugins/properties/stream-properties.desktop.in
rename to src/plugins/properties/stream-properties.desktop.in
diff --git a/plugins/sample/Makefile.am b/src/plugins/sample/Makefile.am
similarity index 95%
rename from plugins/sample/Makefile.am
rename to src/plugins/sample/Makefile.am
index d7d3410..ab5875b 100644
--- a/plugins/sample/Makefile.am
+++ b/src/plugins/sample/Makefile.am
@@ -4,6 +4,7 @@ noinst_LTLIBRARIES = \
INCLUDES = \
-I$(top_builddir) \
-I$(top_srcdir) \
+ -I$(top_srcdir)/src \
-DG_LOG_DOMAIN=\"sample_plugin\" \
-DLIBEXECDIR=\"$(libexecdir)\" \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\"
diff --git a/plugins/sample/sample-plugin.c b/src/plugins/sample/sample-plugin.c
similarity index 97%
rename from plugins/sample/sample-plugin.c
rename to src/plugins/sample/sample-plugin.c
index 0b1d8f2..2faa298 100644
--- a/plugins/sample/sample-plugin.c
+++ b/src/plugins/sample/sample-plugin.c
@@ -22,7 +22,7 @@
#include <config.h>
#endif
-#include <parole/parole.h>
+#include <src/misc/parole.h>
#include "sample-provider.h"
diff --git a/plugins/sample/sample-provider.c b/src/plugins/sample/sample-provider.c
similarity index 100%
rename from plugins/sample/sample-provider.c
rename to src/plugins/sample/sample-provider.c
diff --git a/plugins/sample/sample-provider.h b/src/plugins/sample/sample-provider.h
similarity index 98%
rename from plugins/sample/sample-provider.h
rename to src/plugins/sample/sample-provider.h
index dc19a8b..eb01100 100644
--- a/plugins/sample/sample-provider.h
+++ b/src/plugins/sample/sample-provider.h
@@ -21,7 +21,7 @@
#ifndef SAMPLE_PROVIDER_H_
#define SAMPLE_PROVIDER_H_
-#include <parole/parole.h>
+#include <src/misc/parole.h>
G_BEGIN_DECLS
diff --git a/plugins/tray/Makefile.am b/src/plugins/tray/Makefile.am
similarity index 88%
rename from plugins/tray/Makefile.am
rename to src/plugins/tray/Makefile.am
index a240229..bb8fd79 100644
--- a/plugins/tray/Makefile.am
+++ b/src/plugins/tray/Makefile.am
@@ -1,6 +1,7 @@
INCLUDES = \
-I$(top_builddir) \
-I$(top_srcdir) \
+ -I$(top_srcdir)/src \
-DG_LOG_DOMAIN=\"parole_tray\" \
-DLIBEXECDIR=\"$(libexecdir)\" \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\"
@@ -36,7 +37,7 @@ tray_icon_la_LIBADD = \
# .desktop file
#
desktop_in_files = system-tray.desktop.in
-desktopdir = $(datadir)/parole/parole-plugins-$(PAROLE_VERSION_API)
+desktopdir = $(datadir)/src/misc/parole-plugins-$(PAROLE_VERSION_API)
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
diff --git a/plugins/tray/system-tray.desktop.in b/src/plugins/tray/system-tray.desktop.in
similarity index 100%
rename from plugins/tray/system-tray.desktop.in
rename to src/plugins/tray/system-tray.desktop.in
diff --git a/plugins/tray/tray-plugin.c b/src/plugins/tray/tray-plugin.c
similarity index 100%
rename from plugins/tray/tray-plugin.c
rename to src/plugins/tray/tray-plugin.c
diff --git a/plugins/tray/tray-provider.c b/src/plugins/tray/tray-provider.c
similarity index 99%
rename from plugins/tray/tray-provider.c
rename to src/plugins/tray/tray-provider.c
index aa492d5..92bd078 100644
--- a/plugins/tray/tray-provider.c
+++ b/src/plugins/tray/tray-provider.c
@@ -25,7 +25,7 @@
#include <glib.h>
#include <gtk/gtk.h>
-#include <parole/parole.h>
+#include <src/misc/parole.h>
#ifdef HAVE_LIBNOTIFY
#include <libnotify/notify.h>
@@ -37,7 +37,7 @@
#include "tray-provider.h"
-#define RESOURCE_FILE "xfce4/parole/parole-plugins/tray.rc"
+#define RESOURCE_FILE "xfce4/src/misc/parole-plugins/tray.rc"
static void tray_provider_iface_init (ParoleProviderPluginIface *iface);
static void tray_provider_finalize (GObject *object);
diff --git a/plugins/tray/tray-provider.h b/src/plugins/tray/tray-provider.h
similarity index 98%
rename from plugins/tray/tray-provider.h
rename to src/plugins/tray/tray-provider.h
index 8b59b1c..cc90e62 100644
--- a/plugins/tray/tray-provider.h
+++ b/src/plugins/tray/tray-provider.h
@@ -21,7 +21,7 @@
#ifndef TRAY_PROVIDER_H_
#define TRAY_PROVIDER_H_
-#include <parole/parole.h>
+#include <src/misc/parole.h>
G_BEGIN_DECLS
More information about the Xfce4-commits
mailing list