Hello community, here is the log from the commit of package compiz checked in at Thu Sep 6 21:52:47 CEST 2007. -------- --- compiz/compiz.changes 2007-08-27 16:29:05.000000000 +0200 +++ /mounts/work_src_done/STABLE/compiz/compiz.changes 2007-09-06 19:48:02.093294000 +0200 @@ -1,0 +2,5 @@ +Thu Sep 6 19:45:33 CEST 2007 - dreveman@suse.de + +- Fix plugin load crash in gnome-xgl-settings. #296701 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ compiz.spec ++++++ --- /var/tmp/diff_new_pack.NL8179/_old 2007-09-06 21:50:39.000000000 +0200 +++ /var/tmp/diff_new_pack.NL8179/_new 2007-09-06 21:50:39.000000000 +0200 @@ -31,7 +31,7 @@ Enhances: xgl >= git_070104 Autoreqprov: on Version: 0.5.4 -Release: 6 +Release: 12 Requires: compiz-decorator = %{version} Summary: OpenGL window and compositing manager. BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -332,6 +332,8 @@ %kde_prefix/share/config.kcfg/compiz-* %changelog +* Thu Sep 06 2007 - dreveman@suse.de +- Fix plugin load crash in gnome-xgl-settings. #296701 * Mon Aug 27 2007 - cyberorg@cyberorg.info - Apply compiz-prepend-glib-gconf-to-plugins-list.diff, prevent gconf unload if compiz launched with gconf. ++++++ gnome-xgl-settings-0.9-compiz-0.5.4-update.diff ++++++ --- /var/tmp/diff_new_pack.NL8179/_old 2007-09-06 21:50:39.000000000 +0200 +++ /var/tmp/diff_new_pack.NL8179/_new 2007-09-06 21:50:39.000000000 +0200 @@ -18,7 +18,7 @@ #define KEY_OPACITY_DECREASE "/apps/compiz/general/allscreens/options/opacity_decrease_button" #define KEY_CUBE_SIZE "/apps/compiz/general/screen0/options/hsize" --- ../gnome-xgl-settings-0.9/xgl-settings/plugins.c 2006-06-21 12:21:03.000000000 -0400 -+++ ./xgl-settings/plugins.c 2007-08-08 16:14:00.000000000 -0400 ++++ ./xgl-settings/plugins.c 2007-09-06 12:34:40.000000000 -0400 @@ -29,7 +29,7 @@ #include "gxgl-plugin-options.h" #endif @@ -28,7 +28,30 @@ static GSList *active_plugins; -@@ -173,6 +173,7 @@ +@@ -117,11 +117,6 @@ + gtk_widget_set_sensitive (w, FALSE); + gtk_box_pack_start (GXGL_WIDGET ("all_options_box"), options, FALSE, FALSE, 0); + #endif +- +- gconf_client_notify_add (gconf, KEY_ACTIVE_PLUGINS, active_plugins_changed, +- NULL, NULL, NULL); +- gconf_client_notify (gconf, KEY_ACTIVE_PLUGINS); +- + plugins = gconf_client_all_dirs (gconf, "/apps/compiz/plugins", NULL); + plugins = g_slist_sort (plugins, (GCompareFunc)strcmp); + for (p = plugins; p; p = p->next) { +@@ -166,6 +161,10 @@ + requires = (PluginRelation *)g_array_free (req_arr, FALSE); + supports = (PluginRelation *)g_array_free (supp_arr, FALSE); + ++ gconf_client_notify_add (gconf, KEY_ACTIVE_PLUGINS, active_plugins_changed, ++ NULL, NULL, NULL); ++ gconf_client_notify (gconf, KEY_ACTIVE_PLUGINS); ++ + gtk_widget_show_all (GXGL_WIDGET ("all_options_box")); + } + +@@ -173,6 +172,7 @@ plugin_supports (const char *plugin, const char *other) { int i; @@ -36,7 +59,7 @@ for (i = 0; supports[i].plugin; i++) { if (!strcmp (supports[i].plugin, plugin) && !strcmp (supports[i].other, other)) -@@ -185,6 +186,7 @@ +@@ -185,6 +185,7 @@ plugin_requires (const char *plugin, const char *other) { int i; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org