Hello community, here is the log from the commit of package xdg-user-dirs-gtk for openSUSE:Factory checked in at 2013-03-25 20:45:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xdg-user-dirs-gtk (Old) and /work/SRC/openSUSE:Factory/.xdg-user-dirs-gtk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xdg-user-dirs-gtk", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/xdg-user-dirs-gtk/xdg-user-dirs-gtk.changes 2012-04-12 09:56:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xdg-user-dirs-gtk.new/xdg-user-dirs-gtk.changes 2013-03-25 20:45:59.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Feb 4 18:58:12 UTC 2013 - [email protected] + +- Update to version 0.10: + + Use new location for GTK+ bookmarks file. + +------------------------------------------------------------------- Old: ---- xdg-user-dirs-gtk-0.9.tar.xz New: ---- xdg-user-dirs-gtk-0.10.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xdg-user-dirs-gtk.spec ++++++ --- /var/tmp/diff_new_pack.pHUJYn/_old 2013-03-25 20:46:02.000000000 +0100 +++ /var/tmp/diff_new_pack.pHUJYn/_new 2013-03-25 20:46:02.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xdg-user-dirs-gtk # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,10 +20,10 @@ Summary: xdg-user-dir support for Gnome and Gtk+ applications License: GPL-2.0+ Group: System/GUI/GNOME -Version: 0.9 +Version: 0.10 Release: 0 Url: http://download.gnome.org/sources/xdg-user-dirs-gtk -Source0: http://download.gnome.org/sources/xdg-user-dirs-gtk/0.9/%{name}-%{version}.tar.xz +Source0: http://download.gnome.org/sources/xdg-user-dirs-gtk/0.10/%{name}-%{version}.tar.xz # PATCH-FIX-UPSTREAM xdg-user-dirs-gtk-XFCE-LXDE-autostart.patch fdo#33107 [email protected] -- Start xdg-user-dirs-gtk in Xfce sessions as well Patch1: %{name}-XFCE-autostart.patch BuildRequires: gtk3-devel ++++++ xdg-user-dirs-gtk-0.9.tar.xz -> xdg-user-dirs-gtk-0.10.tar.xz ++++++ ++++ 7961 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xdg-user-dirs-gtk-0.9/NEWS new/xdg-user-dirs-gtk-0.10/NEWS --- old/xdg-user-dirs-gtk-0.9/NEWS 2012-04-03 17:34:14.000000000 +0200 +++ new/xdg-user-dirs-gtk-0.10/NEWS 2013-01-21 14:54:41.000000000 +0100 @@ -1,3 +1,6 @@ +Major changes in 0.10 are: +* Use new location for GTK+ bookmarks file + Major changes in 0.9 are: * Port to Gtk 3 * Add Unity and LXDE to desktop file OnlyShowIn diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xdg-user-dirs-gtk-0.9/configure.ac new/xdg-user-dirs-gtk-0.10/configure.ac --- old/xdg-user-dirs-gtk-0.9/configure.ac 2012-04-03 17:28:59.000000000 +0200 +++ new/xdg-user-dirs-gtk-0.10/configure.ac 2013-01-21 14:54:41.000000000 +0100 @@ -1,8 +1,11 @@ -AC_INIT(parse.c) +AC_PREREQ(2.53) + +AC_INIT([xdg-user-dirs-gtk], [0.10], + [http://bugzilla.gnome.org/enter_bug.cgi?product=xdg-user-dirs-gtk]) +AC_CONFIG_SRCDIR([parse.c]) +AM_INIT_AUTOMAKE([1.9 dist-xz no-dist-gzip tar-ustar foreign]) +AC_CONFIG_HEADERS([config.h]) -AM_INIT_AUTOMAKE(xdg-user-dirs-gtk, 0.9) -AM_CONFIG_HEADER(config.h) - AM_SANITY_CHECK AM_MAINTAINER_MODE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xdg-user-dirs-gtk-0.9/missing new/xdg-user-dirs-gtk-0.10/missing --- old/xdg-user-dirs-gtk-0.9/missing 2012-04-03 17:31:00.000000000 +0200 +++ new/xdg-user-dirs-gtk-0.10/missing 2013-01-21 14:54:01.000000000 +0100 @@ -1,11 +1,10 @@ #! /bin/sh -# Common stub for a few missing GNU programs while installing. +# Common wrapper for a few potentially missing GNU programs. -scriptversion=2009-04-28.21; # UTC +scriptversion=2012-06-26.16; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard <[email protected]>, 1996. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -26,69 +25,40 @@ # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "Try '$0 --help' for more information" exit 1 fi -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi +case $1 in -msg="missing on your system" + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; -h|--h|--he|--hel|--help) echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. Options: -h, --help display this help and exit -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch] + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. Send bug reports to <[email protected]>." exit $? @@ -100,272 +70,141 @@ ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; esac -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. - ;; - - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; +# Run the given program, remember its exit status. +"$@"; st=$? - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $program in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; - - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; +# If it succeeded, we are done. +test $st -eq 0 && exit 0 - autom4te*) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison*|yacc*) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex*|flex*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit $? - fi - ;; - - makeinfo*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - tar*) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi -exit 0 +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'automa4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" + ;; + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} + +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 + +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xdg-user-dirs-gtk-0.9/parse.c new/xdg-user-dirs-gtk-0.10/parse.c --- old/xdg-user-dirs-gtk-0.9/parse.c 2012-04-03 17:28:59.000000000 +0200 +++ new/xdg-user-dirs-gtk-0.10/parse.c 2013-01-21 14:20:04.000000000 +0100 @@ -1,6 +1,33 @@ #include "parse.h" #include <string.h> +static char * +get_gtk_bookmarks_filename (void) +{ + char *filename, *legacy_filename; + gboolean exists, legacy_exists; + + filename = g_build_filename (g_get_user_config_dir (), "gtk-3.0", "bookmarks", NULL); + exists = g_file_test (filename, G_FILE_TEST_EXISTS); + + if (exists) + return filename; + + legacy_filename = g_build_filename (g_get_home_dir (), ".gtk-bookmarks", NULL); + legacy_exists = g_file_test (legacy_filename, G_FILE_TEST_EXISTS); + + if (legacy_exists) + { + g_free (filename); + return legacy_filename; + } + + g_free (legacy_filename); + + /* if neither exist, return the new filename */ + return filename; +} + char * parse_xdg_dirs_locale (void) { @@ -112,24 +139,16 @@ } GList * -parse_gtk_bookmarks (const char *filename) +parse_gtk_bookmarks (void) { - char *filename_free, *contents; + char *filename, *contents; GError **error = NULL; char **lines; int i; GtkBookmark *bookmark; GList *bookmarks; - filename_free = NULL; - if (filename == NULL) - { - filename_free = g_build_filename (g_get_home_dir (), - ".gtk-bookmarks", - NULL); - filename = (const char *)filename_free; - } - + filename = get_gtk_bookmarks_filename (); bookmarks = NULL; /* Read new list from file */ @@ -161,29 +180,20 @@ } g_strfreev (lines); } - g_free (filename_free); + g_free (filename); return bookmarks; } void -save_gtk_bookmarks (const char *filename, - GList *bookmarks) +save_gtk_bookmarks (GList *bookmarks) { - char *filename_free; + char *filename, *dirname; GString *str; GList *l; GtkBookmark *bookmark; - filename_free = NULL; - if (filename == NULL) - { - filename_free = g_build_filename (g_get_home_dir (), - ".gtk-bookmarks", - NULL); - filename = (const char *)filename_free; - } - + filename = get_gtk_bookmarks_filename (); str = g_string_new (""); for (l = bookmarks; l != NULL; l = l->next) @@ -196,8 +206,11 @@ g_string_append_printf (str, "%s\n", bookmark->uri); } - g_file_set_contents (filename, str->str, str->len, NULL); - + dirname = g_path_get_dirname (filename); + if (g_mkdir_with_parents (dirname, 0700) == 0) + g_file_set_contents (filename, str->str, str->len, NULL); + g_string_free (str, TRUE); - g_free (filename_free); + g_free (filename); + g_free (dirname); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xdg-user-dirs-gtk-0.9/parse.h new/xdg-user-dirs-gtk-0.10/parse.h --- old/xdg-user-dirs-gtk-0.9/parse.h 2012-04-03 17:28:59.000000000 +0200 +++ new/xdg-user-dirs-gtk-0.10/parse.h 2013-01-21 14:18:54.000000000 +0100 @@ -12,7 +12,6 @@ XdgDirEntry *parse_xdg_dirs (const char *config_file); char *parse_xdg_dirs_locale (void); -GList * parse_gtk_bookmarks (const char *filename); -void save_gtk_bookmarks (const char *filename, - GList *bookmarks); +GList * parse_gtk_bookmarks (void); +void save_gtk_bookmarks (GList *bookmarks); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xdg-user-dirs-gtk-0.9/po/ChangeLog new/xdg-user-dirs-gtk-0.10/po/ChangeLog --- old/xdg-user-dirs-gtk-0.9/po/ChangeLog 2012-04-03 17:28:59.000000000 +0200 +++ new/xdg-user-dirs-gtk-0.10/po/ChangeLog 2013-01-21 14:18:32.000000000 +0100 @@ -1,3 +1,7 @@ +2012-08-30 Danishka Navin <[email protected]> + + * si.po: Added Sinhala (si) Translations. + 2010-03-15 Nils-Christoph Fiedler <[email protected]> * nds.po: Added Low German Translations. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xdg-user-dirs-gtk-0.9/po/LINGUAS new/xdg-user-dirs-gtk-0.10/po/LINGUAS --- old/xdg-user-dirs-gtk-0.9/po/LINGUAS 2012-04-03 17:28:59.000000000 +0200 +++ new/xdg-user-dirs-gtk-0.10/po/LINGUAS 2013-01-21 14:18:32.000000000 +0100 @@ -10,6 +10,7 @@ ca crh cs +csb da de dz @@ -52,6 +53,7 @@ pt_BR ro ru +si sk sl sq @@ -61,6 +63,7 @@ ta te th +tr uk vi zh_CN diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xdg-user-dirs-gtk-0.9/po/Makefile.in.in new/xdg-user-dirs-gtk-0.10/po/Makefile.in.in --- old/xdg-user-dirs-gtk-0.9/po/Makefile.in.in 2012-04-03 17:30:59.000000000 +0200 +++ new/xdg-user-dirs-gtk-0.10/po/Makefile.in.in 2013-01-21 14:53:56.000000000 +0100 @@ -49,8 +49,8 @@ XGETTEXT = @XGETTEXT@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist -GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot +MSGMERGE = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist +GENPOT = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot ALL_LINGUAS = @ALL_LINGUAS@ @@ -73,15 +73,20 @@ .SUFFIXES: .SUFFIXES: .po .pox .gmo .mo .msg .cat +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +INTLTOOL_V_MSGFMT = $(INTLTOOL__v_MSGFMT_$(V)) +INTLTOOL__v_MSGFMT_= $(INTLTOOL__v_MSGFMT_$(AM_DEFAULT_VERBOSITY)) +INTLTOOL__v_MSGFMT_0 = @echo " MSGFMT" $@; + .po.pox: $(MAKE) $(GETTEXT_PACKAGE).pot $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox .po.mo: - $(MSGFMT) -o $@ $< + $(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $< .po.gmo: - file=`echo $* | sed 's,.*/,,'`.gmo \ + $(INTLTOOL_V_MSGFMT)file=`echo $* | sed 's,.*/,,'`.gmo \ && rm -f $$file && $(GMSGFMT) -o $$file $< .po.cat: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xdg-user-dirs-gtk-0.9/po/csb.po new/xdg-user-dirs-gtk-0.10/po/csb.po --- old/xdg-user-dirs-gtk-0.9/po/csb.po 1970-01-01 01:00:00.000000000 +0100 +++ new/xdg-user-dirs-gtk-0.10/po/csb.po 2013-01-21 14:18:32.000000000 +0100 @@ -0,0 +1,67 @@ +# Kashubian translation for xdg-user-dirs-gtk +# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009 +# This file is distributed under the same license as the xdg-user-dirs-gtk package. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: xdg-user-dirs-gtk\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-04-16 19:38+0200\n" +"PO-Revision-Date: 2009-10-28 22:11+0000\n" +"Last-Translator: Mark Kwidzińsczi <Unknown>\n" +"Language-Team: Kashubian <[email protected]>\n" +"Language: csb\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../update.c:159 +msgid "Update standard folders to current language?" +msgstr "Zaktualnic standardowé katalodżi do aktualnegò jãzëka?" + +#: ../update.c:161 +msgid "" +"You have logged in in a new language. You can automatically update the names " +"of some standard folders in your home folder to match this language. The " +"update would change the following folders:" +msgstr "" +"Jes wlogòwóny z nowim jãzëkã. Mòże aùtomatno zaktualnic miona niejednych " +"standardowich katalogów w domôcym katalogù, abë dopasowac je do nowégò " +"jãzëka. Zaktualnioné bãdą nôslédné katalodżi:" + +#: ../update.c:164 +msgid "_Keep Old Names" +msgstr "Ù_trzëmôj stôré miona" + +#: ../update.c:165 +msgid "_Update Names" +msgstr "_Zaktualni miona" + +#: ../update.c:191 +msgid "Current folder name" +msgstr "Aktualné miono katalaga" + +#: ../update.c:196 +msgid "New folder name" +msgstr "Nowé miono kataloga" + +#: ../update.c:206 +msgid "Note that existing content will not be moved." +msgstr "Egzystëjącô zamkłosc ni mòże bëc przesëniãtô." + +#: ../update.c:213 +msgid "_Don't ask me this again" +msgstr "_Nie pëtôj znowa" + +#: ../update.c:230 +msgid "There was an error updating the folders" +msgstr "Fela przë aktualizacëji katalogów" + +#: ../user-dirs-update-gtk.desktop.in.h:1 +msgid "User folders update" +msgstr "Aktualizacëjô kataloga brëkòwnika" + +#: ../user-dirs-update-gtk.desktop.in.h:2 +msgid "Update common folders names to match current locale" +msgstr "Aktualizacëjô nowich mionów katalogów do aktualnegò nastôwù jãzëka" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xdg-user-dirs-gtk-0.9/po/pl.po new/xdg-user-dirs-gtk-0.10/po/pl.po --- old/xdg-user-dirs-gtk-0.9/po/pl.po 2012-04-03 17:28:59.000000000 +0200 +++ new/xdg-user-dirs-gtk-0.10/po/pl.po 2013-01-21 14:18:32.000000000 +0100 @@ -4,21 +4,23 @@ # pomóc w jego rozwijaniu i pielęgnowaniu, napisz do nas: # [email protected] # -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -# translation of xdg-user-dirs-gtk to Polish -# Copyright (C) 2009 Aviary.pl -# This file is distributed under the same license as the xdg-user-dirs-gtk package. -# Tomasz Dominikowski <[email protected]>, 2007 - 2009 +# Tomasz Dominikowski <[email protected]>, 2007-2009. +# Piotr Drąg <[email protected]>, 2012. +# Aviary.pl <[email protected]>, 2007-2012. msgid "" msgstr "" "Project-Id-Version: xdg-user-dirs-gtk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-03 00:03+0200\n" -"PO-Revision-Date: 2009-06-03 00:02+0100\n" -"Last-Translator: Tomasz Dominikowski <[email protected]>\n" +"POT-Creation-Date: 2012-09-04 21:25+0200\n" +"PO-Revision-Date: 2012-09-04 21:27+0200\n" +"Last-Translator: Piotr Drąg <[email protected]>\n" "Language-Team: Polish <[email protected]>\n" +"Language: pl\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " +"|| n%100>=20) ? 1 : 2);\n" "X-Poedit-Language: Polish\n" "X-Poedit-Country: Poland\n" @@ -32,7 +34,7 @@ "of some standard folders in your home folder to match this language. The " "update would change the following folders:" msgstr "" -"Zalogowano z nowym językiem. Można automatycznie zaktualizować nazwy " +"Zalogowano w nowym języku. Można automatycznie zaktualizować nazwy " "niektórych standardowych katalogów w katalogu domowym, aby dopasować je do " "nowego języka. Aktualizacji podlegałyby następujące katalogi:" @@ -44,33 +46,30 @@ msgid "_Update Names" msgstr "_Zaktualizuj nazwy" -#: ../update.c:190 +#: ../update.c:191 msgid "Current folder name" msgstr "Bieżąca nazwa katalogu" -#: ../update.c:195 +#: ../update.c:196 msgid "New folder name" msgstr "Nowa nazwa katalogu" -#: ../update.c:205 +#: ../update.c:206 msgid "Note that existing content will not be moved." -msgstr "Bieżąca zawartość nie zostanie przeniesiona." +msgstr "Obecna zawartość nie zostanie przeniesiona." -#: ../update.c:212 +#: ../update.c:213 msgid "_Don't ask me this again" -msgstr "_Bez ponownego pytania" +msgstr "_Bez pytania ponownie" -#: ../update.c:229 +#: ../update.c:230 msgid "There was an error updating the folders" msgstr "Wystąpił błąd podczas aktualizowania katalogów" #: ../user-dirs-update-gtk.desktop.in.h:1 -msgid "Update common folders names to match current locale" -msgstr "Aktualizowanie nazw katalogów do bieżących ustawień językowych" - -#: ../user-dirs-update-gtk.desktop.in.h:2 msgid "User folders update" msgstr "Aktualizacja katalogów użytkownika" -#~ msgid "The update would change the following folders:" -#~ msgstr "Aktualizacja zmieniłaby nazwy następujących folderów:" +#: ../user-dirs-update-gtk.desktop.in.h:2 +msgid "Update common folders names to match current locale" +msgstr "Aktualizowanie nazw katalogów do bieżących ustawień językowych" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xdg-user-dirs-gtk-0.9/po/si.po new/xdg-user-dirs-gtk-0.10/po/si.po --- old/xdg-user-dirs-gtk-0.9/po/si.po 1970-01-01 01:00:00.000000000 +0100 +++ new/xdg-user-dirs-gtk-0.10/po/si.po 2013-01-21 14:18:32.000000000 +0100 @@ -0,0 +1,65 @@ +# Sinhalese translation for xdg-user-dirs-gtk +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the xdg-user-dirs-gtk package. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: xdg-user-dirs-gtk\n" +"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2012-07-20 05:15+0000\n" +"PO-Revision-Date: 2012-05-23 04:25+0000\n" +"Last-Translator: පසිඳු කාවින්ද <[email protected]>\n" +"Language-Team: Sinhalese <[email protected]>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-08-31 05:00+0000\n" +"X-Generator: Launchpad (build 15887)\n" + +#: ../update.c:159 +msgid "Update standard folders to current language?" +msgstr "" + +#: ../update.c:161 +msgid "" +"You have logged in in a new language. You can automatically update the names " +"of some standard folders in your home folder to match this language. The " +"update would change the following folders:" +msgstr "" + +#: ../update.c:164 +msgid "_Keep Old Names" +msgstr "පැරණි නම් තබාගන්න (_K)" + +#: ../update.c:165 +msgid "_Update Names" +msgstr "නම් යාවත්කාලීන කරන්න (_U)" + +#: ../update.c:191 +msgid "Current folder name" +msgstr "වත්මන් බහාලුමේ නම" + +#: ../update.c:196 +msgid "New folder name" +msgstr "නව බහාලුමේ නම" + +#: ../update.c:206 +msgid "Note that existing content will not be moved." +msgstr "දැනටමත් පවතින අන්තර්ගතය නොගෙන යන බව මතක තබාගන්න." + +#: ../update.c:213 +msgid "_Don't ask me this again" +msgstr "මගෙන් නැවත නොවිමසන්න (_D)" + +#: ../update.c:230 +msgid "There was an error updating the folders" +msgstr "බහාලුම් යාවත්කාලීන කිරීමේදී දෝෂයක් හට ගැනුණි" + +#: ../user-dirs-update-gtk.desktop.in.h:1 +msgid "User folders update" +msgstr "පරිශීලක බහාලුම් යාවත්කාලීනය" + +#: ../user-dirs-update-gtk.desktop.in.h:2 +msgid "Update common folders names to match current locale" +msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xdg-user-dirs-gtk-0.9/po/tr.po new/xdg-user-dirs-gtk-0.10/po/tr.po --- old/xdg-user-dirs-gtk-0.9/po/tr.po 1970-01-01 01:00:00.000000000 +0100 +++ new/xdg-user-dirs-gtk-0.10/po/tr.po 2013-01-21 14:18:32.000000000 +0100 @@ -0,0 +1,73 @@ +# Turkish translation for xdg-user-dirs-gtk +# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009 +# This file is distributed under the same license as the xdg-user-dirs-gtk package. +# Muhammet Kara <[email protected]>, 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: xdg-user-dirs-gtk\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=xdg-"; +"user-dirs-gtk&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2012-08-31 05:44+0000\n" +"PO-Revision-Date: 2012-09-04 00:52+0000\n" +"Last-Translator: Muhammet Kara <[email protected]>\n" +"Language-Team: Turkish <[email protected]>\n" +"Language: tr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Launchpad-Export-Date: 2012-08-31 05:00+0000\n" +"X-Generator: Launchpad (build 15887)\n" + +#: ../update.c:159 +msgid "Update standard folders to current language?" +msgstr "Standart klasörler geçerli dile güncelleştirilsin mi ?" + +#: ../update.c:161 +msgid "" +"You have logged in in a new language. You can automatically update the names " +"of some standard folders in your home folder to match this language. The " +"update would change the following folders:" +msgstr "" +"Yeni bir dil ile giriş yaptınız. Başlangıç klasörünüzde bu dille " +"uyuşmayan standart klasör adlarını otomatik olarak bu dile " +"güncelleştirebilirsiniz. Güncelleştirme şu dizinlerin adlarını " +"değiştirecektir:" + +#: ../update.c:164 +msgid "_Keep Old Names" +msgstr "_Eski Adları Koru" + +#: ../update.c:165 +msgid "_Update Names" +msgstr "_Adları Güncelleştir" + +#: ../update.c:191 +msgid "Current folder name" +msgstr "Geçerli klasör adı" + +#: ../update.c:196 +msgid "New folder name" +msgstr "Yeni klasör adı" + +#: ../update.c:206 +msgid "Note that existing content will not be moved." +msgstr "Varolan içeriğin taşınmayacağını unutmayın." + +#: ../update.c:213 +msgid "_Don't ask me this again" +msgstr "_Bunu bir daha sorma" + +#: ../update.c:230 +msgid "There was an error updating the folders" +msgstr "Klasörler güncelleştirilirken hata oluştu" + +#: ../user-dirs-update-gtk.desktop.in.h:1 +msgid "User folders update" +msgstr "Kullanıcı klasörlerinin güncelleştirilmesi" + +#: ../user-dirs-update-gtk.desktop.in.h:2 +msgid "Update common folders names to match current locale" +msgstr "" +"Genel klasör adlarını geçerli dile uyumlu hale getirmek için güncelleştir" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xdg-user-dirs-gtk-0.9/update.c new/xdg-user-dirs-gtk-0.10/update.c --- old/xdg-user-dirs-gtk-0.9/update.c 2012-04-03 17:28:59.000000000 +0200 +++ new/xdg-user-dirs-gtk-0.10/update.c 2013-01-21 14:50:11.000000000 +0100 @@ -305,7 +305,7 @@ new_entries = parse_xdg_dirs (NULL); - bookmarks = parse_gtk_bookmarks (NULL); + bookmarks = parse_gtk_bookmarks (); modified_bookmarks = FALSE; if (bookmarks == NULL) @@ -372,7 +372,7 @@ } if (modified_bookmarks) - save_gtk_bookmarks (NULL, bookmarks); + save_gtk_bookmarks (bookmarks); g_free (new_entries); g_free (old_entries); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
