Author: olivier
Date: 2007-01-19 21:35:48 +0000 (Fri, 19 Jan 2007)
New Revision: 24576
Modified:
xfdesktop/trunk/INSTALL
xfdesktop/trunk/configure.ac.in
xfdesktop/trunk/src/settings.c
xfdesktop/trunk/src/windowlist.c
xfdesktop/trunk/src/xfce-desktop.c
Log:
Update version
Modified: xfdesktop/trunk/INSTALL
===================================================================
--- xfdesktop/trunk/INSTALL 2007-01-19 21:33:51 UTC (rev 24575)
+++ xfdesktop/trunk/INSTALL 2007-01-19 21:35:48 UTC (rev 24576)
@@ -1,13 +1,19 @@
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
-Foundation, Inc.
+Installation Instructions
+*************************
- This file is free documentation; the Free Software Foundation gives
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006 Free Software Foundation, Inc.
+
+This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
Basic Installation
==================
- These are generic installation instructions.
+Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package. The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
@@ -20,9 +26,9 @@
It can also use an optional file (typically called `config.cache'
and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring. (Caching is
+the results of its tests to speed up reconfiguring. Caching is
disabled by default to prevent problems with accidental use of stale
-cache files.)
+cache files.
If you need to do unusual things to compile the package, please try
to figure out how `configure' could check whether to do them, and mail
@@ -32,20 +38,17 @@
may remove or edit it.
The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'. You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
+`configure' by a program called `autoconf'. You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
The simplest way to compile this package is:
1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system. If you're
- using `csh' on an old version of System V, you might need to type
- `sh ./configure' instead to prevent `csh' from trying to execute
- `configure' itself.
+ `./configure' to configure the package for your system.
- Running `configure' takes awhile. While running, it prints some
- messages telling which features it is checking for.
+ Running `configure' might take a while. While running, it prints
+ some messages telling which features it is checking for.
2. Type `make' to compile the package.
@@ -67,51 +70,49 @@
Compilers and Options
=====================
- Some systems require unusual options for compilation or linking that
-the `configure' script does not know about. Run `./configure --help'
-for details on some of the pertinent environment variables.
+Some systems require unusual options for compilation or linking that the
+`configure' script does not know about. Run `./configure --help' for
+details on some of the pertinent environment variables.
You can give `configure' initial values for configuration parameters
by setting variables in the command line or in the environment. Here
is an example:
- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
*Note Defining Variables::, for more details.
Compiling For Multiple Architectures
====================================
- You can compile the package for more than one kind of computer at the
+You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
-own directory. To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'. `cd' to the
+own directory. To do this, you can use GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
the `configure' script. `configure' automatically checks for the
source code in the directory that `configure' is in and in `..'.
- If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory. After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
+ With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory. After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
Installation Names
==================
- By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc. You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PATH'.
+By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc. You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
-give `configure' the option `--exec-prefix=PATH', the package will use
-PATH as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
In addition, if you use an unusual directory layout you can give
-options like `--bindir=PATH' to specify different values for particular
+options like `--bindir=DIR' to specify different values for particular
kinds of files. Run `configure --help' for a list of the directories
you can set and what kinds of files go in them.
@@ -122,7 +123,7 @@
Optional Features
=================
- Some packages pay attention to `--enable-FEATURE' options to
+Some packages pay attention to `--enable-FEATURE' options to
`configure', where FEATURE indicates an optional part of the package.
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
is something like `gnu-as' or `x' (for the X Window System). The
@@ -137,11 +138,11 @@
Specifying the System Type
==========================
- There may be some features `configure' cannot figure out
-automatically, but needs to determine by the type of machine the package
-will run on. Usually, assuming the package is built to be run on the
-_same_ architectures, `configure' can figure that out, but if it prints
-a message saying it cannot guess the machine type, give it the
+There may be some features `configure' cannot figure out automatically,
+but needs to determine by the type of machine the package will run on.
+Usually, assuming the package is built to be run on the _same_
+architectures, `configure' can figure that out, but if it prints a
+message saying it cannot guess the machine type, give it the
`--build=TYPE' option. TYPE can either be a short name for the system
type, such as `sun4', or a canonical name which has the form:
@@ -156,7 +157,7 @@
need to know the machine type.
If you are _building_ compiler tools for cross-compiling, you should
-use the `--target=TYPE' option to select the type of system they will
+use the option `--target=TYPE' to select the type of system they will
produce code for.
If you want to _use_ a cross compiler, that generates code for a
@@ -167,9 +168,9 @@
Sharing Defaults
================
- If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
+If you want to set default values for `configure' scripts to share, you
+can create a site shell script called `config.site' that gives default
+values for variables like `CC', `cache_file', and `prefix'.
`configure' looks for `PREFIX/share/config.site' if it exists, then
`PREFIX/etc/config.site' if it exists. Or, you can set the
`CONFIG_SITE' environment variable to the location of the site script.
@@ -178,7 +179,7 @@
Defining Variables
==================
- Variables not defined in a site shell script can be set in the
+Variables not defined in a site shell script can be set in the
environment passed to `configure'. However, some packages may run
configure again during the build, and the customized values of these
variables may be lost. In order to avoid this problem, you should set
@@ -186,14 +187,18 @@
./configure CC=/usr/local2/bin/gcc
-will cause the specified gcc to be used as the C compiler (unless it is
+causes the specified `gcc' to be used as the C compiler (unless it is
overridden in the site shell script).
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug. Until the bug is fixed you can use this workaround:
+
+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
`configure' Invocation
======================
- `configure' recognizes the following options to control how it
-operates.
+`configure' recognizes the following options to control how it operates.
`--help'
`-h'
Modified: xfdesktop/trunk/configure.ac.in
===================================================================
--- xfdesktop/trunk/configure.ac.in 2007-01-19 21:33:51 UTC (rev 24575)
+++ xfdesktop/trunk/configure.ac.in 2007-01-19 21:35:48 UTC (rev 24576)
@@ -4,11 +4,11 @@
dnl
dnl version info
-m4_define([xfdesktop_version], [4.3.99.2])
+m4_define([xfdesktop_version], [4.4.0])
dnl minimum required versions
m4_define([gtk_minimum_version], [2.6.0])
-m4_define([xfce_minimum_version], [4.3.99.2])
+m4_define([xfce_minimum_version], [4.4.0])
m4_define([exo_minimum_version], [0.3.1.12])
m4_define([thunar_minimum_version], [0.5.0])
m4_define([dbus_minimum_version], [0.34])
Modified: xfdesktop/trunk/src/settings.c
===================================================================
--- xfdesktop/trunk/src/settings.c 2007-01-19 21:33:51 UTC (rev 24575)
+++ xfdesktop/trunk/src/settings.c 2007-01-19 21:35:48 UTC (rev 24576)
@@ -89,14 +89,16 @@
McsClient *
settings_init()
{
+ GdkDisplay *gdisplay;
Display *xdpy;
gint xscreen;
g_return_val_if_fail(mcs_client == NULL, mcs_client);
+
+ gdisplay = gdk_display_get_default ();
+ xdpy = (Display *) gdk_x11_display_get_xdisplay (gdisplay);
+ xscreen = gdk_screen_get_number(gdk_display_get_default_screen(gdisplay));
- xdpy = GDK_DISPLAY();
- xscreen =
gdk_screen_get_number(gdk_display_get_default_screen(gdk_display_get_default()));
-
if(!mcs_client_check_manager(xdpy, xscreen, "xfce-mcs-manager")) {
g_critical("%s: Unable to start settings manager", PACKAGE);
return NULL;
Modified: xfdesktop/trunk/src/windowlist.c
===================================================================
--- xfdesktop/trunk/src/windowlist.c 2007-01-19 21:33:51 UTC (rev 24575)
+++ xfdesktop/trunk/src/windowlist.c 2007-01-19 21:35:48 UTC (rev 24576)
@@ -52,19 +52,26 @@
{
static Atom xa_NET_NUMBER_OF_DESKTOPS = 0;
XClientMessageEvent sev;
+ GdkScreen *gscreen;
+ GdkDisplay *gdisplay;
+ GdkWindow *groot;
+ Display *xdpy;
gint n;
- GdkScreen *gscreen = gtk_widget_get_screen(w);
- GdkWindow *groot = gdk_screen_get_root_window(gscreen);
+ gscreen = gtk_widget_get_screen(w);
+ gdisplay = gdk_screen_get_display (gscreen);
+ groot = gdk_screen_get_root_window(gscreen);
+ xdpy = (Display *) gdk_x11_display_get_xdisplay (gdisplay);
+
if(!xa_NET_NUMBER_OF_DESKTOPS) {
- xa_NET_NUMBER_OF_DESKTOPS = XInternAtom(GDK_DISPLAY(),
+ xa_NET_NUMBER_OF_DESKTOPS = XInternAtom(xdpy,
"_NET_NUMBER_OF_DESKTOPS", False);
}
n = GPOINTER_TO_INT(num);
sev.type = ClientMessage;
- sev.display = GDK_DISPLAY();
+ sev.display = xdpy;
sev.format = 32;
sev.window = GDK_WINDOW_XID(groot);
sev.message_type = xa_NET_NUMBER_OF_DESKTOPS;
@@ -72,7 +79,7 @@
gdk_error_trap_push();
- XSendEvent(GDK_DISPLAY(), GDK_WINDOW_XID(groot), False,
+ XSendEvent(xdpy, GDK_WINDOW_XID(groot), False,
SubstructureNotifyMask | SubstructureRedirectMask,
(XEvent *)&sev);
Modified: xfdesktop/trunk/src/xfce-desktop.c
===================================================================
--- xfdesktop/trunk/src/xfce-desktop.c 2007-01-19 21:33:51 UTC (rev 24575)
+++ xfdesktop/trunk/src/xfce-desktop.c 2007-01-19 21:35:48 UTC (rev 24576)
@@ -465,16 +465,24 @@
gint xscreen;
gchar selection_name[100];
Atom selection_atom, manager_atom;
-
+ GdkScreen *gscreen;
+ GdkDisplay *gdisplay;
+ GdkWindow *groot;
+ Display *xdpy;
+
+ gscreen = desktop->priv->gscreen;
xwin = GDK_WINDOW_XID(GTK_WIDGET(desktop)->window);
- xscreen = gdk_screen_get_number(desktop->priv->gscreen);
+ xscreen = gdk_screen_get_number(gscreen);
+ gdisplay = gdk_screen_get_display (gscreen);
+ groot = gdk_screen_get_root_window(gscreen);
+ xdpy = (Display *) gdk_x11_display_get_xdisplay (gdisplay);
g_snprintf(selection_name, 100, XFDESKTOP_SELECTION_FMT, xscreen);
- selection_atom = XInternAtom(GDK_DISPLAY(), selection_name, False);
- manager_atom = XInternAtom(GDK_DISPLAY(), "MANAGER", False);
+ selection_atom = XInternAtom(xdpy, selection_name, False);
+ manager_atom = XInternAtom(xdpy, "MANAGER", False);
- XSelectInput(GDK_DISPLAY(), xwin, PropertyChangeMask | ButtonPressMask);
- XSetSelectionOwner(GDK_DISPLAY(), selection_atom, xwin, GDK_CURRENT_TIME);
+ XSelectInput(xdpy, xwin, PropertyChangeMask | ButtonPressMask);
+ XSetSelectionOwner(xdpy, selection_atom, xwin, GDK_CURRENT_TIME);
/* listen for client messages */
g_signal_connect(G_OBJECT(desktop), "client-event",
@@ -482,9 +490,9 @@
/* Check to see if we managed to claim the selection. If not,
* we treat it as if we got it then immediately lost it */
- if(XGetSelectionOwner(GDK_DISPLAY(), selection_atom) == xwin) {
+ if(XGetSelectionOwner(xdpy, selection_atom) == xwin) {
XClientMessageEvent xev;
- Window xroot =
GDK_WINDOW_XID(gdk_screen_get_root_window(desktop->priv->gscreen));
+ Window xroot = GDK_WINDOW_XID(groot);
xev.type = ClientMessage;
xev.window = xroot;
@@ -496,7 +504,7 @@
xev.data.l[3] = 0; /* manager specific data */
xev.data.l[4] = 0; /* manager specific data */
- XSendEvent(GDK_DISPLAY(), xroot, False, StructureNotifyMask, (XEvent
*)&xev);
+ XSendEvent(xdpy, xroot, False, StructureNotifyMask, (XEvent *)&xev);
} else {
g_error("%s: could not set selection ownership", PACKAGE);
exit(1);
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
