summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2008-05-21 08:02:45 +0000
committerBastien Nocera <hadess@src.gnome.org>2008-05-21 08:02:45 +0000
commitdce692d75334d0da395d4f9aa8ec952a34329394 (patch)
treecfcb5980292b519f5bb1f91da05b32965b11af5f
parent161044c5e7a08bda920a6c61fccc76f1fb5fcfd3 (diff)
downloadtotem-pl-parser-dce692d75334d0da395d4f9aa8ec952a34329394.tar.gz
Patch from Saleem Abdulrasool <compnerd@compnerd.org> to remove the last
2008-05-21 Bastien Nocera <hadess@hadess.net> * configure.in: * plparse/totem-pl-parser.c: * totem-plparser-mini-uninstalled.pc.in: * totem-plparser-mini.pc.in: * totem-plparser-uninstalled.pc.in: * totem-plparser.pc.in: Patch from Saleem Abdulrasool <compnerd@compnerd.org> to remove the last bits of gnome-vfs from here (Closes: #534128) svn path=/trunk/; revision=128
-rw-r--r--ChangeLog11
-rw-r--r--configure.in4
-rw-r--r--plparse/totem-pl-parser.c2
-rw-r--r--totem-plparser-mini-uninstalled.pc.in1
-rw-r--r--totem-plparser-mini.pc.in1
-rw-r--r--totem-plparser-uninstalled.pc.in2
-rw-r--r--totem-plparser.pc.in2
7 files changed, 16 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 3863ba2..d46018c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2008-05-21 Bastien Nocera <hadess@hadess.net>
+
+ * configure.in:
+ * plparse/totem-pl-parser.c:
+ * totem-plparser-mini-uninstalled.pc.in:
+ * totem-plparser-mini.pc.in:
+ * totem-plparser-uninstalled.pc.in:
+ * totem-plparser.pc.in: Patch from Saleem Abdulrasool
+ <compnerd@compnerd.org> to remove the last bits of gnome-vfs
+ from here (Closes: #534128)
+
============ Version 2.23.1
2008-05-09 Bastien Nocera <hadess@hadess.net>
diff --git a/configure.in b/configure.in
index bfd8720..51404a4 100644
--- a/configure.in
+++ b/configure.in
@@ -76,9 +76,9 @@ fi
AM_CONDITIONAL(HAVE_HAL, test x"$with_hal" = xyes)
dnl Check for packages for building libtotem-plparser.la
-PKG_CHECK_MODULES(TOTEM_PLPARSER, [glib-2.0 >= $GLIB_REQS gtk+-2.0 libxml-2.0 gnome-vfs-module-2.0 camel-1.2 gio-2.0])
+PKG_CHECK_MODULES(TOTEM_PLPARSER, [glib-2.0 >= $GLIB_REQS gtk+-2.0 libxml-2.0 camel-1.2 gio-2.0])
-PKG_CHECK_MODULES([TOTEM_PLPARSER_MINI], [gnome-vfs-2.0 gnome-vfs-module-2.0 gio-2.0])
+PKG_CHECK_MODULES([TOTEM_PLPARSER_MINI], [gio-2.0])
GNOME_COMMON_INIT
GNOME_DEBUG_CHECK
diff --git a/plparse/totem-pl-parser.c b/plparse/totem-pl-parser.c
index 4740ec7..b30f3e5 100644
--- a/plparse/totem-pl-parser.c
+++ b/plparse/totem-pl-parser.c
@@ -754,7 +754,7 @@ totem_pl_parser_write_string (GOutputStream *stream, const char *buf, GError **e
/**
* totem_pl_parser_write_buffer:
- * @handle: a #GnomeVFSHandle to an open file
+ * @stream: a #GFileOutputStream to an open file
* @buf: the string buffer to write out
* @len: the length of the string to write out
* @error: return location for a #GError, or %NULL
diff --git a/totem-plparser-mini-uninstalled.pc.in b/totem-plparser-mini-uninstalled.pc.in
index 8eca6a1..7a75f66 100644
--- a/totem-plparser-mini-uninstalled.pc.in
+++ b/totem-plparser-mini-uninstalled.pc.in
@@ -8,6 +8,5 @@ gconf_serverdir=@libexecdir@
Name: totem-plparser
Description: Totem Playlist Parser library
Version: @VERSION@
-Requires.private: gnome-vfs-2.0 gnome-vfs-module-2.0
Libs: ${pc_top_builddir}/${pcfiledir}/plparse/libtotem-plparser-mini.la
Cflags: -I${pc_top_builddir}/${pcfiledir}/plparse
diff --git a/totem-plparser-mini.pc.in b/totem-plparser-mini.pc.in
index cf351a0..3e64cb6 100644
--- a/totem-plparser-mini.pc.in
+++ b/totem-plparser-mini.pc.in
@@ -8,6 +8,5 @@ gconf_serverdir=@libexecdir@
Name: totem-plparser-mini
Description: Totem Playlist Parser library, mini version
Version: @VERSION@
-Requires.private: gnome-vfs-2.0 gnome-vfs-module-2.0
Libs: -L${libdir} -ltotem-plparser-mini
Cflags: -I${includedir}/totem-pl-parser/1/plparser
diff --git a/totem-plparser-uninstalled.pc.in b/totem-plparser-uninstalled.pc.in
index 5ee42e0..3a732f2 100644
--- a/totem-plparser-uninstalled.pc.in
+++ b/totem-plparser-uninstalled.pc.in
@@ -9,6 +9,6 @@ Name: totem-plparser
Description: Totem Playlist Parser library
Version: @VERSION@
Requires: gtk+-2.0
-Requires.private: libxml-2.0 gnome-vfs-2.0 gnome-vfs-module-2.0 camel-1.2
+Requires.private: libxml-2.0 camel-1.2
Libs: ${pc_top_builddir}/${pcfiledir}/plparse/libtotem-plparser.la
Cflags: -I${pc_top_builddir}/${pcfiledir}/plparse
diff --git a/totem-plparser.pc.in b/totem-plparser.pc.in
index 2c54949..e4a98a2 100644
--- a/totem-plparser.pc.in
+++ b/totem-plparser.pc.in
@@ -9,6 +9,6 @@ Name: totem-plparser
Description: Totem Playlist Parser library
Version: @VERSION@
Requires: gtk+-2.0
-Requires.private: libxml-2.0 gnome-vfs-2.0 gnome-vfs-module-2.0 camel-1.2
+Requires.private: libxml-2.0 camel-1.2
Libs: -L${libdir} -ltotem-plparser
Cflags: -I${includedir}/totem-pl-parser/1/plparser