File gnome-xgl-settings-0.9-compiz-0.5.4-update.diff of Package compiz

Overview Repositories Revisions Requests Users Attributes Meta

File gnome-xgl-settings-0.9-compiz-0.5.4-update.diff of Package compiz (Revision 57bb13d2d91065cf3b100b82338920be)

Currently displaying revision 57bb13d2d91065cf3b100b82338920be , Show latest

--- ../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-09-06 12:34:40.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;
 
@@ -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;
+
 	for (i = 0; supports[i].plugin; i++) {
 		if (!strcmp (supports[i].plugin, plugin) &&
 		    !strcmp (supports[i].other, other))
@@ -185,6 +185,7 @@
 plugin_requires (const char *plugin, const char *other)
 {
 	int i;
+
 	for (i = 0; requires[i].plugin; i++) {
 		if (!strcmp (requires[i].plugin, plugin) &&
 		    !strcmp (requires[i].other, other))
--- ../gnome-xgl-settings-0.9/xgl-settings/settings.c	2007-02-01 12:43:01.000000000 -0500
+++ ./xgl-settings/settings.c	2007-08-20 11:03:14.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,27 +188,26 @@
 		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
-key_wobbly_map_effect_changed (const char *effect)
+key_wobbly_map_effect_changed (int effect)
 {
 	GtkToggleButton *toggle = GXGL_WIDGET ("wobbly_map");
 	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_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,12 +224,11 @@
 		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")) {
+		int map_effect = gconf_client_get_int (gconf, KEY_WOBBLY_MAP_EFFECT, NULL);
+		if (map_effect) {
 			gtk_toggle_button_set_active (toggle, active);
 			plugins_activate ("wobbly", NULL);
 		}
-		g_free (map_effect);
 	}
 }
 
@@ -261,29 +240,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 +269,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 +278,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
@@ -830,23 +807,21 @@
 void
 scale_corner_changed (GtkComboBox *combo, gpointer user_data)
 {
-	GSList *types;
+	gchar *types;
 
 	if (gtk_toggle_button_get_active (GXGL_WIDGET ("scale_enable_corner"))) {
-		types = g_slist_prepend (NULL, corner_values[gtk_combo_box_get_active (combo)]);
-		gconf_client_set_list (gconf, KEY_SCALE_CORNERS, GCONF_VALUE_STRING, types, NULL);
-		g_slist_free (types);
+		types = corner_values[gtk_combo_box_get_active (combo)];
+		gconf_client_set_string (gconf, KEY_SCALE_CORNERS, types, NULL);
 	}
 }
 
 static void
-key_scale_corners_changed (GSList *corners)
+key_scale_corners_changed (const gchar *corner)
 {
 	GtkToggleButton *toggle = GXGL_WIDGET ("scale_enable_corner");
 	gboolean active = gtk_toggle_button_get_active (toggle);
 
-	if (corners != NULL) {
-		const char *corner = gconf_value_get_string (corners->data);
+	if (corner != NULL) {
 		GtkComboBox *combo = GXGL_WIDGET ("scale_corner");
 		int i;
 
@@ -877,7 +852,7 @@
 		plugins_activate ("scale", NULL);
 		scale_corner_changed (GXGL_WIDGET ("scale_corner"), user_data);
 	} else
-		gconf_client_set_list (gconf, KEY_SCALE_CORNERS, GCONF_VALUE_STRING, NULL, NULL);
+		gconf_client_set_string (gconf, KEY_SCALE_CORNERS, "", NULL);
 }
 
 static void
@@ -1192,20 +1167,20 @@
 	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))
 		key_move_opacity_changed (gconf_value_get_int (entry->value));
 	else if (!strcmp (entry->key, KEY_WOBBLY_MAP_EFFECT))
-		key_wobbly_map_effect_changed (gconf_value_get_string (entry->value));
+		key_wobbly_map_effect_changed (gconf_value_get_int (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));
@@ -1226,7 +1201,7 @@
 	else if (!strcmp (entry->key, KEY_SCALE_INITIATE))
 		key_scale_initiate_changed (gconf_value_get_string (entry->value));
 	else if (!strcmp (entry->key, KEY_SCALE_CORNERS))
-		key_scale_corners_changed (gconf_value_get_list (entry->value));
+		key_scale_corners_changed (gconf_value_get_string (entry->value));
 	else if (!strcmp (entry->key, KEY_ZOOM_INITIATE))
 		key_zoom_initiate_changed (gconf_value_get_string (entry->value));
 	else if (!strcmp (entry->key, KEY_ZOOM_IN))

Places

File gnome-xgl-settings-0.9-compiz-0.5.4-update.diff of Package compiz (Revision 57bb13d2d91065cf3b100b82338920be)

Places