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

[ntrel at users.sourceforge.net]

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

Log Message:
-----------
Avoid including keybindings.h.

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

Modified: branches/plugin-keybindings/ChangeLog
===================================================================
--- branches/plugin-keybindings/ChangeLog	2008-03-10 13:29:35 UTC (rev 2319)
+++ branches/plugin-keybindings/ChangeLog	2008-03-10 13:35:30 UTC (rev 2320)
@@ -9,6 +9,8 @@
    does nothing).
  * src/keybindings.c, src/keybindings.h, src/plugindata.h:
    Make keybindings_send_command() take guint parameters, not gint.
+ * src/plugindata.h:
+   Avoid including keybindings.h.
 
 
 2008-03-07  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Modified: branches/plugin-keybindings/src/plugindata.h
===================================================================
--- branches/plugin-keybindings/src/plugindata.h	2008-03-10 13:29:35 UTC (rev 2319)
+++ branches/plugin-keybindings/src/plugindata.h	2008-03-10 13:35:30 UTC (rev 2320)
@@ -22,12 +22,6 @@
  * $Id$
  */
 
-#ifndef PLUGIN_H
-#define PLUGIN_H
-
-#include "keybindings.h"	/* needed for KeyCallback typedef */
-
-
 /**
  *  @file plugindata.h
  *  This file defines the plugin API, the interface between Geany and its plugins.
@@ -36,6 +30,9 @@
  **/
 
 
+#ifndef PLUGIN_H
+#define PLUGIN_H
+
 /* The API version should be incremented whenever any plugin data types below are
  * modified or appended to. */
 static const gint api_version = 48;
@@ -332,11 +329,14 @@
 EncodingFuncs;
 
 
+struct KeyBindingGroup;
+typedef void (*_KeyCallback) (guint key_id);
+
 typedef struct KeybindingFuncs
 {
 	void		(*send_command) (guint group_id, guint key_id);
 	void		(*set_item) (struct KeyBindingGroup *group, gsize key_id,
-					KeyCallback callback, guint key, GdkModifierType mod,
+					_KeyCallback callback, guint key, GdkModifierType mod,
 					const gchar *name, const gchar *label, GtkWidget *menu_item);
 }
 KeybindingFuncs;


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