Mailinglist Archive: opensuse-commit (2092 mails)

< Previous Next >
commit compiz
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Mon, 06 Aug 2007 20:56:16 +0200
  • Message-id: <20070806185616.7B942678331@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package compiz
checked in at Mon Aug 6 20:56:16 CEST 2007.

--------
--- compiz/compiz.changes       2007-08-03 23:45:39.000000000 +0200
+++ /mounts/work_src_done/STABLE/compiz/compiz.changes  2007-08-06 16:42:28.417511000 +0200
@@ -1,0 +2,7 @@
+Mon Aug  6 16:41:01 CEST 2007 - dreveman@xxxxxxx
+
+- Update gnome-xgl-settings so it works with compiz 0.5.2.
+- Fix schemas install.
+- Make sure the key-bindings dir exist.
+
+-------------------------------------------------------------------

New:
----
  gnome-xgl-settings-0.9-compiz-0.5.2-update.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ compiz.spec ++++++
--- /var/tmp/diff_new_pack.Q22694/_old  2007-08-06 20:54:41.000000000 +0200
+++ /var/tmp/diff_new_pack.Q22694/_new  2007-08-06 20:54:41.000000000 +0200
@@ -25,7 +25,7 @@
 Enhances:       xgl >= git_070104
 Autoreqprov:    on
 Version:        0.5.2
-Release:        1
+Release:        3
 Requires:       compiz-decorator = %{version}
 Summary:        OpenGL window and compositing manager.
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -45,6 +45,7 @@
 Patch31:        gnome-xgl-settings-246659-hwinfo.diff
 Patch32:        gnome-xgl-settings-linguas.diff
 Patch33:        gnome-xgl-settings-266157-driver-check.diff
+Patch34:        gnome-xgl-settings-0.9-compiz-0.5.2-update.diff
 Patch60:        Mesa-x86_64-fixes.diff
 %if "%(xft-config --prefix)" == "/usr"
 %define xorg_prefix %_prefix
@@ -145,6 +146,7 @@
 %patch31 -p1
 %patch32 -p1
 %patch33 -p1
+%patch34
 sed -i  -e "s@/opt/gnome/@%gnome_prefix/@g" ./xgl-settings/switch.c ./xgl-settings/gnome-xgl-switch
 cd -
 cd Mesa-*
@@ -219,10 +221,13 @@
 
 %post
 %run_ldconfig
+
+%post gnome
 %if "%gnome_prefix" != "/usr"
-export GCONF_CONFIG_SOURCE=`./%gnome_prefix/bin/gconftool-2 --get-default-source`
-./%gnome_prefix/bin/gconftool-2 --makefile-install-rule ./%gnome_etc/gconf/schemas/compiz.schemas >/dev/null
-./%gnome_prefix/bin/gconftool-2 --makefile-install-rule ./%gnome_etc/gconf/schemas/gwd.schemas >/dev/null
+export GCONF_CONFIG_SOURCE=`%gnome_prefix/bin/gconftool-2 --get-default-source`
+for schemas in compiz-core.schemas compiz-annotate.schemas compiz-blur.schemas compiz-clone.schemas compiz-cube.schemas compiz-dbus.schemas compiz-decoration.schemas compiz-fade.schemas compiz-fs.schemas compiz-gconf.schemas compiz-glib.schemas compiz-ini.schemas compiz-inotify.schemas compiz-minimize.schemas compiz-move.schemas compiz-place.schemas compiz-plane.schemas compiz-png.schemas compiz-regex.schemas compiz-resize.schemas compiz-rotate.schemas compiz-scale.schemas compiz-screenshot.schemas compiz-svg.schemas compiz-switcher.schemas compiz-video.schemas compiz-water.schemas compiz-wobbly.schemas compiz-zoom.schemas gwd.schemas; do
+%gnome_prefix/bin/gconftool-2 --makefile-install-rule %gnome_etc/gconf/schemas/$schemas >/dev/null
+done
 %endif
 
 %postun
@@ -267,10 +272,12 @@
 %gnome_prefix/share/pixmaps/xgl-settings-capplet.svg
 %gnome_prefix/%_lib/window-manager-settings/libcompiz*
 %gnome_prefix/share/gnome/wm-properties/compiz.desktop
-%gnome_prefix/share/gnome-control-center/keybindings/*.xml
 %if "%gnome_prefix" != "/usr"
-%gnome_etc/gconf/schemas/compiz.schemas
-%gnome_etc/gconf/schemas/gwd.schemas
+%gnome_etc/gconf/schemas/*.schemas
+%endif
+%if 0%{suse_version} >= 01021
+%dir %gnome_prefix/share/gnome-control-center/keybindings/
+%gnome_prefix/share/gnome-control-center/keybindings/*
 %endif
 
 %files kde
@@ -278,6 +285,10 @@
 %_bindir/kde-window-decorator
 
 %changelog
+* Mon Aug 06 2007 - dreveman@xxxxxxx
+- Update gnome-xgl-settings so it works with compiz 0.5.2.
+- Fix schemas install.
+- Make sure the key-bindings dir exist.
 * Fri Aug 03 2007 - dreveman@xxxxxxx
 - Update to compiz 0.5.2.
 * Tue Jul 17 2007 - mhopf@xxxxxxx

++++++ gnome-xgl-settings-0.9-compiz-0.5.2-update.diff ++++++
--- ../gnome-xgl-settings-0.9/xgl-settings/gnome-xgl-settings.h 2007-02-01 12:51:00.000000000 -0500
+++ ./xgl-settings/gnome-xgl-settings.h 2007-08-05 14:04:55.000000000 -0400
@@ -88,13 +88,13 @@
 
 /* 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_MOVE_WINDOW_TYPES   "/apps/compiz/plugins/wobbly/screen0/options/move_window_match"
 #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_MAP_WINDOW_TYPES    "/apps/compiz/plugins/wobbly/screen0/options/map_window_match"
 #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_WOBBLY_FOCUS_WINDOW_TYPES  "/apps/compiz/plugins/wobbly/screen0/options/focus_window_match"
 #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"
--- ../gnome-xgl-settings-0.9/xgl-settings/plugins.c    2006-06-21 12:21:03.000000000 -0400
+++ ./xgl-settings/plugins.c    2007-08-05 13:40:22.000000000 -0400
@@ -29,7 +29,7 @@
 #include "gxgl-plugin-options.h"
 #endif
 
-#define REQUIRED_PLUGINS "gconf", "decoration", "move", "resize", "place"
+#define REQUIRED_PLUGINS "glib", "gconf", "decoration", "move", "resize", "place"
 
 static GSList *active_plugins;
 
--- ../gnome-xgl-settings-0.9/xgl-settings/settings.c   2007-02-01 12:43:01.000000000 -0500
+++ ./xgl-settings/settings.c   2007-08-05 14:33:16.000000000 -0400
@@ -89,28 +89,9 @@
 }
 
 static void
-set_window_types (const char *key, ...)
+set_window_types (const char *key, char *types)
 {
-       va_list ap;
-       GSList *types = NULL;
-       char *item;
-
-       va_start (ap, key);
-       do {
-               item = va_arg (ap, char *);
-               if (item)
-                       types = g_slist_prepend (types, item);
-       } while (item);
-       va_end (ap);
-
-       gconf_client_set_list (gconf, key, GCONF_VALUE_STRING, types, NULL);
-       g_slist_free (types);
-}
-
-static void
-free_string (gpointer string, gpointer data)
-{
-       g_free (string);
+       gconf_client_set_string (gconf, key, types, NULL);
 }
 
 void
@@ -122,14 +103,14 @@
                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);
+                                 "Toolbar | Menu | Utility | Dialog | "
+                                 "ModalDialog | Normal");
        } else
-               set_window_types (KEY_WOBBLY_MOVE_WINDOW_TYPES, NULL);
+               set_window_types (KEY_WOBBLY_MOVE_WINDOW_TYPES, "");
 }
 
 static void
-key_wobbly_move_window_types_changed (GSList *types)
+key_wobbly_move_window_types_changed (const char *types)
 {
        GtkToggleButton *toggle = GXGL_WIDGET ("wobbly_windows");
        gboolean active = gtk_toggle_button_get_active (toggle);
@@ -207,10 +188,10 @@
                plugins_activate ("wobbly", NULL);
                gconf_client_set_string (gconf, KEY_WOBBLY_MAP_EFFECT, "Shiver", NULL);
                set_window_types (KEY_WOBBLY_MAP_WINDOW_TYPES,
-                                 "Splash", "Dialog", "ModalDialog", "Normal",
-                                 NULL);
+                                 "Splash | Dialog | ModalDialog | Normal"
+                                 );
        } else
-               set_window_types (KEY_WOBBLY_MAP_WINDOW_TYPES, NULL);
+               set_window_types (KEY_WOBBLY_MAP_WINDOW_TYPES, "");
 }
 
 static void
@@ -223,11 +204,10 @@
                if (active)
                        gtk_toggle_button_set_active (toggle, FALSE);
        } else if (!active) {
-               GSList *types = gconf_client_get_list (gconf, KEY_WOBBLY_MAP_WINDOW_TYPES,
-                                                      GCONF_VALUE_STRING, NULL);
+               gchar *types = gconf_client_get_string (gconf, KEY_WOBBLY_MAP_WINDOW_TYPES,
+                                                      NULL);
                if (types) {
-                       g_slist_foreach (types, free_string, NULL);
-                       g_slist_free (types);
+                       g_free (types);
                        gtk_toggle_button_set_active (toggle, TRUE);
                        plugins_activate ("wobbly", NULL);
                }
@@ -235,7 +215,7 @@
 }
 
 static void
-key_wobbly_map_window_types_changed (GSList *types)
+key_wobbly_map_window_types_changed (const char *types)
 {
        GtkToggleButton *toggle = GXGL_WIDGET ("wobbly_map");
        gboolean active = gtk_toggle_button_get_active (toggle);
@@ -244,8 +224,8 @@
                if (active)
                        gtk_toggle_button_set_active (toggle, FALSE);
        } else if (!active) {
-               char *map_effect = gconf_client_get_string (gconf, KEY_WOBBLY_MAP_EFFECT, NULL);
-               if (map_effect && !strcmp (map_effect, "Shiver")) {
+               gchar *map_effect = gconf_client_get_string (gconf, KEY_WOBBLY_MAP_EFFECT, NULL);
+               if (!strcmp (map_effect, "Shiver")) {
                        gtk_toggle_button_set_active (toggle, active);
                        plugins_activate ("wobbly", NULL);
                }
@@ -261,29 +241,28 @@
 
        if (active) {
                plugins_activate ("wobbly", NULL);
-               gconf_client_set_string (gconf, KEY_WOBBLY_FOCUS_EFFECT, "Shiver", NULL);
+               gconf_client_set_int (gconf, KEY_WOBBLY_FOCUS_EFFECT, 1, NULL);
                set_window_types (KEY_WOBBLY_FOCUS_WINDOW_TYPES,
-                                 "Dialog", "ModalDialog", "Normal",
-                                 NULL);
+                                 "Dialog | ModalDialog | Normal"
+                                 );
        } else
-               set_window_types (KEY_WOBBLY_FOCUS_WINDOW_TYPES, NULL);
+               set_window_types (KEY_WOBBLY_FOCUS_WINDOW_TYPES, "");
 }
 
 static void
-key_wobbly_focus_effect_changed (const char *effect)
+key_wobbly_focus_effect_changed (int effect)
 {
        GtkToggleButton *toggle = GXGL_WIDGET ("wobbly_focus");
        gboolean active = gtk_toggle_button_get_active (toggle);
 
-       if (!strcmp (effect, "None")) {
+       if (effect) {
                if (active)
                        gtk_toggle_button_set_active (toggle, FALSE);
        } else if (!active) {
-               GSList *types = gconf_client_get_list (gconf, KEY_WOBBLY_FOCUS_WINDOW_TYPES,
-                                                      GCONF_VALUE_STRING, NULL);
+               gchar *types = gconf_client_get_string (gconf, KEY_WOBBLY_FOCUS_WINDOW_TYPES,
+                                                      NULL);
                if (types) {
-                       g_slist_foreach (types, free_string, NULL);
-                       g_slist_free (types);
+                       g_free (types);
                        gtk_toggle_button_set_active (toggle, TRUE);
                        plugins_activate ("wobbly", NULL);
                }
@@ -291,7 +270,7 @@
 }
 
 static void
-key_wobbly_focus_window_types_changed (GSList *types)
+key_wobbly_focus_window_types_changed (const char *types)
 {
        GtkToggleButton *toggle = GXGL_WIDGET ("wobbly_focus");
        gboolean active = gtk_toggle_button_get_active (toggle);
@@ -300,12 +279,11 @@
                if (active)
                        gtk_toggle_button_set_active (toggle, FALSE);
        } else if (!active) {
-               char *focus_effect = gconf_client_get_string (gconf, KEY_WOBBLY_FOCUS_EFFECT, NULL);
-               if (focus_effect && !strcmp (focus_effect, "Shiver")) {
+               int focus_effect = gconf_client_get_int (gconf, KEY_WOBBLY_FOCUS_EFFECT, NULL);
+               if (focus_effect) {
                        gtk_toggle_button_set_active (toggle, active);
                        plugins_activate ("wobbly", NULL);
                }
-               g_free (focus_effect);
        }
 }
 #endif
@@ -1192,7 +1170,7 @@
        if (!strcmp (entry->key, KEY_ACTIVE_PLUGINS))
                key_active_plugins_changed (gconf_value_get_list (entry->value));
        else if (!strcmp (entry->key, KEY_WOBBLY_MOVE_WINDOW_TYPES))
-               key_wobbly_move_window_types_changed (gconf_value_get_list (entry->value));
+               key_wobbly_move_window_types_changed (gconf_value_get_string (entry->value));
        else if (!strcmp (entry->key, KEY_WOBBLY_SNAP))
                key_wobbly_snap_changed (gconf_value_get_string (entry->value));
        else if (!strcmp (entry->key, KEY_MOVE_OPACITY))
@@ -1200,12 +1178,12 @@
        else if (!strcmp (entry->key, KEY_WOBBLY_MAP_EFFECT))
                key_wobbly_map_effect_changed (gconf_value_get_string (entry->value));
        else if (!strcmp (entry->key, KEY_WOBBLY_MAP_WINDOW_TYPES))
-               key_wobbly_map_window_types_changed (gconf_value_get_list (entry->value));
+               key_wobbly_map_window_types_changed (gconf_value_get_string (entry->value));
 #if 0
        else if (!strcmp (entry->key, KEY_WOBBLY_FOCUS_EFFECT))
-               key_wobbly_focus_effect_changed (gconf_value_get_string (entry->value));
+               key_wobbly_focus_effect_changed (gconf_value_get_int (entry->value));
        else if (!strcmp (entry->key, KEY_WOBBLY_FOCUS_WINDOW_TYPES))
-               key_wobbly_focus_window_types_changed (gconf_value_get_list (entry->value));
+               key_wobbly_focus_window_types_changed (gconf_value_get_string (entry->value));
 #endif
        else if (!strcmp (entry->key, KEY_OPACITY_INCREASE))
                key_opacity_changed (gconf_value_get_string (entry->value));


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread