SF.net SVN: geany: [1726] trunk/plugins

[ntrel at users.sourceforge.net]

Revision: 1726
          http://geany.svn.sourceforge.net/geany/?rev=1726&view=rev
Author:   ntrel
Date:     2007-07-19 04:54:02 -0700 (Thu, 19 Jul 2007)

Log Message:
-----------
Tidy up plugin code to make their structure more consistent.

Modified Paths:
--------------
    trunk/plugins/classbuilder.c
    trunk/plugins/demoplugin.c

Modified: trunk/plugins/classbuilder.c
===================================================================
--- trunk/plugins/classbuilder.c	2007-07-19 11:49:53 UTC (rev 1725)
+++ trunk/plugins/classbuilder.c	2007-07-19 11:54:02 UTC (rev 1726)
@@ -32,6 +32,29 @@
 #include "document.h"
 
 
+static PluginData *plugin_data;
+
+#define doc_array	plugin_data->doc_array
+// can't use document as a macro because it's currently a typename
+#define documents	plugin_data->document
+#define scintilla	plugin_data->sci
+#define templates	plugin_data->templates
+#define utils		plugin_data->utils
+#define ui			plugin_data->ui
+
+
+static struct
+{
+	GtkWidget *menu_item;
+}
+local_data;
+
+
+VERSION_CHECK(4)
+
+PLUGIN_INFO(_("Class Builder"), _("Creates source files for new class types."))
+
+
 enum
 {
 	GEANY_CLASS_TYPE_CPP,
@@ -77,24 +100,6 @@
 } CreateClassDialog;
 
 
-static PluginData *plugin_data;
-
-#define doc_array	plugin_data->doc_array
-// can't use document as a macro because it's currently a typename
-#define documents	plugin_data->document
-#define scintilla	plugin_data->sci
-#define templates	plugin_data->templates
-#define utils		plugin_data->utils
-#define ui			plugin_data->ui
-
-
-static struct
-{
-	GtkWidget *menu_item;
-}
-local_data;
-
-
 static const gchar templates_cpp_class_header[] = "{fileheader}\n\n\
 #ifndef {header_guard}\n\
 #define {header_guard}\n\
@@ -224,11 +229,6 @@
 static void cc_dlg_on_create_class(CreateClassDialog *cc_dlg);
 
 
-VERSION_CHECK(4)
-
-PLUGIN_INFO(_("Class Builder"), _("Creates source files for new class types."))
-
-
 /* I don't want this to be in the plugin API because it can cause leaks if any pointers
  * are NULL -ntrel. */
 /* Frees all passed pointers if they are *ALL* non-NULL.

Modified: trunk/plugins/demoplugin.c
===================================================================
--- trunk/plugins/demoplugin.c	2007-07-19 11:49:53 UTC (rev 1725)
+++ trunk/plugins/demoplugin.c	2007-07-19 11:54:02 UTC (rev 1726)
@@ -29,7 +29,7 @@
 #include "plugindata.h"
 
 
-static PluginData *my_data;
+static PluginData *plugin_data;
 
 static struct
 {
@@ -53,7 +53,7 @@
 	GtkWidget *dialog;
 
 	dialog = gtk_message_dialog_new(
-		GTK_WINDOW(my_data->app->window),
+		GTK_WINDOW(plugin_data->app->window),
 		GTK_DIALOG_DESTROY_WITH_PARENT,
 		GTK_MESSAGE_INFO,
 		GTK_BUTTONS_OK,
@@ -71,12 +71,12 @@
 {
 	GtkWidget *demo_item;
 
-	my_data = data;	// keep a pointer to the main application fields & functions
+	plugin_data = data;	// keep a pointer to the main application fields & functions
 
 	// Add an item to the Tools menu
 	demo_item = gtk_menu_item_new_with_mnemonic(_("_Demo Plugin"));
 	gtk_widget_show(demo_item);
-	gtk_container_add(GTK_CONTAINER(my_data->tools_menu), demo_item);
+	gtk_container_add(GTK_CONTAINER(plugin_data->tools_menu), demo_item);
 	g_signal_connect(G_OBJECT(demo_item), "activate", G_CALLBACK(item_activate), NULL);
 
 	// keep a pointer to the menu item, so we can remove it when the plugin is unloaded


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