HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge Plugin and GeanyPluginPrivate structs.

Browse Source 
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4108 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Nick Treleaven 2009-08-18 15:57:50 +00:00
parent 9f761518e1
commit 83b9594495
4 changed files with 25 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -8,6 +8,8 @@
* src/callbacks.c:
Fix using 'Insert date' keybinding when a custom date string has
not been set.
* src/pluginprivate.h, src/pluginutils.c, src/plugins.c:
Merge Plugin and GeanyPluginPrivate structs.
2009-08-18 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>

21
src/pluginprivate.h
View File

@ -26,7 +26,9 @@
#ifndef PLUGINPRIVATE_H
#define PLUGINPRIVATE_H
#include "ui_utils.h"
#include "ui_utils.h" /* GeanyAutoSeparator */
#include "keybindings.h" /* GeanyKeyGroup */
typedef struct SignalConnection
{
@ -35,11 +37,24 @@ typedef struct SignalConnection
}
SignalConnection;
typedef struct GeanyPluginPrivate
{
GModule *module;
gchar *filename; /* plugin filename (/path/libname.so) */
PluginInfo info; /* plugin name, description, etc */
GeanyPlugin public; /* fields the plugin can read */
void (*init) (GeanyData *data); /* Called when the plugin is enabled */
GtkWidget* (*configure) (GtkDialog *dialog); /* plugin configure dialog, optional */
void (*help) (void); /* Called when the plugin should show some help, optional */
void (*cleanup) (void); /* Called when the plugin is disabled or when Geany exits */
/* extra stuff */
PluginFields fields;
GeanyKeyGroup *key_group;
GeanyAutoSeparator toolbar_separator;
gboolean resident;
GArray *signal_ids; /* SignalConnection's to disconnect when unloading */
GArray *signal_ids; /* SignalConnection's to disconnect when unloading */
}
GeanyPluginPrivate;

28
src/plugins.c
View File

@ -62,24 +62,7 @@
#include "pluginutils.h"
#include "pluginprivate.h"
typedef struct Plugin
{
GModule *module;
gchar *filename; /* plugin filename (/path/libname.so) */
PluginInfo info; /* plugin name, description, etc */
PluginFields fields;
GeanyPlugin public; /* fields the plugin can read */
GeanyPluginPrivate priv; /* GeanyPlugin type private data, same as (*public.priv) */
GeanyKeyGroup *key_group;
void (*init) (GeanyData *data); /* Called when the plugin is enabled */
GtkWidget* (*configure) (GtkDialog *dialog); /* plugin configure dialog, optional */
void (*help) (void); /* Called when the plugin should show some help, optional */
void (*cleanup) (void); /* Called when the plugin is disabled or when Geany exits */
}
Plugin;
typedef GeanyPluginPrivate Plugin; /* shorter alias */
static gboolean want_plugins = FALSE;
@ -534,9 +517,6 @@ plugin_init(Plugin *plugin)
g_return_if_fail(plugin->init);
plugin->init(&geany_data);
if (p_geany_plugin && (*p_geany_plugin)->priv->resident)
g_module_make_resident(plugin->module);
/* store some function pointers for later use */
g_module_symbol(plugin->module, "plugin_configure", (void *) &plugin->configure);
g_module_symbol(plugin->module, "plugin_help", (void *) &plugin->help);
@ -667,7 +647,7 @@ plugin_new(const gchar *fname, gboolean init_plugin, gboolean add_to_list)
plugin->filename = g_strdup(fname);
plugin->module = module;
plugin->public.info = &plugin->info;
plugin->public.priv = &plugin->priv;
plugin->public.priv = plugin;
if (init_plugin)
plugin_init(plugin);
@ -681,7 +661,7 @@ plugin_new(const gchar *fname, gboolean init_plugin, gboolean add_to_list)
static void remove_callbacks(Plugin *plugin)
{
GArray *signal_ids = plugin->priv.signal_ids;
GArray *signal_ids = plugin->signal_ids;
SignalConnection *sc;
if (signal_ids == NULL)
@ -714,7 +694,7 @@ plugin_cleanup(Plugin *plugin)
if (plugin->key_group)
g_ptr_array_remove_fast(keybinding_groups, plugin->key_group);
widget = plugin->priv.toolbar_separator.widget;
widget = plugin->toolbar_separator.widget;
if (widget)
gtk_widget_destroy(widget);

2
src/pluginutils.c
View File

@ -88,7 +88,7 @@ void plugin_module_make_resident(GeanyPlugin *plugin)
{
g_return_if_fail(plugin);
plugin->priv->resident = TRUE;
g_module_make_resident(plugin->priv->module);
}