Revision: 1928 http://geany.svn.sourceforge.net/geany/?rev=1928&view=rev Author: ntrel Date: 2007-10-03 04:21:08 -0700 (Wed, 03 Oct 2007)

Log Message: ----------- Fix segfault when manually editing a keybinding and selecting another item.

Modified Paths: -------------- trunk/ChangeLog trunk/src/prefs.c

Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-10-02 16:20:44 UTC (rev 1927) +++ trunk/ChangeLog 2007-10-03 11:21:08 UTC (rev 1928) @@ -1,3 +1,10 @@ +2007-10-03 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/prefs.c: + Fix segfault when manually editing a keybinding and selecting another + item. + + 2007-10-02 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>

* src/notebook.c:

Modified: trunk/src/prefs.c =================================================================== --- trunk/src/prefs.c 2007-10-02 16:20:44 UTC (rev 1927) +++ trunk/src/prefs.c 2007-10-03 11:21:08 UTC (rev 1928) @@ -980,12 +980,12 @@

gtk_accelerator_parse(new_text, &lkey, &lmods);

+ // get index + gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, 2, &idx, -1); + if (find_duplicate(idx, lkey, lmods, new_text)) return;

- // get index - gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, 2, &idx, -1); - // set the values here, because of the above check, setting it in gtk_accelerator_parse would // return a wrong key combination if it is duplicate keys[idx]->key = lkey;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.