[gentoo-commits] gentoo-x86 commit in gnome-extra/gconf-editor/files: gconf-editor-3.0.1-assertion-crash.patch gconf-editor-3.0.1-drop-accel.patch

[gentoo-commits] gentoo-x86 commit in gnome-extra/gconf-editor/files: gconf-editor-3.0.1-assertion-crash.patch gconf-editor-3.0.1-drop-accel.patch

[Pacho Ramos (pacho)]

pacho       13/07/11 20:02:06

  Added:                gconf-editor-3.0.1-assertion-crash.patch
                        gconf-editor-3.0.1-drop-accel.patch
  Log:
  Apply upstream patches to fix crasher (#476248 by Mike Johnson) and don't load accel maps.
  
  (Portage version: 2.1.12.11/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

Revision  Changes    Path
1.1                  gnome-extra/gconf-editor/files/gconf-editor-3.0.1-assertion-crash.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/gconf-editor/files/gconf-editor-3.0.1-assertion-crash.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/gconf-editor/files/gconf-editor-3.0.1-assertion-crash.patch?rev=1.1&content-type=text/plain

Index: gconf-editor-3.0.1-assertion-crash.patch
===================================================================
From 25d823099337f7ede4782f46fea46f251646dc3e Mon Sep 17 00:00:00 2001
From: Edward Sheldrake <ejsheldrake@gmail.com>
Date: Wed, 11 Apr 2012 07:27:16 +0000
Subject: Fix assertion failed crash

Fix "assertion failed: (last_slash != NULL)" crash while navigating the
left tree view, fixed by having the model for the right list view emit
all the row deleted signals before deleting any of its data.

Fixes https://bugzilla.gnome.org/show_bug.cgi?id=670586
---
diff --git a/src/gconf-list-model.c b/src/gconf-list-model.c
index 27e1af6..4fc60f8 100644
--- a/src/gconf-list-model.c
+++ b/src/gconf-list-model.c
@@ -133,11 +133,14 @@ gconf_list_model_set_root_path (GConfListModel *model, const gchar *root_path)
 
 	if (model->root_path != NULL) {
 		for (list = model->values; list; list = list->next) {
+			model->stamp++;
+			gtk_tree_model_row_deleted (GTK_TREE_MODEL (model), path);
+		}
+
+		for (list = model->values; list; list = list->next) {
 			GConfEntry *entry = list->data;
 
 			g_hash_table_remove (model->key_hash, gconf_entry_get_key (entry));
-			model->stamp++;
-			gtk_tree_model_row_deleted (GTK_TREE_MODEL (model), path);
 
 			gconf_entry_unref (entry);
 		}
--
cgit v0.9.2



1.1                  gnome-extra/gconf-editor/files/gconf-editor-3.0.1-drop-accel.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/gconf-editor/files/gconf-editor-3.0.1-drop-accel.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/gconf-editor/files/gconf-editor-3.0.1-drop-accel.patch?rev=1.1&content-type=text/plain

Index: gconf-editor-3.0.1-drop-accel.patch
===================================================================
From 62e68d8e2f6e2c473820113fbf46ced9f77111d4 Mon Sep 17 00:00:00 2001
From: William Jon McCann <jmccann@redhat.com>
Date: Thu, 03 May 2012 18:10:53 +0000
Subject: Drop use GTK accel maps

They are confusing, weird, and stored in an obsolete location.

https://bugzilla.gnome.org/show_bug.cgi?id=675392
---
diff --git a/src/main.c b/src/main.c
index 8da5ccc..9bce4b8 100644
--- a/src/main.c
+++ b/src/main.c
@@ -26,34 +26,6 @@
 #include "gconf-stock-icons.h"
 #include "gconf-editor-window.h"
 
-static char *
-build_accel_filename (void)
-{
-	return g_build_filename (g_get_home_dir (), ".gnome2", "accels", PACKAGE, NULL);
-}
-
-static void
-load_accel_map (void)
-{
-	char *map;
-
-	map = build_accel_filename ();
-	gtk_accel_map_load (map);
-
-	g_free (map);
-}
-
-static void
-save_accel_map (void)
-{
-	char *map;
-
-	map = build_accel_filename ();
-	gtk_accel_map_save (map);
-
-	g_free (map);
-}
-
 gint
 main (gint argc, gchar **argv)
 {
@@ -92,7 +64,6 @@ main (gint argc, gchar **argv)
 	/* Register our stock icons */
         gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (), ICONDIR);
 	gconf_stock_icons_register ();
-	load_accel_map ();
 
         gtk_window_set_default_icon_name ("gconf-editor");
 
@@ -107,7 +78,6 @@ main (gint argc, gchar **argv)
 	
 	gtk_main ();
 
-	save_accel_map ();
 	g_strfreev (remaining_args);
 
 	return 0;
--
cgit v0.9.2