Author: stephan
Date: 2008-02-24 12:22:22 +0000 (Sun, 24 Feb 2008)
New Revision: 26636
Modified:
squeeze/branches/squeeze_0_2/docs/reference/libsqueeze/libsqueeze-docs.sgml
squeeze/trunk/docs/reference/libsqueeze/libsqueeze-docs.sgml
squeeze/trunk/libsqueeze/archive.c
squeeze/trunk/libsqueeze/archive.h
squeeze/trunk/libsqueeze/libsqueeze.c
Log:
Changed libsqueeze-docs license notice to GPL.
Modified:
squeeze/branches/squeeze_0_2/docs/reference/libsqueeze/libsqueeze-docs.sgml
===================================================================
--- squeeze/branches/squeeze_0_2/docs/reference/libsqueeze/libsqueeze-docs.sgml
2008-02-24 01:58:03 UTC (rev 26635)
+++ squeeze/branches/squeeze_0_2/docs/reference/libsqueeze/libsqueeze-docs.sgml
2008-02-24 12:22:22 UTC (rev 26636)
@@ -18,18 +18,22 @@
<copyright>
<year>2006</year>
<year>2007</year>
+ <year>2008</year>
<holder>Stephan Arts</holder>
</copyright>
<legalnotice id="legalnotice">
<para>
Permission is granted to copy, distribute and/or modify this document
- under the terms of the GNU Free Documentation License, Version 1.1 or
- any later version published by the Free Software Foundation; with no
- Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
- Texts. The complete license text is available from the <ulink
- type="http" url="http://www.gnu.org/";>Free Software Foundation</ulink>.
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation; either Version 2 of the License, or
+ (at your option) any later version.
</para>
+ <para>
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
USA.
+ </para>
</legalnotice>
<authorgroup>
Modified: squeeze/trunk/docs/reference/libsqueeze/libsqueeze-docs.sgml
===================================================================
--- squeeze/trunk/docs/reference/libsqueeze/libsqueeze-docs.sgml
2008-02-24 01:58:03 UTC (rev 26635)
+++ squeeze/trunk/docs/reference/libsqueeze/libsqueeze-docs.sgml
2008-02-24 12:22:22 UTC (rev 26636)
@@ -18,18 +18,22 @@
<copyright>
<year>2006</year>
<year>2007</year>
+ <year>2008</year>
<holder>Stephan Arts</holder>
</copyright>
<legalnotice id="legalnotice">
<para>
Permission is granted to copy, distribute and/or modify this document
- under the terms of the GNU Free Documentation License, Version 1.1 or
- any later version published by the Free Software Foundation; with no
- Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
- Texts. The complete license text is available from the <ulink
- type="http" url="http://www.gnu.org/";>Free Software Foundation</ulink>.
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation; either Version 2 of the License, or
+ (at your option) any later version.
</para>
+ <para>
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
USA.
+ </para>
</legalnotice>
<authorgroup>
Modified: squeeze/trunk/libsqueeze/archive.c
===================================================================
--- squeeze/trunk/libsqueeze/archive.c 2008-02-24 01:58:03 UTC (rev 26635)
+++ squeeze/trunk/libsqueeze/archive.c 2008-02-24 12:22:22 UTC (rev 26636)
@@ -409,7 +409,7 @@
* Return value: TRUE on success
*/
gboolean
-lsq_archive_operate(LSQArchive *archive, LSQCommandType type)
+lsq_archive_operate(LSQArchive *archive, LSQCommandType type, const gchar
**files)
{
g_debug("%s", __FUNCTION__);
LSQSupportTemplate *s_template = archive->priv->s_template;
Modified: squeeze/trunk/libsqueeze/archive.h
===================================================================
--- squeeze/trunk/libsqueeze/archive.h 2008-02-24 01:58:03 UTC (rev 26635)
+++ squeeze/trunk/libsqueeze/archive.h 2008-02-24 12:22:22 UTC (rev 26636)
@@ -108,7 +108,7 @@
ThunarVfsPath *lsq_archive_get_path_info(LSQArchive *);
-gboolean lsq_archive_operate(LSQArchive *archive, LSQCommandType
type);
+gboolean lsq_archive_operate(LSQArchive *archive, LSQCommandType
type, const gchar **);
const gchar *
lsq_archive_get_state_msg(const LSQArchive *archive);
Modified: squeeze/trunk/libsqueeze/libsqueeze.c
===================================================================
--- squeeze/trunk/libsqueeze/libsqueeze.c 2008-02-24 01:58:03 UTC (rev
26635)
+++ squeeze/trunk/libsqueeze/libsqueeze.c 2008-02-24 12:22:22 UTC (rev
26636)
@@ -53,6 +53,9 @@
if(g_str_has_suffix(filename, ".squeeze"))
{
+ /**
+ * FIXME: factories should be per-mime-type, not per-template
+ */
gchar *path = g_strconcat(data_squeeze, "/",
filename, NULL);
LSQSupportFactory *factory =
lsq_support_reader_parse_file(path);
if(factory)
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
