Hello community, here is the log from the commit of package compiz checked in at Mon Apr 23 23:15:08 CEST 2007. -------- --- compiz/compiz.changes 2007-04-12 18:02:51.000000000 +0200 +++ /mounts/work_src_done/STABLE/compiz/compiz.changes 2007-04-23 11:34:36.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Apr 23 11:33:35 CEST 2007 - mhopf@suse.de + +- Don't tell users to enale 24bit before they're even running the right + driver (#266157). + +------------------------------------------------------------------- New: ---- gnome-xgl-settings-266157-driver-check.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ compiz.spec ++++++ --- /var/tmp/diff_new_pack.R30626/_old 2007-04-23 23:14:03.000000000 +0200 +++ /var/tmp/diff_new_pack.R30626/_new 2007-04-23 23:14:03.000000000 +0200 @@ -26,7 +26,7 @@ Enhances: xgl >= git_070104 Autoreqprov: on Version: 0.5.0 -Release: 1 +Release: 3 Summary: OpenGL window and compositing manager. BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 @@ -47,6 +47,7 @@ Patch30: gnome-xgl-switch-md5dir.diff Patch31: gnome-xgl-settings-246659-hwinfo.diff Patch32: gnome-xgl-settings-linguas.diff +Patch33: gnome-xgl-settings-266157-driver-check.diff Patch60: Mesa-x86_64-fixes.diff %if "%(xft-config --prefix)" == "/usr" %define xorg_prefix %_prefix @@ -146,6 +147,7 @@ %patch30 %patch31 -p1 %patch32 -p1 +%patch33 -p1 sed -i -e "s@/opt/gnome/@%gnome_prefix/@g" ./xgl-settings/switch.c ./xgl-settings/gnome-xgl-switch cd - cd Mesa-* @@ -278,6 +280,9 @@ %_bindir/kde-window-decorator %changelog +* Mon Apr 23 2007 - mhopf@suse.de +- Don't tell users to enale 24bit before they're even running the right + driver (#266157). * Thu Apr 12 2007 - mhopf@suse.de - Added autoconf check for Fuse version. - Added test for XFixes version. ++++++ gnome-xgl-settings-266157-driver-check.diff ++++++ --- gnome-xgl-settings-0.9/xgl-settings/switch.c 2007/04/19 13:04:49 1.1 +++ gnome-xgl-settings-0.9/xgl-settings/switch.c 2007/04/19 13:05:19 @@ -158,14 +158,7 @@ comment = g_strdup_printf ("%s %s", supported, _("Sorry.")); button_state = SwitchButtonNone; } else if (card_status == 'G' || card_status == 'S') { - if (!depth24) { - comment = g_strdup_printf ( - "%s\n\n%s\n\n%s", supported, - _("However, Xgl cannot be enabled, because you do not have " - "24-bit color configured."), - sax_advice); - button_state = sax_button_state; - } else if (!accel_enabled && missing_packages && !ran_installer) { + if (!accel_enabled && missing_packages && !ran_installer) { comment = g_strdup_printf ( "%s\n\n%s", supported, _("However, in order to use Xgl, you need to first install a " @@ -179,6 +172,13 @@ _("However, you do not currently have 3D acceleration enabled."), sax_advice); button_state = sax_button_state; + } else if (!depth24) { + comment = g_strdup_printf ( + "%s\n\n%s\n\n%s", supported, + _("However, Xgl cannot be enabled, because you do not have " + "24-bit color configured."), + sax_advice); + button_state = sax_button_state; } else { comment = g_strdup_printf ( "%s\n\n%s", supported, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org