SF.net SVN: geany: [2441] trunk

[eht16 at users.sourceforge.net]

Revision: 2441
          http://geany.svn.sourceforge.net/geany/?rev=2441&view=rev
Author:   eht16
Date:     2008-04-03 08:12:54 -0700 (Thu, 03 Apr 2008)

Log Message:
-----------
Fix missing menu accelerators for default keybindings on startup.

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-04-02 18:12:28 UTC (rev 2440)
+++ trunk/ChangeLog	2008-04-03 15:12:54 UTC (rev 2441)
@@ -1,3 +1,9 @@
+2008-04-03  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
+
+ * src/keybindings.c:
+   Fix missing menu accelerators for default keybindings on startup.
+
+
 2008-04-02  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
 
  * src/dialogs.c:

Modified: trunk/src/keybindings.c
===================================================================
--- trunk/src/keybindings.c	2008-04-02 18:12:28 UTC (rev 2440)
+++ trunk/src/keybindings.c	2008-04-03 15:12:54 UTC (rev 2441)
@@ -97,6 +97,7 @@
 static void cb_func_toggle_sidebar(guint key_id);
 
 static void add_popup_menu_accels(void);
+static void apply_kb_accel(KeyBinding *kb);
 
 
 /** Simple convenience function to fill a KeyBinding struct item */
@@ -116,6 +117,8 @@
 	kb->mods = mod;
 	kb->callback = callback;
 	kb->menu_item = menu_item;
+
+	apply_kb_accel(kb);
 }
 
 
@@ -315,7 +318,7 @@
 		GDK_g, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "menu_findprevious", _("Find Previous"),
 		LW(find_previous1));
 	keybindings_set_item(group, GEANY_KEYS_SEARCH_FINDNEXTSEL, cb_func_search_action,
-		0, 0, "menu_findnextsel", _("Find Next Selection"),LW(find_nextsel1));
+		0, 0, "menu_findnextsel", _("Find Next Selection"), LW(find_nextsel1));
 	keybindings_set_item(group, GEANY_KEYS_SEARCH_FINDPREVSEL, cb_func_search_action,
 		0, 0, "menu_findprevsel", _("Find Previous Selection"), LW(find_prevsel1));
 	keybindings_set_item(group, GEANY_KEYS_SEARCH_REPLACE, cb_func_search_action,
@@ -449,9 +452,10 @@
 {
 	keybinding_groups = g_ptr_array_sized_new(GEANY_KEY_GROUP_COUNT);
 
+	kb_accel_group = gtk_accel_group_new();
+
 	init_default_kb();
 
-	kb_accel_group = gtk_accel_group_new();
 	gtk_window_add_accel_group(GTK_WINDOW(app->window), kb_accel_group);
 }
 


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