Hello community, here is the log from the commit of package lightdm-gtk-greeter for openSUSE:Factory checked in at 2012-05-31 17:06:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lightdm-gtk-greeter (Old) and /work/SRC/openSUSE:Factory/.lightdm-gtk-greeter.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lightdm-gtk-greeter", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/lightdm-gtk-greeter/lightdm-gtk-greeter.changes 2012-04-12 13:25:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lightdm-gtk-greeter.new/lightdm-gtk-greeter.changes 2012-05-31 17:06:53.000000000 +0200 @@ -1,0 +2,9 @@ +Wed May 30 09:41:00 UTC 2012 - gber@opensuse.org + +- update to version 1.1.6 + - fix 'Large Font' option for fontnames containing spaces + - fix 'Cancel' button action, and clear the error label + - add missing include for setlocale + - updated translations + +------------------------------------------------------------------- Old: ---- lightdm-gtk-greeter-1.1.5.tar.gz New: ---- lightdm-gtk-greeter-1.1.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lightdm-gtk-greeter.spec ++++++ --- /var/tmp/diff_new_pack.A9UVdD/_old 2012-05-31 17:06:55.000000000 +0200 +++ /var/tmp/diff_new_pack.A9UVdD/_new 2012-05-31 17:06:55.000000000 +0200 @@ -18,7 +18,7 @@ Name: lightdm-gtk-greeter -Version: 1.1.5 +Version: 1.1.6 Release: 0 Summary: GTK-based Greeter for LightDM License: GPL-3.0+ @@ -26,14 +26,14 @@ Url: https://launchpad.net/lightdm-gtk-greeter Source0: %{name}-%{version}.tar.gz BuildRequires: intltool -BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(gmodule-export-2.0) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(liblightdm-gobject-1) -BuildRequires: pkgconfig(gmodule-export-2.0) +BuildRequires: pkgconfig(x11) BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: lightdm-greeter -Requires: lightdm Requires: %{name}-branding = %{version} +Requires: lightdm Recommends: %{name}-lang = %{version} Recommends: gnome-themes-accessibility Requires(post): update-alternatives ++++++ lightdm-gtk-greeter-1.1.5.tar.gz -> lightdm-gtk-greeter-1.1.6.tar.gz ++++++ ++++ 1699 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/lightdm-gtk-greeter-1.1.5/NEWS new/lightdm-gtk-greeter-1.1.6/NEWS --- old/lightdm-gtk-greeter-1.1.5/NEWS 2012-04-03 22:35:28.000000000 +0200 +++ new/lightdm-gtk-greeter-1.1.6/NEWS 2012-05-21 20:14:41.000000000 +0200 @@ -1,3 +1,10 @@ +Overview of changes in lightdm-gtk-greeter 1.1.6 + + * Fix 'Large Font' option for fontnames containing spaces (Bug #908926) + * Fix 'Cancel' button action, and clear the error label (Bug #990315) + * Add missing include for setlocale (Bug #999438) + * Updated translations. + Overview of changes in lightdm-gtk-greeter 1.1.5 * Restore all translations lost during the split from lightdm 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/lightdm-gtk-greeter-1.1.5/compile new/lightdm-gtk-greeter-1.1.6/compile --- old/lightdm-gtk-greeter-1.1.5/compile 2012-04-03 22:41:25.000000000 +0200 +++ new/lightdm-gtk-greeter-1.1.6/compile 2012-05-21 20:17:28.000000000 +0200 @@ -1,7 +1,7 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-01-04.17; # UTC +scriptversion=2012-03-05.13; # UTC # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free # Software Foundation, Inc. @@ -79,6 +79,48 @@ esac } +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + # func_cl_wrapper cl arg... # Adjust compile command to suit cl func_cl_wrapper () @@ -109,43 +151,34 @@ ;; esac ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; -I*) func_file_conv "${1#-I}" mingw set x "$@" -I"$file" shift ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; -l*) - lib=${1#-l} - found=no - save_IFS=$IFS - IFS=';' - for dir in $lib_path $LIB - do - IFS=$save_IFS - if $shared && test -f "$dir/$lib.dll.lib"; then - found=yes - set x "$@" "$dir/$lib.dll.lib" - break - fi - if test -f "$dir/$lib.lib"; then - found=yes - set x "$@" "$dir/$lib.lib" - break - fi - done - IFS=$save_IFS - - test "$found" != yes && set x "$@" "$lib.lib" + func_cl_dashl "${1#-l}" + set x "$@" "$lib" shift ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; -L*) - func_file_conv "${1#-L}" - if test -z "$lib_path"; then - lib_path=$file - else - lib_path="$lib_path;$file" - fi - linker_opts="$linker_opts -LIBPATH:$file" + func_cl_dashL "${1#-L}" ;; -static) shared=false 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/lightdm-gtk-greeter-1.1.5/configure.ac new/lightdm-gtk-greeter-1.1.6/configure.ac --- old/lightdm-gtk-greeter-1.1.5/configure.ac 2012-04-03 22:35:28.000000000 +0200 +++ new/lightdm-gtk-greeter-1.1.6/configure.ac 2012-05-21 20:16:14.000000000 +0200 @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(lightdm-gtk-greeter, 1.1.5) +AC_INIT(lightdm-gtk-greeter, 1.1.6) AC_CONFIG_MACRO_DIR(m4) AC_CONFIG_HEADER(config.h) AM_INIT_AUTOMAKE 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/lightdm-gtk-greeter-1.1.5/po/de.po new/lightdm-gtk-greeter-1.1.6/po/de.po --- old/lightdm-gtk-greeter-1.1.5/po/de.po 2012-04-03 22:35:21.000000000 +0200 +++ new/lightdm-gtk-greeter-1.1.6/po/de.po 2012-05-21 11:42:41.000000000 +0200 @@ -8,14 +8,14 @@ "Project-Id-Version: lightdm\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-03-19 16:55+0100\n" -"PO-Revision-Date: 2012-03-20 15:12+0000\n" -"Last-Translator: Lionel Le Folgoc <lionel@lefolgoc.net>\n" +"PO-Revision-Date: 2012-04-21 01:16+0000\n" +"Last-Translator: Eduard Gotwig <eduardgotwig@gmail.com>\n" "Language-Team: German <de@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-03-21 06:01+0000\n" -"X-Generator: Launchpad (build 14981)\n" +"X-Launchpad-Export-Date: 2012-04-22 05:14+0000\n" +"X-Generator: Launchpad (build 15120)\n" "Language: de\n" #: ../data/greeter.ui.h:1 @@ -56,7 +56,7 @@ #: ../src/lightdm-gtk-greeter.c:315 msgid "Incorrect password, please try again" -msgstr "Falsches Passwort, bitte versuchen Sie es erneut" +msgstr "Falsches Passwort, bitte wiederholen" #: ../src/lightdm-gtk-greeter.c:319 msgid "Failed to authenticate" 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/lightdm-gtk-greeter-1.1.5/po/es.po new/lightdm-gtk-greeter-1.1.6/po/es.po --- old/lightdm-gtk-greeter-1.1.5/po/es.po 2012-04-03 22:35:21.000000000 +0200 +++ new/lightdm-gtk-greeter-1.1.6/po/es.po 2012-05-21 11:42:41.000000000 +0200 @@ -8,14 +8,14 @@ "Project-Id-Version: lightdm\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-03-19 16:55+0100\n" -"PO-Revision-Date: 2012-03-20 15:13+0000\n" -"Last-Translator: Paco Molinero <paco@byasl.com>\n" +"PO-Revision-Date: 2012-04-04 00:12+0000\n" +"Last-Translator: Fitoschido <fitoschido@gmail.com>\n" "Language-Team: Spanish <es@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-03-21 06:01+0000\n" -"X-Generator: Launchpad (build 14981)\n" +"X-Launchpad-Export-Date: 2012-04-05 05:27+0000\n" +"X-Generator: Launchpad (build 15060)\n" "Language: es\n" #: ../data/greeter.ui.h:1 @@ -36,11 +36,11 @@ #: ../data/greeter.ui.h:5 msgid "Restart..." -msgstr "Reiniciar..." +msgstr "Reiniciar…" #: ../data/greeter.ui.h:6 msgid "Shutdown..." -msgstr "Apagar..." +msgstr "Apagar…" #: ../data/greeter.ui.h:7 msgid "Large Font" 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/lightdm-gtk-greeter-1.1.5/po/he.po new/lightdm-gtk-greeter-1.1.6/po/he.po --- old/lightdm-gtk-greeter-1.1.5/po/he.po 2012-04-03 22:35:21.000000000 +0200 +++ new/lightdm-gtk-greeter-1.1.6/po/he.po 2012-05-21 11:42:41.000000000 +0200 @@ -8,14 +8,14 @@ "Project-Id-Version: lightdm\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-03-19 16:55+0100\n" -"PO-Revision-Date: 2012-03-20 15:19+0000\n" +"PO-Revision-Date: 2012-04-26 10:17+0000\n" "Last-Translator: Yaron <sh.yaron@gmail.com>\n" "Language-Team: Hebrew <he@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-03-21 06:01+0000\n" -"X-Generator: Launchpad (build 14981)\n" +"X-Launchpad-Export-Date: 2012-04-27 05:07+0000\n" +"X-Generator: Launchpad (build 15149)\n" "Language: he\n" #: ../data/greeter.ui.h:1 @@ -77,7 +77,7 @@ #: ../src/lightdm-gtk-greeter.c:401 msgid "" "Are you sure you want to close all programs and shutdown the computer?" -msgstr "האם אכן ברצונך לסגור את כל התבניות ולכבות את המחשב?" +msgstr "האם אכן ברצונך לסגור את כל התכניות ולכבות את המחשב?" #: ../src/lightdm-gtk-greeter.c:402 msgid "Shutdown" 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/lightdm-gtk-greeter-1.1.5/po/kk.po new/lightdm-gtk-greeter-1.1.6/po/kk.po --- old/lightdm-gtk-greeter-1.1.5/po/kk.po 2012-04-03 22:35:21.000000000 +0200 +++ new/lightdm-gtk-greeter-1.1.6/po/kk.po 2012-05-21 11:42:41.000000000 +0200 @@ -8,14 +8,14 @@ "Project-Id-Version: lightdm\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-03-19 16:55+0100\n" -"PO-Revision-Date: 2012-03-20 15:26+0000\n" -"Last-Translator: Lionel Le Folgoc <lionel@lefolgoc.net>\n" +"PO-Revision-Date: 2012-05-12 06:23+0000\n" +"Last-Translator: Baurzhan Muftakhidinov <Unknown>\n" "Language-Team: Kazakh <kk@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-03-21 06:01+0000\n" -"X-Generator: Launchpad (build 14981)\n" +"X-Launchpad-Export-Date: 2012-05-13 05:02+0000\n" +"X-Generator: Launchpad (build 15225)\n" "Language: kk\n" #: ../data/greeter.ui.h:1 @@ -56,7 +56,7 @@ #: ../src/lightdm-gtk-greeter.c:315 msgid "Incorrect password, please try again" -msgstr "Құпия сөз дұрыс емес, тағы енгізіп көріңіз" +msgstr "Пароль қате, қайта енгізіп көріңіз" #: ../src/lightdm-gtk-greeter.c:319 msgid "Failed to authenticate" @@ -86,8 +86,8 @@ #: ../src/lightdm-gtk-greeter.c:579 msgid "Guest Account" -msgstr "" +msgstr "Қонақ тіркелгісі" #: ../src/lightdm-gtk-greeter.c:588 msgid "Other..." -msgstr "" +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/lightdm-gtk-greeter-1.1.5/src/lightdm-gtk-greeter.c new/lightdm-gtk-greeter-1.1.6/src/lightdm-gtk-greeter.c --- old/lightdm-gtk-greeter-1.1.5/src/lightdm-gtk-greeter.c 2012-04-03 22:35:21.000000000 +0200 +++ new/lightdm-gtk-greeter-1.1.6/src/lightdm-gtk-greeter.c 2012-05-21 11:47:42.000000000 +0200 @@ -10,6 +10,7 @@ */ #include <stdlib.h> +#include <locale.h> #include <gtk/gtk.h> #include <glib/gi18n.h> #include <cairo-xlib.h> @@ -194,7 +195,7 @@ { cancelling = TRUE; lightdm_greeter_cancel_authentication (greeter); - return; + set_message_label (""); } /* Start a new login or return to the user list */ @@ -490,16 +491,20 @@ if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget))) { gchar *font_name, **tokens; + guint length; g_object_get (gtk_settings_get_default (), "gtk-font-name", &font_name, NULL); - tokens = g_strsplit (font_name, " ", 2); - if (g_strv_length (tokens) == 2) + tokens = g_strsplit (font_name, " ", -1); + length = g_strv_length (tokens); + if (length > 1) { - gint size = atoi (tokens[1]); + gint size = atoi (tokens[length - 1]); if (size > 0) { + g_free (tokens[length - 1]); + tokens[length - 1] = g_strdup_printf ("%d", size + 10); g_free (font_name); - font_name = g_strdup_printf ("%s %d", tokens[0], size + 10); + font_name = g_strjoinv (" ", tokens); } } g_strfreev (tokens); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org