SF.net SVN: geany: [2321] branches/plugin-keybindings

[ntrel at users.sourceforge.net]

Revision: 2321
          http://geany.svn.sourceforge.net/geany/?rev=2321&view=rev
Author:   ntrel
Date:     2008-03-10 06:54:47 -0700 (Mon, 10 Mar 2008)

Log Message:
-----------
Load keybindings keyfile after plugins have loaded at startup, so
their shortcuts are also loaded. Still to do: loading individual
plugin keybindings after startup.

Modified Paths:
--------------
    branches/plugin-keybindings/ChangeLog
    branches/plugin-keybindings/src/keybindings.c
    branches/plugin-keybindings/src/keybindings.h
    branches/plugin-keybindings/src/main.c

Modified: branches/plugin-keybindings/ChangeLog
===================================================================
--- branches/plugin-keybindings/ChangeLog	2008-03-10 13:35:30 UTC (rev 2320)
+++ branches/plugin-keybindings/ChangeLog	2008-03-10 13:54:47 UTC (rev 2321)
@@ -11,6 +11,10 @@
    Make keybindings_send_command() take guint parameters, not gint.
  * src/plugindata.h:
    Avoid including keybindings.h.
+ * src/keybindings.c, src/keybindings.h, src/main.c:
+   Load keybindings keyfile after plugins have loaded at startup, so
+   their shortcuts are also loaded. Still to do: loading individual
+   plugin keybindings after startup.
 
 
 2008-03-07  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Modified: branches/plugin-keybindings/src/keybindings.c
===================================================================
--- branches/plugin-keybindings/src/keybindings.c	2008-03-10 13:35:30 UTC (rev 2320)
+++ branches/plugin-keybindings/src/keybindings.c	2008-03-10 13:54:47 UTC (rev 2321)
@@ -476,6 +476,11 @@
 	keybinding_groups = g_ptr_array_sized_new(GEANY_KEYGROUP_COUNT);
 
 	init_default_kb();
+}
+
+
+void keybindings_load_keyfile(void)
+{
 	load_user_kb();
 	add_menu_accels();
 }

Modified: branches/plugin-keybindings/src/keybindings.h
===================================================================
--- branches/plugin-keybindings/src/keybindings.h	2008-03-10 13:35:30 UTC (rev 2320)
+++ branches/plugin-keybindings/src/keybindings.h	2008-03-10 13:54:47 UTC (rev 2321)
@@ -252,6 +252,8 @@
 
 void keybindings_init(void);
 
+void keybindings_load_keyfile(void);
+
 void keybindings_free(void);
 
 void keybindings_set_item(KeyBindingGroup *group, gsize key_id,

Modified: branches/plugin-keybindings/src/main.c
===================================================================
--- branches/plugin-keybindings/src/main.c	2008-03-10 13:35:30 UTC (rev 2320)
+++ branches/plugin-keybindings/src/main.c	2008-03-10 13:54:47 UTC (rev 2321)
@@ -853,6 +853,9 @@
 		plugins_init();
 #endif
 
+	/* load keybinding settings after plugins have added their groups */
+	keybindings_load_keyfile();
+
 	/* load any command line files or session files */
 	main_status.opening_session_files = TRUE;
 	if (! open_cl_files(argc, argv))


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