diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | INSTALL | 234 | ||||
| -rwxr-xr-x | autogen.sh | 9 | ||||
| -rw-r--r-- | configure.in.in | 6 | ||||
| -rw-r--r-- | engines/mice/preview.h | 2 | ||||
| -rw-r--r-- | engines/mice/slide.h | 2 | ||||
| -rw-r--r-- | settings/session/Makefile.am | 2 | ||||
| -rw-r--r-- | settings/session/session.c | 4 | ||||
| -rw-r--r-- | settings/session/xfce-session-settings.desktop.in | 3 | ||||
| -rw-r--r-- | settings/splash/Makefile.am | 3 | ||||
| -rw-r--r-- | settings/splash/nopreview.h | 2 | ||||
| -rw-r--r-- | settings/splash/xfce-splash-settings.desktop.in | 3 | ||||
| -rw-r--r-- | xfce4-autostart-editor/xfce4-autostart-editor.desktop.in | 2 | ||||
| -rw-r--r-- | xfce4-session/chooser-icon.h | 2 | ||||
| -rw-r--r-- | xfce4-session/main.c | 1 |
15 files changed, 32 insertions, 254 deletions
@@ -1,3 +1,14 @@ +2008-09-04 Jannis Pohlmann <jannis@xfce.org> + + * autogen.sh: Add git svn revision versioning support. + +2008-08-25 Brian J. Tarricone <kelnos@xfce.org> + + * settings/session/{Makefile.am,xfce-session-settings.desktop.in}, + settings/splash/{Makefile.am,xfce-splash-settings.desktop.in}, + xfce4-autostart-editor/xfce4-autostart-editor.desktop.in: Include + settings dialogs in the new settings manager. + 2007-11-29 Benedikt Meurer <benny@xfce.org> * icons/, xfce4-autostart-editor/main.c: Add icon from diff --git a/INSTALL b/INSTALL deleted file mode 100644 index 5458714e..00000000 --- a/INSTALL +++ /dev/null @@ -1,234 +0,0 @@ -Installation Instructions -************************* - -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 -================== - -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 -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). - - 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 -disabled by default to prevent problems with accidental use of stale -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 -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you -may remove or edit it. - - The file `configure.ac' (or `configure.in') is used to create -`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. - - 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. - - 3. Optionally, type `make check' to run any self-tests that come with - the package. - - 4. Type `make install' to install the programs and any data files and - documentation. - - 5. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly - for the package's developers. If you use it, you may have to get - all sorts of other programs in order to regenerate files that came - with the distribution. - -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. - - 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=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 -same time, by placing the object files for each architecture in their -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 `..'. - - 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' 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 -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=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. - - If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. - -Optional Features -================= - -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 -`README' should mention any `--enable-' and `--with-' options that the -package recognizes. - - For packages that use the X Window System, `configure' can usually -find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. - -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 -`--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: - - CPU-COMPANY-SYSTEM - -where SYSTEM can have one of these forms: - - OS KERNEL-OS - - See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't -need to know the machine type. - - If you are _building_ compiler tools for cross-compiling, you should -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 -platform different from the build platform, you should specify the -"host" platform (i.e., that on which the generated programs will -eventually be run) with `--host=TYPE'. - -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'. -`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. -A warning: not all `configure' scripts look for a site script. - -Defining Variables -================== - -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 -them in the `configure' command line, using `VAR=value'. For example: - - ./configure CC=/usr/local2/bin/gcc - -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. - -`--help' -`-h' - Print a summary of the options to `configure', and exit. - -`--version' -`-V' - Print the version of Autoconf used to generate the `configure' - script, and exit. - -`--cache-file=FILE' - Enable the cache: use and save the results of the tests in FILE, - traditionally `config.cache'. FILE defaults to `/dev/null' to - disable caching. - -`--config-cache' -`-C' - Alias for `--cache-file=config.cache'. - -`--quiet' -`--silent' -`-q' - Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error - messages will still be shown). - -`--srcdir=DIR' - Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. - -`configure' also accepts some other, not widely useful, options. Run -`configure --help' for more details. - @@ -29,7 +29,14 @@ EOF # substitute revision and linguas linguas=`sed -e '/^#/d' po/LINGUAS` -revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%05d\n", $2}'` +if test -d .git/svn; then + revision=`git svn find-rev trunk 2>/dev/null || + git svn find-rev origin/trunk 2>/dev/null || + git svn find-rev HEAD 2>/dev/null || + git svn find-rev master 2>/dev/null` +else + revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%05d\n", $2}'` +fi sed -e "s/@LINGUAS@/${linguas}/g" \ -e "s/@REVISION@/${revision}/g" \ < "configure.in.in" > "configure.in" diff --git a/configure.in.in b/configure.in.in index 8fc4c043..adf9ee13 100644 --- a/configure.in.in +++ b/configure.in.in @@ -9,7 +9,7 @@ dnl dnl Version information m4_define([xfsm_version_major], [4]) m4_define([xfsm_version_minor], [5]) -m4_define([xfsm_version_micro], [80]) +m4_define([xfsm_version_micro], [90]) m4_define([xfsm_version_nano], []) m4_define([xfsm_version_build], [@REVISION@]) m4_define([xfsm_version_tag], []) @@ -70,8 +70,8 @@ dnl Check for i18n support XDT_I18N([@LINGUAS@]) dnl Check for required packages -XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0]) -XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0]) +XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.5.90]) +XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.5.90]) XDT_CHECK_PACKAGE([LIBWNCK], [libwnck-1.0], [2.12]) dnl Check for D-Bus support (for HAL shutdown support) diff --git a/engines/mice/preview.h b/engines/mice/preview.h index 10646154..ec4bebd0 100644 --- a/engines/mice/preview.h +++ b/engines/mice/preview.h @@ -8,7 +8,7 @@ static const GdkPixdata preview = { 320, /* width */ 240, /* height */ /* pixel_data: */ - "\377\332\347\376\377\332\347\376\377\332\347\376\377\332\347\376\377" + (guchar *)"\377\332\347\376\377\332\347\376\377\332\347\376\377\332\347\376\377" "\332\347\376\377\332\347\376\377\332\347\376\377\332\347\376\377\332" "\347\376\377\332\347\376\377\332\347\376\377\332\347\376\377\332\347" "\376\377\332\347\376\377\332\347\376\377\332\347\376\377\332\347\376" diff --git a/engines/mice/slide.h b/engines/mice/slide.h index 7468afaa..8a8eeb43 100644 --- a/engines/mice/slide.h +++ b/engines/mice/slide.h @@ -8,7 +8,7 @@ static const GdkPixdata slide = { 800, /* width */ 52, /* height */ /* pixel_data: */ - "\3\0\0\0\27\0\0\0\17\1\1\1\2\341\0\0\0\0\3\0\0\0/\0\0\0\36\1\1\1\5\341" + (guchar *)"\3\0\0\0\27\0\0\0\17\1\1\1\2\341\0\0\0\0\3\0\0\0/\0\0\0\36\1\1\1\5\341" "\0\0\0\0\3\0\0\0F\0\0\0-\1\1\1\10\341\0\0\0\0\3\0\0\0^\0\0\0<\1\1\1\13" "\341\0\0\0\0\3\0\0\0u\0\0\0K\1\1\1\16\341\0\0\0\0\3\0\0\0\215\0\0\0Z" "\1\1\1\21\341\0\0\0\0\3\0\0\0\244\0\0\0i\1\1\1\24\341\0\0\0\0\3\0\0\0" diff --git a/settings/session/Makefile.am b/settings/session/Makefile.am index 9f24724b..e3f15f3f 100644 --- a/settings/session/Makefile.am +++ b/settings/session/Makefile.am @@ -21,8 +21,6 @@ desktopdir = $(datadir)/applications desktop_in_files = xfce-session-settings.desktop.in desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) -settingsdir = $(datadir)/xfce4/settings-dialogs -settings_DATA = $(desktop_DATA) @INTLTOOL_DESKTOP_RULE@ EXTRA_DIST = \ diff --git a/settings/session/session.c b/settings/session/session.c index 68a6b9bc..fc1a1b92 100644 --- a/settings/session/session.c +++ b/settings/session/session.c @@ -291,7 +291,7 @@ settings_dialog_new() if (dialog != NULL) { gtk_window_present (GTK_WINDOW (dialog)); - return; + return dialog; } kiosk = xfce_kiosk_new ("xfce4-session"); @@ -341,8 +341,6 @@ settings_dialog_new() int main(int argc, char **argv) { - GError *cli_error = NULL; - #ifdef ENABLE_NLS bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); diff --git a/settings/session/xfce-session-settings.desktop.in b/settings/session/xfce-session-settings.desktop.in index 22cd2793..b89ba542 100644 --- a/settings/session/xfce-session-settings.desktop.in +++ b/settings/session/xfce-session-settings.desktop.in @@ -6,6 +6,7 @@ Exec=xfce4-session-settings Icon=xfce4-session Terminal=false Type=Application -Categories=X-XFCE;Settings;DesktopSettings; +Categories=X-XFCE;Settings;DesktopSettings;X-XfceSettingsDialog; OnlyShowIn=XFCE; _GenericName=Sessions and Startup Settings +_X-XfceSettingsName=Sessions and Startup diff --git a/settings/splash/Makefile.am b/settings/splash/Makefile.am index 4dd975d9..df480ae9 100644 --- a/settings/splash/Makefile.am +++ b/settings/splash/Makefile.am @@ -31,9 +31,6 @@ desktopdir = $(datadir)/applications desktop_in_files = xfce-splash-settings.desktop.in desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) -settingsdir = $(datadir)/xfce4/settings-dialogs -settings_DATA = $(desktop_DATA) - @INTLTOOL_DESKTOP_RULE@ EXTRA_DIST = \ diff --git a/settings/splash/nopreview.h b/settings/splash/nopreview.h index 3ef1ede5..5cbceee0 100644 --- a/settings/splash/nopreview.h +++ b/settings/splash/nopreview.h @@ -8,7 +8,7 @@ static const GdkPixdata nopreview = { 320, /* width */ 240, /* height */ /* pixel_data: */ - "\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0" + (guchar *)"\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0" "\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377" "\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0" "\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0" diff --git a/settings/splash/xfce-splash-settings.desktop.in b/settings/splash/xfce-splash-settings.desktop.in index 8999a2b4..c5f8fd05 100644 --- a/settings/splash/xfce-splash-settings.desktop.in +++ b/settings/splash/xfce-splash-settings.desktop.in @@ -6,6 +6,7 @@ Exec=xfce4-splash-settings Icon=xfce4-splash Terminal=false Type=Application -Categories=X-XFCE;Settings;DesktopSettings; +Categories=X-XFCE;Settings;DesktopSettings;X-XfceSettingsDialog; OnlyShowIn=XFCE; _GenericName=Splash Screen Settings +_X-XfceSettingsName=Splash Screen diff --git a/xfce4-autostart-editor/xfce4-autostart-editor.desktop.in b/xfce4-autostart-editor/xfce4-autostart-editor.desktop.in index e544a4c7..a6b05f67 100644 --- a/xfce4-autostart-editor/xfce4-autostart-editor.desktop.in +++ b/xfce4-autostart-editor/xfce4-autostart-editor.desktop.in @@ -6,6 +6,6 @@ Exec=xfce4-autostart-editor Icon=xfce4-autostart-editor Terminal=false Type=Application -Categories=X-XFCE;Settings;DesktopSettings; +Categories=X-XFCE;Settings;DesktopSettings;X-XfceSettingsDialog; OnlyShowIn=XFCE; _GenericName=Autostarted Applications diff --git a/xfce4-session/chooser-icon.h b/xfce4-session/chooser-icon.h index 05c06e17..248ca85b 100644 --- a/xfce4-session/chooser-icon.h +++ b/xfce4-session/chooser-icon.h @@ -8,7 +8,7 @@ static const GdkPixdata chooser_icon_data = { 52, /* width */ 42, /* height */ /* pixel_data: */ - "\377\0\0\0\0\341\0\0\0\0\202!!-\0\2\37\37*\2\23\23\32\5\213\0\0\0\0\202" + (guchar *)"\377\0\0\0\0\341\0\0\0\0\202!!-\0\2\37\37*\2\23\23\32\5\213\0\0\0\0\202" "!!-\0\2\32\32#\2\21\21\27\6\236\0\0\0\0\10!!-\0!!-\1!!-\4!!-\13&'4\33" "\247\255\265r\232\237\243\243\17\17\24\11\206\0\0\0\0\11!!-\0!!-\1!!" "-\4!!-\12!\".\24*,;%\252\262\274\207\225\234\243\250\15\15\22\17\232" diff --git a/xfce4-session/main.c b/xfce4-session/main.c index ab97963a..acf793b4 100644 --- a/xfce4-session/main.c +++ b/xfce4-session/main.c @@ -130,7 +130,6 @@ init_display (GdkDisplay *dpy, gboolean disable_tcp) { const gchar *engine; - gint n; xfce_rc_set_group (rc, "Splash Screen"); engine = xfce_rc_read_entry (rc, "Engine", NULL); |