Hello community, here is the log from the commit of package file-roller for openSUSE:Factory checked in at 2013-06-05 11:50:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/file-roller (Old) and /work/SRC/openSUSE:Factory/.file-roller.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "file-roller" Changes: -------- --- /work/SRC/openSUSE:Factory/file-roller/file-roller.changes 2013-04-26 15:42:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.file-roller.new/file-roller.changes 2013-06-05 11:51:00.000000000 +0200 @@ -1,0 +2,7 @@ +Wed May 1 08:15:53 UTC 2013 - [email protected] + +- Update to version 3.9.1: + + Adedd .tar.rz support. + + Updated translations. + +------------------------------------------------------------------- Old: ---- file-roller-3.8.1.tar.xz New: ---- file-roller-3.9.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ file-roller.spec ++++++ --- /var/tmp/diff_new_pack.txXdR2/_old 2013-06-05 11:51:01.000000000 +0200 +++ /var/tmp/diff_new_pack.txXdR2/_new 2013-06-05 11:51:01.000000000 +0200 @@ -17,13 +17,13 @@ Name: file-roller -Version: 3.8.1 +Version: 3.9.1 Release: 0 Summary: An Archive Manager for GNOME License: GPL-2.0+ Group: Productivity/Archiving/Compression Url: http://fileroller.sourceforge.net -Source: http://download.gnome.org/sources/file-roller/3.8/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/file-roller/3.9/%{name}-%{version}.tar.xz # PATCH-FIX-OPENSUSE file-roller-3.4-change-archiver-priority.patch bnc#767386 [email protected] -- Give unzip a higher priority than 7z when unpackging zip files. Gives better results for non-latin charsets. Patch0: file-roller-3.4-change-archiver-priority.patch # PATCH-FEATURE-OPENSUSE file-roller-pkg-match.patch bnc#696530 [email protected] -- List package match names for automatic installation using PK. ++++++ file-roller-3.8.1.tar.xz -> file-roller-3.9.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-roller-3.8.1/ChangeLog new/file-roller-3.9.1/ChangeLog --- old/file-roller-3.8.1/ChangeLog 2013-04-15 22:39:33.000000000 +0200 +++ new/file-roller-3.9.1/ChangeLog 2013-04-29 21:31:31.000000000 +0200 @@ -1,6 +1,124 @@ +commit 76c9fd23b7c3fb85804459e9bbfcd42949b7598a +Author: Paolo Bacchilega <[email protected]> +Date: 2013-04-29 + + updated for version 3.9.1 + +M NEWS +M configure.ac + +commit 96cd4f6a58b8ccd5de26ef49a654849ef2d0b709 +Author: Paolo Bacchilega <[email protected]> +Date: 2013-04-28 + + removed trailing spaces + +M src/java-utils.c + +commit e0931cfeaec8fb0c262c6fff2297a5dd2701f88b +Author: Paolo Bacchilega <[email protected]> +Date: 2013-04-28 + + include config.h in all .c files + +M src/fr-command-ace.c +M src/fr-command-alz.c +M src/fr-command-ar.c +M src/fr-command-arj.c +M src/fr-command-cfile.c +M src/fr-command-jar.c +M src/fr-command-lha.c +M src/fr-command-rar.c +M src/fr-command-tar.c +M src/fr-command-unarchiver.c +M src/fr-command-unstuff.c +M src/fr-command-zoo.c +M src/fr-error.c +M src/fr-process.c +M src/fr-window.c +M src/gio-utils.c +M src/gth-menu-button.c +M src/gth-toggle-menu-tool-button.c +M src/java-utils.c +M src/preferences.c + +commit 4edb74557531af36cfb29279a6cd3c8f7031fdda +Author: Paolo Bacchilega <[email protected]> +Date: 2013-04-28 + + bumped version number + +M configure.ac + +commit 750f96017c50a1a34a6048dd14fcc2db08193d81 +Author: Paolo Bacchilega <[email protected]> +Date: 2013-04-28 + + use the 'popup' property instead of 'menu' + +M src/gth-menu-button.c + +commit 18c95231668d34ccf48f89e3bbc71856a7187d6c +Author: Paolo Bacchilega <[email protected]> +Date: 2013-04-28 + + removed use of deprecated functions + +M src/fr-file-selector-dialog.c +M src/glib-utils.c +M src/gtk-utils.c +M src/main.c +M src/test-server.c + +commit d692fa4166aac7067e279fda7edc7f032fa20d0e +Author: Paolo Bacchilega <[email protected]> +Date: 2013-04-28 + + use AM_CPPFLAGS instead of INCLUDES + +M copy-n-paste/Makefile.am +M nautilus/Makefile.am +M src/Makefile.am +M src/commands/Makefile.am + +commit d74faa98164c6c8d6c64ddc87cebe54065fb2de0 +Author: Paolo Bacchilega <[email protected]> +Date: 2013-04-28 + + keep the style consistent + +M src/glib-utils.c + +commit 23bf3f4460323759371f2e6080bfd8feb1c4f4b8 +Author: LAN-TW <[email protected]> +Date: 2013-04-28 + + Update desktop file for .tar.rz + +M data/file-roller.desktop.in.in + +commit 5c4f66087997aeace75829607c5eec4563226746 +Author: LAN-TW <[email protected]> +Date: 2013-04-28 + + Add .tar.rz support + +M src/fr-command-cfile.c +M src/fr-command-tar.c +M src/fr-init.c +M src/glib-utils.c + +commit 3a9b364b01822060aa35ab844c6e9d2757c905ed +Author: Gil Forcada <[email protected]> +Date: 2013-04-21 + + Fix Low German header + +M po/nds.po + commit 77906905cd22febb2edc84c2f480ce02d82140a1 Author: Paolo Bacchilega <[email protected]> -Date: 2013-04-15 +Date: 2013-04-15 updated for version 3.8.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-roller-3.8.1/NEWS new/file-roller-3.9.1/NEWS --- old/file-roller-3.8.1/NEWS 2013-04-15 22:38:24.000000000 +0200 +++ new/file-roller-3.9.1/NEWS 2013-04-29 21:30:51.000000000 +0200 @@ -1,3 +1,14 @@ +version 3.9.1 +------------- + + New features and user visible changes: + + * Adedd .tar.rz support + + New or updated application translations: + + * Low German (Nils-Christoph Fiedler) + version 3.8.1 ------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-roller-3.8.1/configure new/file-roller-3.9.1/configure --- old/file-roller-3.8.1/configure 2013-04-15 22:32:06.000000000 +0200 +++ new/file-roller-3.9.1/configure 2013-04-29 21:27:36.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for file-roller 3.8.1. +# Generated by GNU Autoconf 2.69 for file-roller 3.9.1. # # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=file-roller>. # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='file-roller' PACKAGE_TARNAME='file-roller' -PACKAGE_VERSION='3.8.1' -PACKAGE_STRING='file-roller 3.8.1' +PACKAGE_VERSION='3.9.1' +PACKAGE_STRING='file-roller 3.9.1' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=file-roller' PACKAGE_URL='' @@ -1427,7 +1427,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures file-roller 3.8.1 to adapt to many kinds of systems. +\`configure' configures file-roller 3.9.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1497,7 +1497,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of file-roller 3.8.1:";; + short | recursive ) echo "Configuration of file-roller 3.9.1:";; esac cat <<\_ACEOF @@ -1641,7 +1641,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -file-roller configure 3.8.1 +file-roller configure 3.9.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1919,7 +1919,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by file-roller $as_me 3.8.1, which was +It was created by file-roller $as_me 3.9.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2782,7 +2782,7 @@ # Define the identity of the package. PACKAGE='file-roller' - VERSION='3.8.1' + VERSION='3.9.1' cat >>confdefs.h <<_ACEOF @@ -14344,7 +14344,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by file-roller $as_me 3.8.1, which was +This file was extended by file-roller $as_me 3.9.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14410,7 +14410,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -file-roller config.status 3.8.1 +file-roller config.status 3.9.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-roller-3.8.1/configure.ac new/file-roller-3.9.1/configure.ac --- old/file-roller-3.8.1/configure.ac 2013-04-15 22:31:54.000000000 +0200 +++ new/file-roller-3.9.1/configure.ac 2013-04-29 21:27:25.000000000 +0200 @@ -2,7 +2,7 @@ AC_PREREQ([2.68]) -AC_INIT([file-roller],[3.8.1],[http://bugzilla.gnome.org/enter_bug.cgi?product=file-roller],[file-roller]) +AC_INIT([file-roller],[3.9.1],[http://bugzilla.gnome.org/enter_bug.cgi?product=file-roller],[file-roller]) AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz tar-ustar]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-roller-3.8.1/copy-n-paste/Makefile.am new/file-roller-3.9.1/copy-n-paste/Makefile.am --- old/file-roller-3.8.1/copy-n-paste/Makefile.am 2012-08-27 20:58:56.000000000 +0200 +++ new/file-roller-3.9.1/copy-n-paste/Makefile.am 2013-04-28 09:07:41.000000000 +0200 @@ -1,5 +1,5 @@ -INCLUDES = $(DISABLE_DEPRECATED) \ - -UGETTEXT_PACKAGE +AM_CPPFLAGS = $(DISABLE_DEPRECATED) \ + -UGETTEXT_PACKAGE noinst_LTLIBRARIES = libeggsmclient.la diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-roller-3.8.1/copy-n-paste/Makefile.in new/file-roller-3.9.1/copy-n-paste/Makefile.in --- old/file-roller-3.8.1/copy-n-paste/Makefile.in 2013-04-15 22:32:07.000000000 +0200 +++ new/file-roller-3.9.1/copy-n-paste/Makefile.in 2013-04-29 21:27:38.000000000 +0200 @@ -312,8 +312,8 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -INCLUDES = $(DISABLE_DEPRECATED) \ - -UGETTEXT_PACKAGE +AM_CPPFLAGS = $(DISABLE_DEPRECATED) \ + -UGETTEXT_PACKAGE noinst_LTLIBRARIES = libeggsmclient.la libeggsmclient_la_LIBADD = $(GTK_LIBS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-roller-3.8.1/data/file-roller.desktop new/file-roller-3.9.1/data/file-roller.desktop --- old/file-roller-3.8.1/data/file-roller.desktop 2013-04-15 22:32:47.000000000 +0200 +++ new/file-roller-3.9.1/data/file-roller.desktop 2013-04-29 21:28:02.000000000 +0200 @@ -258,10 +258,10 @@ Icon=file-roller Categories=GTK;GNOME;Utility;Archiving;Compression; NotShowIn=KDE; -MimeType=application/x-7z-compressed;application/x-7z-compressed-tar;application/x-ace;application/x-alz;application/x-ar;application/x-arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-bzip1;application/x-bzip1-compressed-tar;application/x-cabinet;application/x-cbr;application/x-cbz;application/x-cd-image;application/x-compress;application/x-compressed-tar;application/x-cpio;application/x-deb;application/x-ear;application/x-ms-dos-executable;application/x-gtar;application/x-gzip;application/x-gzpostscript;application/x-java-archive;application/x-lha;application/x-lhz;application/x-lrzip;application/x-lrzip-compressed-tar;application/x-lzip;application/x-lzip-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-ms-wim;application/x-rar;application/x-rar-compressed;application/x-rpm;application/x-rzip;application/x-tar;application/x-tarz;application/x-stuffit;application/x-war;application/x-xz;application/x-xz-compressed-tar;application/x-zip;application/x-zip-compressed;application/x-zoo;application/zip;application/x-archive;application/vnd.ms-cab-compressed; +MimeType=application/x-7z-compressed;application/x-7z-compressed-tar;application/x-ace;application/x-alz;application/x-ar;application/x-arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-bzip1;application/x-bzip1-compressed-tar;application/x-cabinet;application/x-cbr;application/x-cbz;application/x-cd-image;application/x-compress;application/x-compressed-tar;application/x-cpio;application/x-deb;application/x-ear;application/x-ms-dos-executable;application/x-gtar;application/x-gzip;application/x-gzpostscript;application/x-java-archive;application/x-lha;application/x-lhz;application/x-lrzip;application/x-lrzip-compressed-tar;application/x-lzip;application/x-lzip-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-ms-wim;application/x-rar;application/x-rar-compressed;application/x-rpm;application/x-rzip;application/x-rzip-compressed-tar;application/x-tar;application/x-tarz;application/x-stuffit;application/x-war;application/x-xz;application/x-xz-compressed-tar;application/x-zip;application/x-zip-compressed;application/x-zoo;application/zip;application/x-archive;application/vnd.ms-cab-compressed; X-GNOME-DocPath=file-roller/file-roller.xml X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=file-roller X-GNOME-Bugzilla-Component=general -X-GNOME-Bugzilla-Version=3.8.1 +X-GNOME-Bugzilla-Version=3.9.1 X-GNOME-UsesNotifications=true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-roller-3.8.1/data/file-roller.desktop.in new/file-roller-3.9.1/data/file-roller.desktop.in --- old/file-roller-3.8.1/data/file-roller.desktop.in 2013-04-15 22:32:41.000000000 +0200 +++ new/file-roller-3.9.1/data/file-roller.desktop.in 2013-04-29 21:27:56.000000000 +0200 @@ -10,10 +10,10 @@ Icon=file-roller Categories=GTK;GNOME;Utility;Archiving;Compression; NotShowIn=KDE; -MimeType=application/x-7z-compressed;application/x-7z-compressed-tar;application/x-ace;application/x-alz;application/x-ar;application/x-arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-bzip1;application/x-bzip1-compressed-tar;application/x-cabinet;application/x-cbr;application/x-cbz;application/x-cd-image;application/x-compress;application/x-compressed-tar;application/x-cpio;application/x-deb;application/x-ear;application/x-ms-dos-executable;application/x-gtar;application/x-gzip;application/x-gzpostscript;application/x-java-archive;application/x-lha;application/x-lhz;application/x-lrzip;application/x-lrzip-compressed-tar;application/x-lzip;application/x-lzip-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-ms-wim;application/x-rar;application/x-rar-compressed;application/x-rpm;application/x-rzip;application/x-tar;application/x-tarz;application/x-stuffit;application/x-war;application/x-xz;application/x-xz-compressed-tar;application/x-zip;application/x-zip-compressed;application/x-zoo;application/zip;application/x-archive;application/vnd.ms-cab-compressed; +MimeType=application/x-7z-compressed;application/x-7z-compressed-tar;application/x-ace;application/x-alz;application/x-ar;application/x-arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-bzip1;application/x-bzip1-compressed-tar;application/x-cabinet;application/x-cbr;application/x-cbz;application/x-cd-image;application/x-compress;application/x-compressed-tar;application/x-cpio;application/x-deb;application/x-ear;application/x-ms-dos-executable;application/x-gtar;application/x-gzip;application/x-gzpostscript;application/x-java-archive;application/x-lha;application/x-lhz;application/x-lrzip;application/x-lrzip-compressed-tar;application/x-lzip;application/x-lzip-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-ms-wim;application/x-rar;application/x-rar-compressed;application/x-rpm;application/x-rzip;application/x-rzip-compressed-tar;application/x-tar;application/x-tarz;application/x-stuffit;application/x-war;application/x-xz;application/x-xz-compressed-tar;application/x-zip;application/x-zip-compressed;application/x-zoo;application/zip;application/x-archive;application/vnd.ms-cab-compressed; X-GNOME-DocPath=file-roller/file-roller.xml X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=file-roller X-GNOME-Bugzilla-Component=general -X-GNOME-Bugzilla-Version=3.8.1 +X-GNOME-Bugzilla-Version=3.9.1 X-GNOME-UsesNotifications=true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-roller-3.8.1/data/file-roller.desktop.in.in new/file-roller-3.9.1/data/file-roller.desktop.in.in --- old/file-roller-3.8.1/data/file-roller.desktop.in.in 2013-01-03 10:30:23.000000000 +0100 +++ new/file-roller-3.9.1/data/file-roller.desktop.in.in 2013-04-28 08:44:53.000000000 +0200 @@ -10,7 +10,7 @@ Icon=file-roller Categories=GTK;GNOME;Utility;Archiving;Compression; NotShowIn=KDE; -MimeType=application/x-7z-compressed;application/x-7z-compressed-tar;application/x-ace;application/x-alz;application/x-ar;application/x-arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-bzip1;application/x-bzip1-compressed-tar;application/x-cabinet;application/x-cbr;application/x-cbz;application/x-cd-image;application/x-compress;application/x-compressed-tar;application/x-cpio;application/x-deb;application/x-ear;application/x-ms-dos-executable;application/x-gtar;application/x-gzip;application/x-gzpostscript;application/x-java-archive;application/x-lha;application/x-lhz;application/x-lrzip;application/x-lrzip-compressed-tar;application/x-lzip;application/x-lzip-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-ms-wim;application/x-rar;application/x-rar-compressed;application/x-rpm;application/x-rzip;application/x-tar;application/x-tarz;application/x-stuffit;application/x-war;application/x-xz;application/x-xz-compressed-tar;application/x-zip;application/x-zip-compressed;application/x-zoo;application/zip;application/x-archive;application/vnd.ms-cab-compressed; +MimeType=application/x-7z-compressed;application/x-7z-compressed-tar;application/x-ace;application/x-alz;application/x-ar;application/x-arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-bzip1;application/x-bzip1-compressed-tar;application/x-cabinet;application/x-cbr;application/x-cbz;application/x-cd-image;application/x-compress;application/x-compressed-tar;application/x-cpio;application/x-deb;application/x-ear;application/x-ms-dos-executable;application/x-gtar;application/x-gzip;application/x-gzpostscript;application/x-java-archive;application/x-lha;application/x-lhz;application/x-lrzip;application/x-lrzip-compressed-tar;application/x-lzip;application/x-lzip-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-ms-wim;application/x-rar;application/x-rar-compressed;application/x-rpm;application/x-rzip;application/x-rzip-compressed-tar;application/x-tar;application/x-tarz;application/x-stuffit;application/x-war;application/x-xz;application/x-xz-compressed-tar;application/x-zip;application/x-zip-compressed;application/x-zoo;application/zip;application/x-archive;application/vnd.ms-cab-compressed; X-GNOME-DocPath=file-roller/file-roller.xml X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=file-roller diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-roller-3.8.1/file-roller.spec new/file-roller-3.9.1/file-roller.spec --- old/file-roller-3.8.1/file-roller.spec 2013-04-15 22:32:41.000000000 +0200 +++ new/file-roller-3.9.1/file-roller.spec 2013-04-29 21:27:56.000000000 +0200 @@ -1,7 +1,7 @@ %define release 6 %define prefix /usr %define name file-roller -%define version 3.8.1 +%define version 3.9.1 Summary: An archive manager for GNOME. Name: %{name} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-roller-3.8.1/nautilus/Makefile.am new/file-roller-3.9.1/nautilus/Makefile.am --- old/file-roller-3.8.1/nautilus/Makefile.am 2012-08-06 15:23:48.000000000 +0200 +++ new/file-roller-3.9.1/nautilus/Makefile.am 2013-04-28 09:07:50.000000000 +0200 @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -DFR_DATADIR=\"$(datadir)\" \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ -I$(top_srcdir) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-roller-3.8.1/nautilus/Makefile.in new/file-roller-3.9.1/nautilus/Makefile.in --- old/file-roller-3.8.1/nautilus/Makefile.in 2013-04-15 22:32:08.000000000 +0200 +++ new/file-roller-3.9.1/nautilus/Makefile.in 2013-04-29 21:27:39.000000000 +0200 @@ -330,7 +330,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -INCLUDES = \ +AM_CPPFLAGS = \ -DFR_DATADIR=\"$(datadir)\" \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ -I$(top_srcdir) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-roller-3.8.1/po/nds.po new/file-roller-3.9.1/po/nds.po --- old/file-roller-3.8.1/po/nds.po 2011-08-04 09:46:36.000000000 +0200 +++ new/file-roller-3.9.1/po/nds.po 2013-04-28 08:28:30.000000000 +0200 @@ -8,13 +8,13 @@ "Project-Id-Version: file-roller master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=file-roller&component=general\n"; "POT-Creation-Date: 2009-11-28 11:07+0000\n" -"PO-Revision-Date: 2009-11-28 12:29+0100\n" +"PO-Revision-Date: 2013-04-21 23:21+0200\n" "Last-Translator: Nils-Christoph Fiedler <[email protected]>\n" "Language-Team: Low German <[email protected]>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"plural-Forms: nplurals=2; plural=(n!=1);\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\n" #: ../copy-n-paste/eggdesktopfile.c:165 #, c-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-roller-3.8.1/src/Makefile.am new/file-roller-3.9.1/src/Makefile.am --- old/file-roller-3.8.1/src/Makefile.am 2012-12-03 19:36:16.000000000 +0100 +++ new/file-roller-3.9.1/src/Makefile.am 2013-04-28 09:08:05.000000000 +0200 @@ -23,7 +23,7 @@ applications_dir = $(datadir)/applications endif -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir)/copy-n-paste/ \ -I$(top_srcdir) \ -I$(top_builddir) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-roller-3.8.1/src/Makefile.in new/file-roller-3.9.1/src/Makefile.in --- old/file-roller-3.8.1/src/Makefile.in 2013-04-15 22:32:09.000000000 +0200 +++ new/file-roller-3.9.1/src/Makefile.in 2013-04-29 21:27:39.000000000 +0200 @@ -442,7 +442,7 @@ @RUN_IN_PLACE_TRUE@shdir = $(abs_top_srcdir)/src/sh/ @RUN_IN_PLACE_FALSE@applications_dir = $(datadir)/applications @RUN_IN_PLACE_TRUE@applications_dir = $(abs_top_builddir)/data -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir)/copy-n-paste/ \ -I$(top_srcdir) \ -I$(top_builddir) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-roller-3.8.1/src/commands/Makefile.am new/file-roller-3.9.1/src/commands/Makefile.am --- old/file-roller-3.8.1/src/commands/Makefile.am 2011-08-04 09:46:36.000000000 +0200 +++ new/file-roller-3.9.1/src/commands/Makefile.am 2013-04-28 09:08:16.000000000 +0200 @@ -1,7 +1,7 @@ privexecdir = $(libexecdir)/$(PACKAGE) privexec_PROGRAMS = rpm2cpio -INCLUDES = $(DISABLE_DEPRECATED) $(FR_CFLAGS) +AM_CPPFLAGS = $(DISABLE_DEPRECATED) $(FR_CFLAGS) rpm2cpio_SOURCES = rpm2cpio.c rpm2cpio_LDADD = $(FR_LIBS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-roller-3.8.1/src/commands/Makefile.in new/file-roller-3.9.1/src/commands/Makefile.in --- old/file-roller-3.8.1/src/commands/Makefile.in 2013-04-15 22:32:09.000000000 +0200 +++ new/file-roller-3.9.1/src/commands/Makefile.in 2013-04-29 21:27:39.000000000 +0200 @@ -299,7 +299,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ privexecdir = $(libexecdir)/$(PACKAGE) -INCLUDES = $(DISABLE_DEPRECATED) $(FR_CFLAGS) +AM_CPPFLAGS = $(DISABLE_DEPRECATED) $(FR_CFLAGS) rpm2cpio_SOURCES = rpm2cpio.c rpm2cpio_LDADD = $(FR_LIBS) all: all-am diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-roller-3.8.1/src/fr-command-ace.c new/file-roller-3.9.1/src/fr-command-ace.c --- old/file-roller-3.8.1/src/fr-command-ace.c 2012-08-06 15:23:48.000000000 +0200 +++ new/file-roller-3.9.1/src/fr-command-ace.c 2013-04-28 09:43:27.000000000 +0200 @@ -19,6 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <config.h> #include <stdlib.h> #include <string.h> #include <time.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-roller-3.8.1/src/fr-command-alz.c new/file-roller-3.9.1/src/fr-command-alz.c --- old/file-roller-3.8.1/src/fr-command-alz.c 2012-08-06 15:23:48.000000000 +0200 +++ new/file-roller-3.9.1/src/fr-command-alz.c 2013-04-28 09:43:27.000000000 +0200 @@ -19,6 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <config.h> #include <stdlib.h> #include <string.h> #include <time.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-roller-3.8.1/src/fr-command-ar.c new/file-roller-3.9.1/src/fr-command-ar.c --- old/file-roller-3.8.1/src/fr-command-ar.c 2012-08-09 07:59:29.000000000 +0200 +++ new/file-roller-3.9.1/src/fr-command-ar.c 2013-04-28 09:43:27.000000000 +0200 @@ -19,6 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <config.h> #include <stdlib.h> #include <string.h> #include <time.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-roller-3.8.1/src/fr-command-arj.c new/file-roller-3.9.1/src/fr-command-arj.c --- old/file-roller-3.8.1/src/fr-command-arj.c 2012-11-25 13:01:45.000000000 +0100 +++ new/file-roller-3.9.1/src/fr-command-arj.c 2013-04-28 09:43:27.000000000 +0200 @@ -19,6 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <config.h> #include <stdlib.h> #include <string.h> #include <time.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-roller-3.8.1/src/fr-command-cfile.c new/file-roller-3.9.1/src/fr-command-cfile.c --- old/file-roller-3.8.1/src/fr-command-cfile.c 2012-08-09 07:59:29.000000000 +0200 +++ new/file-roller-3.9.1/src/fr-command-cfile.c 2013-04-28 09:45:07.000000000 +0200 @@ -19,6 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <config.h> #include <sys/types.h> #include <unistd.h> #include <stdlib.h> @@ -509,7 +510,8 @@ if (_g_program_is_available ("lzop", check_command)) capabilities |= FR_ARCHIVE_CAN_READ_WRITE; } - else if (_g_mime_type_matches (mime_type, "application/x-rzip")) { + else if (_g_mime_type_matches (mime_type, "application/x-rzip") || + _g_mime_type_matches (mime_type, "application/x-rzip-compressed-tar")) { if (_g_program_is_available ("rzip", check_command)) capabilities |= FR_ARCHIVE_CAN_READ_WRITE; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-roller-3.8.1/src/fr-command-jar.c new/file-roller-3.9.1/src/fr-command-jar.c --- old/file-roller-3.8.1/src/fr-command-jar.c 2012-08-09 07:59:29.000000000 +0200 +++ new/file-roller-3.9.1/src/fr-command-jar.c 2013-04-28 09:43:27.000000000 +0200 @@ -19,6 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <config.h> #include <glib.h> #include <unistd.h> #include <string.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-roller-3.8.1/src/fr-command-lha.c new/file-roller-3.9.1/src/fr-command-lha.c --- old/file-roller-3.8.1/src/fr-command-lha.c 2012-11-25 13:00:40.000000000 +0100 +++ new/file-roller-3.9.1/src/fr-command-lha.c 2013-04-28 09:43:27.000000000 +0200 @@ -19,6 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <config.h> #include <stdlib.h> #include <string.h> #include <time.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-roller-3.8.1/src/fr-command-rar.c new/file-roller-3.9.1/src/fr-command-rar.c --- old/file-roller-3.8.1/src/fr-command-rar.c 2012-11-26 23:34:39.000000000 +0100 +++ new/file-roller-3.9.1/src/fr-command-rar.c 2013-04-28 09:43:27.000000000 +0200 @@ -19,6 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <config.h> #include <stdio.h> #include <stdlib.h> #include <string.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-roller-3.8.1/src/fr-command-tar.c new/file-roller-3.9.1/src/fr-command-tar.c --- old/file-roller-3.8.1/src/fr-command-tar.c 2012-11-27 10:09:22.000000000 +0100 +++ new/file-roller-3.9.1/src/fr-command-tar.c 2013-04-28 09:43:27.000000000 +0200 @@ -20,17 +20,14 @@ */ #include <config.h> - #include <sys/types.h> #include <unistd.h> #include <stdlib.h> #include <string.h> #include <ctype.h> #include <time.h> - #include <glib.h> #include <glib/gi18n.h> - #include "file-data.h" #include "file-utils.h" #include "glib-utils.h" @@ -268,7 +265,9 @@ static gboolean can_create_a_compressed_archive (FrCommand *comm) { - return comm->creating_archive && ! _g_mime_type_matches (FR_ARCHIVE (comm)->mime_type, "application/x-7z-compressed-tar"); + return comm->creating_archive && + ! _g_mime_type_matches (FR_ARCHIVE (comm)->mime_type, "application/x-7z-compressed-tar") && + ! _g_mime_type_matches (FR_ARCHIVE (comm)->mime_type, "application/x-rzip-compressed-tar"); } @@ -687,6 +686,25 @@ fr_process_add_arg (comm->process, c_tar->uncomp_filename); fr_process_end_command (comm->process); } + else if (_g_mime_type_matches (archive->mime_type, "application/x-rzip-compressed-tar")) { + fr_process_begin_command (comm->process, "rzip"); + fr_process_set_begin_func (comm->process, begin_func__recompress, comm); + switch (archive->compression) { + case FR_COMPRESSION_VERY_FAST: + fr_process_add_arg (comm->process, "-L1"); break; + case FR_COMPRESSION_FAST: + fr_process_add_arg (comm->process, "-L3"); break; + case FR_COMPRESSION_NORMAL: + fr_process_add_arg (comm->process, "-L6"); break; + case FR_COMPRESSION_MAXIMUM: + fr_process_add_arg (comm->process, "-L9"); break; + } + fr_process_add_arg (comm->process, "-f"); + fr_process_add_arg (comm->process, c_tar->uncomp_filename); + fr_process_end_command (comm->process); + + new_name = g_strconcat (c_tar->uncomp_filename, ".rz", NULL); + } if (c_tar->name_modified) { char *tmp_dir; @@ -813,6 +831,11 @@ if (_g_filename_has_extension (e_filename, ".tar.7z")) new_name[l - 3] = 0; } + else if (_g_mime_type_matches (archive->mime_type, "application/x-rzip-compressed-tar")) { + /* X.tar.rz --> X.tar */ + if (_g_filename_has_extension (e_filename, ".tar.rz")) + new_name[l - 3] = 0; + } return new_name; } @@ -960,6 +983,13 @@ fr_process_add_arg (comm->process, tmp_name); fr_process_end_command (comm->process); } + else if (_g_mime_type_matches (archive->mime_type, "application/x-rzip-compressed-tar")) { + fr_process_begin_command (comm->process, "rzip"); + fr_process_set_begin_func (comm->process, begin_func__uncompress, comm); + fr_process_add_arg (comm->process, "-df"); + fr_process_add_arg (comm->process, tmp_name); + fr_process_end_command (comm->process); + } } c_tar->uncomp_filename = get_uncompressed_name (c_tar, tmp_name); @@ -986,6 +1016,7 @@ "application/x-lzip-compressed-tar", "application/x-lzma-compressed-tar", "application/x-lzop-compressed-tar", + "application/x-rzip-compressed-tar", "application/x-tarz", "application/x-xz-compressed-tar", NULL }; @@ -1059,6 +1090,10 @@ } } } + else if(_g_mime_type_matches (mime_type, "application/x-rzip-compressed-tar")) { + if(_g_program_is_available ("rzip", check_command)) + capabilities |= FR_ARCHIVE_CAN_WRITE; + } return capabilities; } @@ -1110,6 +1145,8 @@ return PACKAGES ("tar,lzop"); else if (_g_mime_type_matches (mime_type, "application/x-7z-compressed-tar")) return PACKAGES ("tar,p7zip"); + else if (_g_mime_type_matches (mime_type, "application/x-rzip-compressed-tar")) + return PACKAGES ("tar,rzip"); return NULL; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-roller-3.8.1/src/fr-command-unarchiver.c new/file-roller-3.9.1/src/fr-command-unarchiver.c --- old/file-roller-3.8.1/src/fr-command-unarchiver.c 2012-08-06 17:37:34.000000000 +0200 +++ new/file-roller-3.9.1/src/fr-command-unarchiver.c 2013-04-28 09:41:42.000000000 +0200 @@ -19,6 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <config.h> #define _XOPEN_SOURCE /* See feature_test_macros(7) */ #include <time.h> #include <stdio.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-roller-3.8.1/src/fr-command-unstuff.c new/file-roller-3.9.1/src/fr-command-unstuff.c --- old/file-roller-3.8.1/src/fr-command-unstuff.c 2012-08-06 15:23:48.000000000 +0200 +++ new/file-roller-3.9.1/src/fr-command-unstuff.c 2013-04-28 09:43:27.000000000 +0200 @@ -19,6 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <config.h> #include <stdlib.h> #include <string.h> #include <time.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-roller-3.8.1/src/fr-command-zoo.c new/file-roller-3.9.1/src/fr-command-zoo.c --- old/file-roller-3.8.1/src/fr-command-zoo.c 2012-08-09 07:59:29.000000000 +0200 +++ new/file-roller-3.9.1/src/fr-command-zoo.c 2013-04-28 09:43:27.000000000 +0200 @@ -19,6 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <config.h> #include <stdlib.h> #include <string.h> #include <time.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-roller-3.8.1/src/fr-error.c new/file-roller-3.9.1/src/fr-error.c --- old/file-roller-3.8.1/src/fr-error.c 2012-08-06 15:23:48.000000000 +0200 +++ new/file-roller-3.9.1/src/fr-error.c 2013-04-28 09:43:27.000000000 +0200 @@ -20,6 +20,7 @@ */ +#include <config.h> #include "fr-error.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-roller-3.8.1/src/fr-file-selector-dialog.c new/file-roller-3.9.1/src/fr-file-selector-dialog.c --- old/file-roller-3.8.1/src/fr-file-selector-dialog.c 2012-08-09 21:45:47.000000000 +0200 +++ new/file-roller-3.9.1/src/fr-file-selector-dialog.c 2013-04-28 09:06:17.000000000 +0200 @@ -686,15 +686,18 @@ /* Taken from the Gtk+ file gtkfilechooserdefault.c * Copyright (C) 2003, Red Hat, Inc. * + * Changed by File-Roller authors + * * Guesses a size based upon font sizes */ static int get_font_size (GtkWidget *widget) { - GtkStyleContext *context; - GtkStateFlags state; - int font_size; - GdkScreen *screen; - double resolution; + GtkStyleContext *context; + GtkStateFlags state; + int font_size; + GdkScreen *screen; + double resolution; + PangoFontDescription *font; context = gtk_widget_get_style_context (widget); state = gtk_widget_get_state_flags (widget); @@ -708,7 +711,8 @@ else resolution = 96.0; /* wheeee */ - font_size = pango_font_description_get_size (gtk_style_context_get_font (context, state)); + gtk_style_context_get (context, state, "font", &font, NULL); + font_size = pango_font_description_get_size (font); font_size = PANGO_PIXELS (font_size) * resolution / 72.0; return font_size; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-roller-3.8.1/src/fr-init.c new/file-roller-3.9.1/src/fr-init.c --- old/file-roller-3.8.1/src/fr-init.c 2013-03-12 09:45:03.000000000 +0100 +++ new/file-roller-3.9.1/src/fr-init.c 2013-04-28 08:44:45.000000000 +0200 @@ -96,6 +96,7 @@ { "application/x-rar", ".rar", 0 }, { "application/x-rpm", ".rpm", 0 }, { "application/x-rzip", ".rz", 0 }, + { "application/x-rzip-compressed-tar", ".tar.rz", 0 }, { "application/x-tar", ".tar", 0 }, { "application/x-tarz", ".tar.Z", 0 }, { "application/x-stuffit", ".sit", 0 }, @@ -147,6 +148,7 @@ { ".tar.lzma", "application/x-lzma-compressed-tar" }, { ".tar.lzo", "application/x-lzop-compressed-tar" }, { ".tar.7z", "application/x-7z-compressed-tar" }, + { ".tar.rz", "application/x-rzip-compressed-tar" }, { ".tar.xz", "application/x-xz-compressed-tar" }, { ".tar.Z", "application/x-tarz" }, { ".taz", "application/x-tarz" }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-roller-3.8.1/src/fr-process.c new/file-roller-3.9.1/src/fr-process.c --- old/file-roller-3.8.1/src/fr-process.c 2012-11-26 23:03:58.000000000 +0100 +++ new/file-roller-3.9.1/src/fr-process.c 2013-04-28 09:33:22.000000000 +0200 @@ -19,6 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <config.h> #include <errno.h> #include <fcntl.h> #include <stdio.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-roller-3.8.1/src/fr-window.c new/file-roller-3.9.1/src/fr-window.c --- old/file-roller-3.8.1/src/fr-window.c 2013-01-03 10:11:43.000000000 +0100 +++ new/file-roller-3.9.1/src/fr-window.c 2013-04-28 09:43:27.000000000 +0200 @@ -22,7 +22,6 @@ #include <config.h> #include <math.h> #include <string.h> - #include <glib/gi18n.h> #include <gio/gio.h> #include <gtk/gtk.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-roller-3.8.1/src/gio-utils.c new/file-roller-3.9.1/src/gio-utils.c --- old/file-roller-3.8.1/src/gio-utils.c 2012-09-28 11:27:49.000000000 +0200 +++ new/file-roller-3.9.1/src/gio-utils.c 2013-04-28 09:43:27.000000000 +0200 @@ -19,6 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <config.h> #include <string.h> #include <glib.h> #include <gio/gio.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-roller-3.8.1/src/glib-utils.c new/file-roller-3.9.1/src/glib-utils.c --- old/file-roller-3.8.1/src/glib-utils.c 2012-12-03 19:36:16.000000000 +0100 +++ new/file-roller-3.9.1/src/glib-utils.c 2013-04-28 09:37:43.000000000 +0200 @@ -19,6 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <config.h> #include <ctype.h> #include <string.h> #include <stdio.h> @@ -27,6 +28,9 @@ #include <glib/gprintf.h> #include <glib-object.h> #include "glib-utils.h" +#if ENABLE_MAGIC +# include <magic.h> +#endif #define MAX_PATTERNS 128 @@ -1051,7 +1055,8 @@ ext = filename + p; if (ext - 4 > filename) { const char *test = ext - 4; - if (strncmp (test, ".tar", 4) == 0) + /* .tar.rz cannot be uncompressed in one step */ + if ((strncmp (test, ".tar", 4) == 0) && (strncmp (ext, ".rz", 2) != 0)) ext = ext - 4; } return ext; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-roller-3.8.1/src/gth-menu-button.c new/file-roller-3.9.1/src/gth-menu-button.c --- old/file-roller-3.8.1/src/gth-menu-button.c 2012-12-03 19:36:15.000000000 +0100 +++ new/file-roller-3.9.1/src/gth-menu-button.c 2013-04-28 09:43:27.000000000 +0200 @@ -19,6 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <config.h> #include <string.h> #include <gtk/gtk.h> #include "gth-menu-button.h" @@ -380,7 +381,7 @@ g_return_if_fail (GTH_IS_MENU_BUTTON (self)); g_return_if_fail (GTK_IS_MENU (menu) || menu == NULL); - g_object_set (self, "menu", menu, NULL); + g_object_set (self, "popup", menu, NULL); } @@ -391,7 +392,7 @@ g_return_val_if_fail (GTH_IS_MENU_BUTTON (self), NULL); - g_object_get (self, "menu", &menu, NULL); + g_object_get (self, "popup", &menu, NULL); return menu; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-roller-3.8.1/src/gth-toggle-menu-tool-button.c new/file-roller-3.9.1/src/gth-toggle-menu-tool-button.c --- old/file-roller-3.8.1/src/gth-toggle-menu-tool-button.c 2013-04-05 21:32:59.000000000 +0200 +++ new/file-roller-3.9.1/src/gth-toggle-menu-tool-button.c 2013-04-28 09:43:28.000000000 +0200 @@ -19,6 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <config.h> #include <string.h> #include <gtk/gtk.h> #include "gth-toggle-menu-action.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-roller-3.8.1/src/gtk-utils.c new/file-roller-3.9.1/src/gtk-utils.c --- old/file-roller-3.8.1/src/gtk-utils.c 2012-08-09 21:45:47.000000000 +0200 +++ new/file-roller-3.9.1/src/gtk-utils.c 2013-04-28 09:03:11.000000000 +0200 @@ -511,7 +511,7 @@ g_error_free (error); } - gtk_icon_info_free (icon_info); + g_object_unref (icon_info); } return pixbuf; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-roller-3.8.1/src/java-utils.c new/file-roller-3.9.1/src/java-utils.c --- old/file-roller-3.8.1/src/java-utils.c 2011-08-04 09:46:36.000000000 +0200 +++ new/file-roller-3.9.1/src/java-utils.c 2013-04-28 09:43:28.000000000 +0200 @@ -18,7 +18,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ - + +#include <config.h> #include <fcntl.h> #include <unistd.h> #include <errno.h> @@ -27,9 +28,9 @@ #include "java-utils.h" -/* +/* * The following code conforms to the JVM specification.(Java 2 Platform) - * For further changes to the classfile structure, please update the + * For further changes to the classfile structure, please update the * following macros. */ @@ -63,7 +64,7 @@ /* represents the utf8 strings in class file */ -struct utf_string +struct utf_string { guint16 index; guint16 length; @@ -79,7 +80,7 @@ typedef struct { int fd; - + guint32 magic_no; /* 0xCAFEBABE (JVM Specification) :) */ guint16 major; /* versions */ @@ -91,7 +92,7 @@ guint16 access_flags; guint16 this_class; /* the index of the class the file is named after. */ - + #if 0 /* not needed */ guint16 super_class; guint16 interfaces_count; @@ -110,10 +111,10 @@ java_class_file_new (void) { JavaClassFile *cfile; - + cfile = g_new0 (JavaClassFile, 1); cfile->fd = -1; - + return cfile; } @@ -132,7 +133,7 @@ struct utf_string *string = scan->data; g_free (string->str); } - + if (cfile->const_pool_utf != NULL) { g_slist_foreach (cfile->const_pool_utf, (GFunc)g_free, NULL); g_slist_free (cfile->const_pool_utf); @@ -145,18 +146,18 @@ } -/* The following function loads the utf8 strings and class structures from the +/* The following function loads the utf8 strings and class structures from the * class file. */ static void load_constant_pool_utfs (JavaClassFile *cfile) { guint8 tag; guint16 i = 0; /* should be comparable with const_pool_count */ - + while ((i < cfile->const_pool_count - 1) && (read (cfile->fd, &tag, 1) != -1)) { struct utf_string *txt = NULL; struct class_info *class = NULL; - + switch (tag) { case CONST_CLASS: class = g_new0 (struct class_info, 1); @@ -168,43 +169,43 @@ class->name_index = GUINT16_FROM_BE (class->name_index); cfile->const_pool_class = g_slist_append (cfile->const_pool_class, class); break; - + case CONST_FIELDREF: lseek (cfile->fd, CONST_FIELDREF_INFO, SEEK_CUR); break; - + case CONST_METHODREF: lseek (cfile->fd, CONST_METHODREF_INFO, SEEK_CUR); break; - + case CONST_INTERFACEMETHODREF: lseek (cfile->fd, CONST_INTERFACEMETHODREF_INFO, SEEK_CUR); break; - + case CONST_STRING: lseek (cfile->fd, CONST_STRING_INFO, SEEK_CUR); break; - + case CONST_INTEGER: lseek (cfile->fd, CONST_INTEGER_INFO, SEEK_CUR); break; - + case CONST_FLOAT: lseek (cfile->fd, CONST_FLOAT_INFO, SEEK_CUR); break; - + case CONST_LONG: lseek (cfile->fd, CONST_LONG_INFO, SEEK_CUR); break; - + case CONST_DOUBLE: lseek (cfile->fd, CONST_DOUBLE_INFO, SEEK_CUR); break; - + case CONST_NAMEANDTYPE: lseek (cfile->fd, CONST_NAMEANDTYPE_INFO, SEEK_CUR); break; - + case CONST_UTF8: txt = g_new0 (struct utf_string, 1); txt->index = i + 1; @@ -220,14 +221,14 @@ } cfile->const_pool_utf = g_slist_append (cfile->const_pool_utf, txt); break; - + default: return; /* error - unknown tag in class file */ break; } i++; } - + #ifdef DEBUG g_print( "Number of Entries: %d\n", i ); #endif @@ -235,7 +236,7 @@ static char* -close_and_exit (JavaClassFile *cfile) +close_and_exit (JavaClassFile *cfile) { java_class_file_free (cfile); return NULL; @@ -252,7 +253,7 @@ guint32 magic; guint16 major, minor, count; int i = 0; - + if (! g_file_test (fname, G_FILE_TEST_EXISTS)) return NULL; @@ -287,7 +288,7 @@ cfile->this_class = GUINT16_FROM_BE(cfile->this_class); /* now search for the class structure with index = cfile->this_class */ - + for (i = 0; (i < g_slist_length (cfile->const_pool_class)) && (utf_index == 0); i++ ) { struct class_info *class = g_slist_nth_data (cfile->const_pool_class, i); if (class->index == cfile->this_class) @@ -295,7 +296,7 @@ } /* now search for the utf8 string with index = utf_index */ - + for (i = 0; i < g_slist_length (cfile->const_pool_utf); i++) { struct utf_string *data = g_slist_nth_data (cfile->const_pool_utf, i); if (data->index == utf_index) { @@ -313,12 +314,12 @@ } java_class_file_free (cfile); - + return package; } -/* This function consumes a comment from the java file +/* This function consumes a comment from the java file * multiline = TRUE implies that comment is multiline */ static void consume_comment (int fdesc, @@ -327,7 +328,7 @@ gboolean escaped = FALSE; gboolean star = FALSE; char ch; - + while (read (fdesc, &ch, 1) == 1) { switch (ch) { case '/': @@ -336,21 +337,21 @@ else if (star) return; break; - + case '\n': if (! multiline) return; break; - + case '*': escaped = FALSE; star = TRUE; break; - + case '\\': escaped = ! escaped; break; - + default: escaped = FALSE; star = FALSE; @@ -369,7 +370,7 @@ gboolean prev_char_is_bslash = FALSE; gboolean valid_char_found = FALSE; char ch; - + if (! g_file_test (fname, G_FILE_TEST_EXISTS)) return NULL; @@ -377,56 +378,56 @@ cfile->fd = open (fname, O_RDONLY); if (cfile->fd == -1) return close_and_exit (cfile); - + while (! valid_char_found && (read (cfile->fd, &ch, 1) == 1)) { switch (ch) { case '/': - if (prev_char_is_bslash == TRUE) { + if (prev_char_is_bslash == TRUE) { consume_comment (cfile->fd, FALSE); prev_char_is_bslash = FALSE; } else prev_char_is_bslash = TRUE; break; - + case '*': if (prev_char_is_bslash == TRUE) consume_comment (cfile->fd, TRUE); prev_char_is_bslash = FALSE; break; - + case ' ': case '\t': case '\r': case '\n': prev_char_is_bslash = FALSE; break; - + default: prev_char_is_bslash = FALSE; valid_char_found = TRUE; break; } } - + if (ch == 'p') { char first_valid_word[8] = ""; - + first_valid_word[0] = 'p'; - if (read (cfile->fd, &first_valid_word[1], 6) != 6) + if (read (cfile->fd, &first_valid_word[1], 6) != 6) return close_and_exit (cfile); - + first_valid_word[7] = 0; if (g_ascii_strcasecmp (first_valid_word, "package") == 0) { char buffer[500]; int index = 0; - + while (read (cfile->fd, &ch, 1) == 1) { if (ch == ';') break; if (ch == '.') buffer[index++] = '/'; - else + else buffer[index++] = ch; } buffer[index] = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-roller-3.8.1/src/main.c new/file-roller-3.9.1/src/main.c --- old/file-roller-3.8.1/src/main.c 2012-12-03 19:36:16.000000000 +0100 +++ new/file-roller-3.9.1/src/main.c 2013-04-28 09:02:55.000000000 +0200 @@ -30,8 +30,6 @@ GtkApplication *app; int status; - g_type_init (); - bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-roller-3.8.1/src/preferences.c new/file-roller-3.9.1/src/preferences.c --- old/file-roller-3.8.1/src/preferences.c 2011-08-04 09:46:36.000000000 +0200 +++ new/file-roller-3.9.1/src/preferences.c 2013-04-28 09:43:28.000000000 +0200 @@ -19,6 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <config.h> #include <string.h> #include "typedefs.h" #include "preferences.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-roller-3.8.1/src/test-server.c new/file-roller-3.9.1/src/test-server.c --- old/file-roller-3.8.1/src/test-server.c 2012-08-10 13:30:19.000000000 +0200 +++ new/file-roller-3.9.1/src/test-server.c 2013-04-28 09:02:45.000000000 +0200 @@ -135,8 +135,6 @@ GDBusConnection *connection; GError *error = NULL; - g_type_init (); - connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error); if (connection != NULL) { GDBusProxy *proxy; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
