Hello community,
here is the log from the commit of package compiz
checked in at Tue Jan 23 01:13:16 CET 2007.
--------
--- compiz/compiz.changes 2007-01-19 14:30:08.000000000 +0100
+++ /mounts/work_src_done/STABLE/compiz/compiz.changes 2007-01-22 22:57:00.631479000 +0100
@@ -1,0 +2,7 @@
+Mon Jan 22 22:56:54 CET 2007 - jpr@suse.de
+
+- Make transluceny and other options work in the settings dialog
+ (#235542)
+- More default setting fixes for compiz (#236541)
+
+-------------------------------------------------------------------
Old:
----
gnome-xgl-settings-0.7.tar.gz
gnome-xgl-settings-compiz-0.2-update.diff
gnome-xgl-settings-glade.patch
New:
----
gnome-xgl-settings-0.8.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ compiz.spec ++++++
--- /var/tmp/diff_new_pack.D23882/_old 2007-01-23 01:12:58.000000000 +0100
+++ /var/tmp/diff_new_pack.D23882/_new 2007-01-23 01:12:58.000000000 +0100
@@ -22,21 +22,19 @@
Enhances: xgl >= git_070104
Autoreqprov: on
Version: 0.3.6
-Release: 3
+Release: 4
Summary: OpenGL window and compositing manager.
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64
Source: MesaLib-6.5.2.tar.bz2
Source1: compiz-%version.tar.bz2
-Source2: gnome-xgl-settings-0.7.tar.gz
+Source2: gnome-xgl-settings-0.8.tar.gz
Source3: opensuse.png
Patch: compiz-java-config-notify.diff
Patch1: compiz-default-gconf-settings.patch
Patch2: compiz-broken-Mesa-decl.patch
Patch3: compiz-decorator-default.diff
Patch4: compiz-opensuse-logo.diff
-Patch30: gnome-xgl-settings-glade.patch
-Patch31: gnome-xgl-settings-compiz-0.2-update.diff
Patch32: gnome-xgl-switch-md5dir.diff
Patch60: Mesa-x86_64-fixes.patch
Patch61: libqtpath.patch
@@ -130,8 +128,6 @@
%endif
cd -
cd gnome-xgl-*
-%patch30
-%patch31
%patch32 -p0
sed -i -e "s@/opt/gnome/@%gnome_prefix/@g" ./xgl-settings/switch.c ./xgl-settings/gnome-xgl-switch
cd -
@@ -239,6 +235,10 @@
%_bindir/kde-window-decorator
%changelog -n compiz
+* Mon Jan 22 2007 - jpr@suse.de
+- Make transluceny and other options work in the settings dialog
+ (#235542)
+- More default setting fixes for compiz (#236541)
* Fri Jan 19 2007 - mhopf@suse.de
- Fix upgrade path for gnome: PreReq (Andreas Hanke) #236350.
- Fix upgrade path for gnome: gnome-xgl-settings #235177.
++++++ compiz-default-gconf-settings.patch ++++++
--- /var/tmp/diff_new_pack.D23882/_old 2007-01-23 01:12:58.000000000 +0100
+++ /var/tmp/diff_new_pack.D23882/_new 2007-01-23 01:12:58.000000000 +0100
@@ -10,3 +10,30 @@
<locale name="C">
<short>Audible Bell</short>
<long>Audible system beep</long>
+@@ -13244,7 +13244,7 @@
+ <applyto>/apps/compiz/plugins/wobbly/screen0/options/map_effect</applyto>
+ <owner>compiz</owner>
+ <type>string</type>
+- <default>Shiver</default>
++ <default>None</default>
+ <locale name="C">
+ <short>Map Effect</short>
+ <long>Map Window Effect (None, Shiver)</long>
+@@ -13568,7 +13568,7 @@
+ <owner>compiz</owner>
+ <type>list</type>
+ string
+- <default>[Toolbar,Menu,Utility,Dialog,ModalDialog,Normal]</default>
++ <default>[]</default>
+ <locale name="C">
+ <short>Move Window Types</short>
+ <long>Window types that should wobble when moved (Desktop, Dock, Toolbar, Menu, Utility, Splash, Dialog, Normal, DropdownMenu, PopupMenu, Tooltip, Notification, Combo, Dnd, ModalDialog, Fullscreen, Unknown)</long>
+@@ -18156,7 +18156,7 @@
+ <applyto>/apps/compiz/plugins/move/allscreens/options/opacity</applyto>
+ <owner>compiz</owner>
+ <type>int</type>
+- <default>100</default>
++ <default>80</default>
+ <locale name="C">
+ <short>Opacity</short>
+ <long>Opacity level of moving windows (1-100)</long>
++++++ gnome-xgl-settings-0.7.tar.gz -> gnome-xgl-settings-0.8.tar.gz ++++++
++++ 18453 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/gnome-xgl-settings-0.7/ChangeLog new/gnome-xgl-settings-0.8/ChangeLog
--- old/gnome-xgl-settings-0.7/ChangeLog 2006-09-15 20:36:19.000000000 +0200
+++ new/gnome-xgl-settings-0.8/ChangeLog 2007-01-22 21:57:41.000000000 +0100
@@ -1,3 +1,25 @@
+2007-01-22 JP Rosevear
+
+ * xgl-settings/settings.c: update keybinding gconf keys for 0.3.x
+
+2007-01-22 JP Rosevear
+
+ * xgl-settings/gnome-xgl-settings.h: more key updates for compiz
+ 0.3.x
+
+2007-01-19 JP Rosevear
+
+ * xgl-settings/settings.c (scale_key_changed, scale_key_changed):
+ only set the initiate key for scaling, not the termination key
+
+ * xgl-settings/gnome-xgl-settings.h: update settings for newest
+ compiz versions, mainly switching screen0 for allscreens
+
+2006-10-12 Dan Winship
+
+ * configure.in: add gmodule-2.0 to GLADE_LIBS so we still get
+ --export-dynamic
+
2006-09-15 Dan Winship
* configure.in: 0.7
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/gnome-xgl-settings-0.7/configure.in new/gnome-xgl-settings-0.8/configure.in
--- old/gnome-xgl-settings-0.7/configure.in 2006-09-15 20:36:16.000000000 +0200
+++ new/gnome-xgl-settings-0.8/configure.in 2007-01-22 20:56:13.000000000 +0100
@@ -1,4 +1,4 @@
-AC_INIT([gnome-xgl-settings], [0.7],
+AC_INIT([gnome-xgl-settings], [0.8],
[https://bugzilla.novell.com/enter_bug.cgi?product=SUSE+Linux+Enterprise+Desktop+10&component=Xgl])
AC_CONFIG_SRCDIR([xgl-settings])
@@ -25,7 +25,7 @@
GLIB_DEFINE_LOCALEDIR(GNOMELOCALEDIR)
PKG_CHECK_MODULES(GNOME, libgnomeui-2.0)
-PKG_CHECK_MODULES(GLADE, libglade-2.0)
+PKG_CHECK_MODULES(GLADE, libglade-2.0 gmodule-2.0)
XGL_SETTINGS_LIBS="$GNOME_LIBS $GLADE_LIBS"
XGL_SETTINGS_CFLAGS="$GNOME_CFLAGS $GLADE_CFLAGS"
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/gnome-xgl-settings-0.7/intltool-extract.in new/gnome-xgl-settings-0.8/intltool-extract.in
--- old/gnome-xgl-settings-0.7/intltool-extract.in 2006-09-15 20:36:41.000000000 +0200
+++ new/gnome-xgl-settings-0.8/intltool-extract.in 2007-01-22 17:00:34.000000000 +0100
@@ -32,7 +32,7 @@
## Release information
my $PROGRAM = "intltool-extract";
my $PACKAGE = "intltool";
-my $VERSION = "0.34.1";
+my $VERSION = "0.35.2";
## Loaded modules
use strict;
@@ -114,6 +114,11 @@
sub place_normal {
$FILE = $ARGV[0];
$OUTFILE = "$FILE.h";
+
+ my $dirname = dirname ($OUTFILE);
+ if (! -d "$dirname" && $dirname ne "") {
+ system ("mkdir -p $dirname");
+ }
}
sub place_local {
@@ -156,7 +161,7 @@
--type=TYPE Specify the file type of FILENAME. Currently supports:
"gettext/glade", "gettext/ini", "gettext/keys"
"gettext/rfc822deb", "gettext/schemas",
- "gettext/scheme", "gettext/xml"
+ "gettext/scheme", "gettext/xml", "gettext/quoted"
-l, --local Writes output into current working directory
(conflicts with --update)
--update Writes output into the same directory the source file
@@ -212,6 +217,7 @@
&type_scheme if $gettext_type eq "scheme";
&type_schemas if $gettext_type eq "schemas";
&type_rfc822deb if $gettext_type eq "rfc822deb";
+ &type_quoted if $gettext_type eq "quoted";
}
sub entity_decode_minimal
@@ -242,7 +248,7 @@
{
return '\"' if $_ eq '"';
return '\n' if $_ eq "\n";
- return '\\' if $_ eq '\\';
+ return '\\\\' if $_ eq '\\';
return $_;
}
@@ -485,10 +491,12 @@
sub intltool_tree_comment
{
my $expat = shift;
- my $data = shift;
+ my $data = $expat->original_string();
my $clist = $expat->{Curlist};
my $pos = $#$clist;
+ $data =~ s/^<!--//s;
+ $data =~ s/-->$//s;
push @$clist, 1 => $data;
}
@@ -709,6 +717,17 @@
return @list;
}
+sub type_quoted {
+ while ($input =~ /\"(([^\"]|\\\")*[^\\\"])\"/g) {
+ my $message = $1;
+ my $before = $`;
+ $message =~ s/\\\"/\"/g;
+ $before =~ s/[^\n]//g;
+ $messages{$message} = [];
+ $loc{$message} = length ($before) + 2;
+ }
+}
+
sub type_glade {
### For translatable Glade XML files ###
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/gnome-xgl-settings-0.7/intltool-merge.in new/gnome-xgl-settings-0.8/intltool-merge.in
--- old/gnome-xgl-settings-0.7/intltool-merge.in 2006-09-15 20:36:41.000000000 +0200
+++ new/gnome-xgl-settings-0.8/intltool-merge.in 2007-01-22 17:00:34.000000000 +0100
@@ -35,7 +35,7 @@
## Release information
my $PROGRAM = "intltool-merge";
my $PACKAGE = "intltool";
-my $VERSION = "0.34.1";
+my $VERSION = "0.35.2";
## Loaded modules
use strict;
@@ -60,6 +60,7 @@
my $DESKTOP_STYLE_ARG = 0;
my $SCHEMAS_STYLE_ARG = 0;
my $RFC822DEB_STYLE_ARG = 0;
+my $QUOTED_STYLE_ARG = 0;
my $QUIET_ARG = 0;
my $PASS_THROUGH_ARG = 0;
my $UTF8_ARG = 0;
@@ -79,6 +80,7 @@
"desktop-style|d" => \$DESKTOP_STYLE_ARG,
"schemas-style|s" => \$SCHEMAS_STYLE_ARG,
"rfc822deb-style|r" => \$RFC822DEB_STYLE_ARG,
+ "quoted-style" => \$QUOTED_STYLE_ARG,
"pass-through|p" => \$PASS_THROUGH_ARG,
"utf8|u" => \$UTF8_ARG,
"multiple-output|m" => \$MULTIPLE_OUTPUT,
@@ -91,7 +93,7 @@
my %po_files_by_lang = ();
my %translations = ();
-my $iconv = $ENV{"ICONV"} || $ENV{"INTLTOOL_ICONV"} || "/usr/bin/iconv";
+my $iconv = $ENV{"ICONV"} || $ENV{"INTLTOOL_ICONV"} || "@INTLTOOL_ICONV@";
my $devnull = ($^O eq 'MSWin32' ? 'NUL:' : '/dev/null');
# Use this instead of \w for XML files to handle more possible characters.
@@ -157,6 +159,14 @@
&rfc822deb_merge_translations;
&finalize;
}
+elsif ($QUOTED_STYLE_ARG && @ARGV > 2)
+{
+ &utf8_sanity_check;
+ &preparation;
+ &print_message;
+ "ed_merge_translations;
+ &finalize;
+}
else
{
&print_help;
@@ -193,6 +203,7 @@
-k, --keys-style includes translations in the keys style
-s, --schemas-style includes translations in the schemas style
-r, --rfc822deb-style includes translations in the RFC822 style
+ --quoted-style includes translations in the quoted string style
-x, --xml-style includes translations in the standard xml style
Other options:
@@ -257,7 +268,7 @@
sub get_local_charset
{
my ($encoding) = @_;
- my $alias_file = $ENV{"G_CHARSET_ALIAS"} || "/usr/lib/charset.alias";
+ my $alias_file = $ENV{"G_CHARSET_ALIAS"} || "@INTLTOOL_LIBDIR@/charset.alias";
# seek character encoding aliases in charset.alias (glib)
@@ -395,7 +406,7 @@
}
else
{
- print STDERR "WARNING: $po_file is not in UTF-8 but $encoding, converting...\n" unless $QUIET_ARG;;
+ print "NOTICE: $po_file is not in UTF-8 but $encoding, converting...\n" unless $QUIET_ARG;;
open PO_FILE, "$iconv -f $encoding -t UTF-8 $po_file|";
}
@@ -415,7 +426,7 @@
{
$nextfuzzy = 1 if /^#, fuzzy/;
- if (/^msgid "((\\.|[^\\])*)"/ )
+ if (/^msgid "((\\.|[^\\]+)*)"/ )
{
$translations{$lang, $msgid} = $msgstr if $inmsgstr && $msgid && $msgstr;
$msgid = "";
@@ -431,14 +442,14 @@
$nextfuzzy = 0;
}
- if (/^msgstr "((\\.|[^\\])*)"/)
+ if (/^msgstr "((\\.|[^\\]+)*)"/)
{
$msgstr = unescape_po_string($1);
$inmsgstr = 1;
$inmsgid = 0;
}
- if (/^"((\\.|[^\\])*)"/)
+ if (/^"((\\.|[^\\]+)*)"/)
{
$msgid .= unescape_po_string($1) if $inmsgid;
$msgstr .= unescape_po_string($1) if $inmsgstr;
@@ -1354,3 +1365,39 @@
return @list;
}
+sub quoted_translation
+{
+ my ($lang, $string) = @_;
+
+ $string =~ s/\\\"/\"/g;
+
+ my $translation = $translations{$lang, $string};
+ $translation = $string if !$translation;
+
+ $translation =~ s/\"/\\\"/g;
+ return $translation
+}
+
+sub quoted_merge_translations
+{
+ if (!$MULTIPLE_OUTPUT) {
+ print "Quoted only supports Multiple Output.\n";
+ exit(1);
+ }
+
+ for my $lang (sort keys %po_files_by_lang) {
+ if ( ! -e $lang ) {
+ mkdir $lang or die "Cannot create subdirectory $lang: $!\n";
+ }
+ open INPUT, "<${FILE}" or die;
+ open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n";
+ binmode (OUTPUT) if $^O eq 'MSWin32';
+ while (<INPUT>)
+ {
+ s/\"(([^\"]|\\\")*[^\\\"])\"/"\"" . "ed_translation($lang, $1) . "\""/ge;
+ print OUTPUT;
+ }
+ close OUTPUT;
+ close INPUT;
+ }
+}
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/gnome-xgl-settings-0.7/intltool-update.in new/gnome-xgl-settings-0.8/intltool-update.in
--- old/gnome-xgl-settings-0.7/intltool-update.in 2006-09-15 20:36:41.000000000 +0200
+++ new/gnome-xgl-settings-0.8/intltool-update.in 2007-01-22 17:00:34.000000000 +0100
@@ -30,7 +30,7 @@
## Release information
my $PROGRAM = "intltool-update";
-my $VERSION = "0.34.1";
+my $VERSION = "0.35.2";
my $PACKAGE = "intltool";
## Loaded modules
@@ -80,7 +80,8 @@
"directory(?:\\.in)+|". # http://www.freedesktop.org/Standards/menu-spec
"soundlist(?:\\.in)+|". # GNOME specific
"keys(?:\\.in)+|". # GNOME Mime database specific
-"theme(?:\\.in)+"; # http://www.freedesktop.org/Standards/icon-theme-spec
+"theme(?:\\.in)+|". # http://www.freedesktop.org/Standards/icon-theme-spec
+"service(?:\\.in)+"; # DBus specific
my $buildin_gettext_support =
"c|y|cs|cc|cpp|c\\+\\+|h|hh|gob|py";
@@ -89,10 +90,9 @@
$| = 1;
## Sometimes the source tree will be rooted somewhere else.
-my $SRCDIR = ".";
+my $SRCDIR = $ENV{"srcdir"} || ".";
my $POTFILES_in;
-$SRCDIR = $ENV{"srcdir"} if $ENV{"srcdir"};
$POTFILES_in = "<$SRCDIR/POTFILES.in";
my $devnull = ($^O eq 'MSWin32' ? 'NUL:' : '/dev/null');
@@ -123,8 +123,10 @@
&Console_Write_IntltoolHelp if $arg_count > 1;
+my $PKGNAME = FindPackageName ();
+
# --version and --help don't require a module name
-my $MODULE = $GETTEXT_PACKAGE || &FindPackageName;
+my $MODULE = $GETTEXT_PACKAGE || $PKGNAME || "unknown";
if ($POT_ARG)
{
@@ -315,7 +317,8 @@
@buf_potfiles_ignore,
@buf_allfiles,
@buf_allfiles_sorted,
- @buf_potfiles_sorted
+ @buf_potfiles_sorted,
+ @buf_potfiles_ignore_sorted
);
## Search and find all translatable files
@@ -341,7 +344,7 @@
## comparing with POTFILES.in
foreach my $ignore ("POTFILES.skip", "POTFILES.ignore")
{
- (-s $ignore) or next;
+ (-s "$SRCDIR/$ignore") or next;
if ("$ignore" eq "POTFILES.ignore")
{
@@ -350,7 +353,7 @@
}
print "Found $ignore: Ignoring files...\n" if $VERBOSE;
- open FILE, "<$ignore" or die "ERROR: Failed to open $ignore!\n";
+ open FILE, "<$SRCDIR/$ignore" or die "ERROR: Failed to open $SRCDIR/$ignore!\n";
while (<FILE>)
{
@@ -358,7 +361,7 @@
}
close FILE;
- @buf_potfiles = (@buf_potfiles_ignore, @buf_potfiles);
+ @buf_potfiles_ignore_sorted = sort (@buf_potfiles_ignore);
}
foreach my $file (@buf_i18n_plain)
@@ -416,7 +419,7 @@
}
}
- if (/\.GetString ?\(QUOTEDTEXT/)
+ if (/\w\.GetString *\(QUOTEDTEXT/)
{
if (defined isNotValidMissing (unpack("x3 A*", $file))) {
## Remove the first 3 chars and add newline
@@ -425,7 +428,8 @@
last;
}
- if (/_\(QUOTEDTEXT/)
+ ## N_ Q_ and _ are the three macros defined in gi8n.h
+ if (/[NQ]?_ *\(QUOTEDTEXT/)
{
if (defined isNotValidMissing (unpack("x3 A*", $file))) {
## Remove the first 3 chars and add newline
@@ -488,6 +492,11 @@
$in2{$_} = 1;
}
+ foreach (@buf_potfiles_ignore_sorted)
+ {
+ $in2{$_} = 1;
+ }
+
my @result;
foreach (@buf_allfiles_sorted)
@@ -503,7 +512,7 @@
foreach (@buf_potfiles_sorted)
{
chomp (my $dummy = $_);
- if ("$dummy" ne "" and ! -f "../$dummy")
+ if ("$dummy" ne "" and !(-f "$SRCDIR/../$dummy" or -f "../$dummy"))
{
push @buf_potfiles_notexist, $_;
}
@@ -536,7 +545,7 @@
warn "\n" if ($VERBOSE or @result);
warn "\e[1mThe following files do not exist anymore:\e[0m\n\n";
warn @buf_potfiles_notexist, "\n";
- warn "Please remove them from POTFILES.in or POTFILES.skip. A file \e[1m'notexist'\e[0m\n".
+ warn "Please remove them from POTFILES.in. A file \e[1m'notexist'\e[0m\n".
"containing this list of absent files has been written in the current directory.\n";
}
}
@@ -610,7 +619,7 @@
#
sub GeneratePOTemplate
{
- my $XGETTEXT = $ENV{"XGETTEXT"} || "/usr/bin/xgettext";
+ my $XGETTEXT = $ENV{"XGETTEXT"} || "@INTLTOOL_XGETTEXT@";
my $XGETTEXT_ARGS = $ENV{"XGETTEXT_ARGS"} || '';
chomp $XGETTEXT;
@@ -670,12 +679,8 @@
}
else
{
- if ($SRCDIR eq ".") {
- print OUTFILE "../$_\n";
- } else {
- print OUTFILE "$SRCDIR/../$_\n";
- }
- $gettext_code = &TextFile_DetermineEncoding ("../$_") if ($gettext_support_nonascii and not defined $forced_gettext_code);
+ print OUTFILE "$SRCDIR/../$_\n";
+ $gettext_code = &TextFile_DetermineEncoding ("$SRCDIR/../$_") if ($gettext_support_nonascii and not defined $forced_gettext_code);
}
next if (! $gettext_support_nonascii);
@@ -721,6 +726,8 @@
"--files-from\=\.\/POTFILES\.in\.temp");
my $XGETTEXT_KEYWORDS = &FindPOTKeywords;
push @xgettext_argument, $XGETTEXT_KEYWORDS;
+ my $MSGID_BUGS_ADDRESS = &FindMakevarsBugAddress;
+ push @xgettext_argument, "--msgid-bugs-address\=$MSGID_BUGS_ADDRESS" if $MSGID_BUGS_ADDRESS;
push @xgettext_argument, "--from-code\=$encoding" if ($gettext_support_nonascii);
push @xgettext_argument, $XGETTEXT_ARGS if $XGETTEXT_ARGS;
my $xgettext_command = join ' ', @xgettext_argument;
@@ -781,7 +788,7 @@
{
-f "$MODULE.pot" or die "$PROGRAM: $MODULE.pot does not exist.\n";
- my $MSGMERGE = $ENV{"MSGMERGE"} || "/usr/bin/msgmerge";
+ my $MSGMERGE = $ENV{"MSGMERGE"} || "@INTLTOOL_MSGMERGE@";
my ($lang, $outfile) = @_;
print "Merging $SRCDIR/$lang.po with $MODULE.pot..." if $VERBOSE;
@@ -824,7 +831,7 @@
sub Console_Write_TranslationStatus
{
my ($lang, $output_file) = @_;
- my $MSGFMT = $ENV{"MSGFMT"} || "/usr/bin/msgfmt";
+ my $MSGFMT = $ENV{"MSGFMT"} || "@INTLTOOL_MSGFMT@";
$output_file = "$SRCDIR/$lang.po" if ($output_file eq "");
@@ -833,7 +840,7 @@
sub Console_Write_CoverageReport
{
- my $MSGFMT = $ENV{"MSGFMT"} || "/usr/bin/msgfmt";
+ my $MSGFMT = $ENV{"MSGFMT"} || "@INTLTOOL_MSGFMT@";
&GatherPOFiles;
@@ -873,8 +880,10 @@
{
my $rest = $3;
my $untouched = $1;
- my $sub = $varhash{$2};
-
+ my $sub = "";
+ # Ignore recursive definitions of variables
+ $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\${?$2}?/;
+
return SubstituteVariable ("$untouched$sub$rest");
}
@@ -991,10 +1000,10 @@
($name, $version) = ($1, $2);
$name =~ s/[\[\]\s]//g;
$version =~ s/[\[\]\s]//g;
- $varhash{"AC_PACKAGE_NAME"} = $name;
- $varhash{"PACKAGE"} = $name;
- $varhash{"AC_PACKAGE_VERSION"} = $version;
- $varhash{"VERSION"} = $version;
+ $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
+ $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
+ $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
+ $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
}
if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)/m)
@@ -1002,19 +1011,18 @@
($name, $version) = ($1, $2);
$name =~ s/[\[\]\s]//g;
$version =~ s/[\[\]\s]//g;
- $varhash{"AC_PACKAGE_NAME"} = $name;
- $varhash{"PACKAGE"} = $name;
- $varhash{"AC_PACKAGE_VERSION"} = $version;
- $varhash{"VERSION"} = $version;
+ $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
+ $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
+ $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
+ $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
}
# \s makes this not work, why?
$name = $1 if $conf_source =~ /^GETTEXT_PACKAGE=\[?([^\n\]]+)/m;
- # prepend '$' to auto* internal variables, usually they are
- # used in configure.in/ac without the '$'
- $name =~ s/AC_/\$AC_/g;
- $name =~ s/\$\$/\$/g;
+ # m4 macros AC_PACKAGE_NAME, AC_PACKAGE_VERSION etc. have same value
+ # as corresponding $PACKAGE_NAME, $PACKAGE_VERSION etc. shell variables.
+ $name =~ s/\bAC_PACKAGE_/\$PACKAGE_/g;
$name = $domain if $domain;
@@ -1063,3 +1071,23 @@
return $domain;
}
+
+sub FindMakevarsBugAddress
+{
+
+ my $address = "";
+ my $makevars_source; {
+ local (*IN);
+ open (IN, "= 1.8 provides @mkdir_p@.
+# Until it can be supposed, use the safe fallback:
+mkdir_p = $(install_sh) -d
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
-CC = @CC@
-GENCAT = @GENCAT@
GMSGFMT = @GMSGFMT@
MSGFMT = @MSGFMT@
XGETTEXT = @XGETTEXT@
@@ -54,32 +52,26 @@
MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
-DEFS = @DEFS@
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
-
-INCLUDES = -I.. -I$(top_srcdir)/intl
-
-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
-
-SOURCES =
-POFILES = @POFILES@
-GMOFILES = @GMOFILES@
-DISTFILES = ChangeLog Makefile.in.in POTFILES.in \
-$(POFILES) $(SOURCES)
+ALL_LINGUAS = @ALL_LINGUAS@
+
+PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi)
+
+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS`" -o -n "`echo $$ALINGUAS|grep ' ?$$lang ?'`"; then printf "$$lang "; fi; done; fi)
+
+USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
+
+POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
+
+DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES)
EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS
POTFILES = \
+# This comment gets stripped out
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-INSTOBJEXT = @INSTOBJEXT@
+CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
.SUFFIXES:
-.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat
-
-.c.o:
- $(COMPILE) $<
+.SUFFIXES: .po .pox .gmo .mo .msg .cat
.po.pox:
$(MAKE) $(GETTEXT_PACKAGE).pot
@@ -94,7 +86,7 @@
.po.cat:
sed -f ../intl/po2msg.sed < $< > $*.msg \
- && rm -f $@ && $(GENCAT) $@ $*.msg
+ && rm -f $@ && gencat $@ $*.msg
all: all-@USE_NLS@
@@ -105,120 +97,91 @@
$(GETTEXT_PACKAGE).pot: $(POTFILES)
$(GENPOT)
-install: install-exec install-data
-install-exec:
+install: install-data
install-data: install-data-@USE_NLS@
install-data-no: all
install-data-yes: all
- if test -n "$(MKINSTALLDIRS)"; then \
- $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
- else \
- $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
- fi
- @catalogs='$(CATALOGS)'; \
- for cat in $$catalogs; do \
- cat=`basename $$cat`; \
- case "$$cat" in \
- *.gmo) destdir=$(gnulocaledir);; \
- *) destdir=$(localedir);; \
- esac; \
- lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
- dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
- if test -n "$(MKINSTALLDIRS)"; then \
- $(MKINSTALLDIRS) $$dir; \
+ $(mkdir_p) $(DESTDIR)$(itlocaledir)
+ linguas="$(USE_LINGUAS)"; \
+ for lang in $$linguas; do \
+ dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
+ $(mkdir_p) $$dir; \
+ if test -r $$lang.gmo; then \
+ $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
+ echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \
else \
- $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \
+ $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
+ echo "installing $(srcdir)/$$lang.gmo as" \
+ "$$dir/$(GETTEXT_PACKAGE).mo"; \
fi; \
- if test -r $$cat; then \
- $(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
- echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
+ if test -r $$lang.gmo.m; then \
+ $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \
+ echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \
else \
- $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
- echo "installing $(srcdir)/$$cat as" \
- "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
- fi; \
- if test -r $$cat.m; then \
- $(INSTALL_DATA) $$cat.m $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
- echo "installing $$cat.m as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
- else \
- if test -r $(srcdir)/$$cat.m ; then \
- $(INSTALL_DATA) $(srcdir)/$$cat.m \
- $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
- echo "installing $(srcdir)/$$cat as" \
- "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
+ if test -r $(srcdir)/$$lang.gmo.m ; then \
+ $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \
+ $$dir/$(GETTEXT_PACKAGE).mo.m; \
+ echo "installing $(srcdir)/$$lang.gmo.m as" \
+ "$$dir/$(GETTEXT_PACKAGE).mo.m"; \
else \
true; \
fi; \
fi; \
done
- if test "$(PACKAGE)" = "glib"; then \
- if test -n "$(MKINSTALLDIRS)"; then \
- $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
- else \
- $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
- fi; \
- $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
- $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
- else \
- : ; \
- fi
+
+# Empty stubs to satisfy archaic automake needs
+dvi info tags TAGS ID:
# Define this as empty until I found a useful application.
installcheck:
uninstall:
- catalogs='$(CATALOGS)'; \
- for cat in $$catalogs; do \
- cat=`basename $$cat`; \
- lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
- rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
- rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
- rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
- rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
+ linguas="$(USE_LINGUAS)"; \
+ for lang in $$linguas; do \
+ rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
+ rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
done
- if test "$(PACKAGE)" = "glib"; then \
- rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
- fi
check: all $(GETTEXT_PACKAGE).pot
-
-dvi info tags TAGS ID:
+ rm -f missing notexist
+ srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m
+ if [ -r missing -o -r notexist ]; then \
+ exit 1; \
+ fi
mostlyclean:
- rm -f core core.* *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
- rm -fr *.o
+ rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
rm -f .intltool-merge-cache
clean: mostlyclean
distclean: clean
- rm -f Makefile Makefile.in POTFILES
- rm -f *.mo *.msg *.cat *.cat.m $(GMOFILES)
+ rm -f Makefile Makefile.in POTFILES stamp-it
+ rm -f *.mo *.msg *.cat *.cat.m *.gmo
maintainer-clean: distclean
@echo "This command is intended for maintainers to use;"
@echo "it deletes files that may require special tools to rebuild."
rm -f Makefile.in.in
-distdir = ../$(GETTEXT_PACKAGE)-$(VERSION)/$(subdir)
+distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
dist distdir: $(DISTFILES)
dists="$(DISTFILES)"; \
extra_dists="$(EXTRA_DISTFILES)"; \
for file in $$extra_dists; do \
- test -f $$file && dists="$$dists $$file"; \
+ test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \
done; \
for file in $$dists; do \
- ln $(srcdir)/$$file $(distdir) 2> /dev/null \
- || cp -p $(srcdir)/$$file $(distdir); \
+ test -f $$file || file="$(srcdir)/$$file"; \
+ ln $$file $(distdir) 2> /dev/null \
+ || cp -p $$file $(distdir); \
done
update-po: Makefile
$(MAKE) $(GETTEXT_PACKAGE).pot
tmpdir=`pwd`; \
- catalogs='$(CATALOGS)'; \
- for cat in $$catalogs; do \
- cat=`basename $$cat`; \
- lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+ linguas="$(USE_LINGUAS)"; \
+ for lang in $$linguas; do \
echo "$$lang:"; \
result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
if $$result; then \
@@ -234,28 +197,20 @@
fi; \
fi; \
else \
- echo "msgmerge for $$cat failed!"; \
+ echo "msgmerge for $$lang.gmo failed!"; \
rm -f $$tmpdir/$$lang.new.po; \
fi; \
done
-# POTFILES is created from POTFILES.in by stripping comments, empty lines
-# and Intltool tags (enclosed in square brackets), and appending a full
-# relative path to them
-POTFILES: POTFILES.in
- ( posrcprefix='$(top_srcdir)/'; \
- rm -f $@-t $@ \
- && (sed -e '/^#/d' \
- -e 's/^[[].*] *//' \
- -e '/^[ ]*$$/d' \
- -e "s@^@ $$posrcprefix@" $(srcdir)/$@.in \
- | sed -e '$$!s/$$/ \\/') > $@-t \
- && chmod a-w $@-t \
- && mv $@-t $@ )
-
-Makefile: Makefile.in.in ../config.status POTFILES
- cd .. \
- && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
+Makefile POTFILES: stamp-it
+ @if test ! -f $@; then \
+ rm -f stamp-it; \
+ $(MAKE) stamp-it; \
+ fi
+
+stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in
+ cd $(top_builddir) \
+ && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \
$(SHELL) ./config.status
# Tell versions [3.59,3.63) of GNU make not to export all variables.
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/gnome-xgl-settings-0.7/po/POTFILES.skip new/gnome-xgl-settings-0.8/po/POTFILES.skip
--- old/gnome-xgl-settings-0.7/po/POTFILES.skip 1970-01-01 01:00:00.000000000 +0100
+++ new/gnome-xgl-settings-0.8/po/POTFILES.skip 2007-01-22 15:30:01.000000000 +0100
@@ -0,0 +1 @@
+xgl-settings/gnome-xgl-settings.desktop.in
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/gnome-xgl-settings-0.7/xgl-settings/gnome-xgl-settings.h new/gnome-xgl-settings-0.8/xgl-settings/gnome-xgl-settings.h
--- old/gnome-xgl-settings-0.7/xgl-settings/gnome-xgl-settings.h 2006-09-15 19:57:51.000000000 +0200
+++ new/gnome-xgl-settings-0.8/xgl-settings/gnome-xgl-settings.h 2007-01-22 20:26:50.000000000 +0100
@@ -85,28 +85,27 @@
/* GConf keys */
#define KEY_ACTIVE_PLUGINS "/apps/compiz/general/allscreens/options/active_plugins"
#define KEY_WOBBLY_MOVE_WINDOW_TYPES "/apps/compiz/plugins/wobbly/screen0/options/move_window_types"
-#define KEY_WOBBLY_SNAP "/apps/compiz/plugins/wobbly/screen0/options/snap"
-#define KEY_MOVE_OPACITY "/apps/compiz/plugins/move/screen0/options/opacity"
+#define KEY_WOBBLY_SNAP "/apps/compiz/plugins/wobbly/allscreens/options/snap_key"
+#define KEY_MOVE_OPACITY "/apps/compiz/plugins/move/allscreens/options/opacity"
#define KEY_WOBBLY_MAP_EFFECT "/apps/compiz/plugins/wobbly/screen0/options/map_effect"
#define KEY_WOBBLY_MAP_WINDOW_TYPES "/apps/compiz/plugins/wobbly/screen0/options/map_window_types"
#define KEY_WOBBLY_FOCUS_EFFECT "/apps/compiz/plugins/wobbly/screen0/options/focus_effect"
#define KEY_WOBBLY_FOCUS_WINDOW_TYPES "/apps/compiz/plugins/wobbly/screen0/options/focus_window_types"
-#define KEY_OPACITY_INCREASE "/apps/compiz/general/allscreens/options/opacity_increase"
-#define KEY_OPACITY_DECREASE "/apps/compiz/general/allscreens/options/opacity_decrease"
-#define KEY_CUBE_SIZE "/apps/compiz/general/screen0/options/size"
-#define KEY_CUBE_DRAG "/apps/compiz/plugins/rotate/screen0/options/initiate"
-#define KEY_ROTATE_EDGE_FLIP_POINTER "/apps/compiz/plugins/rotate/screen0/options/edge_flip_pointer"
-#define KEY_ROTATE_EDGE_FLIP_MOVE "/apps/compiz/plugins/rotate/screen0/options/edge_flip_move"
-#define KEY_ROTATE_EDGE_FLIP_DND "/apps/compiz/plugins/rotate/screen0/options/edge_flip_dnd"
-#define KEY_ROTATE_FLIP_TIME "/apps/compiz/plugins/rotate/screen0/options/flip_time"
-#define KEY_SCALE_INITIATE "/apps/compiz/plugins/scale/screen0/options/initiate"
-#define KEY_SCALE_TERMINATE "/apps/compiz/plugins/scale/screen0/options/terminate"
-#define KEY_SCALE_CORNERS "/apps/compiz/plugins/scale/screen0/options/corners"
-#define KEY_ZOOM_INITIATE "/apps/compiz/plugins/zoom/screen0/options/initiate"
-#define KEY_ZOOM_IN "/apps/compiz/plugins/zoom/screen0/options/zoom_in"
-#define KEY_ZOOM_OUT "/apps/compiz/plugins/zoom/screen0/options/zoom_out"
-#define KEY_WATER_INITIATE "/apps/compiz/plugins/water/screen0/options/initiate"
-#define KEY_RAIN_TOGGLE "/apps/compiz/plugins/water/screen0/options/toggle_rain"
-#define KEY_RAIN_DELAY "/apps/compiz/plugins/water/screen0/options/rain_delay"
+#define KEY_OPACITY_INCREASE "/apps/compiz/general/allscreens/options/opacity_increase_button"
+#define KEY_OPACITY_DECREASE "/apps/compiz/general/allscreens/options/opacity_decrease_button"
+#define KEY_CUBE_SIZE "/apps/compiz/general/screen0/options/hsize"
+#define KEY_CUBE_DRAG "/apps/compiz/plugins/rotate/allscreens/options/initiate_button"
+#define KEY_ROTATE_EDGE_FLIP_POINTER "/apps/compiz/plugins/rotate/allscreens/options/edge_flip_pointer"
+#define KEY_ROTATE_EDGE_FLIP_MOVE "/apps/compiz/plugins/rotate/allscreens/options/edge_flip_move"
+#define KEY_ROTATE_EDGE_FLIP_DND "/apps/compiz/plugins/rotate/allscreens/options/edge_flip_dnd"
+#define KEY_ROTATE_FLIP_TIME "/apps/compiz/plugins/rotate/allscreens/options/flip_time"
+#define KEY_SCALE_INITIATE "/apps/compiz/plugins/scale/allscreens/options/initiate_key"
+#define KEY_SCALE_CORNERS "/apps/compiz/plugins/scale/allscreens/options/initiate_edge"
+#define KEY_ZOOM_INITIATE "/apps/compiz/plugins/zoom/allscreens/options/initiate_button"
+#define KEY_ZOOM_IN "/apps/compiz/plugins/zoom/allscreens/options/zoom_in_button"
+#define KEY_ZOOM_OUT "/apps/compiz/plugins/zoom/allscreens/options/zoom_out_button"
+#define KEY_WATER_INITIATE "/apps/compiz/plugins/water/allscreens/options/initiate_button"
+#define KEY_RAIN_TOGGLE "/apps/compiz/plugins/water/allscreens/options/toggle_rain_key"
+#define KEY_RAIN_DELAY "/apps/compiz/plugins/water/allscreens/options/rain_delay"
#endif /* __GNOME_XGL_SETTINGS_H__ */
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/gnome-xgl-settings-0.7/xgl-settings/settings.c new/gnome-xgl-settings-0.8/xgl-settings/settings.c
--- old/gnome-xgl-settings-0.7/xgl-settings/settings.c 2006-06-21 18:21:03.000000000 +0200
+++ new/gnome-xgl-settings-0.8/xgl-settings/settings.c 2007-01-22 21:52:29.000000000 +0100
@@ -120,6 +120,7 @@
if (active) {
plugins_activate ("wobbly", NULL);
+ gconf_client_set_bool (gconf, KEY_ROTATE_EDGE_FLIP_MOVE, FALSE, NULL);
set_window_types (KEY_WOBBLY_MOVE_WINDOW_TYPES,
"Toolbar", "Menu", "Utility", "Dialog",
"ModalDialog", "Normal", NULL);
@@ -536,35 +537,35 @@
const char *key;
int minsides;
} cube_keys[] = {
- { "/apps/compiz/plugins/cube/screen0/options/unfold", 1 },
- { "/apps/compiz/plugins/rotate/screen0/options/rotate_left", 1 },
- { "/apps/compiz/plugins/rotate/screen0/options/rotate_left_window", 1 },
- { "/apps/compiz/plugins/rotate/screen0/options/rotate_right", 1 },
- { "/apps/compiz/plugins/rotate/screen0/options/rotate_right_window", 1 },
- { "/apps/compiz/plugins/rotate/screen0/options/rotate_to_1", 1 },
- { "/apps/compiz/plugins/rotate/screen0/options/rotate_to_1_window", 1 },
- { "/apps/compiz/plugins/rotate/screen0/options/rotate_to_2", 2 },
- { "/apps/compiz/plugins/rotate/screen0/options/rotate_to_2_window", 2 },
- { "/apps/compiz/plugins/rotate/screen0/options/rotate_to_3", 3 },
- { "/apps/compiz/plugins/rotate/screen0/options/rotate_to_3_window", 3 },
- { "/apps/compiz/plugins/rotate/screen0/options/rotate_to_4", 4 },
- { "/apps/compiz/plugins/rotate/screen0/options/rotate_to_4_window", 4 },
- { "/apps/compiz/plugins/rotate/screen0/options/rotate_to_5", 5 },
- { "/apps/compiz/plugins/rotate/screen0/options/rotate_to_5_window", 5 },
- { "/apps/compiz/plugins/rotate/screen0/options/rotate_to_6", 6 },
- { "/apps/compiz/plugins/rotate/screen0/options/rotate_to_6_window", 6 },
- { "/apps/compiz/plugins/rotate/screen0/options/rotate_to_7", 7 },
- { "/apps/compiz/plugins/rotate/screen0/options/rotate_to_7_window", 7 },
- { "/apps/compiz/plugins/rotate/screen0/options/rotate_to_8", 8 },
- { "/apps/compiz/plugins/rotate/screen0/options/rotate_to_8_window", 8 },
- { "/apps/compiz/plugins/rotate/screen0/options/rotate_to_9", 9 },
- { "/apps/compiz/plugins/rotate/screen0/options/rotate_to_9_window", 9 },
- { "/apps/compiz/plugins/rotate/screen0/options/rotate_to_10", 10 },
- { "/apps/compiz/plugins/rotate/screen0/options/rotate_to_10_window", 10 },
- { "/apps/compiz/plugins/rotate/screen0/options/rotate_to_11", 11 },
- { "/apps/compiz/plugins/rotate/screen0/options/rotate_to_11_window", 11 },
- { "/apps/compiz/plugins/rotate/screen0/options/rotate_to_12", 12 },
- { "/apps/compiz/plugins/rotate/screen0/options/rotate_to_12_window", 12 }
+ { "/apps/compiz/plugins/cube/allscreens/options/unfold_key", 1 },
+ { "/apps/compiz/plugins/rotate/allscreens/options/rotate_left_key", 1 },
+ { "/apps/compiz/plugins/rotate/allscreens/options/rotate_left_window_key", 1 },
+ { "/apps/compiz/plugins/rotate/allscreens/options/rotate_right_key", 1 },
+ { "/apps/compiz/plugins/rotate/allscreens/options/rotate_right_window_key", 1 },
+ { "/apps/compiz/plugins/rotate/allscreens/options/rotate_to_1_key", 1 },
+ { "/apps/compiz/plugins/rotate/allscreens/options/rotate_to_1_window_key", 1 },
+ { "/apps/compiz/plugins/rotate/allscreens/options/rotate_to_2_key", 2 },
+ { "/apps/compiz/plugins/rotate/allscreens/options/rotate_to_2_window_key", 2 },
+ { "/apps/compiz/plugins/rotate/allscreens/options/rotate_to_3_key", 3 },
+ { "/apps/compiz/plugins/rotate/allscreens/options/rotate_to_3_window_key", 3 },
+ { "/apps/compiz/plugins/rotate/allscreens/options/rotate_to_4_key", 4 },
+ { "/apps/compiz/plugins/rotate/allscreens/options/rotate_to_4_window_key", 4 },
+ { "/apps/compiz/plugins/rotate/allscreens/options/rotate_to_5_key", 5 },
+ { "/apps/compiz/plugins/rotate/allscreens/options/rotate_to_5_window_key", 5 },
+ { "/apps/compiz/plugins/rotate/allscreens/options/rotate_to_6_key", 6 },
+ { "/apps/compiz/plugins/rotate/allscreens/options/rotate_to_6_window_key", 6 },
+ { "/apps/compiz/plugins/rotate/allscreens/options/rotate_to_7_key", 7 },
+ { "/apps/compiz/plugins/rotate/allscreens/options/rotate_to_7_window_key", 7 },
+ { "/apps/compiz/plugins/rotate/allscreens/options/rotate_to_8_key", 8 },
+ { "/apps/compiz/plugins/rotate/allscreens/options/rotate_to_8_window_key", 8 },
+ { "/apps/compiz/plugins/rotate/allscreens/options/rotate_to_9_key", 9 },
+ { "/apps/compiz/plugins/rotate/allscreens/options/rotate_to_9_window_key", 9 },
+ { "/apps/compiz/plugins/rotate/allscreens/options/rotate_to_10_key", 10 },
+ { "/apps/compiz/plugins/rotate/allscreens/options/rotate_to_10_window_key", 10 },
+ { "/apps/compiz/plugins/rotate/allscreens/options/rotate_to_11_key", 11 },
+ { "/apps/compiz/plugins/rotate/allscreens/options/rotate_to_11_window_key", 11 },
+ { "/apps/compiz/plugins/rotate/allscreens/options/rotate_to_12_key", 12 },
+ { "/apps/compiz/plugins/rotate/allscreens/options/rotate_to_12_window_key", 12 }
};
#define N_CUBE_KEYS G_N_ELEMENTS (cube_keys)
@@ -812,7 +813,6 @@
{
plugins_activate ("scale", NULL);
gconf_client_set_string (gconf, KEY_SCALE_INITIATE, binding, NULL);
- gconf_client_set_string (gconf, KEY_SCALE_TERMINATE, binding, NULL);
}
static void
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org