Hello community, here is the log from the commit of package compiz checked in at Tue Apr 25 21:53:40 CEST 2006. -------- --- compiz/compiz.changes 2006-04-24 17:04:23.000000000 +0200 +++ STABLE/compiz/compiz.changes 2006-04-25 20:08:12.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 25 20:07:52 CEST 2006 - danw@suse.de + +- Add xgl-settings-scale.patch to fix a crasher when the scale + corner is disabled + +------------------------------------------------------------------- New: ---- xgl-settings-scale.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ compiz.spec ++++++ --- /var/tmp/diff_new_pack.0Vbsgk/_old 2006-04-25 21:53:30.000000000 +0200 +++ /var/tmp/diff_new_pack.0Vbsgk/_new 2006-04-25 21:53:30.000000000 +0200 @@ -18,7 +18,7 @@ Requires: libpng libdrm gconf2 gtk2 gnome-desktop control-center2 libsvg libsvg-cairo libwnck Autoreqprov: on Version: cvs_060421 -Release: 3 +Release: 5 Summary: OpenGL window and compositing manager. BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 @@ -31,6 +31,7 @@ Patch1: Mesa-configs.diff Patch2: mesa-tfp-defines-1.patch Patch3: compiz-schema.patch +Patch4: xgl-settings-scale.patch %description Compiz is an OpenGL compositing manager that use @@ -53,6 +54,7 @@ patch -d Mesa -p0 < $RPM_SOURCE_DIR/Mesa-configs.diff patch -d Mesa -p0 < $RPM_SOURCE_DIR/mesa-tfp-defines-1.patch patch -d compiz-* -p0 < $RPM_SOURCE_DIR/compiz-schema.patch +patch -d xgl-* -p0 < $RPM_SOURCE_DIR/xgl-settings-scale.patch %build PREFIX=/usr @@ -137,6 +139,9 @@ /etc/opt/gnome/gconf/schemas/compiz.schemas %changelog -n compiz +* Tue Apr 25 2006 - danw@suse.de +- Add xgl-settings-scale.patch to fix a crasher when the scale + corner is disabled * Mon Apr 24 2006 - danw@suse.de - Update to gnome-xgl-settings 0.2 and add it back to the build. - Patch compiz.schemas to make the switcher/initiate binding ++++++ xgl-settings-scale.patch ++++++ Index: xgl-settings/settings.c =================================================================== --- xgl-settings/settings.c (revision 121) +++ xgl-settings/settings.c (working copy) @@ -721,13 +721,10 @@ static void key_active_plugins_scale_changed (gboolean active) { - GtkToggleButton *toggle = GXGL_WIDGET ("scale_enable_corner"); - GXGLKeybinding *keybinding = GXGL_WIDGET ("scale_key"); - - if (active != gtk_toggle_button_get_active (toggle)) - gtk_toggle_button_set_active (toggle, active); - if (!active) - gxgl_keybinding_set (keybinding, "Disabled"); + if (!active) { + gtk_toggle_button_set_active (GXGL_WIDGET ("scale_enable_corner"), FALSE); + gxgl_keybinding_set (GXGL_WIDGET ("scale_key"), "Disabled"); + } } void @@ -1091,6 +1088,9 @@ void setup_settings_pages (void) { + /* glade bug */ + gtk_combo_box_set_active (GXGL_WIDGET ("scale_corner"), 0); + gconf_client_add_dir (gconf, "/apps/compiz", GCONF_CLIENT_PRELOAD_NONE, NULL); gconf_client_notify_add (gconf, "/apps/compiz", gconf_key_changed, NULL, NULL, NULL); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...