SF.net SVN: geany: [1700] trunk

[ntrel at users.sourceforge.net]

Revision: 1700
          http://svn.sourceforge.net/geany/?rev=1700&view=rev
Author:   ntrel
Date:     2007-07-13 04:22:47 -0700 (Fri, 13 Jul 2007)

Log Message:
-----------
Remove init_function_pointers(), use static initializers.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/plugins.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-07-13 11:07:35 UTC (rev 1699)
+++ trunk/ChangeLog	2007-07-13 11:22:47 UTC (rev 1700)
@@ -6,6 +6,8 @@
  * src/main.c:
    If -i, --new-instance options are passed, disable loading & saving of
    session files.
+ * src/plugins.c:
+   Remove init_function_pointers(), use static initializers.
 
 
 2007-07-12  Enrico Tröger  <enrico.troeger at uvena.de>

Modified: trunk/src/plugins.c
===================================================================
--- trunk/src/plugins.c	2007-07-13 11:07:35 UTC (rev 1699)
+++ trunk/src/plugins.c	2007-07-13 11:22:47 UTC (rev 1700)
@@ -49,27 +49,25 @@
 }
 Plugin;
 
-
-static DocumentFuncs	doc_funcs;
-static ScintillaFuncs	sci_funcs;
-static TemplateFuncs	template_funcs;
-static UtilsFuncs		utils_funcs;
-
 static GList *plugin_list = NULL;
 
 
-static void
-init_function_pointers()
-{
-	doc_funcs.new_file = &document_new_file;
+static DocumentFuncs doc_funcs = {
+	&document_new_file
+	};
 
-	template_funcs.get_template_fileheader = &templates_get_template_fileheader;
+static ScintillaFuncs sci_funcs = {
+	&sci_set_text
+	};
 
-	sci_funcs.set_text = &sci_set_text;
+static TemplateFuncs template_funcs = {
+	&templates_get_template_fileheader
+	};
 
-	utils_funcs.str_equal = &utils_str_equal;
-	utils_funcs.str_replace = &utils_str_replace;
-}
+static UtilsFuncs utils_funcs = {
+	&utils_str_equal,
+	&utils_str_replace
+	};
 
 
 static void
@@ -230,8 +228,6 @@
 	const gchar *path = LIBDIR;
 	GSList *list, *item;
 
-	init_function_pointers();
-
 	list = utils_get_file_list(path, NULL, NULL);
 
 	for (item = list; item != NULL; item = g_slist_next(item))


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