[geany/geany-plugins] 72619b: Merge branch 'codenav/less-deprecated' of https://github.com/b4n/geany-plugins

[Jiří Techet]

Branch:      refs/heads/master
Author:      Jiří Techet <techet at gmail.com>
Committer:   Jiří Techet <techet at gmail.com>
Date:        Thu, 09 Jun 2016 09:29:28 UTC
Commit:      72619b1a23454632c56df4e0a267f5015cd1ae29
             https://github.com/geany/geany-plugins/commit/72619b1a23454632c56df4e0a267f5015cd1ae29

Log Message:
-----------
Merge branch 'codenav/less-deprecated' of https://github.com/b4n/geany-plugins

Conflicts:
	codenav/src/codenavigation.h


Modified Paths:
--------------
    codenav/src/codenavigation.c
    codenav/src/codenavigation.h

Modified: codenav/src/codenavigation.c
8 lines changed, 4 insertions(+), 4 deletions(-)
===================================================================
@@ -44,10 +44,6 @@ PLUGIN_SET_TRANSLATABLE_INFO(
 	_(	"This plugin adds features to facilitate navigation between source files."), 
 	CODE_NAVIGATION_VERSION, "Lionel Fuentes, Federico Reghenzani")
 
-/* Declare "GeanyKeyGroupInfo plugin_key_group_info[1]" and "GeanyKeyGroup *plugin_key_group",
- * for Geany to find the keybindings */
-PLUGIN_KEY_GROUP(code_navigation, NB_KEY_IDS)
-
 
 /********************* Data types for the feature *********************/
 /* Column for the configuration widget */
@@ -64,6 +60,8 @@ typedef enum
 GeanyPlugin		*geany_plugin;
 GeanyData		*geany_data;
 
+GeanyKeyGroup *plugin_key_group;
+
 static GtkListStore *list_store;	/* for settings dialog */
 
 
@@ -100,6 +98,8 @@ void plugin_init(GeanyData *data)
 {
 	log_func();
 
+	plugin_key_group = plugin_set_key_group(geany_plugin, "code_navigation", NB_KEY_IDS, NULL);
+
 	/* Load configuration */
 	load_configuration();
 	/* Initialize the features */


Modified: codenav/src/codenavigation.h
11 lines changed, 1 insertions(+), 10 deletions(-)
===================================================================
@@ -23,26 +23,17 @@
 #define CODENAVIGATION_H
 
 /* First */
-#include "geany.h"		/* for the GeanyApp data type */
+#include <geanyplugin.h>
 
 /* Other includes */
-#include "editor.h"		/* for the declaration of the GeanyEditor struct, not strictly necessary
-						   as it will be also included by plugindata.h */
-#include "document.h"	/* for the declaration of the GeanyDocument struct */
-#include "ui_utils.h"
 #include "Scintilla.h"	/* for the SCNotification struct */
 
-#include "keybindings.h"
-#include "filetypes.h"
 #include <gdk/gdkkeysyms.h>
 
 #include <string.h>
 
 #include "switch_head_impl.h"
 
-/* Last */
-#include "plugindata.h"		/* this defines the plugin API */
-
 /* Debug flag */
 /*#define CODE_NAVIGATION_DEBUG*/
 



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).