Commits March 2008

commits@lists.geany.org

3 participants
133 discussions

SF.net SVN: geany: [2301] branches/plugin-keybindings
by ntrel＠users.sourceforge.net 03 Mar '08

03 Mar '08

Revision: 2301 http://geany.svn.sourceforge.net/geany/?rev=2301&view=rev Author: ntrel Date: 2008-03-03 09:28:15 -0800 (Mon, 03 Mar 2008) Log Message: ----------- Re-enable focus commands in the VTE. Modified Paths: -------------- branches/plugin-keybindings/ChangeLog branches/plugin-keybindings/src/keybindings.c Modified: branches/plugin-keybindings/ChangeLog =================================================================== --- branches/plugin-keybindings/ChangeLog 2008-03-03 17:05:00 UTC (rev 2300) +++ branches/plugin-keybindings/ChangeLog 2008-03-03 17:28:15 UTC (rev 2301) @@ -3,6 +3,8 @@ * src/prefs.c: Fix segfault when setting custom keybindings in Prefs dialog. Fix clearing a shortcut when overriding it in Prefs dialog. + * src/keybindings.c: + Re-enable focus commands in the VTE. 2008-02-29 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: branches/plugin-keybindings/src/keybindings.c =================================================================== --- branches/plugin-keybindings/src/keybindings.c 2008-03-03 17:05:00 UTC (rev 2300) +++ branches/plugin-keybindings/src/keybindings.c 2008-03-03 17:28:15 UTC (rev 2301) @@ -798,7 +798,7 @@ static gboolean check_vte(GdkModifierType state, guint keyval) { - /*guint i;*/ + guint i; GtkWidget *widget; if (! vc->enable_bash_keys) @@ -811,14 +811,14 @@ if (state == 0 && (keyval < GDK_F1 || keyval > GDK_F35)) /* e.g. backspace */ return FALSE; -#if 0 /* tmp */ /* make focus commands override any bash commands */ - for (i = GEANY_KEYS_GROUP_FOCUS; i < GEANY_KEYS_GROUP_TABS; i++) + for (i = 0; i < GEANY_KEYS_FOCUS_COUNT; i++) { - if (state == keys[i]->mods && keyval == keys[i]->key) + KeyBinding *kb = keybindings_lookup_item(GEANY_KEYGROUP_FOCUS, i); + + if (state == kb->mods && keyval == kb->key) return FALSE; } -#endif /* Temporarily disable the menus to prevent conflicting menu accelerators * from overriding the VTE bash shortcuts. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2300] branches/plugin-keybindings
by ntrel＠users.sourceforge.net 03 Mar '08

03 Mar '08

Revision: 2300 http://geany.svn.sourceforge.net/geany/?rev=2300&view=rev Author: ntrel Date: 2008-03-03 09:05:00 -0800 (Mon, 03 Mar 2008) Log Message: ----------- Fix clearing a shortcut when overriding it in Prefs dialog. Modified Paths: -------------- branches/plugin-keybindings/ChangeLog branches/plugin-keybindings/src/prefs.c Modified: branches/plugin-keybindings/ChangeLog =================================================================== --- branches/plugin-keybindings/ChangeLog 2008-03-03 16:53:12 UTC (rev 2299) +++ branches/plugin-keybindings/ChangeLog 2008-03-03 17:05:00 UTC (rev 2300) @@ -2,6 +2,7 @@ * src/prefs.c: Fix segfault when setting custom keybindings in Prefs dialog. + Fix clearing a shortcut when overriding it in Prefs dialog. 2008-02-29 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: branches/plugin-keybindings/src/prefs.c =================================================================== --- branches/plugin-keybindings/src/prefs.c 2008-03-03 16:53:12 UTC (rev 2299) +++ branches/plugin-keybindings/src/prefs.c 2008-03-03 17:05:00 UTC (rev 2300) @@ -1241,7 +1241,7 @@ return; /* find child kb node*/ - if (! find_child_iter(&parent, group_id, &child)) + if (! find_child_iter(&parent, keybinding_id, &child)) return; gtk_tree_store_set(store, &child, KB_TREE_SHORTCUT, NULL, -1); /* clear shortcut */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2299] branches/plugin-keybindings
by ntrel＠users.sourceforge.net 03 Mar '08

03 Mar '08

Revision: 2299 http://geany.svn.sourceforge.net/geany/?rev=2299&view=rev Author: ntrel Date: 2008-03-03 08:53:12 -0800 (Mon, 03 Mar 2008) Log Message: ----------- Fix segfault when setting custom keybindings in Prefs dialog. Modified Paths: -------------- branches/plugin-keybindings/ChangeLog branches/plugin-keybindings/src/prefs.c Modified: branches/plugin-keybindings/ChangeLog =================================================================== --- branches/plugin-keybindings/ChangeLog 2008-02-29 22:26:30 UTC (rev 2298) +++ branches/plugin-keybindings/ChangeLog 2008-03-03 16:53:12 UTC (rev 2299) @@ -1,3 +1,9 @@ +2008-03-03 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/prefs.c: + Fix segfault when setting custom keybindings in Prefs dialog. + + 2008-02-29 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/build.c, src/keybindings.c, src/keybindings.h, src/tools.c, Modified: branches/plugin-keybindings/src/prefs.c =================================================================== --- branches/plugin-keybindings/src/prefs.c 2008-02-29 22:26:30 UTC (rev 2298) +++ branches/plugin-keybindings/src/prefs.c 2008-03-03 16:53:12 UTC (rev 2299) @@ -1119,7 +1119,7 @@ /* lookup the parent to get group index */ gtk_tree_model_iter_parent(GTK_TREE_MODEL(store), &parent, iter); - gtk_tree_model_get(GTK_TREE_MODEL(store), iter, KB_TREE_INDEX, &group_idx, -1); + gtk_tree_model_get(GTK_TREE_MODEL(store), &parent, KB_TREE_INDEX, &group_idx, -1); return keybindings_lookup_item(group_idx, keybinding_idx); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits March 2008