summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--COPYING60
-rw-r--r--ChangeLog255
-rwxr-xr-xconfigure38
-rw-r--r--configure.ac4
-rw-r--r--engines/balou/config.c8
-rw-r--r--settings/session/session.c61
-rw-r--r--settings/splash/splash.c78
-rw-r--r--xfce4-session.rc2
8 files changed, 303 insertions, 203 deletions
diff --git a/COPYING b/COPYING
index d60c31a9..5a965fbc 100644
--- a/COPYING
+++ b/COPYING
@@ -278,63 +278,3 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/ChangeLog b/ChangeLog
index b449f127..3a3cdab5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,88 @@
+2004-07-23 19:09 benny
+
+ * xfce4-session.spec.in: Fixed .spec file.
+
+2004-07-23 18:31 benny
+
+ * xfce4-session.rc: AlwaysDisplay is now false by default.
+
+2004-07-23 17:46 benny
+
+ * xfce4-session/xfsm-fadeout.c: Use single-colored fadeout screen,
+ faster on remote displays.
+
+2004-07-23 16:47 benny
+
+ * settings/session/session.c, xfce4-session/main.c,
+ xfce4-session/shutdown.c: Implemented PromptOnLogout.
+
+2004-07-23 15:09 benny
+
+ * configure, xfce4-session/shutdown.c,
+ xfce4-session/xfsm-shutdown-helper-sudo.c: Reap the shutdown
+ helper, so no zombies are created if the user cancels the shutdown
+ attempt.
+
+2004-07-23 14:33 benny
+
+ * configure, configure.ac: Disabled redhat shutdown code for now,
+ until I can be sure, that it works.
+
+2004-07-22 01:00 benny
+
+ * m4/depends.m4: Readded the XFCE_MCS_PLUGIN macro. I didn't ment
+ to remove it, tho.
+
+2004-07-20 22:58 benny
+
+ * m4/depends.m4: Modifed panel plugin check, so one (the installer)
+ can choose to install into a different plugin dir.
+
+2004-07-16 16:08 benny
+
+ * Makefile.am, Makefile.in, config.h.in, configure, configure.ac,
+ engines/.cvsignore, engines/balou/.cvsignore,
+ engines/balou/scripts/.cvsignore, engines/balou/themes/.cvsignore,
+ engines/balou/themes/Default/.cvsignore, engines/mice/.cvsignore,
+ engines/simple/.cvsignore, engines/simple/simple.c,
+ icons/.cvsignore, icons/128x128/.cvsignore, icons/48x48/.cvsignore,
+ icons/64x64/.cvsignore, icons/72x72/.cvsignore,
+ settings/.cvsignore, settings/scripts/.cvsignore,
+ settings/session/.cvsignore, settings/splash/.cvsignore,
+ xfce4-session/.cvsignore, xfce4-session/Makefile.am,
+ xfce4-session/Makefile.in,
+ xfce4-session/xfsm-shutdown-helper-none.c,
+ xfce4-session/xfsm-shutdown-helper-redhat.c,
+ xfce4-session/xfsm-shutdown-helper-sudo.c,
+ xfce4-session/xfsm-shutdown-helper.c: Added simple redhat shutdown
+ code (dunno if this works actually, copied from gnome-session) per
+ botsie's request. Added lots of .cvsignore files. Use Brians
+ XfceColorButton instead of the 2.4-only GtkColorButton widget.
+ Removed the custom xinitrc script, its no longer required, since
+ xinitrc starts xfce4-session automatically.
+
+2004-07-15 22:37 benny
+
+ * engines/simple/simple.c: Use clipping to avoid drawing the layout
+ to the window border.
+
+2004-07-15 22:27 benny
+
+ * xfce4-session/: Makefile.am, Makefile.in, chooser-icon.h,
+ xfsm-manager.c: Use GdkPixdata instead of raw pixbuf data.
+
+2004-07-15 22:17 benny
+
+ * ChangeLog, configure, engines/mice/mice.c,
+ xfce4-session/xfsm-compat-gnome.c, xfce4-session/xfsm-fadeout.c,
+ xfce4-session/xfsm-splash-screen.c: Updated ChangeLog. Removed
+ useless debug message and changed fadeout color.
+
+2004-07-15 19:55 benny
+
+ * engines/simple/simple.c: Fix rendering bug with small images and
+ added text shadow.
+
2004-07-14 22:17 benny
* configure, configure.ac, engines/balou/Makefile.am,
@@ -145,13 +230,13 @@
* Makefile.in, aclocal.m4, config.guess, config.sub, configure,
configure.ac, install-sh, ltmain.sh, mkinstalldirs,
- defaults/Makefile.in, docs/Makefile.in, icons/Makefile.in,
- icons/128x128/Makefile.in, icons/48x48/Makefile.in,
- icons/64x64/Makefile.in, icons/72x72/Makefile.in, po/lt.gmo,
- po/lt.po, settings/Makefile.in, settings/scripts/Makefile.in,
- themes/Makefile.in, themes/Default/Makefile.in,
- xfce4-session/Makefile.in, xfsm-shutdown-helper/Makefile.in:
- Updated lt translations from Mantas Zapolskas
+ docs/Makefile.in, icons/Makefile.in, icons/128x128/Makefile.in,
+ icons/48x48/Makefile.in, icons/64x64/Makefile.in,
+ icons/72x72/Makefile.in, po/lt.gmo, po/lt.po, settings/Makefile.in,
+ settings/scripts/Makefile.in, themes/Makefile.in,
+ themes/Default/Makefile.in, xfce4-session/Makefile.in,
+ xfsm-shutdown-helper/Makefile.in: Updated lt translations from
+ Mantas Zapolskas
2004-06-13 11:40 pollux
@@ -219,18 +304,17 @@
2004-06-05 23:19 benny
* BUGS, ChangeLog, Makefile.in, config.h.in, configure,
- configure.ac, defaults/Makefile.in, docs/Makefile.in,
- icons/Makefile.am, icons/Makefile.in, icons/xfsm-shutdown.png,
- po/ar.gmo, po/az.gmo, po/ca.gmo, po/de.gmo, po/de.po, po/es.gmo,
- po/es_MX.gmo, po/eu.gmo, po/fa_IR.gmo, po/fr.gmo, po/hi.gmo,
- po/it.gmo, po/ja.gmo, po/ko.gmo, po/ms.gmo, po/nl.gmo, po/no.gmo,
- po/pl.gmo, po/pt_BR.gmo, po/sv.gmo, po/ta.gmo, po/tr.gmo,
- po/zh_CN.gmo, po/zh_TW.gmo, settings/Makefile.am,
- settings/Makefile.in, settings/gnome-kde-logo.h,
- settings/gnome-kde-logo.png, settings/looknfeel.c,
- settings/session.c, settings/xfsm-install-theme,
- settings/scripts/Makefile.am, settings/scripts/Makefile.in,
- settings/scripts/xfsm-export-theme,
+ configure.ac, docs/Makefile.in, icons/Makefile.am,
+ icons/Makefile.in, icons/xfsm-shutdown.png, po/ar.gmo, po/az.gmo,
+ po/ca.gmo, po/de.gmo, po/de.po, po/es.gmo, po/es_MX.gmo, po/eu.gmo,
+ po/fa_IR.gmo, po/fr.gmo, po/hi.gmo, po/it.gmo, po/ja.gmo,
+ po/ko.gmo, po/ms.gmo, po/nl.gmo, po/no.gmo, po/pl.gmo,
+ po/pt_BR.gmo, po/sv.gmo, po/ta.gmo, po/tr.gmo, po/zh_CN.gmo,
+ po/zh_TW.gmo, settings/Makefile.am, settings/Makefile.in,
+ settings/gnome-kde-logo.h, settings/gnome-kde-logo.png,
+ settings/looknfeel.c, settings/session.c,
+ settings/xfsm-install-theme, settings/scripts/Makefile.am,
+ settings/scripts/Makefile.in, settings/scripts/xfsm-export-theme,
settings/scripts/xfsm-install-theme, themes/Makefile.in,
themes/Default/Makefile.in, xfce4-session/Makefile.in,
xfce4-session/main.c, xfce4-session/shutdown.c,
@@ -254,8 +338,8 @@
2004-06-05 14:46 benny
* Makefile.am, Makefile.in, config.h.in, configure, configure.ac,
- xfce4-session.rc, defaults/Makefile.in, docs/Makefile.in,
- icons/Makefile.am, icons/Makefile.in, icons/xfsm-trash-hilight.png,
+ xfce4-session.rc, docs/Makefile.in, icons/Makefile.am,
+ icons/Makefile.in, icons/xfsm-trash-hilight.png,
icons/xfsm-trash-normal.png, po/POTFILES.in, po/ar.po, po/az.po,
po/ca.po, po/de.po, po/es.po, po/es_MX.po, po/eu.po, po/fa_IR.po,
po/fr.gmo, po/fr.po, po/hi.po, po/it.po, po/ja.po, po/ko.po,
@@ -352,12 +436,11 @@
2004-05-25 23:29 benny
* Makefile.in, config.h.in, configure, configure.ac,
- xfce4-session.spec.in, defaults/Makefile.in, docs/Makefile.in,
- settings/Makefile.in, settings/looknfeel.c, settings/session.c,
- themes/Makefile.in, themes/Default/Makefile.in,
- xfce4-session/Makefile.am, xfce4-session/Makefile.in,
- xfce4-session/main.c, xfce4-session/shutdown.c,
- xfce4-session/xfsm-compat-gnome.c,
+ xfce4-session.spec.in, docs/Makefile.in, settings/Makefile.in,
+ settings/looknfeel.c, settings/session.c, themes/Makefile.in,
+ themes/Default/Makefile.in, xfce4-session/Makefile.am,
+ xfce4-session/Makefile.in, xfce4-session/main.c,
+ xfce4-session/shutdown.c, xfce4-session/xfsm-compat-gnome.c,
xfce4-session/xfsm-compat-gnome.h, xfce4-session/xfsm-compat-kde.c,
xfce4-session/xfsm-compat-kde.h, xfce4-session/xfsm-global.c,
xfce4-session/xfsm-global.h, xfce4-session/xfsm-splash-screen.c,
@@ -457,9 +540,7 @@
2004-05-20 23:04 benny
- * BUGS, ChangeLog, README, defaults/Makefile.am,
- defaults/Makefile.in, defaults/shutdown.allow: Remove obsolete
- file. Updated ChangeLog.
+ * BUGS, ChangeLog, README: Remove obsolete file. Updated ChangeLog.
2004-05-20 22:51 benny
@@ -469,11 +550,11 @@
2004-05-20 22:45 benny
* BUGS, Makefile.am, Makefile.in, README, config.h.in, configure,
- configure.ac, xfce4-session.spec.in, defaults/Makefile.in,
- docs/FAQ, docs/Makefile.in, settings/Makefile.in,
- themes/Makefile.in, themes/Default/Makefile.in,
- xfce4-session/Makefile.am, xfce4-session/Makefile.in,
- xfce4-session/shutdown.c, xfce4-session/xfsm-shutdown-helper.c,
+ configure.ac, xfce4-session.spec.in, docs/FAQ, docs/Makefile.in,
+ settings/Makefile.in, themes/Makefile.in,
+ themes/Default/Makefile.in, xfce4-session/Makefile.am,
+ xfce4-session/Makefile.in, xfce4-session/shutdown.c,
+ xfce4-session/xfsm-shutdown-helper.c,
xfce4-session/xfsm-shutdown-helper.h, xfce4-session/xfsm-util.c,
xfce4-session/xfsm-util.h, xfsm-shutdown-helper/Makefile.am,
xfsm-shutdown-helper/Makefile.in, xfsm-shutdown-helper/main.c: New
@@ -656,9 +737,8 @@
2004-05-17 20:30 benny
* Makefile.in, aclocal.m4, config.guess, config.sub, configure,
- configure.ac, install-sh, ltmain.sh, defaults/Makefile.am,
- defaults/Makefile.in, defaults/default.session, docs/FAQ,
- docs/Makefile.am, docs/Makefile.in, docs/SessionFileFormat.txt,
+ configure.ac, install-sh, ltmain.sh, docs/FAQ, docs/Makefile.am,
+ docs/Makefile.in, docs/SessionFileFormat.txt,
docs/SplashThemes.txt, po/POTFILES.in, po/ar.gmo, po/ar.po,
po/az.gmo, po/az.po, po/ca.gmo, po/ca.po, po/de.gmo, po/de.po,
po/es.gmo, po/es.po, po/es_MX.gmo, po/es_MX.po, po/eu.gmo,
@@ -698,9 +778,9 @@
2004-05-03 23:44 olivier
* Makefile.in, aclocal.m4, config.guess, config.sub, configure,
- install-sh, ltmain.sh, mkinstalldirs, defaults/Makefile.in,
- docs/Makefile.in, xfce4-session/Makefile.in: Update zh_TW
- translations from umm <umm@pchome.com.tw>
+ install-sh, ltmain.sh, mkinstalldirs, docs/Makefile.in,
+ xfce4-session/Makefile.in: Update zh_TW translations from umm
+ <umm@pchome.com.tw>
2004-05-03 22:21 kelnos
@@ -831,9 +911,8 @@
* Makefile.in, aclocal.m4, compile, config.guess, config.sub,
configure, depcomp, install-sh, ltmain.sh, missing, mkinstalldirs,
- defaults/Makefile.in, docs/Makefile.in, settings/Makefile.in,
- xfce4-session/Makefile.in: Update libtool and other automake,
- autoconf and gettext packages
+ docs/Makefile.in, settings/Makefile.in, xfce4-session/Makefile.in:
+ Update libtool and other automake, autoconf and gettext packages
2004-01-23 14:19 benny
@@ -891,11 +970,10 @@
* ChangeLog, Makefile.in, aclocal.m4, config.guess, config.sub,
configure, configure.ac, depcomp, install-sh, ltmain.sh,
- defaults/Makefile.in, docs/Makefile.in, po/fr.gmo, po/fr.po,
- settings/Makefile.in, xfce4-session/Makefile.in,
- xfce4-session/shutdown.c: Added french translations, thanks to
- Jean-François Wauthy <pollux@castor.be>. Make "poweroff" the
- default shutdown operation
+ docs/Makefile.in, po/fr.gmo, po/fr.po, settings/Makefile.in,
+ xfce4-session/Makefile.in, xfce4-session/shutdown.c: Added french
+ translations, thanks to Jean-François Wauthy <pollux@castor.be>.
+ Make "poweroff" the default shutdown operation
2003-12-29 16:18 olivier
@@ -914,8 +992,8 @@
2003-12-24 07:54 jasper
* Makefile.in, aclocal.m4, config.guess, config.sub, configure,
- configure.ac, depcomp, install-sh, ltmain.sh, defaults/Makefile.in,
- docs/Makefile.in, po/xfce4-session.pot, settings/Makefile.in,
+ configure.ac, depcomp, install-sh, ltmain.sh, docs/Makefile.in,
+ po/xfce4-session.pot, settings/Makefile.in,
xfce4-session/Makefile.in, xfce4-session/splash-fallback.h: Bump
version number for tarball release
@@ -968,8 +1046,8 @@
2003-11-20 18:57 benny
* Makefile.in, aclocal.m4, config.guess, config.sub, configure,
- configure.ac, depcomp, install-sh, ltmain.sh, defaults/Makefile.in,
- docs/Makefile.in, po/ko.gmo, po/ko.po, settings/Makefile.in,
+ configure.ac, depcomp, install-sh, ltmain.sh, docs/Makefile.in,
+ po/ko.gmo, po/ko.po, settings/Makefile.in,
xfce4-session/Makefile.in: Added korean translations, thanks to
byunghyunchoi@hotmail.com.
@@ -1243,11 +1321,10 @@
2003-07-09 00:30 bmeurer
- * ChangeLog, NEWS, TODO, defaults/default.session,
- po/xfce4-session.pot, xfce4-session/main.c,
- xfce4-session/manager.c, xfce4-session/manager.h,
- xfce4-session/tray-icon.c, xfce4-session/tray-icon.h: Additional
- notes and ChangeLog updated.
+ * ChangeLog, NEWS, TODO, po/xfce4-session.pot,
+ xfce4-session/main.c, xfce4-session/manager.c,
+ xfce4-session/manager.h, xfce4-session/tray-icon.c,
+ xfce4-session/tray-icon.h: Additional notes and ChangeLog updated.
2003-07-08 23:20 bmeurer
@@ -1335,23 +1412,20 @@
config.guess, config.h.in, config.sub, configure, configure.ac,
depcomp, install-sh, ltcf-c.sh, ltconfig, INSTALL, Makefile.am,
Makefile.in, ltmain.sh, missing, mkinstalldirs, COPYING, ChangeLog,
- ChangeLog.pre-xfce-devel, NEWS, defaults/Makefile.am,
- defaults/Makefile.in, defaults/default.session,
- defaults/shutdown.allow, defaults/xinitrc.xfce4-session,
- docs/Makefile.am, docs/Makefile.in, docs/SessionFileFormat.txt,
- docs/SplashThemes.txt, xfce4-session/Makefile.in,
- xfce4-session/client.c, xfce4-session/client.h,
- xfce4-session/ice-layer.c, xfce4-session/ice-layer.h,
- xfce4-session/main.c, xfce4-session/manager.c,
- xfce4-session/manager.h, xfce4-session/util.h,
- xfce4-session/shutdown.c, xfce4-session/shutdown.h,
- xfce4-session/splash-fallback.h, settings/Makefile.am,
- xfce4-session/Makefile.am, xfce4-session/splash-fallback.png,
- xfce4-session/splash-screen.c, xfce4-session/splash-screen.h,
- xfce4-session/startup.c, xfce4-session/startup.h,
- xfce4-session/util.c, settings/Makefile.in,
- settings/session-icon.h, settings/session.c, m4/X11.m4,
- m4/debug.m4, m4/depends.m4, m4/i18n.m4, po/ChangeLog,
+ ChangeLog.pre-xfce-devel, NEWS, docs/Makefile.am, docs/Makefile.in,
+ docs/SessionFileFormat.txt, docs/SplashThemes.txt,
+ xfce4-session/Makefile.in, xfce4-session/client.c,
+ xfce4-session/client.h, xfce4-session/ice-layer.c,
+ xfce4-session/ice-layer.h, xfce4-session/main.c,
+ xfce4-session/manager.c, xfce4-session/manager.h,
+ xfce4-session/util.h, xfce4-session/shutdown.c,
+ xfce4-session/shutdown.h, xfce4-session/splash-fallback.h,
+ settings/Makefile.am, xfce4-session/Makefile.am,
+ xfce4-session/splash-fallback.png, xfce4-session/splash-screen.c,
+ xfce4-session/splash-screen.h, xfce4-session/startup.c,
+ xfce4-session/startup.h, xfce4-session/util.c,
+ settings/Makefile.in, settings/session-icon.h, settings/session.c,
+ m4/X11.m4, m4/debug.m4, m4/depends.m4, m4/i18n.m4, po/ChangeLog,
po/Makefile.in.in, po/POTFILES.in, po/de.gmo, po/de.po,
po/xfce4-session.pot, settings/session.png: Initial revision
@@ -1361,23 +1435,20 @@
config.guess, config.h.in, config.sub, configure, configure.ac,
depcomp, install-sh, ltcf-c.sh, ltconfig, INSTALL, Makefile.am,
Makefile.in, ltmain.sh, missing, mkinstalldirs, COPYING, ChangeLog,
- ChangeLog.pre-xfce-devel, NEWS, defaults/Makefile.am,
- defaults/Makefile.in, defaults/default.session,
- defaults/shutdown.allow, defaults/xinitrc.xfce4-session,
- docs/Makefile.am, docs/Makefile.in, docs/SessionFileFormat.txt,
- docs/SplashThemes.txt, xfce4-session/Makefile.in,
- xfce4-session/client.c, xfce4-session/client.h,
- xfce4-session/ice-layer.c, xfce4-session/ice-layer.h,
- xfce4-session/main.c, xfce4-session/manager.c,
- xfce4-session/manager.h, xfce4-session/util.h,
- xfce4-session/shutdown.c, xfce4-session/shutdown.h,
- xfce4-session/splash-fallback.h, settings/Makefile.am,
- xfce4-session/Makefile.am, xfce4-session/splash-fallback.png,
- xfce4-session/splash-screen.c, xfce4-session/splash-screen.h,
- xfce4-session/startup.c, xfce4-session/startup.h,
- xfce4-session/util.c, settings/Makefile.in,
- settings/session-icon.h, settings/session.c, m4/X11.m4,
- m4/debug.m4, m4/depends.m4, m4/i18n.m4, po/ChangeLog,
+ ChangeLog.pre-xfce-devel, NEWS, docs/Makefile.am, docs/Makefile.in,
+ docs/SessionFileFormat.txt, docs/SplashThemes.txt,
+ xfce4-session/Makefile.in, xfce4-session/client.c,
+ xfce4-session/client.h, xfce4-session/ice-layer.c,
+ xfce4-session/ice-layer.h, xfce4-session/main.c,
+ xfce4-session/manager.c, xfce4-session/manager.h,
+ xfce4-session/util.h, xfce4-session/shutdown.c,
+ xfce4-session/shutdown.h, xfce4-session/splash-fallback.h,
+ settings/Makefile.am, xfce4-session/Makefile.am,
+ xfce4-session/splash-fallback.png, xfce4-session/splash-screen.c,
+ xfce4-session/splash-screen.h, xfce4-session/startup.c,
+ xfce4-session/startup.h, xfce4-session/util.c,
+ settings/Makefile.in, settings/session-icon.h, settings/session.c,
+ m4/X11.m4, m4/debug.m4, m4/depends.m4, m4/i18n.m4, po/ChangeLog,
po/Makefile.in.in, po/POTFILES.in, po/de.gmo, po/de.po,
po/xfce4-session.pot, settings/session.png: Initial import of the
new session manager with version 0.0.20.
diff --git a/configure b/configure
index 3f6e35c5..7ca8dd1a 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
#! /bin/sh
# From configure.ac Id: configure.ac,v 1.60 2004/07/23 12:33:37 benny Exp .
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for xfce4-session 4.1.12.
+# Generated by GNU Autoconf 2.59 for xfce4-session 4.1.13.
#
# Report bugs to <xfce4-dev@xfce.org>.
#
@@ -429,8 +429,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='xfce4-session'
PACKAGE_TARNAME='xfce4-session'
-PACKAGE_VERSION='4.1.12'
-PACKAGE_STRING='xfce4-session 4.1.12'
+PACKAGE_VERSION='4.1.13'
+PACKAGE_STRING='xfce4-session 4.1.13'
PACKAGE_BUGREPORT='xfce4-dev@xfce.org'
# Factoring default headers for most tests.
@@ -959,7 +959,7 @@ if test "$ac_init_help" = "long"; then
# 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 xfce4-session 4.1.12 to adapt to many kinds of systems.
+\`configure' configures xfce4-session 4.1.13 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1029,7 +1029,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xfce4-session 4.1.12:";;
+ short | recursive ) echo "Configuration of xfce4-session 4.1.13:";;
esac
cat <<\_ACEOF
@@ -1191,7 +1191,7 @@ fi
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-xfce4-session configure 4.1.12
+xfce4-session configure 4.1.13
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1210,7 +1210,7 @@ cat >&5 <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xfce4-session $as_me 4.1.12, which was
+It was created by xfce4-session $as_me 4.1.13, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1549,7 +1549,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-XFSM_VERSION=4.1.12
+XFSM_VERSION=4.1.13
am__api_version="1.8"
ac_aux_dir=
for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
@@ -24181,23 +24181,23 @@ fi
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
- echo "$as_me:$LINENO: checking for libxfce4mcs-client-1.0 >= 4.1.0" >&5
-echo $ECHO_N "checking for libxfce4mcs-client-1.0 >= 4.1.0... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for libxfce4mcs-client-1.0 >= 4.1.1" >&5
+echo $ECHO_N "checking for libxfce4mcs-client-1.0 >= 4.1.1... $ECHO_C" >&6
- if $PKG_CONFIG --exists "libxfce4mcs-client-1.0 >= 4.1.0" ; then
+ if $PKG_CONFIG --exists "libxfce4mcs-client-1.0 >= 4.1.1" ; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
succeeded=yes
echo "$as_me:$LINENO: checking LIBXFCE4MCS_CLIENT_CFLAGS" >&5
echo $ECHO_N "checking LIBXFCE4MCS_CLIENT_CFLAGS... $ECHO_C" >&6
- LIBXFCE4MCS_CLIENT_CFLAGS=`$PKG_CONFIG --cflags "libxfce4mcs-client-1.0 >= 4.1.0"`
+ LIBXFCE4MCS_CLIENT_CFLAGS=`$PKG_CONFIG --cflags "libxfce4mcs-client-1.0 >= 4.1.1"`
echo "$as_me:$LINENO: result: $LIBXFCE4MCS_CLIENT_CFLAGS" >&5
echo "${ECHO_T}$LIBXFCE4MCS_CLIENT_CFLAGS" >&6
echo "$as_me:$LINENO: checking LIBXFCE4MCS_CLIENT_LIBS" >&5
echo $ECHO_N "checking LIBXFCE4MCS_CLIENT_LIBS... $ECHO_C" >&6
- LIBXFCE4MCS_CLIENT_LIBS=`$PKG_CONFIG --libs "libxfce4mcs-client-1.0 >= 4.1.0"`
+ LIBXFCE4MCS_CLIENT_LIBS=`$PKG_CONFIG --libs "libxfce4mcs-client-1.0 >= 4.1.1"`
echo "$as_me:$LINENO: result: $LIBXFCE4MCS_CLIENT_LIBS" >&5
echo "${ECHO_T}$LIBXFCE4MCS_CLIENT_LIBS" >&6
else
@@ -24205,7 +24205,7 @@ echo "${ECHO_T}$LIBXFCE4MCS_CLIENT_LIBS" >&6
LIBXFCE4MCS_CLIENT_LIBS=""
## If we have a custom action on failure, don't print errors, but
## do set a variable so people can do so.
- LIBXFCE4MCS_CLIENT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libxfce4mcs-client-1.0 >= 4.1.0"`
+ LIBXFCE4MCS_CLIENT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libxfce4mcs-client-1.0 >= 4.1.1"`
echo $LIBXFCE4MCS_CLIENT_PKG_ERRORS
fi
@@ -24220,12 +24220,12 @@ echo "${ECHO_T}$LIBXFCE4MCS_CLIENT_LIBS" >&6
if test $succeeded = yes; then
:
else
- { { echo "$as_me:$LINENO: error: Library requirements (libxfce4mcs-client-1.0 >= 4.1.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
-echo "$as_me: error: Library requirements (libxfce4mcs-client-1.0 >= 4.1.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+ { { echo "$as_me:$LINENO: error: Library requirements (libxfce4mcs-client-1.0 >= 4.1.1) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+echo "$as_me: error: Library requirements (libxfce4mcs-client-1.0 >= 4.1.1) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
{ (exit 1); exit 1; }; }
fi
- LIBXFCE4MCS_CLIENT_REQUIRED_VERSION=4.1.0
+ LIBXFCE4MCS_CLIENT_REQUIRED_VERSION=4.1.1
@@ -25280,7 +25280,7 @@ _ASBOX
} >&5
cat >&5 <<_CSEOF
-This file was extended by xfce4-session $as_me 4.1.12, which was
+This file was extended by xfce4-session $as_me 4.1.13, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -25343,7 +25343,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-xfce4-session config.status 4.1.12
+xfce4-session config.status 4.1.13
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/configure.ac b/configure.ac
index 4deb6978..2bc4f1bf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl
dnl Version information
m4_define([xfsm_version_major], [4])
m4_define([xfsm_version_minor], [1])
-m4_define([xfsm_version_micro], [12])
+m4_define([xfsm_version_micro], [13])
m4_define([xfsm_version], [xfsm_version_major.xfsm_version_minor.xfsm_version_micro])
dnl Initialize autoconf
@@ -62,7 +62,7 @@ BM_I18N([xfce4-session], [ar az ca de es es_MX eu fa_IR fr hi it ja ko lt
dnl Check for required packages
BM_DEPEND([LIBXFCE4UTIL], [libxfce4util-1.0], [4.1.11])
-BM_DEPEND([LIBXFCE4MCS_CLIENT], [libxfce4mcs-client-1.0], [4.1.0])
+BM_DEPEND([LIBXFCE4MCS_CLIENT], [libxfce4mcs-client-1.0], [4.1.1])
BM_DEPEND([LIBXFCEGUI4], [libxfcegui4-1.0], [4.1.24])
dnl Configure the MCS plugins
diff --git a/engines/balou/config.c b/engines/balou/config.c
index 7e794e41..b1322171 100644
--- a/engines/balou/config.c
+++ b/engines/balou/config.c
@@ -799,16 +799,18 @@ config_store (GtkTreeView *treeview,
static gboolean
config_selection_changed (GtkTreeSelection *selection,
- GtkWidget *treeview)
+ gpointer user_data)
{
GtkTreeModel *model;
GtkTreeIter iter;
+ GtkTreeView *treeview;
GdkPixbuf *icon;
if (gtk_tree_selection_get_selected (selection, &model, &iter))
{
+ treeview = gtk_tree_selection_get_tree_view (selection);
gtk_tree_model_get (model, &iter, PREVIEW_COLUMN, &icon, -1);
- gtk_drag_source_set_icon_pixbuf (treeview, icon);
+ gtk_drag_source_set_icon_pixbuf (GTK_WIDGET (treeview), icon);
g_object_unref (icon);
}
@@ -859,7 +861,7 @@ config_create (XfsmSplashRc *rc)
gtk_tree_selection_set_mode (GTK_TREE_SELECTION (selection),
GTK_SELECTION_SINGLE);
g_signal_connect (G_OBJECT (selection), "changed",
- G_CALLBACK (config_selection_changed), treeview);
+ G_CALLBACK (config_selection_changed), NULL);
g_idle_add ((GSourceFunc)config_selection_changed, selection);
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE);
gtk_container_add (GTK_CONTAINER (swin), treeview);
diff --git a/settings/session/session.c b/settings/session/session.c
index fdebf9ac..3d2ec193 100644
--- a/settings/session/session.c
+++ b/settings/session/session.c
@@ -43,13 +43,14 @@
/*
Global variables
*/
-static GtkWidget *dialog = NULL;
-static GtkWidget *general_chooser;
-static GtkWidget *general_autosave;
-static GtkWidget *general_prompt;
-static GtkWidget *advanced_kde;
-static GtkWidget *advanced_gnome;
-static GtkWidget *advanced_remote;
+static GtkWidget *dialog = NULL;
+static GtkWidget *general_chooser;
+static GtkWidget *general_autosave;
+static GtkWidget *general_prompt;
+static GtkWidget *advanced_kde;
+static GtkWidget *advanced_gnome;
+static GtkWidget *advanced_remote;
+static GtkTooltips *tooltips;
@@ -130,6 +131,10 @@ general_create (XfceRc *rc)
g_signal_connect (G_OBJECT (general_chooser), "toggled",
G_CALLBACK (config_store), NULL);
gtk_box_pack_start (GTK_BOX (vbox), general_chooser, FALSE, TRUE, 0);
+ gtk_tooltips_set_tip (tooltips, general_chooser,
+ _("If set, the session manager will ask you to choose "
+ "a session every time you log in to Xfce."),
+ NULL);
frame = xfce_framebox_new (_("Logout settings"), TRUE);
gtk_box_pack_start (GTK_BOX (page), frame, FALSE, TRUE, 0);
@@ -141,12 +146,25 @@ general_create (XfceRc *rc)
g_signal_connect (G_OBJECT (general_autosave), "toggled",
G_CALLBACK (config_store), NULL);
gtk_box_pack_start (GTK_BOX (vbox), general_autosave, FALSE, TRUE, 0);
+ gtk_tooltips_set_tip (tooltips, general_autosave,
+ _("This option instructs the session manager to "
+ "save the current session automatically when "
+ "you log out. If you don't select this option "
+ "you'll be prompted whether you want to save "
+ "the current session on each logout."),
+ NULL);
general_prompt = gtk_check_button_new_with_label (_("Prompt on logout"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (general_prompt), prompt);
g_signal_connect (G_OBJECT (general_prompt), "toggled",
G_CALLBACK (config_store), NULL);
gtk_box_pack_start (GTK_BOX (vbox), general_prompt, FALSE, TRUE, 0);
+ gtk_tooltips_set_tip (tooltips, general_prompt,
+ _("This option disables the logout confirmation "
+ "dialog. Whether the session will be saved or not "
+ "depends on whether you enabled the automatic "
+ "saving of sessions on logout or not."),
+ NULL);
return page;
}
@@ -195,12 +213,27 @@ advanced_create (XfceRc *rc)
g_signal_connect (G_OBJECT (advanced_gnome), "toggled",
G_CALLBACK (config_store), NULL);
gtk_box_pack_start (GTK_BOX (vbox), advanced_gnome, FALSE, TRUE, 0);
+ gtk_tooltips_set_tip (tooltips, advanced_gnome,
+ _("Enable this if you plan to use Gnome applications. "
+ "This will instruct the session manager to start "
+ "some vital Gnome services for you. You should "
+ "also enable this if you want to use the Assistive "
+ "Technologies that ship with Gnome."),
+ NULL);
advanced_kde = gtk_check_button_new_with_label (_("Launch KDE services on startup"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (advanced_kde), kde);
g_signal_connect (G_OBJECT (advanced_kde), "toggled",
G_CALLBACK (config_store), NULL);
gtk_box_pack_start (GTK_BOX (vbox), advanced_kde, FALSE, TRUE, 0);
+ gtk_tooltips_set_tip (tooltips, advanced_kde,
+ _("Enable this option if you plan to run KDE "
+ "applications as part of your Xfce Desktop session. "
+ "This will notably increase the startup time, but "
+ "on the other hand, KDE applications will startup "
+ "faster. Some KDE applications may not work at all "
+ "if you don't enable this option."),
+ NULL);
icon = xfce_themed_icon_load ("xfsm-gnome-kde-logo", 64);
image = gtk_image_new_from_pixbuf (icon);
@@ -216,11 +249,17 @@ advanced_create (XfceRc *rc)
#ifdef HAVE__ICETRANSNOLISTEN
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (advanced_remote), remote);
#else
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (advanced_remote), TRUE);
gtk_widget_set_senstive (advanced_remote, FALSE);
#endif
g_signal_connect (G_OBJECT (advanced_remote), "toggled",
G_CALLBACK (config_store), NULL);
gtk_box_pack_start (GTK_BOX (vbox), advanced_remote, FALSE, TRUE, 0);
+ gtk_tooltips_set_tip (tooltips, advanced_remote,
+ _("Allow the session manager to manage applications "
+ "running on remote hosts. Do not enable this "
+ "option unless you know what you are doing."),
+ NULL);
return page;
}
@@ -239,6 +278,12 @@ dialog_response (void)
dialog = NULL;
}
+ if (tooltips != NULL)
+ {
+ gtk_object_destroy (GTK_OBJECT (tooltips));
+ tooltips = NULL;
+ }
+
return TRUE;
}
@@ -259,6 +304,8 @@ dialog_run (McsPlugin *plugin)
return;
}
+ tooltips = gtk_tooltips_new ();
+
rc = config_open (TRUE);
dialog = gtk_dialog_new_with_buttons (_("Sessions and Startup"),
diff --git a/settings/splash/splash.c b/settings/splash/splash.c
index 3472a6c9..2b516f4c 100644
--- a/settings/splash/splash.c
+++ b/settings/splash/splash.c
@@ -65,22 +65,23 @@ enum
/*
Global variables
*/
-static GList *modules = NULL;
-static XfceRc *modules_rc = NULL;
-static gboolean splash_centered;
-static GtkWidget *splash_dialog = NULL;
-static GtkWidget *splash_treeview;
-static GtkWidget *splash_button_cfg;
-static GtkWidget *splash_button_test;
-static GtkWidget *splash_image;
-static GtkWidget *splash_descr0;
-static GtkWidget *splash_descr1;
-static GtkWidget *splash_version0;
-static GtkWidget *splash_version1;
-static GtkWidget *splash_author0;
-static GtkWidget *splash_author1;
-static GtkWidget *splash_www0;
-static GtkWidget *splash_www1;
+static GList *modules = NULL;
+static XfceRc *modules_rc = NULL;
+static gboolean splash_centered;
+static GtkWidget *splash_dialog = NULL;
+static GtkWidget *splash_treeview;
+static GtkWidget *splash_button_cfg;
+static GtkWidget *splash_button_test;
+static GtkWidget *splash_image;
+static GtkWidget *splash_descr0;
+static GtkWidget *splash_descr1;
+static GtkWidget *splash_version0;
+static GtkWidget *splash_version1;
+static GtkWidget *splash_author0;
+static GtkWidget *splash_author1;
+static GtkWidget *splash_www0;
+static GtkWidget *splash_www1;
+static GtkTooltips *tooltips = NULL;
/*
@@ -154,6 +155,12 @@ splash_response (void)
splash_dialog = NULL;
}
+ if (G_LIKELY (tooltips != NULL))
+ {
+ gtk_object_destroy (GTK_OBJECT (tooltips));
+ tooltips = NULL;
+ }
+
splash_unload_modules ();
return TRUE;
@@ -337,6 +344,8 @@ splash_run (McsPlugin *plugin)
GtkWidget *header;
GtkWidget *hbox;
GtkWidget *vbox;
+ GtkWidget *swin;
+ GtkWidget *frame;
GtkWidget *table;
XfceRc *rc;
GList *lp;
@@ -347,6 +356,8 @@ splash_run (McsPlugin *plugin)
return;
}
+ tooltips = gtk_tooltips_new ();
+
/* load splash modules */
splash_load_modules ();
@@ -412,9 +423,18 @@ splash_run (McsPlugin *plugin)
gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
gtk_widget_show (vbox);
+ swin = gtk_scrolled_window_new (NULL, NULL);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swin),
+ GTK_POLICY_NEVER,
+ GTK_POLICY_AUTOMATIC);
+ gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (swin),
+ GTK_SHADOW_ETCHED_IN);
+ gtk_box_pack_start (GTK_BOX (vbox), swin, TRUE, TRUE, 0);
+ gtk_widget_show (swin);
+
splash_treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store));
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (splash_treeview), FALSE);
- gtk_box_pack_start (GTK_BOX (vbox), splash_treeview, TRUE, TRUE, 0);
+ gtk_container_add (GTK_CONTAINER (swin), splash_treeview);
gtk_widget_show (splash_treeview);
g_object_unref (G_OBJECT (store));
@@ -434,6 +454,10 @@ splash_run (McsPlugin *plugin)
splash_configure, NULL);
gtk_box_pack_start (GTK_BOX (vbox), splash_button_cfg, FALSE, FALSE, 0);
gtk_widget_show (splash_button_cfg);
+ gtk_tooltips_set_tip (tooltips, splash_button_cfg,
+ _("Opens the configuration panel for the selected "
+ "splash screen."),
+ NULL);
splash_button_test = xfsm_imgbtn_new (_("Test"), GTK_STOCK_EXECUTE, NULL);
gtk_widget_set_sensitive (splash_button_test, FALSE);
@@ -441,19 +465,33 @@ splash_run (McsPlugin *plugin)
splash_test, NULL);
gtk_box_pack_start (GTK_BOX (vbox), splash_button_test, FALSE, FALSE, 0);
gtk_widget_show (splash_button_test);
+ gtk_tooltips_set_tip (tooltips, splash_button_test,
+ _("Demonstrates the selected splash screen."),
+ NULL);
vbox = gtk_vbox_new (FALSE, 6);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
- gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
gtk_widget_show (vbox);
+ frame = gtk_frame_new (NULL);
+ gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
+ gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
+ gtk_widget_show (frame);
+
splash_image = gtk_image_new ();
- gtk_box_pack_start (GTK_BOX (vbox), splash_image, TRUE, TRUE, 0);
+ gtk_container_add (GTK_CONTAINER (frame), splash_image);
gtk_widget_show (splash_image);
+ frame = gtk_frame_new (_("Information"));
+ gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
+ gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE, 0);
+ gtk_widget_show (frame);
+
table = gtk_table_new (4, 2, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (table), 6);
- gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
+ gtk_container_set_border_width (GTK_CONTAINER (table), 6);
+ gtk_container_add (GTK_CONTAINER (frame), table);
gtk_widget_show (table);
splash_descr0 = gtk_label_new (_("<b>Description:</b>"));
diff --git a/xfce4-session.rc b/xfce4-session.rc
index c89d0e5b..5208c39d 100644
--- a/xfce4-session.rc
+++ b/xfce4-session.rc
@@ -1,3 +1,5 @@
+# $Id$
+
[General]
SessionName=Default
DisableTcp=True
View Lorry Controller Status