SF.net SVN: geany-plugins: [47] trunk/geanydoc/src

[yurand at users.sourceforge.net]

Revision: 47
          http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=47&view=rev
Author:   yurand
Date:     2008-05-20 15:45:41 -0700 (Tue, 20 May 2008)

Log Message:
-----------
Make sources compile with latest geany svn

Modified Paths:
--------------
    trunk/geanydoc/src/config.c
    trunk/geanydoc/src/geanydoc.c

Modified: trunk/geanydoc/src/config.c
===================================================================
--- trunk/geanydoc/src/config.c	2008-05-20 22:44:52 UTC (rev 46)
+++ trunk/geanydoc/src/config.c	2008-05-20 22:45:41 UTC (rev 47)
@@ -34,6 +34,7 @@
 #include "geanydoc.h"
 
 extern GeanyData *geany_data;
+extern GeanyFunctions *geany_functions;
 
 const gchar defaults[] =
 	"[C]\n"

Modified: trunk/geanydoc/src/geanydoc.c
===================================================================
--- trunk/geanydoc/src/geanydoc.c	2008-05-20 22:44:52 UTC (rev 46)
+++ trunk/geanydoc/src/geanydoc.c	2008-05-20 22:45:41 UTC (rev 47)
@@ -43,6 +43,7 @@
 /* These items are set by Geany before init() is called. */
 PluginFields *plugin_fields;
 GeanyData *geany_data;
+GeanyFunctions *geany_functions;
 
 static GtkWidget *keyb1;
 static GtkWidget *keyb2;
@@ -50,7 +51,7 @@
 
 /* Check that Geany supports plugin API version 52 or later, and check
  * for binary compatibility. */
-PLUGIN_VERSION_CHECK(53)
+PLUGIN_VERSION_CHECK(60)
 /* All plugins must set name, description, version and author. */
 	PLUGIN_INFO(_("Doc"), _("Call documentation viewer on current symbol."), VERSION,
 	    _("Yura Siamshka <yurand2 at gmail.com>"));
@@ -155,7 +156,7 @@
 		if (idx == -1)
 		{
 			idx = p_document->new_file(name,
-						   geany_data->filetypes[filetype_new_file],
+						   filetypes_array->pdata[filetype_new_file],
 						   std_output);
 		}
 		else
@@ -456,7 +457,7 @@
 static void
 init_Configure(GtkWidget * dialog)
 {
-	gint i;
+	guint i;
 	GtkWidget *cbTypes;
 
 	cbTypes = p_support->lookup_widget(dialog, "comboboxType");
@@ -464,7 +465,9 @@
 
 	for (i = 0; i < GEANY_MAX_FILE_TYPES; i++)
 	{
-		gtk_combo_box_append_text(GTK_COMBO_BOX(cbTypes), geany_data->filetypes[i]->name);
+		gtk_combo_box_append_text(GTK_COMBO_BOX(cbTypes),
+					  ((struct _GeanyFiletype *) (filetypes_array->pdata[i]))->
+					  name);
 	}
 	g_object_set_data(G_OBJECT(cbTypes), "config", config_clone());
 	g_object_set_data(G_OBJECT(cbTypes), "current", NULL);


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