SF.net SVN: geany: [1867] trunk

[eht16 at users.sourceforge.net]

Revision: 1867
          http://geany.svn.sourceforge.net/geany/?rev=1867&view=rev
Author:   eht16
Date:     2007-09-10 11:25:03 -0700 (Mon, 10 Sep 2007)

Log Message:
-----------
Remove get_zoom from plugin API.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/plugins/Makefile.am
    trunk/plugins/export.c
    trunk/src/plugindata.h
    trunk/src/plugins.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-09-10 17:57:48 UTC (rev 1866)
+++ trunk/ChangeLog	2007-09-10 18:25:03 UTC (rev 1867)
@@ -2,6 +2,9 @@
 
  * THANKS, pixmaps/geany.ico, pixmaps/geany.png:
    Replace Geany's icon by a new one by Sebastian Kraft (thanks).
+ * plugins/Makefile.am: Add makefile.win32 to EXTRA_DIST files.
+ * plugins/export.c, src/plugins.c, src/plugindata.h:
+   Remove get_zoom from plugin API.
 
 
 2007-09-09  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>

Modified: trunk/plugins/Makefile.am
===================================================================
--- trunk/plugins/Makefile.am	2007-09-10 17:57:48 UTC (rev 1866)
+++ trunk/plugins/Makefile.am	2007-09-10 18:25:03 UTC (rev 1867)
@@ -1,7 +1,7 @@
 # Adapted from Pidgin's plugins/Makefile.am, thanks
 
-#EXTRA_DIST = \
-	#makefile.win32
+EXTRA_DIST = \
+	makefile.win32
 
 if IS_COMPILER_GCC
     AM_CFLAGS = -Wall -pipe

Modified: trunk/plugins/export.c
===================================================================
--- trunk/plugins/export.c	2007-09-10 17:57:48 UTC (rev 1866)
+++ trunk/plugins/export.c	2007-09-10 18:25:03 UTC (rev 1867)
@@ -574,7 +574,7 @@
 	// take the zoom level also into account
 	font_size = scintilla->send_message(doc_list[idx].sci, SCI_STYLEGETSIZE, 0, 0);
 	if (use_zoom)
-		font_size += scintilla->get_zoom(doc_list[idx].sci);
+		font_size += scintilla->send_message(doc_list[idx].sci, SCI_GETZOOM, 0, 0);
 
 	// read the document and write the HTML body
 	body = g_string_new("");

Modified: trunk/src/plugindata.h
===================================================================
--- trunk/src/plugindata.h	2007-09-10 17:57:48 UTC (rev 1866)
+++ trunk/src/plugindata.h	2007-09-10 18:25:03 UTC (rev 1867)
@@ -71,12 +71,12 @@
 
 /* The API version should be incremented whenever any plugin data types below are
  * modified. */
-static const gint api_version = 15;
+static const gint api_version = 16;
 
 /* The ABI version should be incremented whenever existing fields in the plugin
  * data types below have to be changed or reordered. It should stay the same if fields
  * are only appended, as this doesn't affect existing fields. */
-static const gint abi_version = 7;
+static const gint abi_version = 8;
 
 /* This performs runtime checks that try to ensure:
  * 1. Geany ABI data types are compatible with this plugin.
@@ -220,7 +220,6 @@
 	gint	(*find_bracematch) (struct _ScintillaObject* sci, gint pos);
 	gint	(*get_style_at) (struct _ScintillaObject *sci, gint position);
 	gchar	(*get_char_at) (struct _ScintillaObject *sci, gint pos);
-	gint	(*get_zoom) (struct _ScintillaObject * sci);
 }
 ScintillaFuncs;
 

Modified: trunk/src/plugins.c
===================================================================
--- trunk/src/plugins.c	2007-09-10 17:57:48 UTC (rev 1866)
+++ trunk/src/plugins.c	2007-09-10 18:25:03 UTC (rev 1867)
@@ -114,8 +114,7 @@
 	&sci_scroll_caret,
 	&sci_find_bracematch,
 	&sci_get_style_at,
-	&sci_get_char_at,
-	&sci_get_zoom
+	&sci_get_char_at
 };
 
 static TemplateFuncs template_funcs = {


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