Hello community, here is the log from the commit of package gnome-desktop for openSUSE:Factory checked in at Wed Aug 3 16:23:22 CEST 2011.
-------- --- GNOME/gnome-desktop/gnome-desktop.changes 2011-07-04 18:55:08.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-desktop/gnome-desktop.changes 2011-07-25 22:45:40.000000000 +0200 @@ -1,0 +2,16 @@ +Mon Jul 25 22:43:09 CEST 2011 - [email protected] + +- Update to version 3.1.4: + + libgnome-desktop + + GnomeRR: Add the capability to get and set the DPMS mode of + the screen + + Misc + + Fix Cflags path in uninstalled.pc file + + Remove stale startup-notification dependency + + Require xext in configure + + Updated translations. +- Remove now unneeded pkgconfig(libstartup-notification-1.0) + BuildRequires. +- Add pkgconfig(xext) BuildRequires, for new dependency. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gnome-desktop-3.1.3.tar.bz2 New: ---- gnome-desktop-3.1.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-desktop.spec ++++++ --- /var/tmp/diff_new_pack.bDgNXB/_old 2011-08-03 16:20:46.000000000 +0200 +++ /var/tmp/diff_new_pack.bDgNXB/_new 2011-08-03 16:20:46.000000000 +0200 @@ -19,7 +19,7 @@ %define IS_DEFAULT_GNOME_DESKTOP 1 Name: gnome-desktop -Version: 3.1.3 +Version: 3.1.4 Release: 1 License: LGPLv2.1+ Summary: The GNOME Desktop API Library @@ -36,8 +36,8 @@ BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gsettings-desktop-schemas) BuildRequires: pkgconfig(gtk+-3.0) -BuildRequires: pkgconfig(libstartup-notification-1.0) BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xrandr) %if 0%{?BUILD_FROM_VCS} BuildRequires: gnome-common ++++++ gnome-desktop-3.1.3.tar.bz2 -> gnome-desktop-3.1.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-desktop-3.1.3/ChangeLog new/gnome-desktop-3.1.4/ChangeLog --- old/gnome-desktop-3.1.3/ChangeLog 2011-07-04 17:20:17.000000000 +0200 +++ new/gnome-desktop-3.1.4/ChangeLog 2011-07-25 21:26:22.000000000 +0200 @@ -1,6 +1,90 @@ +commit 4545552762932592c2a8e9564d608bc40888fc40 +Author: Vincent Untz <[email protected]> +Date: 2011-07-25 + + build: Fix previous commit (1e38a386) + + https://bugzilla.gnome.org/show_bug.cgi?id=655274 + +M configure.ac + +commit 1e38a386da4a6c7f70f89621fa43fa1099523176 +Author: Xan Lopez <[email protected]> +Date: 2011-07-22 + + build: check for the X DPMS extension + + We use it unconditionally, so we need to do this if for no other + reason that the module fails to link with GNU Gold otherwise. + +M configure.ac + +commit 1871113d3514ec50cfc4cfb1d22e28c0d58af7df +Author: Tommi Vainikainen <[email protected]> +Date: 2011-07-19 + + Updated Finnish translation + +M po/fi.po + +commit 21a4d13a6e5e43e6bf8aee872c115d4f581d1d07 +Author: Vincent Untz <[email protected]> +Date: 2011-07-18 + + build: Remove startup-notification dependency + + We don't have anything using it in the library anymore. + +M configure.ac +M libgnome-desktop/gnome-desktop-3.0-uninstalled.pc.in +M libgnome-desktop/gnome-desktop-3.0.pc.in + +commit 759c4f3e87b4301b7cbc895a6d3a50d7886535d9 +Author: Brian Cameron <[email protected]> +Date: 2011-07-18 + + build: Fix Cflags path in uninstalled.pc file + + https://bugzilla.gnome.org/show_bug.cgi?id=654717 + +M libgnome-desktop/gnome-desktop-3.0-uninstalled.pc.in + +commit 4e7dac8fb6590a51054550b177b31b1991f7981e +Author: Richard Hughes <[email protected]> +Date: 2011-07-04 + + Add the capability to get and set the DPMS mode of the screen + + This is presently per-screen, but future versions of xrandr will + allow us to + set the DPMS mode of each output. + + This functionality is required by the power plugin in + gnome-settings-daemon. + +M libgnome-desktop/gnome-rr-private.h +M libgnome-desktop/gnome-rr.c +M libgnome-desktop/gnome-rr.h + +commit 422189c751e82dc45242c7ad4505f8b6019b1849 +Author: Vincent Untz <[email protected]> +Date: 2011-07-04 + + release: post-release bump to 3.1.4 + +M configure.ac + +commit 6d5ba2db000823926bb3ea93d9a28d0eaffbdef7 +Author: Vincent Untz <[email protected]> +Date: 2011-07-04 + + release: 3.1.3 + +M NEWS + commit 43d8fea7045bb279e20b5b4b0f0b9f6a95806660 Author: Vincent Untz <[email protected]> -Date: 2011-07-04 +Date: 2011-07-04 Revert "Add gnome-about.desktop.in to POTFILES" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-desktop-3.1.3/config.h.in new/gnome-desktop-3.1.4/config.h.in --- old/gnome-desktop-3.1.3/config.h.in 2011-07-04 17:20:36.000000000 +0200 +++ new/gnome-desktop-3.1.4/config.h.in 2011-07-25 21:29:18.000000000 +0200 @@ -33,9 +33,6 @@ /* Define if the xrandr-$XRANDR_REQUIRED library is present */ #undef HAVE_RANDR -/* Define if the startup-notification package is present */ -#undef HAVE_STARTUP_NOTIFICATION - /* Define to 1 if you have the <stdint.h> header file. */ #undef HAVE_STDINT_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-desktop-3.1.3/configure new/gnome-desktop-3.1.4/configure --- old/gnome-desktop-3.1.3/configure 2011-07-04 17:20:35.000000000 +0200 +++ new/gnome-desktop-3.1.4/configure 2011-07-25 21:29:18.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for gnome-desktop 3.1.3. +# Generated by GNU Autoconf 2.65 for gnome-desktop 3.1.4. # # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-desktop>. # @@ -702,8 +702,8 @@ # Identity of this package. PACKAGE_NAME='gnome-desktop' PACKAGE_TARNAME='gnome-desktop' -PACKAGE_VERSION='3.1.3' -PACKAGE_STRING='gnome-desktop 3.1.3' +PACKAGE_VERSION='3.1.4' +PACKAGE_STRING='gnome-desktop 3.1.4' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-desktop' PACKAGE_URL='' @@ -803,9 +803,8 @@ XMKMF XLIB_LIBS XLIB_CFLAGS -STARTUP_NOTIFICATION_PACKAGE +XEXT_REQUIRED XRANDR_REQUIRED -STARTUP_NOTIFICATION_REQUIRED GDK_PIXBUF_REQUIRED GLIB_REQUIRED GTK_REQUIRED @@ -1559,7 +1558,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 gnome-desktop 3.1.3 to adapt to many kinds of systems. +\`configure' configures gnome-desktop 3.1.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1633,7 +1632,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gnome-desktop 3.1.3:";; + short | recursive ) echo "Configuration of gnome-desktop 3.1.4:";; esac cat <<\_ACEOF @@ -1771,7 +1770,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gnome-desktop configure 3.1.3 +gnome-desktop configure 3.1.4 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2142,7 +2141,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gnome-desktop $as_me 3.1.3, which was +It was created by gnome-desktop $as_me 3.1.4, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2952,7 +2951,7 @@ # Define the identity of the package. PACKAGE='gnome-desktop' - VERSION='3.1.3' + VERSION='3.1.4' cat >>confdefs.h <<_ACEOF @@ -4763,13 +4762,13 @@ else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:4766: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4765: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4769: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4768: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4772: output\"" >&5) + (eval echo "\"\$as_me:4771: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5972,7 +5971,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5975 "configure"' > conftest.$ac_ext + echo '#line 5974 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7798,11 +7797,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7801: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7800: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7805: \$? = $ac_status" >&5 + echo "$as_me:7804: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8137,11 +8136,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8140: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8139: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8144: \$? = $ac_status" >&5 + echo "$as_me:8143: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8242,11 +8241,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8245: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8244: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8249: \$? = $ac_status" >&5 + echo "$as_me:8248: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8297,11 +8296,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8300: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8299: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8304: \$? = $ac_status" >&5 + echo "$as_me:8303: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10664,7 +10663,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10667 "configure" +#line 10666 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10760,7 +10759,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10763 "configure" +#line 10762 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12336,7 +12335,7 @@ GNOME_PLATFORM=3 GNOME_MINOR=1 -GNOME_MICRO=3 +GNOME_MICRO=4 GNOME_DISTRIBUTOR="GNOME.Org" GNOME_DATE=`date +"%Y-%m-%d"` @@ -12581,9 +12580,9 @@ GDK_PIXBUF_REQUIRED=2.21.3 GTK_REQUIRED=3.0 GLIB_REQUIRED=2.19.1 -STARTUP_NOTIFICATION_REQUIRED=0.5 XRANDR_REQUIRED=1.2 GSETTINGS_DESKTOP_SCHEMAS_REQUIRED=0.1.4 +XEXT_REQUIRED=1.2 @@ -12591,25 +12590,6 @@ -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libstartup-notification" >&5 -$as_echo_n "checking for libstartup-notification... " >&6; } -if $PKG_CONFIG --atleast-version $STARTUP_NOTIFICATION_REQUIRED libstartup-notification-1.0; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -$as_echo "#define HAVE_STARTUP_NOTIFICATION 1" >>confdefs.h - - have_startup_notification=yes - STARTUP_NOTIFICATION_PACKAGE=libstartup-notification-1.0 -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - have_startup_notification=no - STARTUP_NOTIFICATION_PACKAGE= -fi - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5 $as_echo_n "checking for X... " >&6; } @@ -13899,12 +13879,12 @@ pkg_cv_GNOME_DESKTOP_CFLAGS="$GNOME_DESKTOP_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdk-pixbuf-2.0 >= \$GDK_PIXBUF_REQUIRED gtk+-3.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED gsettings-desktop-schemas >= \$GSETTINGS_DESKTOP_SCHEMAS_REQUIRED \$STARTUP_NOTIFICATION_PACKAGE \$RANDR_PACKAGE\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-3.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED $STARTUP_NOTIFICATION_PACKAGE $RANDR_PACKAGE") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdk-pixbuf-2.0 >= \$GDK_PIXBUF_REQUIRED gtk+-3.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED gsettings-desktop-schemas >= \$GSETTINGS_DESKTOP_SCHEMAS_REQUIRED \$RANDR_PACKAGE xext >= \$XEXT_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-3.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED $RANDR_PACKAGE xext >= $XEXT_REQUIRED") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GNOME_DESKTOP_CFLAGS=`$PKG_CONFIG --cflags "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-3.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED $STARTUP_NOTIFICATION_PACKAGE $RANDR_PACKAGE" 2>/dev/null` + pkg_cv_GNOME_DESKTOP_CFLAGS=`$PKG_CONFIG --cflags "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-3.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED $RANDR_PACKAGE xext >= $XEXT_REQUIRED" 2>/dev/null` else pkg_failed=yes fi @@ -13915,12 +13895,12 @@ pkg_cv_GNOME_DESKTOP_LIBS="$GNOME_DESKTOP_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdk-pixbuf-2.0 >= \$GDK_PIXBUF_REQUIRED gtk+-3.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED gsettings-desktop-schemas >= \$GSETTINGS_DESKTOP_SCHEMAS_REQUIRED \$STARTUP_NOTIFICATION_PACKAGE \$RANDR_PACKAGE\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-3.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED $STARTUP_NOTIFICATION_PACKAGE $RANDR_PACKAGE") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdk-pixbuf-2.0 >= \$GDK_PIXBUF_REQUIRED gtk+-3.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED gsettings-desktop-schemas >= \$GSETTINGS_DESKTOP_SCHEMAS_REQUIRED \$RANDR_PACKAGE xext >= \$XEXT_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-3.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED $RANDR_PACKAGE xext >= $XEXT_REQUIRED") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GNOME_DESKTOP_LIBS=`$PKG_CONFIG --libs "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-3.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED $STARTUP_NOTIFICATION_PACKAGE $RANDR_PACKAGE" 2>/dev/null` + pkg_cv_GNOME_DESKTOP_LIBS=`$PKG_CONFIG --libs "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-3.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED $RANDR_PACKAGE xext >= $XEXT_REQUIRED" 2>/dev/null` else pkg_failed=yes fi @@ -13940,14 +13920,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GNOME_DESKTOP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-3.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED $STARTUP_NOTIFICATION_PACKAGE $RANDR_PACKAGE" 2>&1` + GNOME_DESKTOP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-3.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED $RANDR_PACKAGE xext >= $XEXT_REQUIRED" 2>&1` else - GNOME_DESKTOP_PKG_ERRORS=`$PKG_CONFIG --print-errors "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-3.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED $STARTUP_NOTIFICATION_PACKAGE $RANDR_PACKAGE" 2>&1` + GNOME_DESKTOP_PKG_ERRORS=`$PKG_CONFIG --print-errors "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-3.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED $RANDR_PACKAGE xext >= $XEXT_REQUIRED" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GNOME_DESKTOP_PKG_ERRORS" >&5 - as_fn_error "Package requirements (gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-3.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED $STARTUP_NOTIFICATION_PACKAGE $RANDR_PACKAGE) were not met: + as_fn_error "Package requirements (gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-3.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED $RANDR_PACKAGE xext >= $XEXT_REQUIRED) were not met: $GNOME_DESKTOP_PKG_ERRORS @@ -15684,7 +15664,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gnome-desktop $as_me 3.1.3, which was +This file was extended by gnome-desktop $as_me 3.1.4, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15750,7 +15730,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -gnome-desktop config.status 3.1.3 +gnome-desktop config.status 3.1.4 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" @@ -17553,7 +17533,6 @@ Build desktop-wide docs: ${enable_desktop_docs} Date in gnome-version.xml: ${enable_date_in_gnome_version} Use external pnp.ids: ${EXTERNAL_PNP_IDS} - Startup notification support: ${have_startup_notification} XRandr support: ${have_randr} Build gtk-doc documentation: ${enable_gtk_doc} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-desktop-3.1.3/configure.ac new/gnome-desktop-3.1.4/configure.ac --- old/gnome-desktop-3.1.3/configure.ac 2011-06-14 14:22:55.000000000 +0200 +++ new/gnome-desktop-3.1.4/configure.ac 2011-07-25 17:56:12.000000000 +0200 @@ -1,6 +1,6 @@ m4_define(gnome_platform, 3) m4_define(gnome_minor, 1) -m4_define(gnome_micro, 3) +m4_define(gnome_micro, 4) dnl gnome_sub is an optional sub-version which will not be advertised to the user dnl It allows to release a 2.30.1.1 which is just a better 2.30.1 dnl Leave empty if not needed @@ -113,30 +113,15 @@ GDK_PIXBUF_REQUIRED=2.21.3 GTK_REQUIRED=3.0 GLIB_REQUIRED=2.19.1 -STARTUP_NOTIFICATION_REQUIRED=0.5 XRANDR_REQUIRED=1.2 GSETTINGS_DESKTOP_SCHEMAS_REQUIRED=0.1.4 +XEXT_REQUIRED=1.2 AC_SUBST(GTK_REQUIRED) AC_SUBST(GLIB_REQUIRED) AC_SUBST(GDK_PIXBUF_REQUIRED) -AC_SUBST(STARTUP_NOTIFICATION_REQUIRED) AC_SUBST(XRANDR_REQUIRED) - -AC_MSG_CHECKING(for libstartup-notification) -if $PKG_CONFIG --atleast-version $STARTUP_NOTIFICATION_REQUIRED libstartup-notification-1.0; then - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_STARTUP_NOTIFICATION, 1, - [Define if the startup-notification package is present]) - have_startup_notification=yes - STARTUP_NOTIFICATION_PACKAGE=libstartup-notification-1.0 -else - AC_MSG_RESULT(no) - have_startup_notification=no - STARTUP_NOTIFICATION_PACKAGE= -fi - -AC_SUBST(STARTUP_NOTIFICATION_PACKAGE) +AC_SUBST(XEXT_REQUIRED) dnl we need x11 for GnomeBG @@ -173,7 +158,7 @@ dnl pkg-config dependency checks -PKG_CHECK_MODULES(GNOME_DESKTOP, gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-3.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED $STARTUP_NOTIFICATION_PACKAGE $RANDR_PACKAGE) +PKG_CHECK_MODULES(GNOME_DESKTOP, gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-3.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED $RANDR_PACKAGE xext >= $XEXT_REQUIRED) dnl gnome-doc-utils stuff @@ -237,7 +222,6 @@ Build desktop-wide docs: ${enable_desktop_docs} Date in gnome-version.xml: ${enable_date_in_gnome_version} Use external pnp.ids: ${EXTERNAL_PNP_IDS} - Startup notification support: ${have_startup_notification} XRandr support: ${have_randr} Build gtk-doc documentation: ${enable_gtk_doc} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-desktop-3.1.3/desktop-docs/fdl/Makefile.in new/gnome-desktop-3.1.4/desktop-docs/fdl/Makefile.in --- old/gnome-desktop-3.1.3/desktop-docs/fdl/Makefile.in 2011-07-04 17:20:36.000000000 +0200 +++ new/gnome-desktop-3.1.4/desktop-docs/fdl/Makefile.in 2011-07-25 21:29:19.000000000 +0200 @@ -200,13 +200,12 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ -STARTUP_NOTIFICATION_PACKAGE = @STARTUP_NOTIFICATION_PACKAGE@ -STARTUP_NOTIFICATION_REQUIRED = @STARTUP_NOTIFICATION_REQUIRED@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ X11_PACKAGE = @X11_PACKAGE@ +XEXT_REQUIRED = @XEXT_REQUIRED@ XGETTEXT = @XGETTEXT@ XLIB_CFLAGS = @XLIB_CFLAGS@ XLIB_LIBS = @XLIB_LIBS@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-desktop-3.1.3/desktop-docs/gpl/Makefile.in new/gnome-desktop-3.1.4/desktop-docs/gpl/Makefile.in --- old/gnome-desktop-3.1.3/desktop-docs/gpl/Makefile.in 2011-07-04 17:20:36.000000000 +0200 +++ new/gnome-desktop-3.1.4/desktop-docs/gpl/Makefile.in 2011-07-25 21:29:19.000000000 +0200 @@ -200,13 +200,12 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ -STARTUP_NOTIFICATION_PACKAGE = @STARTUP_NOTIFICATION_PACKAGE@ -STARTUP_NOTIFICATION_REQUIRED = @STARTUP_NOTIFICATION_REQUIRED@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ X11_PACKAGE = @X11_PACKAGE@ +XEXT_REQUIRED = @XEXT_REQUIRED@ XGETTEXT = @XGETTEXT@ XLIB_CFLAGS = @XLIB_CFLAGS@ XLIB_LIBS = @XLIB_LIBS@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-desktop-3.1.3/desktop-docs/lgpl/Makefile.in new/gnome-desktop-3.1.4/desktop-docs/lgpl/Makefile.in --- old/gnome-desktop-3.1.3/desktop-docs/lgpl/Makefile.in 2011-07-04 17:20:36.000000000 +0200 +++ new/gnome-desktop-3.1.4/desktop-docs/lgpl/Makefile.in 2011-07-25 21:29:19.000000000 +0200 @@ -200,13 +200,12 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ -STARTUP_NOTIFICATION_PACKAGE = @STARTUP_NOTIFICATION_PACKAGE@ -STARTUP_NOTIFICATION_REQUIRED = @STARTUP_NOTIFICATION_REQUIRED@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ X11_PACKAGE = @X11_PACKAGE@ +XEXT_REQUIRED = @XEXT_REQUIRED@ XGETTEXT = @XGETTEXT@ XLIB_CFLAGS = @XLIB_CFLAGS@ XLIB_LIBS = @XLIB_LIBS@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-desktop-3.1.3/desktop-docs/Makefile.in new/gnome-desktop-3.1.4/desktop-docs/Makefile.in --- old/gnome-desktop-3.1.3/desktop-docs/Makefile.in 2011-07-04 17:20:36.000000000 +0200 +++ new/gnome-desktop-3.1.4/desktop-docs/Makefile.in 2011-07-25 21:29:19.000000000 +0200 @@ -215,13 +215,12 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ -STARTUP_NOTIFICATION_PACKAGE = @STARTUP_NOTIFICATION_PACKAGE@ -STARTUP_NOTIFICATION_REQUIRED = @STARTUP_NOTIFICATION_REQUIRED@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ X11_PACKAGE = @X11_PACKAGE@ +XEXT_REQUIRED = @XEXT_REQUIRED@ XGETTEXT = @XGETTEXT@ XLIB_CFLAGS = @XLIB_CFLAGS@ XLIB_LIBS = @XLIB_LIBS@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-desktop-3.1.3/docs/Makefile.in new/gnome-desktop-3.1.4/docs/Makefile.in --- old/gnome-desktop-3.1.3/docs/Makefile.in 2011-07-04 17:20:36.000000000 +0200 +++ new/gnome-desktop-3.1.4/docs/Makefile.in 2011-07-25 21:29:19.000000000 +0200 @@ -215,13 +215,12 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ -STARTUP_NOTIFICATION_PACKAGE = @STARTUP_NOTIFICATION_PACKAGE@ -STARTUP_NOTIFICATION_REQUIRED = @STARTUP_NOTIFICATION_REQUIRED@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ X11_PACKAGE = @X11_PACKAGE@ +XEXT_REQUIRED = @XEXT_REQUIRED@ XGETTEXT = @XGETTEXT@ XLIB_CFLAGS = @XLIB_CFLAGS@ XLIB_LIBS = @XLIB_LIBS@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-desktop-3.1.3/docs/reference/gnome-desktop3/Makefile.in new/gnome-desktop-3.1.4/docs/reference/gnome-desktop3/Makefile.in --- old/gnome-desktop-3.1.3/docs/reference/gnome-desktop3/Makefile.in 2011-07-04 17:20:37.000000000 +0200 +++ new/gnome-desktop-3.1.4/docs/reference/gnome-desktop3/Makefile.in 2011-07-25 21:29:19.000000000 +0200 @@ -182,13 +182,12 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ -STARTUP_NOTIFICATION_PACKAGE = @STARTUP_NOTIFICATION_PACKAGE@ -STARTUP_NOTIFICATION_REQUIRED = @STARTUP_NOTIFICATION_REQUIRED@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ X11_PACKAGE = @X11_PACKAGE@ +XEXT_REQUIRED = @XEXT_REQUIRED@ XGETTEXT = @XGETTEXT@ XLIB_CFLAGS = @XLIB_CFLAGS@ XLIB_LIBS = @XLIB_LIBS@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-desktop-3.1.3/docs/reference/Makefile.in new/gnome-desktop-3.1.4/docs/reference/Makefile.in --- old/gnome-desktop-3.1.3/docs/reference/Makefile.in 2011-07-04 17:20:36.000000000 +0200 +++ new/gnome-desktop-3.1.4/docs/reference/Makefile.in 2011-07-25 21:29:19.000000000 +0200 @@ -215,13 +215,12 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ -STARTUP_NOTIFICATION_PACKAGE = @STARTUP_NOTIFICATION_PACKAGE@ -STARTUP_NOTIFICATION_REQUIRED = @STARTUP_NOTIFICATION_REQUIRED@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ X11_PACKAGE = @X11_PACKAGE@ +XEXT_REQUIRED = @XEXT_REQUIRED@ XGETTEXT = @XGETTEXT@ XLIB_CFLAGS = @XLIB_CFLAGS@ XLIB_LIBS = @XLIB_LIBS@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-desktop-3.1.3/libgnome-desktop/gnome-desktop-3.0.pc.in new/gnome-desktop-3.1.4/libgnome-desktop/gnome-desktop-3.0.pc.in --- old/gnome-desktop-3.1.3/libgnome-desktop/gnome-desktop-3.0.pc.in 2011-03-22 15:30:35.000000000 +0100 +++ new/gnome-desktop-3.1.4/libgnome-desktop/gnome-desktop-3.0.pc.in 2011-07-18 15:24:56.000000000 +0200 @@ -5,7 +5,7 @@ Name: gnome-desktop-3.0 Description: Utility library for loading .desktop files -Requires: gtk+-3.0 gsettings-desktop-schemas @STARTUP_NOTIFICATION_PACKAGE@ +Requires: gtk+-3.0 gsettings-desktop-schemas Version: @VERSION@ Libs: -L${libdir} -lgnome-desktop-3 Cflags: -I${includedir}/gnome-desktop-3.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-desktop-3.1.3/libgnome-desktop/gnome-desktop-3.0-uninstalled.pc.in new/gnome-desktop-3.1.4/libgnome-desktop/gnome-desktop-3.0-uninstalled.pc.in --- old/gnome-desktop-3.1.3/libgnome-desktop/gnome-desktop-3.0-uninstalled.pc.in 2011-03-22 15:30:35.000000000 +0100 +++ new/gnome-desktop-3.1.4/libgnome-desktop/gnome-desktop-3.0-uninstalled.pc.in 2011-07-18 15:25:06.000000000 +0200 @@ -5,7 +5,7 @@ Name: gnome-desktop-3.0 Description: Utility library for loading .desktop files -Requires: gtk+-3.0 gsettings-desktop-schemas @STARTUP_NOTIFICATION_PACKAGE@ +Requires: gtk+-3.0 gsettings-desktop-schemas Version: @VERSION@ Libs: ${pc_top_builddir}/${pcfiledir}/libgnome-desktop-3.la -Cflags: -I${pc_top_builddir}/${pcfiledir} +Cflags: -I${pc_top_builddir}/${pcfiledir}/.. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-desktop-3.1.3/libgnome-desktop/gnome-rr.c new/gnome-desktop-3.1.4/libgnome-desktop/gnome-rr.c --- old/gnome-desktop-3.1.3/libgnome-desktop/gnome-rr.c 2011-07-04 16:43:09.000000000 +0200 +++ new/gnome-desktop-3.1.4/libgnome-desktop/gnome-rr.c 2011-07-18 15:08:22.000000000 +0200 @@ -36,6 +36,7 @@ #include <gtk/gtk.h> #include <gdk/gdkx.h> #include <X11/Xatom.h> +#include <X11/extensions/dpms.h> #undef GNOME_DISABLE_DEPRECATED #include "gnome-rr.h" @@ -532,6 +533,11 @@ } #endif + /* can the screen do DPMS? */ + gdk_error_trap_push (); + priv->dpms_capable = DPMSCapable (priv->xdisplay); + gdk_error_trap_pop_ignored (); + return TRUE; #else return FALSE; @@ -1166,6 +1172,125 @@ } /** + * gnome_rr_screen_get_dpms_mode: + **/ +gboolean +gnome_rr_screen_get_dpms_mode (GnomeRRScreen *screen, + GnomeRRDpmsMode *mode, + GError **error) +{ + BOOL enabled = FALSE; + CARD16 state; + gboolean ret = FALSE; + + g_return_val_if_fail (error == NULL || *error == NULL, FALSE); + g_return_val_if_fail (mode != NULL, FALSE); + + if (!screen->priv->dpms_capable) { + g_set_error_literal (error, + GNOME_RR_ERROR, + GNOME_RR_ERROR_NO_DPMS_EXTENSION, + "Display is not DPMS capable"); + goto out; + } + + if (!DPMSInfo (screen->priv->xdisplay, + &state, + &enabled)) { + g_set_error_literal (error, + GNOME_RR_ERROR, + GNOME_RR_ERROR_UNKNOWN, + "Unable to get DPMS state"); + goto out; + } + + /* DPMS not enabled is a valid mode */ + if (!enabled) { + *mode = GNOME_RR_DPMS_DISABLED; + ret = TRUE; + goto out; + } + + switch (state) { + case DPMSModeOn: + *mode = GNOME_RR_DPMS_ON; + break; + case DPMSModeStandby: + *mode = GNOME_RR_DPMS_STANDBY; + break; + case DPMSModeSuspend: + *mode = GNOME_RR_DPMS_SUSPEND; + break; + case DPMSModeOff: + *mode = GNOME_RR_DPMS_OFF; + break; + default: + g_assert_not_reached (); + break; + } + ret = TRUE; +out: + return ret; +} + +/** + * gnome_rr_screen_set_dpms_mode: + **/ +gboolean +gnome_rr_screen_set_dpms_mode (GnomeRRScreen *screen, + GnomeRRDpmsMode mode, + GError **error) +{ + CARD16 state = 0; + gboolean ret; + GnomeRRDpmsMode current_mode; + + g_return_val_if_fail (error == NULL || *error == NULL, FALSE); + + /* set, if the new mode is different */ + ret = gnome_rr_screen_get_dpms_mode (screen, ¤t_mode, error); + if (!ret) + goto out; + if (current_mode == mode) + goto out; + + switch (state) { + case GNOME_RR_DPMS_ON: + state = DPMSModeOn; + break; + case GNOME_RR_DPMS_STANDBY: + state = DPMSModeStandby; + break; + case GNOME_RR_DPMS_SUSPEND: + state = DPMSModeSuspend; + break; + case GNOME_RR_DPMS_OFF: + state = DPMSModeOff; + break; + default: + g_assert_not_reached (); + break; + } + + gdk_error_trap_push (); + ret = DPMSForceLevel (screen->priv->xdisplay, state); + gdk_flush (); + if (gdk_error_trap_pop ()) + ret = FALSE; + + if (!ret) { + ret = FALSE; + g_set_error_literal (error, + GNOME_RR_ERROR, + GNOME_RR_ERROR_UNKNOWN, + "Could not change DPMS mode"); + goto out; + } +out: + return ret; +} + +/** * gnome_rr_screen_list_modes: * * List available XRandR modes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-desktop-3.1.3/libgnome-desktop/gnome-rr.h new/gnome-desktop-3.1.4/libgnome-desktop/gnome-rr.h --- old/gnome-desktop-3.1.3/libgnome-desktop/gnome-rr.h 2011-07-04 16:43:09.000000000 +0200 +++ new/gnome-desktop-3.1.4/libgnome-desktop/gnome-rr.h 2011-07-18 15:08:22.000000000 +0200 @@ -60,6 +60,15 @@ GNOME_RR_REFLECT_Y = (1 << 5) } GnomeRRRotation; +typedef enum { + GNOME_RR_DPMS_ON, + GNOME_RR_DPMS_STANDBY, + GNOME_RR_DPMS_SUSPEND, + GNOME_RR_DPMS_OFF, + GNOME_RR_DPMS_DISABLED, + GNOME_RR_DPMS_UNKNOWN +} GnomeRRDpmsMode; + /* Error codes */ #define GNOME_RR_ERROR (gnome_rr_error_quark ()) @@ -73,6 +82,7 @@ GNOME_RR_ERROR_BOUNDS_ERROR, /* requested bounds of a CRTC are outside the maximum size */ GNOME_RR_ERROR_CRTC_ASSIGNMENT, /* could not assign CRTCs to outputs */ GNOME_RR_ERROR_NO_MATCHING_CONFIG, /* none of the saved configurations matched the current configuration */ + GNOME_RR_ERROR_NO_DPMS_EXTENSION, /* DPMS extension is not present */ } GnomeRRError; #define GNOME_RR_CONNECTOR_TYPE_PANEL "Panel" /* This is a laptop's built-in LCD */ @@ -127,6 +137,13 @@ GnomeRRMode **gnome_rr_screen_create_clone_modes (GnomeRRScreen *screen); +gboolean gnome_rr_screen_get_dpms_mode (GnomeRRScreen *screen, + GnomeRRDpmsMode *mode, + GError **error); +gboolean gnome_rr_screen_set_dpms_mode (GnomeRRScreen *screen, + GnomeRRDpmsMode mode, + GError **error); + /* GnomeRROutput */ guint32 gnome_rr_output_get_id (GnomeRROutput *output); const char * gnome_rr_output_get_name (GnomeRROutput *output); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-desktop-3.1.3/libgnome-desktop/gnome-rr-private.h new/gnome-desktop-3.1.4/libgnome-desktop/gnome-rr-private.h --- old/gnome-desktop-3.1.3/libgnome-desktop/gnome-rr-private.h 2011-04-04 17:22:06.000000000 +0200 +++ new/gnome-desktop-3.1.4/libgnome-desktop/gnome-rr-private.h 2011-07-18 15:08:22.000000000 +0200 @@ -47,6 +47,7 @@ int rr_minor_version; Atom connector_type_atom; + gboolean dpms_capable; }; struct GnomeRROutputInfoPrivate diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-desktop-3.1.3/libgnome-desktop/Makefile.in new/gnome-desktop-3.1.4/libgnome-desktop/Makefile.in --- old/gnome-desktop-3.1.3/libgnome-desktop/Makefile.in 2011-07-04 17:20:37.000000000 +0200 +++ new/gnome-desktop-3.1.4/libgnome-desktop/Makefile.in 2011-07-25 21:29:19.000000000 +0200 @@ -251,13 +251,12 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ -STARTUP_NOTIFICATION_PACKAGE = @STARTUP_NOTIFICATION_PACKAGE@ -STARTUP_NOTIFICATION_REQUIRED = @STARTUP_NOTIFICATION_REQUIRED@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ X11_PACKAGE = @X11_PACKAGE@ +XEXT_REQUIRED = @XEXT_REQUIRED@ XGETTEXT = @XGETTEXT@ XLIB_CFLAGS = @XLIB_CFLAGS@ XLIB_LIBS = @XLIB_LIBS@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-desktop-3.1.3/Makefile.in new/gnome-desktop-3.1.4/Makefile.in --- old/gnome-desktop-3.1.3/Makefile.in 2011-07-04 17:20:37.000000000 +0200 +++ new/gnome-desktop-3.1.4/Makefile.in 2011-07-25 21:29:19.000000000 +0200 @@ -256,13 +256,12 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ -STARTUP_NOTIFICATION_PACKAGE = @STARTUP_NOTIFICATION_PACKAGE@ -STARTUP_NOTIFICATION_REQUIRED = @STARTUP_NOTIFICATION_REQUIRED@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ X11_PACKAGE = @X11_PACKAGE@ +XEXT_REQUIRED = @XEXT_REQUIRED@ XGETTEXT = @XGETTEXT@ XLIB_CFLAGS = @XLIB_CFLAGS@ XLIB_LIBS = @XLIB_LIBS@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-desktop-3.1.3/NEWS new/gnome-desktop-3.1.4/NEWS --- old/gnome-desktop-3.1.3/NEWS 2011-07-04 17:16:19.000000000 +0200 +++ new/gnome-desktop-3.1.4/NEWS 2011-07-25 21:28:14.000000000 +0200 @@ -1,4 +1,23 @@ ============= +Version 3.1.4 +============= + + libgnome-desktop + + * GnomeRR: Add the capability to get and set the DPMS mode of the + screen (Richard Hughes) + + Misc + + * Fix Cflags path in uninstalled.pc file (Brian Cameron) + * Remove stale startup-notification dependency (Vincent) + * Require xext in configure (Xan Lopez) + + Translators + + * Tommi Vainikainen (fi) + +============= Version 3.1.3 ============= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-desktop-3.1.3/po/fi.po new/gnome-desktop-3.1.4/po/fi.po --- old/gnome-desktop-3.1.3/po/fi.po 2010-03-27 12:34:40.000000000 +0100 +++ new/gnome-desktop-3.1.4/po/fi.po 2011-07-25 17:47:00.000000000 +0200 @@ -6,156 +6,21 @@ # Mikko Rauhala <[email protected]>, 1999 # Pauli Virtanen <[email protected]>, 2000-2005 # Ilkka Tuohela <[email protected]>, 2005-2009 -# Tommi Vainikainen <[email protected]>, 2009-2010 +# Tommi Vainikainen <[email protected]>, 2009-2011 # msgid "" msgstr "" "Project-Id-Version: gnome-desktop\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-18 15:05+0200\n" -"PO-Revision-Date: 2010-03-18 15:04+0200\n" +"POT-Creation-Date: 2011-07-19 08:46+0300\n" +"PO-Revision-Date: 2011-07-19 08:55+0300\n" "Last-Translator: Tommi Vainikainen <[email protected]>\n" "Language-Team: Finnish <[email protected]>\n" +"Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../gnome-about/gnome-about.desktop.in.in.h:1 -#: ../gnome-about/gnome-about.in:60 -msgid "About GNOME" -msgstr "Tietoja Gnomesta" - -#: ../gnome-about/gnome-about.desktop.in.in.h:2 -msgid "Learn more about GNOME" -msgstr "Opi lisää Gnomesta" - -#: ../gnome-about/gnome-about.in:61 -msgid "News" -msgstr "Uutiset" - -#: ../gnome-about/gnome-about.in:62 -msgid "GNOME Library" -msgstr "Gnome-kirjasto" - -#: ../gnome-about/gnome-about.in:63 -msgid "Friends of GNOME" -msgstr "Gnomen ystävät" - -#: ../gnome-about/gnome-about.in:64 -msgid "Contact" -msgstr "Yhteystiedot" - -#: ../gnome-about/gnome-about.in:68 -msgid "The Mysterious GEGL" -msgstr "Salaperäinen GEGL" - -#: ../gnome-about/gnome-about.in:69 -msgid "The Squeaky Rubber GNOME" -msgstr "Vinkuva kumitonttu" - -#: ../gnome-about/gnome-about.in:70 -msgid "Wanda The GNOME Fish" -msgstr "Wanda, Gnome-kala" - -#: ../gnome-about/gnome-about.in:567 -msgid "_Open URL" -msgstr "_Avaa URL" - -#: ../gnome-about/gnome-about.in:574 -msgid "_Copy URL" -msgstr "_Kopioi URL" - -#: ../gnome-about/gnome-about.in:826 -msgid "About the GNOME Desktop" -msgstr "Tietoja Gnomesta" - -#: ../gnome-about/gnome-about.in:859 -msgid "%(name)s: %(value)s" -msgstr "%(name)s: %(value)s" - -#: ../gnome-about/gnome-about.in:873 -msgid "Welcome to the GNOME Desktop" -msgstr "Tervetuloa käyttämään Gnome-työpöytäympäristöä" - -#: ../gnome-about/gnome-about.in:890 -msgid "Brought to you by:" -msgstr "Työn ovat tehneet:" - -#: ../gnome-about/gnome-about.in:914 -msgid "<b>%(name)s:</b> %(value)s" -msgstr "<b>%(name)s:</b> %(value)s" - -#: ../gnome-about/gnome-about.in:975 -msgid "Version" -msgstr "Versio" - -#: ../gnome-about/gnome-about.in:977 -msgid "Distributor" -msgstr "Jakelija" - -#: ../gnome-about/gnome-about.in:979 -msgid "Build Date" -msgstr "Kääntöpäivä" - -#: ../gnome-about/gnome-about.in:1024 -msgid "Display information on this GNOME version" -msgstr "Näytä tietoja tästä Gnomen versiosta" - -#: ../gnome-version.xml.in.in.h:1 -msgid "" -"GNOME also includes a complete development platform for applications " -"programmers, allowing the creation of powerful and complex applications." -msgstr "" -"Gnomessa on myös täydellinen ohjelmistokehitysympäristö, jolla voi luoda " -"tehokkaita ja mutkikkaita ohjelmia." - -#: ../gnome-version.xml.in.in.h:2 -msgid "" -"GNOME includes most of what you see on your computer, including the file " -"manager, web browser, menus, and many applications." -msgstr "" -"Gnomeen kuuluu suurin osa siitä, mitä tietokoneen ruudulla yleensä näkyy, " -"kuten tiedostonhallinta, WWW-selain, valikot ja monet sovellukset." - -#. NOTE TO AUTHORS: Do not put anything in the following paragraphs that -#. will be substituted by the configure script. Otherwise you will break -#. the translations. -#: ../gnome-version.xml.in.in.h:6 -msgid "" -"GNOME is a Free, usable, stable, accessible desktop environment for the Unix-" -"like family of operating systems." -msgstr "" -"Gnome on Vapaa, käytettävä, vakaa ja esteetön työpöytäympäristö Unix-" -"tyyppisille käyttöjärjestelmille." - -#: ../gnome-version.xml.in.in.h:7 -msgid "" -"GNOME's focus on usability and accessibility, regular release cycle, and " -"strong corporate backing make it unique among Free Software desktops." -msgstr "" -"Gnomen keskittyminen käytettävyyteen ja esteettömyyteen, säännöllinen " -"julkaisutahti ja yhtiöiden tuki tekee Gnomesta ainutlaatuisen " -"vapaaohjelmistoihin perustuvien työpöytien joukossa." - -#: ../gnome-version.xml.in.in.h:8 -msgid "" -"GNOME's greatest strength is our strong community. Virtually anyone, with or " -"without coding skills, can contribute to making GNOME better." -msgstr "" -"Gnomen suurin vahvuus on vahva yhteisö. Käytännössä kuka tahansa, " -"ohjelmointitaitoinen tai ei, voi osallistua Gnomen kehittämiseen." - -#: ../gnome-version.xml.in.in.h:9 -msgid "" -"Hundreds of people have contributed code to GNOME since it was started in " -"1997; many more have contributed in other important ways, including " -"translations, documentation, and quality assurance." -msgstr "" -"Sadat ihmiset ovat ohjelmoineet Gnomen hyväksi projektin käynnistyttyä " -"vuonna 1997, ja monet muut ovat osallistuneet muilla tärkeillä tavoin, kuten " -"kääntämällä sitä toisille kielille, kirjoittamalla ohjeita ja tarkkailemalla " -"laatua." - #. Translators: "Unknown" here is used to identify a monitor for which #. * we don't know the vendor. When a vendor is known, the name of the #. * vendor is used. @@ -164,96 +29,26 @@ msgid "Unknown" msgstr "Tuntematon" -#: ../libgnome-desktop/gnome-desktop-item.c:220 -#, c-format -msgid "Error reading file '%s': %s" -msgstr "Tiedoston ”%s” luku epäonnistui: %s" - -#: ../libgnome-desktop/gnome-desktop-item.c:288 -#, c-format -msgid "Error rewinding file '%s': %s" -msgstr "Tiedoston ”%s” kelaus epäonnistui: %s" - -#. Translators: the "name" mentioned -#. * here is the name of an application or -#. * a document -#. Translators: the "name" mentioned here is the name of -#. * an application or a document -#: ../libgnome-desktop/gnome-desktop-item.c:380 -#: ../libgnome-desktop/gnome-desktop-item.c:3524 -msgid "No name" -msgstr "Ei nimeä" - -#: ../libgnome-desktop/gnome-desktop-item.c:607 -#, c-format -msgid "File '%s' is not a regular file or directory." -msgstr "Tiedosto ”%s” ei ole tavallinen tiedosto tai kansio." - -#: ../libgnome-desktop/gnome-desktop-item.c:791 -#, c-format -msgid "Cannot find file '%s'" -msgstr "Tiedostoa ”%s” ei löytynyt" - -#: ../libgnome-desktop/gnome-desktop-item.c:837 -#, c-format -msgid "No filename to save to" -msgstr "Ei tiedostonimeä, johon tallentaa" - -#: ../libgnome-desktop/gnome-desktop-item.c:1822 -#, c-format -msgid "Starting %s" -msgstr "%s käynnistyy" - -#: ../libgnome-desktop/gnome-desktop-item.c:2058 -#, c-format -msgid "No URL to launch" -msgstr "Ei käynnistettävää URL:ia" - -#: ../libgnome-desktop/gnome-desktop-item.c:2074 -#, c-format -msgid "Not a launchable item" -msgstr "Ei käynnistettävää kohdetta" - -#: ../libgnome-desktop/gnome-desktop-item.c:2084 -#, c-format -msgid "No command (Exec) to launch" -msgstr "Ei käynnistettävää komentoa (exec)" - -#: ../libgnome-desktop/gnome-desktop-item.c:2097 -#, c-format -msgid "Bad command (Exec) to launch" -msgstr "Virheellinen käynnistettävä komento (exec)" - -#: ../libgnome-desktop/gnome-desktop-item.c:3581 -#, c-format -msgid "Unknown encoding of: %s" -msgstr "Tuntematon merkistö: %s" - -#: ../libgnome-desktop/gnome-desktop-utils.c:133 msgid "Cannot find a terminal, using xterm, even if it may not work" msgstr "Päätettä ei löytynyt, käytetään xtermiä vaikka se ei ehkä toimi" -#: ../libgnome-desktop/gnome-rr.c:444 +#. Translators: a CRTC is a CRT Controller (this is X terminology). #, c-format msgid "could not get the screen resources (CRTCs, outputs, modes)" msgstr "Näyttöresurssien tietoja ei saatu (CRTCt, ulostuloa, tilat)" -#: ../libgnome-desktop/gnome-rr.c:464 #, c-format msgid "unhandled X error while getting the range of screen sizes" msgstr "käsittelemätön X-virhe noudettaessa kelvollisia näytön kokoja" -#: ../libgnome-desktop/gnome-rr.c:470 #, c-format msgid "could not get the range of screen sizes" msgstr "näytön kokoluetteloa ei saatu noudettua" -#: ../libgnome-desktop/gnome-rr.c:715 #, c-format msgid "RANDR extension is not present" msgstr "RANDR-laajennos ei ole saatavilla" -#: ../libgnome-desktop/gnome-rr.c:1034 #, c-format msgid "could not get information about output %d" msgstr "Tietoja ulostulosta %d ei saatu." @@ -261,52 +56,93 @@ #. Translators: the "position", "size", and "maximum" #. * words here are not keywords; please translate them #. * as usual. A CRTC is a CRT Controller (this is X terminology) -#: ../libgnome-desktop/gnome-rr.c:1421 #, c-format msgid "" -"requested position/size for CRTC %d is outside the allowed limit: position=(%" -"d, %d), size=(%d, %d), maximum=(%d, %d)" +"requested position/size for CRTC %d is outside the allowed limit: position=" +"(%d, %d), size=(%d, %d), maximum=(%d, %d)" msgstr "" "pyydetty sijainti tai koko CRTC:lle %d ei ole sallituissa rajoissa: sijainti=" "(%d,%d), koko=(%d,%d), maksimi=(%d,%d)" -#: ../libgnome-desktop/gnome-rr.c:1457 #, c-format msgid "could not set the configuration for CRTC %d" msgstr "Asetuksia CRTC:lle %d ei voitu asettaa" -#: ../libgnome-desktop/gnome-rr.c:1573 #, c-format msgid "could not get information about CRTC %d" msgstr "Tietoja CRTC:stä %d ei saatu." -#: ../libgnome-desktop/gnome-rr-config.c:501 msgid "Laptop" msgstr "Kannettava" -#: ../libgnome-desktop/gnome-rr-config.c:1162 #, c-format msgid "" "none of the saved display configurations matched the active configuration" msgstr "" "yksikään tallennetuista näyttöasetuksista ei vastaa aktiivista määrittelyä" +#, c-format +msgid "CRTC %d cannot drive output %s" +msgstr "CRTC %d ei voi ajaa ulostuloa %s" + +#, c-format +msgid "output %s does not support mode %dx%d@%dHz" +msgstr "ulostulo %s ei tue tilaa %d×%d@%d Hz" + +#, c-format +msgid "CRTC %d does not support rotation=%s" +msgstr "CRTC %d ei tue kiertoa %s" + +#, c-format +msgid "" +"output %s does not have the same parameters as another cloned output:\n" +"existing mode = %d, new mode = %d\n" +"existing coordinates = (%d, %d), new coordinates = (%d, %d)\n" +"existing rotation = %s, new rotation = %s" +msgstr "" +"ulostulolla %s ei ole samat parametrit kuin kloonatulla ulostulolla:\n" +"nykyinen tila = %d, uusi tila = %d\n" +"nykyiset koordinaatit = (%d, %d), uudet koordinaatit = (%d, %d)\n" +"nykyinen kierto = %s, uusi kierto = %s" + +#, c-format +msgid "cannot clone to output %s" +msgstr "ei voi kloonata ulostuloon %s" + +#, c-format +msgid "Trying modes for CRTC %d\n" +msgstr "Yritetään tiloja CRTC %d:lle\n" + +#, c-format +msgid "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n" +msgstr "CRTC %d: yritetään tilaa %d×%d@%d Hz ulostulolla %d×%d@%d Hz (vaihe %d)\n" + +#, c-format +msgid "" +"could not assign CRTCs to outputs:\n" +"%s" +msgstr "" +"ei voitu sijoittaa CRTC:itä ulostuloihin:\n" +"%s" + +#, c-format +msgid "" +"none of the selected modes were compatible with the possible modes:\n" +"%s" +msgstr "" +"mikään valituista tiloista ei ollut yhteensopiva mahdollisten tilojen kanssa:\n" +"%s" + #. Translators: the "requested", "minimum", and #. * "maximum" words here are not keywords; please #. * translate them as usual. -#: ../libgnome-desktop/gnome-rr-config.c:1689 #, c-format msgid "" "required virtual size does not fit available size: requested=(%d, %d), " "minimum=(%d, %d), maximum=(%d, %d)" msgstr "" -"vaadittu virtuaalinen koko ei mahdu saatavilla olevaan kokoon: pyydetty=(%d,%" -"d), minimi=(%d,%d), maksimi=(%d,%d)" - -#: ../libgnome-desktop/gnome-rr-config.c:1703 -#, c-format -msgid "could not find a suitable configuration of screens" -msgstr "sopivaa näyttöasetusten määrittelyä ei löytynyt" +"vaadittu virtuaalinen koko ei mahdu saatavilla olevaan kokoon: pyydetty=(%d," +"%d), minimi=(%d,%d), maksimi=(%d,%d)" #. Keep this string in sync with gnome-control-center/capplets/display/xrandr-capplet.c:get_display_name() #. Translators: this is the feature where what you see on your laptop's @@ -314,10 +150,148 @@ #. * used as an adjective, not as a verb. For example, the Spanish #. * translation could be "Pantallas en Espejo", *not* "Espejar Pantallas". #. -#: ../libgnome-desktop/gnome-rr-labeler.c:212 msgid "Mirror Screens" msgstr "Peilatut näytöt" +#~ msgid "About GNOME" +#~ msgstr "Tietoja Gnomesta" + +#~ msgid "Learn more about GNOME" +#~ msgstr "Opi lisää Gnomesta" + +#~ msgid "News" +#~ msgstr "Uutiset" + +#~ msgid "GNOME Library" +#~ msgstr "Gnome-kirjasto" + +#~ msgid "Friends of GNOME" +#~ msgstr "Gnomen ystävät" + +#~ msgid "Contact" +#~ msgstr "Yhteystiedot" + +#~ msgid "The Mysterious GEGL" +#~ msgstr "Salaperäinen GEGL" + +#~ msgid "The Squeaky Rubber GNOME" +#~ msgstr "Vinkuva kumitonttu" + +#~ msgid "Wanda The GNOME Fish" +#~ msgstr "Wanda, Gnome-kala" + +#~ msgid "_Open URL" +#~ msgstr "_Avaa URL" + +#~ msgid "_Copy URL" +#~ msgstr "_Kopioi URL" + +#~ msgid "About the GNOME Desktop" +#~ msgstr "Tietoja Gnomesta" + +#~ msgid "Welcome to the GNOME Desktop" +#~ msgstr "Tervetuloa käyttämään Gnome-työpöytäympäristöä" + +#~ msgid "Brought to you by:" +#~ msgstr "Työn ovat tehneet:" + +#~ msgid "Version" +#~ msgstr "Versio" + +#~ msgid "Distributor" +#~ msgstr "Jakelija" + +#~ msgid "Build Date" +#~ msgstr "Kääntöpäivä" + +#~ msgid "Display information on this GNOME version" +#~ msgstr "Näytä tietoja tästä Gnomen versiosta" + +#~ msgid "" +#~ "GNOME also includes a complete development platform for applications " +#~ "programmers, allowing the creation of powerful and complex applications." +#~ msgstr "" +#~ "Gnomessa on myös täydellinen ohjelmistokehitysympäristö, jolla voi luoda " +#~ "tehokkaita ja mutkikkaita ohjelmia." + +#~ msgid "" +#~ "GNOME includes most of what you see on your computer, including the file " +#~ "manager, web browser, menus, and many applications." +#~ msgstr "" +#~ "Gnomeen kuuluu suurin osa siitä, mitä tietokoneen ruudulla yleensä näkyy, " +#~ "kuten tiedostonhallinta, WWW-selain, valikot ja monet sovellukset." + +#~ msgid "" +#~ "GNOME is a Free, usable, stable, accessible desktop environment for the " +#~ "Unix-like family of operating systems." +#~ msgstr "" +#~ "Gnome on Vapaa, käytettävä, vakaa ja esteetön työpöytäympäristö Unix-" +#~ "tyyppisille käyttöjärjestelmille." + +#~ msgid "" +#~ "GNOME's focus on usability and accessibility, regular release cycle, and " +#~ "strong corporate backing make it unique among Free Software desktops." +#~ msgstr "" +#~ "Gnomen keskittyminen käytettävyyteen ja esteettömyyteen, säännöllinen " +#~ "julkaisutahti ja yhtiöiden tuki tekee Gnomesta ainutlaatuisen " +#~ "vapaaohjelmistoihin perustuvien työpöytien joukossa." + +#~ msgid "" +#~ "GNOME's greatest strength is our strong community. Virtually anyone, with " +#~ "or without coding skills, can contribute to making GNOME better." +#~ msgstr "" +#~ "Gnomen suurin vahvuus on vahva yhteisö. Käytännössä kuka tahansa, " +#~ "ohjelmointitaitoinen tai ei, voi osallistua Gnomen kehittämiseen." + +#~ msgid "" +#~ "Hundreds of people have contributed code to GNOME since it was started in " +#~ "1997; many more have contributed in other important ways, including " +#~ "translations, documentation, and quality assurance." +#~ msgstr "" +#~ "Sadat ihmiset ovat ohjelmoineet Gnomen hyväksi projektin käynnistyttyä " +#~ "vuonna 1997, ja monet muut ovat osallistuneet muilla tärkeillä tavoin, " +#~ "kuten kääntämällä sitä toisille kielille, kirjoittamalla ohjeita ja " +#~ "tarkkailemalla laatua." + +#~ msgid "Error reading file '%s': %s" +#~ msgstr "Tiedoston ”%s” luku epäonnistui: %s" + +#~ msgid "Error rewinding file '%s': %s" +#~ msgstr "Tiedoston ”%s” kelaus epäonnistui: %s" + +#~ msgid "No name" +#~ msgstr "Ei nimeä" + +#~ msgid "File '%s' is not a regular file or directory." +#~ msgstr "Tiedosto ”%s” ei ole tavallinen tiedosto tai kansio." + +#~ msgid "Cannot find file '%s'" +#~ msgstr "Tiedostoa ”%s” ei löytynyt" + +#~ msgid "No filename to save to" +#~ msgstr "Ei tiedostonimeä, johon tallentaa" + +#~ msgid "Starting %s" +#~ msgstr "%s käynnistyy" + +#~ msgid "No URL to launch" +#~ msgstr "Ei käynnistettävää URL:ia" + +#~ msgid "Not a launchable item" +#~ msgstr "Ei käynnistettävää kohdetta" + +#~ msgid "No command (Exec) to launch" +#~ msgstr "Ei käynnistettävää komentoa (exec)" + +#~ msgid "Bad command (Exec) to launch" +#~ msgstr "Virheellinen käynnistettävä komento (exec)" + +#~ msgid "Unknown encoding of: %s" +#~ msgstr "Tuntematon merkistö: %s" + +#~ msgid "could not find a suitable configuration of screens" +#~ msgstr "sopivaa näyttöasetusten määrittelyä ei löytynyt" + #~ msgid "Directory" #~ msgstr "Kansio" @@ -423,12 +397,6 @@ #~ msgid "Could not locate the GNOME logo." #~ msgstr "Gnomen logoa ei löytynyt." -#~ msgid "%s: %s\n" -#~ msgstr "%s: %s\n" - -#~ msgid "%s: " -#~ msgstr "%s: " - #~ msgid "Software" #~ msgstr "Ohjelmistot" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
