diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:58:29 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:58:29 +0100 |
commit | 0cf2f20608308acdf3cb922c3736446bbd8f3388 (patch) | |
tree | 07815070629c7c11000a7f51ceb8ccbccb49a809 /gnome-extra/gconf-editor/files | |
parent | 1798c4aeca70ac8d0a243684d6a798fbc65735f8 (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'gnome-extra/gconf-editor/files')
-rw-r--r-- | gnome-extra/gconf-editor/files/gconf-editor-3.0.1-assertion-crash.patch | 34 | ||||
-rw-r--r-- | gnome-extra/gconf-editor/files/gconf-editor-3.0.1-drop-accel.patch | 66 |
2 files changed, 0 insertions, 100 deletions
diff --git a/gnome-extra/gconf-editor/files/gconf-editor-3.0.1-assertion-crash.patch b/gnome-extra/gconf-editor/files/gconf-editor-3.0.1-assertion-crash.patch deleted file mode 100644 index b7df8f51007d..000000000000 --- a/gnome-extra/gconf-editor/files/gconf-editor-3.0.1-assertion-crash.patch +++ /dev/null @@ -1,34 +0,0 @@ -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 diff --git a/gnome-extra/gconf-editor/files/gconf-editor-3.0.1-drop-accel.patch b/gnome-extra/gconf-editor/files/gconf-editor-3.0.1-drop-accel.patch deleted file mode 100644 index 0d79ec56c396..000000000000 --- a/gnome-extra/gconf-editor/files/gconf-editor-3.0.1-drop-accel.patch +++ /dev/null @@ -1,66 +0,0 @@ -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 |