Hello community,
here is the log from the commit of package compiz
checked in at Tue May 9 12:16:16 CEST 2006.
--------
--- compiz/compiz.changes 2006-05-08 01:47:16.000000000 +0200
+++ STABLE/compiz/compiz.changes 2006-05-08 03:39:40.000000000 +0200
@@ -1,0 +2,6 @@
+Mon May 8 03:39:07 CEST 2006 - danw@suse.de
+
+- Add xgl-settings-options.diff to patch out some not-quite-working
+ code in xgl-settings.
+
+-------------------------------------------------------------------
New:
----
xgl-settings-options.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ compiz.spec ++++++
--- /var/tmp/diff_new_pack.GU2tpk/_old 2006-05-09 12:16:02.000000000 +0200
+++ /var/tmp/diff_new_pack.GU2tpk/_new 2006-05-09 12:16:02.000000000 +0200
@@ -18,7 +18,7 @@
Requires: libpng libdrm gconf2 gtk2 gnome-desktop control-center2 libsvg libsvg-cairo libwnck
Autoreqprov: on
Version: cvs_060507
-Release: 2
+Release: 4
Summary: OpenGL window and compositing manager.
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64
@@ -29,6 +29,7 @@
### /bin/ls *.{diff,patch} | perl -ne 'print "Patch$n: ".$_; $n++;'
Patch: Mesa-6.4.1-x86_64-fixes-1.patch
Patch1: Mesa-configs.diff
+Patch2: xgl-settings-options.diff
%description
Compiz is an OpenGL compositing manager that use
@@ -49,6 +50,7 @@
%setup -q -n . -D -T -b 0 -b 1 -b 2
patch -d Mesa -p0 < $RPM_SOURCE_DIR/Mesa-6.4.1-x86_64-fixes-1.patch
patch -d Mesa -p0 < $RPM_SOURCE_DIR/Mesa-configs.diff
+patch -d xgl-set* -p0 < $RPM_SOURCE_DIR/xgl-settings-options.diff
%build
PREFIX=/usr
@@ -133,6 +135,9 @@
/etc/opt/gnome/gconf/schemas/compiz.schemas
%changelog -n compiz
+* Mon May 08 2006 - danw@suse.de
+- Add xgl-settings-options.diff to patch out some not-quite-working
+ code in xgl-settings.
* Mon May 08 2006 - dreveman@suse.de
- Audible and visual bell control. (bnc 163251)
- Change to Shift instead of Control for "move with snapping".
++++++ xgl-settings-options.diff ++++++
--- xgl-settings/gnome-xgl-settings.glade.orig 2006-05-08 03:36:38.804080188 +0200
+++ xgl-settings/gnome-xgl-settings.glade 2006-05-08 03:36:48.093460958 +0200
@@ -3180,7 +3180,6 @@
<child>
<widget class="GtkScrolledWindow" id="all_options_scroll">
- <property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
<property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
--- xgl-settings/plugins.c.orig 2006-05-08 03:36:38.780084371 +0200
+++ xgl-settings/plugins.c 2006-05-08 03:36:48.068465315 +0200
@@ -25,7 +25,6 @@
#include
#include "gnome-xgl-settings.h"
-#include "gxgl-plugin-options.h"
#define REQUIRED_PLUGINS "gconf", "decoration", "move", "resize", "place"
@@ -37,49 +36,24 @@
PluginRelation *requires, *supports;
-GHashTable *plugin_options;
-
static void
active_plugins_changed (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer user_data)
{
- GSList *plugins, *p, *deactivated, *activated;
+ GSList *plugins, *p;
char *name;
- GXGLPluginOptions *poptions;
/* Make sure the required plugins are always enabled */
if (plugins_activate (REQUIRED_PLUGINS, NULL))
return;
- plugins = deactivated = activated = NULL;
+ plugins = NULL;
for (p = gconf_value_get_list (entry->value); p; p = p->next) {
name = g_strdup (gconf_value_get_string (p->data));
plugins = g_slist_append (plugins, name);
- if (!g_slist_find_custom (active_plugins, name, (GCompareFunc)strcmp))
- activated = g_slist_prepend (activated, g_strdup (name));
- }
-
- for (p = active_plugins; p; p = p->next) {
- name = p->data;
- if (!g_slist_find_custom (plugins, name, (GCompareFunc)strcmp))
- deactivated = g_slist_prepend (deactivated, g_strdup (name));
}
free_slist (active_plugins);
active_plugins = plugins;
-
- for (p = deactivated; p; p = p->next) {
- poptions = g_hash_table_lookup (plugin_options, p->data);
- if (poptions)
- gxgl_plugin_options_set_active (poptions, FALSE);
- }
- free_slist (deactivated);
-
- for (p = activated; p; p = p->next) {
- poptions = g_hash_table_lookup (plugin_options, p->data);
- if (poptions)
- gxgl_plugin_options_set_active (poptions, TRUE);
- }
- free_slist (activated);
}
void
@@ -91,17 +65,6 @@
GArray *req_arr = g_array_new (TRUE, TRUE, sizeof (PluginRelation));
GArray *supp_arr = g_array_new (TRUE, TRUE, sizeof (PluginRelation));
PluginRelation rel;
- GtkWidget *options, *w;
- GtkSizeGroup *size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
-
- plugin_options = g_hash_table_new (g_str_hash, g_str_equal);
-
- options = gxgl_options_new ("General Compiz Options", NULL,
- "/apps/compiz/general", size_group);
- w = g_hash_table_lookup (GXGL_OPTIONS (options)->editors, KEY_ACTIVE_PLUGINS);
- if (w)
- gtk_widget_set_sensitive (w, FALSE);
- gtk_box_pack_start (GXGL_WIDGET ("all_options_box"), options, FALSE, FALSE, 0);
gconf_client_notify_add (gconf, KEY_ACTIVE_PLUGINS, active_plugins_changed,
NULL, NULL, NULL);
@@ -136,18 +99,11 @@
}
g_slist_free (deps);
}
-
- options = gxgl_plugin_options_new (name, size_group);
- g_hash_table_insert (plugin_options, g_strdup (name), options);
- gtk_box_pack_start (GXGL_WIDGET ("all_options_box"), options, FALSE, FALSE, 0);
}
free_slist (plugins);
- g_object_unref (size_group);
requires = (PluginRelation *)g_array_free (req_arr, FALSE);
supports = (PluginRelation *)g_array_free (supp_arr, FALSE);
-
- gtk_widget_show_all (GXGL_WIDGET ("all_options_box"));
}
static gboolean
--- xgl-settings/Makefile.in.orig 2006-05-08 03:36:58.847586405 +0200
+++ xgl-settings/Makefile.in 2006-05-08 03:37:13.493033549 +0200
@@ -56,7 +56,6 @@
PROGRAMS = $(bin_PROGRAMS)
am_gnome_xgl_settings_OBJECTS = eggaccelerators.$(OBJEXT) \
eggcellrendererkeys.$(OBJEXT) gnome-xgl-settings.$(OBJEXT) \
- gxgl-options.$(OBJEXT) gxgl-plugin-options.$(OBJEXT) \
keybinding.$(OBJEXT) plugins.$(OBJEXT) settings.$(OBJEXT) \
switch.$(OBJEXT)
gnome_xgl_settings_OBJECTS = $(am_gnome_xgl_settings_OBJECTS)
@@ -252,10 +251,6 @@
eggcellrendererkeys.h \
gnome-xgl-settings.c \
gnome-xgl-settings.h \
- gxgl-options.c \
- gxgl-options.h \
- gxgl-plugin-options.c \
- gxgl-plugin-options.h \
keybinding.c \
keybinding.h \
plugins.c \
@@ -378,8 +373,6 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eggaccelerators.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eggcellrendererkeys.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome-xgl-settings.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gxgl-options.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gxgl-plugin-options.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keybinding.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plugins.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/settings.Po@am__quote@
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...