gnome 2.6 commit

6 files changed, 142 insertions, 6 deletions

diff --git a/gnome-extra/gconf-editor/ChangeLog b/gnome-extra/gconf-editor/ChangeLog
index edfbeebb2bc3..135867c29b9c 100644
--- a/gnome-extra/gconf-editor/ChangeLog
+++ b/gnome-extra/gconf-editor/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/gconf-editor
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gconf-editor/ChangeLog,v 1.24 2004/03/21 15:32:42 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gconf-editor/ChangeLog,v 1.25 2004/03/28 17:08:10 foser Exp $
+
+*gconf-editor-2.6.0 (28 Mar 2004)
+
+  28 Mar 2004; foser <foser@gentoo.org> gconf-editor-2.6.0.ebuild :
+  Gnome 2.6 final
+  Add patch to fix regression caused by http://bugzilla.gnome.org/show_bug.cgi?id=96744
 
 *gconf-editor-2.5.92 (21 Mar 2004)
 
diff --git a/gnome-extra/gconf-editor/Manifest b/gnome-extra/gconf-editor/Manifest
index 7291ce1ce627..ef831e9054ca 100644
--- a/gnome-extra/gconf-editor/Manifest
+++ b/gnome-extra/gconf-editor/Manifest
@@ -1,6 +1,7 @@
 MD5 131cf7e01b6bab1c6d696040181a2174 gconf-editor-2.4.0.ebuild 582
-MD5 3e2a12cd70059877dfa2d31d28721fe9 gconf-editor-2.5.92.ebuild 634
-MD5 0a6203f057070d2d372933f5e9cb5bcb ChangeLog 2766
+MD5 0bd7e793c28a330efcc5ddcba5740bdb gconf-editor-2.6.0.ebuild 856
+MD5 98ac421e0962dee00aba0f3fef6f1476 ChangeLog 2976
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 82611faacd619c31934fba15905b1947 files/digest-gconf-editor-2.5.92 72
 MD5 a2b72e9cea80bfd300183397a4487a72 files/digest-gconf-editor-2.4.0 71
+MD5 e1005344b4be9e39de4829d91f0c2aba files/digest-gconf-editor-2.6.0 71
+MD5 d82811e98599090bb20b4e7173356556 files/gconf-editor-2.6.0-revert_escape_cjk.patch 3887
diff --git a/gnome-extra/gconf-editor/files/digest-gconf-editor-2.5.92 b/gnome-extra/gconf-editor/files/digest-gconf-editor-2.5.92
deleted file mode 100644
index 1d8e52832422..000000000000
--- a/gnome-extra/gconf-editor/files/digest-gconf-editor-2.5.92
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2252bd7dddae094b287bbc911d6f8abf gconf-editor-2.5.92.tar.bz2 369646
diff --git a/gnome-extra/gconf-editor/files/digest-gconf-editor-2.6.0 b/gnome-extra/gconf-editor/files/digest-gconf-editor-2.6.0
new file mode 100644
index 000000000000..aa4582c27697
--- /dev/null
+++ b/gnome-extra/gconf-editor/files/digest-gconf-editor-2.6.0
@@ -0,0 +1 @@
+MD5 456d5dbddefffe7b49f18688aa9c1975 gconf-editor-2.6.0.tar.bz2 372032
diff --git a/gnome-extra/gconf-editor/files/gconf-editor-2.6.0-revert_escape_cjk.patch b/gnome-extra/gconf-editor/files/gconf-editor-2.6.0-revert_escape_cjk.patch
new file mode 100644
index 000000000000..00b43cb3150b
--- /dev/null
+++ b/gnome-extra/gconf-editor/files/gconf-editor-2.6.0-revert_escape_cjk.patch
@@ -0,0 +1,118 @@
+Index: gconf-editor-window.c
+===================================================================
+RCS file: /cvs/gnome/gconf-editor/src/gconf-editor-window.c,v
+retrieving revision 1.35
+diff -u -p -r1.35 gconf-editor-window.c
+--- gconf-editor-window.c	22 Aug 2002 13:05:30 -0000	1.35
++++ gconf-editor-window.c	7 Nov 2002 00:55:52 -0000
+@@ -455,7 +455,7 @@ gconf_editor_window_selection_changed (G
+ 	if (selection == NULL)
+ 		gtk_window_set_title (GTK_WINDOW (window), _("GConf editor"));
+ 	else {
+-		gchar *name, *title, *path;
++	  	gchar *name, *title, *path, *escape_path;
+ 		GtkTreeIter child_iter;
+ 
+ 		if (!gtk_tree_selection_get_selected (selection, NULL, &iter)) {
+@@ -478,8 +478,11 @@ gconf_editor_window_selection_changed (G
+ 		gtk_statusbar_pop (GTK_STATUSBAR (window->statusbar), 0);
+ 		gtk_statusbar_push (GTK_STATUSBAR (window->statusbar), 0, path);
+ 
+-		gconf_list_model_set_root_path (GCONF_LIST_MODEL (window->list_model), path);
++		escape_path = gconf_tree_model_get_gconf_escape_path (path);
++		
++		gconf_list_model_set_root_path (GCONF_LIST_MODEL (window->list_model), escape_path);
+ 
++		g_free (escape_path);
+ 		g_free (path);
+ 
+ 	}
+Index: gconf-tree-model.c
+===================================================================
+RCS file: /cvs/gnome/gconf-editor/src/gconf-tree-model.c,v
+retrieving revision 1.12
+diff -u -p -r1.12 gconf-tree-model.c
+--- gconf-tree-model.c	9 Sep 2002 07:11:46 -0000	1.12
++++ gconf-tree-model.c	7 Nov 2002 00:55:52 -0000
+@@ -104,17 +104,43 @@ gconf_tree_model_get_gconf_name (GConfTr
+ 	return g_strdup (ptr);
+ }
+ 
++gchar *
++gconf_tree_model_get_gconf_escape_path (gchar *node_path)
++{
++	gchar *ptr;
++	gchar *escape_key;
++	gchar *escape_node_path;
++	gchar *node_dir;
++
++	ptr = node_path + strlen (node_path);
++
++	while (ptr[-1] != '/')
++		ptr--;
++
++	escape_key = gconf_escape_key (ptr, -1);
++
++	node_dir = g_strndup (node_path, ptr - node_path);
++	escape_node_path = g_strconcat (node_dir, escape_key, NULL);
++	g_free (node_dir);
++	g_free (escape_key);
++
++	return escape_node_path;
++
++}
+ static gboolean
+ gconf_tree_model_build_level (GConfTreeModel *model, Node *parent_node, gboolean emit_signals)
+ {
+ 	GSList *list, *tmp;
+ 	Node *tmp_node = NULL;
+ 	gint i = 0;
++	gchar *escape_key;
+ 
+ 	if (parent_node->children)
+ 		return FALSE;
+ 
+-	list = gconf_client_all_dirs (model->client, parent_node->path, NULL);
++	escape_key = gconf_tree_model_get_gconf_escape_path (parent_node->path);
++	list = gconf_client_all_dirs (model->client, escape_key, NULL);
++	g_free (escape_key);
+ 
+ 	if (!list)
+ 		return FALSE;
+@@ -125,7 +151,8 @@ gconf_tree_model_build_level (GConfTreeM
+ 		node = g_new0 (Node, 1);
+ 		node->offset = i;
+ 		node->parent = parent_node;
+-		node->path = tmp->data;
++		node->path = gconf_unescape_key (tmp->data, -1);
++		g_free (tmp->data);
+ 
+ 		if (tmp_node) {
+ 			tmp_node->next = node;
+@@ -402,8 +429,11 @@ gconf_tree_model_iter_has_child (GtkTree
+ 	GConfTreeModel *model = (GConfTreeModel *)tree_model;
+ 	Node *node = iter->user_data;
+ 	GSList *list;
++	gchar *escape_key;
+ 
+-	list = gconf_client_all_dirs (model->client, node->path, NULL);
++	escape_key = gconf_tree_model_get_gconf_escape_path (node->path);
++	list = gconf_client_all_dirs (model->client, escape_key, NULL);
++	g_free (escape_key);
+ 
+ 	if (list == NULL)
+ 		return FALSE;
+Index: gconf-tree-model.h
+===================================================================
+RCS file: /cvs/gnome/gconf-editor/src/gconf-tree-model.h,v
+retrieving revision 1.2
+diff -u -p -r1.2 gconf-tree-model.h
+--- gconf-tree-model.h	14 Jan 2002 18:13:05 -0000	1.2
++++ gconf-tree-model.h	7 Nov 2002 00:55:52 -0000
+@@ -62,4 +62,6 @@ gchar *gconf_tree_model_get_gconf_path (
+ 
+ GtkTreePath *gconf_tree_model_get_tree_path_from_gconf_path (GConfTreeModel *tree_model, const char *path);
+ 
++gchar *gconf_tree_model_get_gconf_escape_path (gchar *node_path);
++
+ #endif /* __GCONF_TREE_MODEL_H__ */
diff --git a/gnome-extra/gconf-editor/gconf-editor-2.5.92.ebuild b/gnome-extra/gconf-editor/gconf-editor-2.6.0.ebuild
index 39406b871bb3..2eb251ed4d94 100644
--- a/gnome-extra/gconf-editor/gconf-editor-2.5.92.ebuild
+++ b/gnome-extra/gconf-editor/gconf-editor-2.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gconf-editor/gconf-editor-2.5.92.ebuild,v 1.1 2004/03/21 15:32:42 foser Exp $ 
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gconf-editor/gconf-editor-2.6.0.ebuild,v 1.1 2004/03/28 17:08:10 foser Exp $ 
 
 inherit gnome2
 
@@ -20,3 +20,14 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9"
 
 DOCS="AUTHORS ChangeLog COPYING README INSTALL NEWS"
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+
+	# Fix gconf-editor not showing some keys anymore
+	# http://bugzilla.gnome.org/show_bug.cgi?id=135807
+	EPATCH_OPTS="-d ${S}/src -R" epatch ${FILESDIR}/${P}-revert_escape_cjk.patch
+
+}