Author: kelnos
Date: 2008-10-18 12:00:26 +0000 (Sat, 18 Oct 2008)
New Revision: 28291
Modified:
xfce-utils/trunk/NEWS
xfce-utils/trunk/configure.in.in
xfce-utils/trunk/scripts/xfconf-migration-4.6.pl.in
Log:
migrate xfce4-session splash engine settings
Modified: xfce-utils/trunk/NEWS
===================================================================
--- xfce-utils/trunk/NEWS 2008-10-18 10:31:55 UTC (rev 28290)
+++ xfce-utils/trunk/NEWS 2008-10-18 12:00:26 UTC (rev 28291)
@@ -1,3 +1,9 @@
+4.5.92 (Xfce 4.6beta2)
+======================
+
+- Migrate xfce4-session splash settings to xfconf.
+
+
4.5.91 (Xfce 4.6beta1)
======================
@@ -4,6 +10,8 @@
- Fix migrating shortcut keys in the xfconf settings migration script.
Previously keys that had more than one char in the keysym name were
getting parsed incorrectly.
+- Use new keyboard shortcut settings layout in xfconf migration script.
+- Migrate xfce4-session settings to xfconf.
4.5.90 (Xfce 4.6alpha)
Modified: xfce-utils/trunk/configure.in.in
===================================================================
--- xfce-utils/trunk/configure.in.in 2008-10-18 10:31:55 UTC (rev 28290)
+++ xfce-utils/trunk/configure.in.in 2008-10-18 12:00:26 UTC (rev 28291)
@@ -8,7 +8,7 @@
dnl and Xavier MAILLARD <[EMAIL PROTECTED]>.
dnl
-m4_define([xfce_utils_version], [4.5.91])
+m4_define([xfce_utils_version], [4.5.91svn])
AC_INIT([xfce-utils], [xfce_utils_version], [EMAIL PROTECTED])
AM_INIT_AUTOMAKE([dist-bzip2])
Modified: xfce-utils/trunk/scripts/xfconf-migration-4.6.pl.in
===================================================================
--- xfce-utils/trunk/scripts/xfconf-migration-4.6.pl.in 2008-10-18 10:31:55 UTC
(rev 28290)
+++ xfce-utils/trunk/scripts/xfconf-migration-4.6.pl.in 2008-10-18 12:00:26 UTC
(rev 28291)
@@ -673,6 +673,50 @@
return $file;
}
+sub migrate_xfce4_splash
+{
+ my $file = $ENV{'XDG_CONFIG_HOME'}.'/xfce4-session/xfce4-splash.rc';
+ my $group = '';
+ my $chan = 'xfce4-session';
+
+ open(RCFILE, '<'.$file) or return undef;
+
+ while(<RCFILE>) {
+ chomp;
+ next if($_ eq '');
+
+ if(/^\[(.*?)\]$/) {
+ $group = $1;
+ } else {
+ my ($key, $val) = split(/=/, $_, 2);
+ next if(!defined($key) || !defined($val));
+
+ my $p;
+ if($group =~ /^Engine: (.*)$/) {
+ $p = '/splash/engines/'.$1.'/'.$key;
+ } else {
+ next;
+ }
+
+ if($group eq 'Engine: balou') {
+ if($key eq 'Theme') {
+ xfconf_set($chan, $p, 'string', $val);
+ }
+ } elsif($group eq 'Engine: simple') {
+ if($key eq 'Font' || $key eq 'BgColor' ||
+ $key eq 'FgColor' || $key eq 'Image')
+ {
+ xfconf_set($chan, $p, 'string', $val);
+ }
+ }
+ }
+ }
+
+ close(RCFILE);
+
+ return $file;
+}
+
setup_env;
my @migrated = ();
@@ -689,6 +733,7 @@
push(@migrated, $tmp) if(defined(($tmp = migrate_xfprint)));
push(@migrated, $tmp) if(defined(($tmp = migrate_keyboard_shortcuts)));
migrate_xfce4_session;
+migrate_xfce4_splash;
disable_autostart_file;
write_info_file(@migrated);
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
