Hello community,
here is the log from the commit of package xorg-x11-libs
checked in at Fri Mar 21 02:31:14 CET 2008.
--------
--- xorg-x11-libs/xorg-x11-libs.changes 2008-03-06 21:57:53.000000000 +0100
+++ xorg-x11-libs/xorg-x11-libs.changes 2008-03-18 10:03:46.455308000 +0100
@@ -1,0 +2,5 @@
+Tue Mar 18 10:21:15 CET 2008 - sndirsch@suse.de
+
+- libXScrnSaver 1.1.3
+
+-------------------------------------------------------------------
Old:
----
libXScrnSaver-1.1.2.tar.bz2
New:
----
libXScrnSaver-1.1.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-libs.spec ++++++
--- /var/tmp/diff_new_pack.t11930/_old 2008-03-21 02:30:09.000000000 +0100
+++ /var/tmp/diff_new_pack.t11930/_new 2008-03-21 02:30:09.000000000 +0100
@@ -20,7 +20,7 @@
%endif
Url: http://xorg.freedesktop.org/
Version: 7.3
-Release: 40
+Release: 43
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/Libraries
@@ -28,7 +28,7 @@
Source0: libAppleWM-X11R7.0-1.0.0.tar.bz2
Source1: libFS-X11R7.0-1.0.0.tar.bz2
Source2: libWindowsWM-X11R7.0-1.0.0.tar.bz2
-Source3: libXScrnSaver-1.1.2.tar.bz2
+Source3: libXScrnSaver-1.1.3.tar.bz2
Source4: libXTrap-X11R7.0-1.0.0.tar.bz2
Source5: libXaw-1.0.4.tar.bz2
Source6: libXcomposite-0.4.0.tar.bz2
@@ -220,6 +220,8 @@
%{_mandir}/man3/*
%changelog
+* Tue Mar 18 2008 sndirsch@suse.de
+- libXScrnSaver 1.1.3
* Thu Mar 06 2008 sndirsch@suse.de
- libpciaccess 0.10
- libXinerama 1.0.3
++++++ libXScrnSaver-1.1.2.tar.bz2 -> libXScrnSaver-1.1.3.tar.bz2 ++++++
++++ 21136 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/libXScrnSaver-1.1.2/ChangeLog new/libXScrnSaver-1.1.3/ChangeLog
--- old/libXScrnSaver-1.1.2/ChangeLog 2006-12-16 00:36:33.000000000 +0100
+++ new/libXScrnSaver-1.1.3/ChangeLog 2008-03-18 02:29:20.000000000 +0100
@@ -1,3 +1,49 @@
+commit e3af1209b9c1fdb032d01e00b300d57278b81189
+Author: Alan Coopersmith
+Date: Mon Mar 17 18:28:14 2008 -0700
+
+ Version bump: 1.1.3
+
+commit a9208d44e5123c2f688097c2833abba7e6bcfc71
+Author: Paulo Cesar Pereira de Andrade
+Date: Tue Mar 4 18:51:25 2008 -0300
+
+ libXScrnSaver ansification.
+
+ Signed-off-by: Alan Coopersmith
+
+commit b805b9ebb2f981a507d16fc5524f573b8187e5f1
+Author: Alan Coopersmith
+Date: Mon Mar 17 18:05:32 2008 -0700
+
+ Add hooks to check code with sparse/lint/etc.
+
+commit ae5c253a13cbb408cb41e173bffb993ec6aa6310
+Author: Matthieu Herrb
+Date: Sun Mar 9 00:21:17 2008 +0100
+
+ Makefile.am: nuke RCS Id
+
+commit f641875615739ae6431e59b4fc47bb52fdce6381
+Author: James Cloos
+Date: Thu Dec 6 15:51:14 2007 -0500
+
+ Add missing PHONY line for automatic ChangeLog generation
+
+commit ec5ca1927558d686c4957f2ae8c8c50c722cd87b
+Author: Daniel Drake
+Date: Tue May 29 10:07:00 2007 -0800
+
+ Bug #11084: libXScrnSaver COPYING file
+
+ X.Org Bugzilla #11084 https://bugs.freedesktop.org/show_bug.cgi?id=11084
+
+commit 8eced0dc1e259777bcda00539c0c59a57fa4a49d
+Author: James Cloos
+Date: Mon Sep 3 05:53:34 2007 -0400
+
+ Add *~ to .gitignore to skip patch/emacs droppings
+
commit 36205d276fd8f783898abae4c32f72ab4eaab3c4
Author: Daniel Stone
Date: Sat Dec 16 01:35:45 2006 +0200
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/libXScrnSaver-1.1.2/configure.ac new/libXScrnSaver-1.1.3/configure.ac
--- old/libXScrnSaver-1.1.2/configure.ac 2006-12-16 00:35:39.000000000 +0100
+++ new/libXScrnSaver-1.1.3/configure.ac 2008-03-18 02:25:53.000000000 +0100
@@ -23,12 +23,16 @@
AC_PREREQ([2.57])
-AC_INIT(libXScrnSaver, 1.1.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXScrnSaver)
+AC_INIT(libXScrnSaver, 1.1.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXScrnSaver)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
+# Require xorg-macros version 1.1.0 or newer for XORG_WITH_LINT macro
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.1)
+
# Check for progs
AC_PROG_CC
AC_PROG_LIBTOOL
@@ -38,6 +42,10 @@
AC_SUBST(XSCRNSAVER_CFLAGS)
AC_SUBST(XSCRNSAVER_LIBS)
+
+dnl Allow checking code with lint, sparse, etc.
+XORG_WITH_LINT
+XORG_LINT_LIBRARY([Xss])
XORG_CHECK_MALLOC_ZERO
XORG_MANPAGE_SECTIONS
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/libXScrnSaver-1.1.2/COPYING new/libXScrnSaver-1.1.3/COPYING
--- old/libXScrnSaver-1.1.2/COPYING 2006-12-06 17:17:08.000000000 +0100
+++ new/libXScrnSaver-1.1.3/COPYING 2007-09-08 01:00:39.000000000 +0200
@@ -1,12 +1,49 @@
-This is a stub file. This package has not yet had its complete licensing
-information compiled. Please see the individual source files for details on
-your rights to use and modify this software.
+Copyright (c) 1992 X Consortium
-Please submit updated COPYING files to the Xorg bugzilla:
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-http://lists.freedesktop.org/mailman/listinfo/xorg
+Except as contained in this notice, the name of the X Consortium shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from the X Consortium.
+
+
+Copyright (C) 2003 The XFree86 Project, Inc. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+IN NO EVENT SHALL THE XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES
+OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of the XFree86 Project
+shall not be used in advertising or otherwise to promote the sale, use
+or other dealings in this Software without prior written authorization
+from the XFree86 Project.
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/libXScrnSaver-1.1.2/Makefile.am new/libXScrnSaver-1.1.3/Makefile.am
--- old/libXScrnSaver-1.1.2/Makefile.am 2006-12-06 17:56:15.000000000 +0100
+++ new/libXScrnSaver-1.1.3/Makefile.am 2008-03-18 02:15:28.000000000 +0100
@@ -28,7 +28,15 @@
CLEANFILES = ChangeLog
+.PHONY: ChangeLog
+
ChangeLog:
(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
dist-hook: ChangeLog
+
+if LINT
+# Check source code with tools like lint & sparse
+lint:
+ (cd src && $(MAKE) $(MFLAGS) lint)
+endif LINT
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/libXScrnSaver-1.1.2/man/Makefile.am new/libXScrnSaver-1.1.3/man/Makefile.am
--- old/libXScrnSaver-1.1.2/man/Makefile.am 2006-12-06 17:17:08.000000000 +0100
+++ new/libXScrnSaver-1.1.3/man/Makefile.am 2008-03-18 02:15:28.000000000 +0100
@@ -1,4 +1,3 @@
-# $Id$
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
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/libXScrnSaver-1.1.2/missing new/libXScrnSaver-1.1.3/missing
--- old/libXScrnSaver-1.1.2/missing 2006-12-16 00:36:26.000000000 +0100
+++ new/libXScrnSaver-1.1.3/missing 2008-03-18 02:29:01.000000000 +0100
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,6 +33,8 @@
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.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
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
@@ -106,7 +109,7 @@
# 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).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
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 [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ 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
@@ -289,11 +290,17 @@
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 's/.*-o \([^ ]*\).*/\1/p'`
+ 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`
+ 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
@@ -317,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
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/libXScrnSaver-1.1.2/src/Makefile.am new/libXScrnSaver-1.1.3/src/Makefile.am
--- old/libXScrnSaver-1.1.2/src/Makefile.am 2006-12-06 17:17:08.000000000 +0100
+++ new/libXScrnSaver-1.1.3/src/Makefile.am 2008-03-18 02:15:28.000000000 +0100
@@ -8,4 +8,19 @@
libXss_la_LDFLAGS = -version-info 1:0:0 -no-undefined
+if LINT
+ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
+lint:
+ $(LINT) $(ALL_LINT_FLAGS) $(libXss_la_SOURCES)
+endif LINT
+
+if MAKE_LINT_LIB
+lintlibdir = $(libdir)
+
+lintlib_DATA = $(LINTLIB)
+
+$(LINTLIB): $(libXss_la_SOURCES)
+ $(LINT) -y -oXss -x $(ALL_LINT_FLAGS) $(libXss_la_SOURCES)
+endif MAKE_LINT_LIB
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/libXScrnSaver-1.1.2/src/XScrnSaver.c new/libXScrnSaver-1.1.3/src/XScrnSaver.c
--- old/libXScrnSaver-1.1.2/src/XScrnSaver.c 2006-12-06 17:17:08.000000000 +0100
+++ new/libXScrnSaver-1.1.3/src/XScrnSaver.c 2008-03-18 02:15:29.000000000 +0100
@@ -47,9 +47,23 @@
#define ScreenSaverSimpleCheckExtension(dpy,i) \
XextSimpleCheckExtension (dpy, i, screen_saver_extension_name)
-static int close_display();
-static Bool wire_to_event();
-static Status event_to_wire();
+static int close_display(
+ Display * /* dpy */,
+ XExtCodes * /* codes */
+);
+
+static Bool wire_to_event(
+ Display * /* dpy */,
+ XEvent * /* re */,
+ xEvent * /* event */
+);
+
+static Status event_to_wire(
+ Display * /* dpy */,
+ XEvent * /* re */,
+ xEvent * /* event */
+);
+
static /* const */ XExtensionHooks screen_saver_extension_hooks = {
NULL, /* create_gc */
NULL, /* copy_gc */
@@ -72,10 +86,10 @@
static XEXT_GENERATE_CLOSE_DISPLAY (close_display, screen_saver_info)
-static Bool wire_to_event (dpy, re, event)
- Display *dpy;
- XEvent *re;
- xEvent *event;
+static Bool wire_to_event (
+ Display *dpy,
+ XEvent *re,
+ xEvent *event)
{
XExtDisplayInfo *info = find_display (dpy);
XScreenSaverNotifyEvent *se;
@@ -104,10 +118,10 @@
return False;
}
-static Status event_to_wire (dpy, re, event)
- Display *dpy;
- XEvent *re;
- xEvent *event;
+static Status event_to_wire (
+ Display *dpy,
+ XEvent *re,
+ xEvent *event)
{
XExtDisplayInfo *info = find_display (dpy);
XScreenSaverNotifyEvent *se;
@@ -140,9 +154,10 @@
* *
****************************************************************************/
-Bool XScreenSaverQueryExtension (dpy, event_basep, error_basep)
- Display *dpy;
- int *event_basep, *error_basep;
+Bool XScreenSaverQueryExtension (
+ Display *dpy,
+ int *event_basep,
+ int *error_basep)
{
XExtDisplayInfo *info = find_display (dpy);
@@ -156,9 +171,10 @@
}
-Status XScreenSaverQueryVersion(dpy, major_versionp, minor_versionp)
- Display *dpy;
- int *major_versionp, *minor_versionp;
+Status XScreenSaverQueryVersion(
+ Display *dpy,
+ int *major_versionp,
+ int *minor_versionp)
{
XExtDisplayInfo *info = find_display (dpy);
xScreenSaverQueryVersionReply rep;
@@ -184,15 +200,15 @@
return 1;
}
-XScreenSaverInfo *XScreenSaverAllocInfo ()
+XScreenSaverInfo *XScreenSaverAllocInfo (void)
{
return (XScreenSaverInfo *) Xmalloc (sizeof (XScreenSaverInfo));
}
-Status XScreenSaverQueryInfo (dpy, drawable, saver_info)
- Display *dpy;
- Drawable drawable;
- XScreenSaverInfo *saver_info;
+Status XScreenSaverQueryInfo (
+ Display *dpy,
+ Drawable drawable,
+ XScreenSaverInfo *saver_info)
{
XExtDisplayInfo *info = find_display (dpy);
xScreenSaverQueryInfoReply rep;
@@ -221,10 +237,10 @@
return 1;
}
-void XScreenSaverSelectInput (dpy, drawable, mask)
- register Display *dpy;
- Drawable drawable;
- unsigned long mask;
+void XScreenSaverSelectInput (
+ register Display *dpy,
+ Drawable drawable,
+ unsigned long mask)
{
XExtDisplayInfo *info = find_display (dpy);
register xScreenSaverSelectInputReq *req;
@@ -242,11 +258,11 @@
}
static void
-XScreenSaverProcessWindowAttributes (dpy, req, valuemask, attributes)
- register Display *dpy;
- xChangeWindowAttributesReq *req;
- register unsigned long valuemask;
- register XSetWindowAttributes *attributes;
+XScreenSaverProcessWindowAttributes (
+ register Display *dpy,
+ xChangeWindowAttributesReq *req,
+ register unsigned long valuemask,
+ register XSetWindowAttributes *attributes)
{
unsigned long values[32];
register unsigned long *value = values;
@@ -304,21 +320,19 @@
}
-void XScreenSaverSetAttributes (dpy, drawable, x, y, width, height,
- border_width, depth, class, visual,
- valuemask, attributes)
- Display* dpy;
- Drawable drawable;
- int x;
- int y;
- unsigned int width;
- unsigned int height;
- unsigned int border_width;
- int depth;
- unsigned int class;
- Visual * visual;
- unsigned long valuemask;
- XSetWindowAttributes *attributes;
+void XScreenSaverSetAttributes (
+ Display *dpy,
+ Drawable drawable,
+ int x,
+ int y,
+ unsigned int width,
+ unsigned int height,
+ unsigned int border_width,
+ int depth,
+ unsigned int class,
+ Visual *visual,
+ unsigned long valuemask,
+ XSetWindowAttributes *attributes)
{
XExtDisplayInfo *info = find_display (dpy);
register xScreenSaverSetAttributesReq *req;
@@ -351,9 +365,9 @@
}
-void XScreenSaverUnsetAttributes (dpy, drawable)
- register Display *dpy;
- Drawable drawable;
+void XScreenSaverUnsetAttributes (
+ register Display *dpy,
+ Drawable drawable)
{
XExtDisplayInfo *info = find_display (dpy);
register xScreenSaverUnsetAttributesReq *req;
@@ -370,11 +384,11 @@
}
-Status XScreenSaverRegister (dpy, screen, xid, type)
- Display *dpy;
- int screen;
- XID xid;
- Atom type;
+Status XScreenSaverRegister (
+ Display *dpy,
+ int screen,
+ XID xid,
+ Atom type)
{
Atom prop;
unsigned long ul;
@@ -391,9 +405,9 @@
-Status XScreenSaverUnregister (dpy, screen)
- Display *dpy;
- int screen;
+Status XScreenSaverUnregister (
+ Display *dpy,
+ int screen)
{
Atom prop;
@@ -407,11 +421,11 @@
-Status XScreenSaverGetRegistered (dpy, screen, xid, type)
- Display *dpy;
- int screen;
- XID *xid;
- Atom *type;
+Status XScreenSaverGetRegistered (
+ Display *dpy,
+ int screen,
+ XID *xid,
+ Atom *type)
{
Atom actual_type = None;
int actual_format;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org