[geany/geany] f3078e: Merge branch 'kugel-/linkage-cleanup_rebase-for-merge'

[Colomban Wendling]

Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Fri, 10 Apr 2015 14:54:30 UTC
Commit:      f3078ebbc60b9747683029df0fa283d8f3e762a5
             https://github.com/geany/geany/commit/f3078ebbc60b9747683029df0fa283d8f3e762a5

Log Message:
-----------
Merge branch 'kugel-/linkage-cleanup_rebase-for-merge'

This merges PR#429 with only small history cleanup (no code changes),
and ABI bump.

Closes #355, #358 and #429.


Modified Paths:
--------------
    .gitignore
    configure.ac
    doc/Doxyfile.in
    doc/Makefile.am
    doc/plugins.dox
    geany.pc.in
    m4/geany-lib.m4
    plugins/Makefile.am
    plugins/geanyfunctions.h
    plugins/geanyplugin.h
    plugins/genapi.py
    po/POTFILES.in
    scintilla/Makefile.am
    scintilla/gtk/ScintillaGTK.cxx
    scintilla/gtk/makefile.win32
    scintilla/scintilla_changes.patch
    src/Makefile.am
    src/build.c
    src/callbacks.c
    src/callbacks.h
    src/dialogs.c
    src/document.c
    src/editor.c
    src/encodings.c
    src/filetypes.c
    src/highlighting.c
    src/keybindings.c
    src/libmain.c
    src/main.c
    src/main.h
    src/makefile.win32
    src/msgwindow.c
    src/navqueue.c
    src/plugindata.h
    src/plugins.c
    src/pluginutils.c
    src/project.c
    src/sciwrappers.c
    src/search.c
    src/stash.c
    src/stash.h
    src/symbols.c
    src/templates.c
    src/ui_utils.c
    src/utils.c
    tagmanager/ctags/Makefile.am
    tagmanager/ctags/ctags.c
    tagmanager/mio/Makefile.am
    tagmanager/src/Makefile.am
    tagmanager/src/makefile.win32
    tagmanager/src/tm_source_file.c
    tagmanager/src/tm_workspace.c
    wscript

Modified: .gitignore
1 lines changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -92,6 +92,7 @@ Makefile.in
 # /src/
 #-----------------------------------------------------------------------
 /src/geany
+/src/signallist.i
 
 #-----------------------------------------------------------------------
 # /doc/


Modified: configure.ac
6 lines changed, 5 insertions(+), 1 deletions(-)
===================================================================
@@ -24,6 +24,7 @@ fi
 AC_USE_SYSTEM_EXTENSIONS
 
 m4_ifdef([AM_PROG_AR],[AM_PROG_AR])
+LT_INIT
 AC_PROG_CC
 AC_PROG_CC_C99
 AM_PROG_CC_C_O
@@ -74,7 +75,7 @@ AM_CONDITIONAL([GTK3], [test "x$gtk_package" = "xgtk+-3.0"])
 
 # GTK/GLib/GIO checks
 gtk_modules="$gtk_package >= $gtk_min_version glib-2.0 >= 2.20"
-gtk_modules_private="gio-2.0 >= 2.20 gmodule-2.0"
+gtk_modules_private="gio-2.0 >= 2.20 gmodule-no-export-2.0"
 PKG_CHECK_MODULES([GTK], [$gtk_modules $gtk_modules_private])
 AC_SUBST([DEPENDENCIES], [$gtk_modules])
 AC_SUBST([GTK_CFLAGS])
@@ -122,6 +123,9 @@ AC_SUBST([pkgdatadir])
 GEANY_CHECK_DOCUTILS
 GEANY_CHECK_DOXYGEN
 
+# libgeany
+GEANY_LIB_INIT
+
 # Output
 AC_CONFIG_FILES([
 		Makefile


Modified: doc/Doxyfile.in
1 lines changed, 0 insertions(+), 1 deletions(-)
===================================================================
@@ -775,7 +775,6 @@ WARN_LOGFILE           =
 INPUT                  = @top_srcdir@/src/ \
                          @top_srcdir@/doc/ \
                          @top_srcdir@/plugins/geanyplugin.h \
-                         @top_srcdir@/plugins/geanyfunctions.h \
                          @top_srcdir@/tagmanager/src/tm_source_file.c \
                          @top_srcdir@/tagmanager/src/tm_source_file.h \
                          @top_srcdir@/tagmanager/src/tm_workspace.c \


Modified: doc/Makefile.am
1 lines changed, 0 insertions(+), 1 deletions(-)
===================================================================
@@ -96,7 +96,6 @@ doxygen_sources = \
 	$(srcdir)/*.dox \
 	$(top_srcdir)/src/*.[ch] \
 	$(top_srcdir)/plugins/geanyplugin.h \
-	$(top_srcdir)/plugins/geanyfunctions.h \
 	$(top_srcdir)/tagmanager/src/tm_source_file.[ch] \
 	$(top_srcdir)/tagmanager/src/tm_workspace.[ch]
 


Modified: doc/plugins.dox
7 lines changed, 2 insertions(+), 5 deletions(-)
===================================================================
@@ -187,14 +187,12 @@ so there is no need to include @a gtk/gtk.h yourself.
 
 @note
 @a plugindata.h contains the biggest part of the plugin API and provides some basic macros.
- at a geanyfunctions.h provides some macros for convenient access to plugin API functions.
 
-Then you should define three basic variables which will give access to data fields and
-functions provided by the plugin API.
+Then you should define two basic variables which will give access to data fields
+provided by the plugin API.
 @code
 GeanyPlugin			*geany_plugin;
 GeanyData			*geany_data;
-GeanyFunctions		*geany_functions;
 @endcode
 
 Now you can go on and write your first lines for your new plugin. As mentioned before,
@@ -363,7 +361,6 @@ Once this is done, your first plugin is ready. Congratulations!
 
 GeanyPlugin		*geany_plugin;
 GeanyData		*geany_data;
-GeanyFunctions	*geany_functions;
 
 PLUGIN_VERSION_CHECK(211)
 


Modified: geany.pc.in
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -10,5 +10,5 @@ Name: Geany
 Description: A fast and lightweight IDE using GTK2
 Requires: @DEPENDENCIES@
 Version: @VERSION@
-Libs: -L${libdir}
+Libs: -L${libdir} -lgeany
 Cflags: -DGTK -I${includedir}/geany -I${includedir}/geany/tagmanager -I${includedir}/geany/scintilla


Modified: m4/geany-lib.m4
58 lines changed, 58 insertions(+), 0 deletions(-)
===================================================================
@@ -0,0 +1,58 @@
+dnl checks whether the compiler supports GCC4-style visibility
+AC_DEFUN([GCC4_VISIBILITY],
+[
+	have_gcc4_visibility=no
+	AC_MSG_CHECKING([whether compiler supports GCC4-style visibility])
+	gcc_visibility_backup_cflags=$CFLAGS
+	CFLAGS=-fvisibility=hidden
+	AC_LINK_IFELSE([AC_LANG_SOURCE([[__attribute__((visibility("default")))
+									 int main(int argc, char **argv) { return 0; }]])],
+				   [have_gcc4_visibility=yes])
+	AC_MSG_RESULT([$have_gcc4_visibility])
+	CFLAGS="${gcc_visibility_backup_cflags}"
+])
+
+dnl Checks and fills LIBGEANY_EXPORT_CFLAGS
+AC_DEFUN([GEANY_EXPORT],
+[
+	AC_REQUIRE([GEANY_CHECK_MINGW])
+	AC_REQUIRE([GCC4_VISIBILITY])
+
+	dnl FIXME: better way to detect Windows?
+	AM_COND_IF([MINGW], [win32=yes], [win32=false])
+
+	export_CFLAGS=
+	AS_IF([test x$win32 = xyes],
+		  [export_CFLAGS='-DGEANY_EXPORT_SYMBOL="__declspec(dllexport)"'],
+		  [test x$have_gcc4_visibility = xyes],
+		  [export_CFLAGS='-fvisibility=hidden -DGEANY_EXPORT_SYMBOL="__attribute__((visibility(\"default\")))"'],
+		  [dnl GEANY_EXPORT_SYMBOL expands to nothing
+		   export_CFLAGS='-DGEANY_EXPORT_SYMBOL'])
+
+	LIBGEANY_EXPORT_CFLAGS="${export_CFLAGS} -DGEANY_API_SYMBOL=GEANY_EXPORT_SYMBOL"
+
+	AC_SUBST([LIBGEANY_EXPORT_CFLAGS])
+])
+
+AC_DEFUN([GEANY_LIB_INIT],
+[
+	AC_REQUIRE([GEANY_EXPORT])
+
+dnl In the future, if we want to use libtool/library versioning, we can
+dnl set these variables accordingly. For now its the same as if not specified (0:0:0)
+	libgeany_current=0
+	libgeany_revision=0
+	libgeany_age=0
+
+	LIBGEANY_CFLAGS="${LIBGEANY_EXPORT_CFLAGS}"
+	LIBGEANY_LDFLAGS="-version-info ${libgeany_current}:${libgeany_revision}:${libgeany_age}"
+
+	AC_SUBST([LIBGEANY_CFLAGS])
+	AC_SUBST([LIBGEANY_LDFLAGS])
+
+dnl Check for utilities needed to do codegen
+	AC_PATH_PROG([SORT], [sort], [
+		AC_MSG_ERROR([The 'sort' utility is required, is it installed?])])
+	AC_PATH_PROG([UNIQ], [uniq], [
+		AC_MSG_ERROR([The 'uniq' utility is required, is it installed?])])
+])


Modified: plugins/Makefile.am
29 lines changed, 10 insertions(+), 19 deletions(-)
===================================================================
@@ -1,8 +1,7 @@
 # Adapted from Pidgin's plugins/Makefile.am, thanks
 
 EXTRA_DIST = \
-	makefile.win32 \
-	genapi.py
+	makefile.win32
 
 if MINGW
 plugindir = $(libdir)
@@ -12,15 +11,8 @@ endif
 
 plugins_includedir = $(includedir)/geany
 plugins_include_HEADERS = \
-	geanyplugin.h \
-	geanyfunctions.h
-
-# systems without python should continue to build OK
-$(srcdir)/geanyfunctions.h: $(srcdir)/genapi.py $(srcdir)/../src/plugins.c
-	(cd "$(srcdir)" && python genapi.py ../src/plugins.c) || true
-
-all: geanyfunctions.h
-
+	geanyfunctions.h \
+	geanyplugin.h
 
 demoplugin_la_LDFLAGS    = -module -avoid-version -no-undefined
 classbuilder_la_LDFLAGS  = -module -avoid-version -no-undefined
@@ -31,7 +23,6 @@ filebrowser_la_LDFLAGS   = -module -avoid-version -no-undefined
 splitwindow_la_LDFLAGS   = -module -avoid-version -no-undefined
 
 if PLUGINS
-
 # Plugins to be installed
 plugin_LTLIBRARIES = \
 	classbuilder.la \
@@ -61,13 +52,13 @@ saveactions_la_CFLAGS   = -DG_LOG_DOMAIN=\""SaveActions"\"
 filebrowser_la_CFLAGS   = -DG_LOG_DOMAIN=\""FileBrowser"\"
 splitwindow_la_CFLAGS   = -DG_LOG_DOMAIN=\""SplitWindow"\"
 
-demoplugin_la_LIBADD    = $(GTK_LIBS)
-classbuilder_la_LIBADD  = $(GTK_LIBS)
-htmlchars_la_LIBADD     = $(GTK_LIBS)
-export_la_LIBADD        = $(GTK_LIBS) -lm
-saveactions_la_LIBADD   = $(GTK_LIBS)
-filebrowser_la_LIBADD   = $(GTK_LIBS)
-splitwindow_la_LIBADD   = $(GTK_LIBS)
+demoplugin_la_LIBADD    = $(top_builddir)/src/libgeany.la $(GTK_LIBS)
+classbuilder_la_LIBADD  = $(top_builddir)/src/libgeany.la $(GTK_LIBS)
+htmlchars_la_LIBADD     = $(top_builddir)/src/libgeany.la $(GTK_LIBS)
+export_la_LIBADD        = $(top_builddir)/src/libgeany.la $(GTK_LIBS) -lm
+saveactions_la_LIBADD   = $(top_builddir)/src/libgeany.la $(GTK_LIBS)
+filebrowser_la_LIBADD   = $(top_builddir)/src/libgeany.la $(GTK_LIBS)
+splitwindow_la_LIBADD   = $(top_builddir)/src/libgeany.la $(GTK_LIBS)
 
 endif # PLUGINS
 


Modified: plugins/geanyfunctions.h
460 lines changed, 20 insertions(+), 440 deletions(-)
===================================================================
@@ -1,448 +1,28 @@
-/* This file is generated automatically by genapi.py - do not edit. */
-
-/** @file geanyfunctions.h @ref geany_functions wrappers.
- * This allows the use of normal API function names in plugins by defining macros.
+/*
+ *      geanyfunctions.h - this file is part of Geany, a fast and lightweight IDE
+ *
+ *      Copyright 2014 Matthew Brush <mbrush at codebrainz.ca>
  *
- * E.g.:@code
- * #define plugin_add_toolbar_item \
- * 	geany_functions->p_plugin->plugin_add_toolbar_item @endcode
+ *      This program is free software; you can redistribute it and/or modify
+ *      it under the terms of the GNU General Public License as published by
+ *      the Free Software Foundation; either version 2 of the License, or
+ *      (at your option) any later version.
  *
- * You need to declare the @ref geany_functions symbol yourself.
+ *      This program is distributed in the hope that it will be useful,
+ *      but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *      GNU General Public License for more details.
  *
- * Note: This must be included after all other API headers to prevent conflicts with
- * other header's function prototypes - this is done for you when using geanyplugin.h.
+ *      You should have received a copy of the GNU General Public License along
+ *      with this program; if not, write to the Free Software Foundation, Inc.,
+ *      51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+/* This file exists purely for backwards compatibility. */
+
 #ifndef GEANY_FUNCTIONS_H
-#define GEANY_FUNCTIONS_H
+#define GEANY_FUNCTIONS_H 1
 
-#define plugin_add_toolbar_item \
-	geany_functions->p_plugin->plugin_add_toolbar_item
-#define plugin_module_make_resident \
-	geany_functions->p_plugin->plugin_module_make_resident
-#define plugin_signal_connect \
-	geany_functions->p_plugin->plugin_signal_connect
-#define plugin_set_key_group \
-	geany_functions->p_plugin->plugin_set_key_group
-#define plugin_show_configure \
-	geany_functions->p_plugin->plugin_show_configure
-#define plugin_timeout_add \
-	geany_functions->p_plugin->plugin_timeout_add
-#define plugin_timeout_add_seconds \
-	geany_functions->p_plugin->plugin_timeout_add_seconds
-#define plugin_idle_add \
-	geany_functions->p_plugin->plugin_idle_add
-#define plugin_builder_connect_signals \
-	geany_functions->p_plugin->plugin_builder_connect_signals
-#define document_new_file \
-	geany_functions->p_document->document_new_file
-#define document_get_current \
-	geany_functions->p_document->document_get_current
-#define document_get_from_page \
-	geany_functions->p_document->document_get_from_page
-#define document_find_by_filename \
-	geany_functions->p_document->document_find_by_filename
-#define document_find_by_real_path \
-	geany_functions->p_document->document_find_by_real_path
-#define document_save_file \
-	geany_functions->p_document->document_save_file
-#define document_open_file \
-	geany_functions->p_document->document_open_file
-#define document_open_files \
-	geany_functions->p_document->document_open_files
-#define document_remove_page \
-	geany_functions->p_document->document_remove_page
-#define document_reload_force \
-	geany_functions->p_document->document_reload_force
-#define document_set_encoding \
-	geany_functions->p_document->document_set_encoding
-#define document_set_text_changed \
-	geany_functions->p_document->document_set_text_changed
-#define document_set_filetype \
-	geany_functions->p_document->document_set_filetype
-#define document_close \
-	geany_functions->p_document->document_close
-#define document_index \
-	geany_functions->p_document->document_index
-#define document_save_file_as \
-	geany_functions->p_document->document_save_file_as
-#define document_rename_file \
-	geany_functions->p_document->document_rename_file
-#define document_get_status_color \
-	geany_functions->p_document->document_get_status_color
-#define document_get_basename_for_display \
-	geany_functions->p_document->document_get_basename_for_display
-#define document_get_notebook_page \
-	geany_functions->p_document->document_get_notebook_page
-#define document_compare_by_display_name \
-	geany_functions->p_document->document_compare_by_display_name
-#define document_compare_by_tab_order \
-	geany_functions->p_document->document_compare_by_tab_order
-#define document_compare_by_tab_order_reverse \
-	geany_functions->p_document->document_compare_by_tab_order_reverse
-#define document_find_by_id \
-	geany_functions->p_document->document_find_by_id
-#define editor_get_indent_prefs \
-	geany_functions->p_editor->editor_get_indent_prefs
-#define editor_create_widget \
-	geany_functions->p_editor->editor_create_widget
-#define editor_indicator_set_on_range \
-	geany_functions->p_editor->editor_indicator_set_on_range
-#define editor_indicator_set_on_line \
-	geany_functions->p_editor->editor_indicator_set_on_line
-#define editor_indicator_clear \
-	geany_functions->p_editor->editor_indicator_clear
-#define editor_set_indent_type \
-	geany_functions->p_editor->editor_set_indent_type
-#define editor_get_word_at_pos \
-	geany_functions->p_editor->editor_get_word_at_pos
-#define editor_get_eol_char_name \
-	geany_functions->p_editor->editor_get_eol_char_name
-#define editor_get_eol_char_len \
-	geany_functions->p_editor->editor_get_eol_char_len
-#define editor_get_eol_char \
-	geany_functions->p_editor->editor_get_eol_char
-#define editor_insert_text_block \
-	geany_functions->p_editor->editor_insert_text_block
-#define editor_get_eol_char_mode \
-	geany_functions->p_editor->editor_get_eol_char_mode
-#define editor_goto_pos \
-	geany_functions->p_editor->editor_goto_pos
-#define editor_find_snippet \
-	geany_functions->p_editor->editor_find_snippet
-#define editor_insert_snippet \
-	geany_functions->p_editor->editor_insert_snippet
-#define scintilla_send_message \
-	geany_functions->p_scintilla->scintilla_send_message
-#define scintilla_new \
-	geany_functions->p_scintilla->scintilla_new
-#define sci_send_command \
-	geany_functions->p_sci->sci_send_command
-#define sci_start_undo_action \
-	geany_functions->p_sci->sci_start_undo_action
-#define sci_end_undo_action \
-	geany_functions->p_sci->sci_end_undo_action
-#define sci_set_text \
-	geany_functions->p_sci->sci_set_text
-#define sci_insert_text \
-	geany_functions->p_sci->sci_insert_text
-#define sci_get_text \
-	geany_functions->p_sci->sci_get_text
-#define sci_get_length \
-	geany_functions->p_sci->sci_get_length
-#define sci_get_current_position \
-	geany_functions->p_sci->sci_get_current_position
-#define sci_set_current_position \
-	geany_functions->p_sci->sci_set_current_position
-#define sci_get_col_from_position \
-	geany_functions->p_sci->sci_get_col_from_position
-#define sci_get_line_from_position \
-	geany_functions->p_sci->sci_get_line_from_position
-#define sci_get_position_from_line \
-	geany_functions->p_sci->sci_get_position_from_line
-#define sci_replace_sel \
-	geany_functions->p_sci->sci_replace_sel
-#define sci_get_selected_text \
-	geany_functions->p_sci->sci_get_selected_text
-#define sci_get_selected_text_length \
-	geany_functions->p_sci->sci_get_selected_text_length
-#define sci_get_selection_start \
-	geany_functions->p_sci->sci_get_selection_start
-#define sci_get_selection_end \
-	geany_functions->p_sci->sci_get_selection_end
-#define sci_get_selection_mode \
-	geany_functions->p_sci->sci_get_selection_mode
-#define sci_set_selection_mode \
-	geany_functions->p_sci->sci_set_selection_mode
-#define sci_set_selection_start \
-	geany_functions->p_sci->sci_set_selection_start
-#define sci_set_selection_end \
-	geany_functions->p_sci->sci_set_selection_end
-#define sci_get_text_range \
-	geany_functions->p_sci->sci_get_text_range
-#define sci_get_line \
-	geany_functions->p_sci->sci_get_line
-#define sci_get_line_length \
-	geany_functions->p_sci->sci_get_line_length
-#define sci_get_line_count \
-	geany_functions->p_sci->sci_get_line_count
-#define sci_get_line_is_visible \
-	geany_functions->p_sci->sci_get_line_is_visible
-#define sci_ensure_line_is_visible \
-	geany_functions->p_sci->sci_ensure_line_is_visible
-#define sci_scroll_caret \
-	geany_functions->p_sci->sci_scroll_caret
-#define sci_find_matching_brace \
-	geany_functions->p_sci->sci_find_matching_brace
-#define sci_get_style_at \
-	geany_functions->p_sci->sci_get_style_at
-#define sci_get_char_at \
-	geany_functions->p_sci->sci_get_char_at
-#define sci_get_current_line \
-	geany_functions->p_sci->sci_get_current_line
-#define sci_has_selection \
-	geany_functions->p_sci->sci_has_selection
-#define sci_get_tab_width \
-	geany_functions->p_sci->sci_get_tab_width
-#define sci_indicator_clear \
-	geany_functions->p_sci->sci_indicator_clear
-#define sci_indicator_set \
-	geany_functions->p_sci->sci_indicator_set
-#define sci_get_contents \
-	geany_functions->p_sci->sci_get_contents
-#define sci_get_contents_range \
-	geany_functions->p_sci->sci_get_contents_range
-#define sci_get_selection_contents \
-	geany_functions->p_sci->sci_get_selection_contents
-#define sci_set_font \
-	geany_functions->p_sci->sci_set_font
-#define sci_get_line_end_position \
-	geany_functions->p_sci->sci_get_line_end_position
-#define sci_set_target_start \
-	geany_functions->p_sci->sci_set_target_start
-#define sci_set_target_end \
-	geany_functions->p_sci->sci_set_target_end
-#define sci_replace_target \
-	geany_functions->p_sci->sci_replace_target
-#define sci_set_marker_at_line \
-	geany_functions->p_sci->sci_set_marker_at_line
-#define sci_delete_marker_at_line \
-	geany_functions->p_sci->sci_delete_marker_at_line
-#define sci_is_marker_set_at_line \
-	geany_functions->p_sci->sci_is_marker_set_at_line
-#define sci_goto_line \
-	geany_functions->p_sci->sci_goto_line
-#define sci_find_text \
-	geany_functions->p_sci->sci_find_text
-#define sci_set_line_indentation \
-	geany_functions->p_sci->sci_set_line_indentation
-#define sci_get_line_indentation \
-	geany_functions->p_sci->sci_get_line_indentation
-#define sci_get_lexer \
-	geany_functions->p_sci->sci_get_lexer
-#define templates_get_template_fileheader \
-	geany_functions->p_templates->templates_get_template_fileheader
-#define utils_str_equal \
-	geany_functions->p_utils->utils_str_equal
-#define utils_string_replace_all \
-	geany_functions->p_utils->utils_string_replace_all
-#define utils_get_file_list \
-	geany_functions->p_utils->utils_get_file_list
-#define utils_write_file \
-	geany_functions->p_utils->utils_write_file
-#define utils_get_locale_from_utf8 \
-	geany_functions->p_utils->utils_get_locale_from_utf8
-#define utils_get_utf8_from_locale \
-	geany_functions->p_utils->utils_get_utf8_from_locale
-#define utils_remove_ext_from_filename \
-	geany_functions->p_utils->utils_remove_ext_from_filename
-#define utils_mkdir \
-	geany_functions->p_utils->utils_mkdir
-#define utils_get_setting_boolean \
-	geany_functions->p_utils->utils_get_setting_boolean
-#define utils_get_setting_integer \
-	geany_functions->p_utils->utils_get_setting_integer
-#define utils_get_setting_string \
-	geany_functions->p_utils->utils_get_setting_string
-#define utils_spawn_sync \
-	geany_functions->p_utils->utils_spawn_sync
-#define utils_spawn_async \
-	geany_functions->p_utils->utils_spawn_async
-#define utils_str_casecmp \
-	geany_functions->p_utils->utils_str_casecmp
-#define utils_get_date_time \
-	geany_functions->p_utils->utils_get_date_time
-#define utils_open_browser \
-	geany_functions->p_utils->utils_open_browser
-#define utils_string_replace_first \
-	geany_functions->p_utils->utils_string_replace_first
-#define utils_str_middle_truncate \
-	geany_functions->p_utils->utils_str_middle_truncate
-#define utils_str_remove_chars \
-	geany_functions->p_utils->utils_str_remove_chars
-#define utils_get_file_list_full \
-	geany_functions->p_utils->utils_get_file_list_full
-#define utils_copy_environment \
-	geany_functions->p_utils->utils_copy_environment
-#define utils_find_open_xml_tag \
-	geany_functions->p_utils->utils_find_open_xml_tag
-#define utils_find_open_xml_tag_pos \
-	geany_functions->p_utils->utils_find_open_xml_tag_pos
-#define ui_dialog_vbox_new \
-	geany_functions->p_ui->ui_dialog_vbox_new
-#define ui_frame_new_with_alignment \
-	geany_functions->p_ui->ui_frame_new_with_alignment
-#define ui_set_statusbar \
-	geany_functions->p_ui->ui_set_statusbar
-#define ui_table_add_row \
-	geany_functions->p_ui->ui_table_add_row
-#define ui_path_box_new \
-	geany_functions->p_ui->ui_path_box_new
-#define ui_button_new_with_image \
-	geany_functions->p_ui->ui_button_new_with_image
-#define ui_add_document_sensitive \
-	geany_functions->p_ui->ui_add_document_sensitive
-#define ui_widget_set_tooltip_text \
-	geany_functions->p_ui->ui_widget_set_tooltip_text
-#define ui_image_menu_item_new \
-	geany_functions->p_ui->ui_image_menu_item_new
-#define ui_lookup_widget \
-	geany_functions->p_ui->ui_lookup_widget
-#define ui_progress_bar_start \
-	geany_functions->p_ui->ui_progress_bar_start
-#define ui_progress_bar_stop \
-	geany_functions->p_ui->ui_progress_bar_stop
-#define ui_entry_add_clear_icon \
-	geany_functions->p_ui->ui_entry_add_clear_icon
-#define ui_menu_add_document_items \
-	geany_functions->p_ui->ui_menu_add_document_items
-#define ui_widget_modify_font_from_string \
-	geany_functions->p_ui->ui_widget_modify_font_from_string
-#define ui_is_keyval_enter_or_return \
-	geany_functions->p_ui->ui_is_keyval_enter_or_return
-#define ui_get_gtk_settings_integer \
-	geany_functions->p_ui->ui_get_gtk_settings_integer
-#define ui_combo_box_add_to_history \
-	geany_functions->p_ui->ui_combo_box_add_to_history
-#define ui_menu_add_document_items_sorted \
-	geany_functions->p_ui->ui_menu_add_document_items_sorted
-#define ui_lookup_stock_label \
-	geany_functions->p_ui->ui_lookup_stock_label
-#define ui_tree_view_set_tooltip_text_column \
-	geany_functions->p_ui->ui_tree_view_set_tooltip_text_column
-#define dialogs_show_question \
-	geany_functions->p_dialogs->dialogs_show_question
-#define dialogs_show_msgbox \
-	geany_functions->p_dialogs->dialogs_show_msgbox
-#define dialogs_show_save_as \
-	geany_functions->p_dialogs->dialogs_show_save_as
-#define dialogs_show_input_numeric \
-	geany_functions->p_dialogs->dialogs_show_input_numeric
-#define dialogs_show_input \
-	geany_functions->p_dialogs->dialogs_show_input
-#define msgwin_status_add \
-	geany_functions->p_msgwin->msgwin_status_add
-#define msgwin_compiler_add \
-	geany_functions->p_msgwin->msgwin_compiler_add
-#define msgwin_msg_add \
-	geany_functions->p_msgwin->msgwin_msg_add
-#define msgwin_clear_tab \
-	geany_functions->p_msgwin->msgwin_clear_tab
-#define msgwin_switch_tab \
-	geany_functions->p_msgwin->msgwin_switch_tab
-#define msgwin_set_messages_dir \
-	geany_functions->p_msgwin->msgwin_set_messages_dir
-#define encodings_convert_to_utf8 \
-	geany_functions->p_encodings->encodings_convert_to_utf8
-#define encodings_convert_to_utf8_from_charset \
-	geany_functions->p_encodings->encodings_convert_to_utf8_from_charset
-#define encodings_get_charset_from_index \
-	geany_functions->p_encodings->encodings_get_charset_from_index
-#define keybindings_send_command \
-	geany_functions->p_keybindings->keybindings_send_command
-#define keybindings_set_item \
-	geany_functions->p_keybindings->keybindings_set_item
-#define keybindings_get_item \
-	geany_functions->p_keybindings->keybindings_get_item
-#define keybindings_get_modifiers \
-	geany_functions->p_keybindings->keybindings_get_modifiers
-#define tm_get_real_path \
-	geany_functions->p_tm->tm_get_real_path
-#define tm_source_file_new \
-	geany_functions->p_tm->tm_source_file_new
-#define tm_source_file_free \
-	geany_functions->p_tm->tm_source_file_free
-#define tm_workspace_add_source_file \
-	geany_functions->p_tm->tm_workspace_add_source_file
-#define tm_workspace_remove_source_file \
-	geany_functions->p_tm->tm_workspace_remove_source_file
-#define tm_workspace_add_source_files \
-	geany_functions->p_tm->tm_workspace_add_source_files
-#define tm_workspace_remove_source_files \
-	geany_functions->p_tm->tm_workspace_remove_source_files
-#define search_show_find_in_files_dialog \
-	geany_functions->p_search->search_show_find_in_files_dialog
-#define highlighting_get_style \
-	geany_functions->p_highlighting->highlighting_get_style
-#define highlighting_set_styles \
-	geany_functions->p_highlighting->highlighting_set_styles
-#define highlighting_is_string_style \
-	geany_functions->p_highlighting->highlighting_is_string_style
-#define highlighting_is_comment_style \
-	geany_functions->p_highlighting->highlighting_is_comment_style
-#define highlighting_is_code_style \
-	geany_functions->p_highlighting->highlighting_is_code_style
-#define filetypes_detect_from_file \
-	geany_functions->p_filetypes->filetypes_detect_from_file
-#define filetypes_lookup_by_name \
-	geany_functions->p_filetypes->filetypes_lookup_by_name
-#define filetypes_index \
-	geany_functions->p_filetypes->filetypes_index
-#define filetypes_get_display_name \
-	geany_functions->p_filetypes->filetypes_get_display_name
-#define filetypes_get_sorted_by_name \
-	geany_functions->p_filetypes->filetypes_get_sorted_by_name
-#define navqueue_goto_line \
-	geany_functions->p_navqueue->navqueue_goto_line
-#define main_reload_configuration \
-	geany_functions->p_main->main_reload_configuration
-#define main_locale_init \
-	geany_functions->p_main->main_locale_init
-#define main_is_realized \
-	geany_functions->p_main->main_is_realized
-#define stash_group_new \
-	geany_functions->p_stash->stash_group_new
-#define stash_group_add_boolean \
-	geany_functions->p_stash->stash_group_add_boolean
-#define stash_group_add_integer \
-	geany_functions->p_stash->stash_group_add_integer
-#define stash_group_add_string \
-	geany_functions->p_stash->stash_group_add_string
-#define stash_group_add_string_vector \
-	geany_functions->p_stash->stash_group_add_string_vector
-#define stash_group_load_from_key_file \
-	geany_functions->p_stash->stash_group_load_from_key_file
-#define stash_group_save_to_key_file \
-	geany_functions->p_stash->stash_group_save_to_key_file
-#define stash_group_free \
-	geany_functions->p_stash->stash_group_free
-#define stash_group_load_from_file \
-	geany_functions->p_stash->stash_group_load_from_file
-#define stash_group_save_to_file \
-	geany_functions->p_stash->stash_group_save_to_file
-#define stash_group_add_toggle_button \
-	geany_functions->p_stash->stash_group_add_toggle_button
-#define stash_group_add_radio_buttons \
-	geany_functions->p_stash->stash_group_add_radio_buttons
-#define stash_group_add_spin_button_integer \
-	geany_functions->p_stash->stash_group_add_spin_button_integer
-#define stash_group_add_combo_box \
-	geany_functions->p_stash->stash_group_add_combo_box
-#define stash_group_add_combo_box_entry \
-	geany_functions->p_stash->stash_group_add_combo_box_entry
-#define stash_group_add_entry \
-	geany_functions->p_stash->stash_group_add_entry
-#define stash_group_add_widget_property \
-	geany_functions->p_stash->stash_group_add_widget_property
-#define stash_group_display \
-	geany_functions->p_stash->stash_group_display
-#define stash_group_update \
-	geany_functions->p_stash->stash_group_update
-#define stash_group_free_settings \
-	geany_functions->p_stash->stash_group_free_settings
-#define symbols_get_context_separator \
-	geany_functions->p_symbols->symbols_get_context_separator
-#define build_activate_menu_item \
-	geany_functions->p_build->build_activate_menu_item
-#define build_get_current_menu_item \
-	geany_functions->p_build->build_get_current_menu_item
-#define build_remove_menu_item \
-	geany_functions->p_build->build_remove_menu_item
-#define build_set_menu_item \
-	geany_functions->p_build->build_set_menu_item
-#define build_get_group_count \
-	geany_functions->p_build->build_get_group_count
-#define project_write_config \
-	geany_functions->p_project->project_write_config
+#include "geanyplugin.h"
 
-#endif
+#endif /* GEANY_FUNCTIONS */


Modified: plugins/geanyplugin.h
16 lines changed, 14 insertions(+), 2 deletions(-)
===================================================================
@@ -28,27 +28,39 @@
 #ifndef GEANY_PLUGIN_H
 #define GEANY_PLUGIN_H 1
 
-/* Note: only include headers that define types or macros, not just functions */
+#ifndef HAVE_PLUGINS
+# define HAVE_PLUGINS 1
+#endif
+
+/* Only include public headers here */
 #include "app.h"
+#include "build.h"
+#include "dialogs.h"
 #include "document.h"
 #include "editor.h"
 #include "encodings.h"
 #include "filetypes.h"
 #include "geany.h"
+#include "geanyfunctions.h"
 #include "highlighting.h"
 #include "keybindings.h"
+#include "main.h"
 #include "msgwindow.h"
+#include "navqueue.h"
 #include "plugindata.h"
+#include "pluginutils.h"
 #include "prefs.h"
 #include "project.h"
+#include "sciwrappers.h"
 #include "search.h"
 #include "stash.h"
 #include "support.h"
+#include "symbols.h"
 #include "templates.h"
 #include "toolbar.h"
 #include "ui_utils.h"
 #include "utils.h"
 
-#include "geanyfunctions.h"
+#include "gtkcompat.h"
 
 #endif


Modified: plugins/genapi.py
98 lines changed, 0 insertions(+), 98 deletions(-)
===================================================================
@@ -1,98 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
-#       genapi.py - this file is part of Geany, a fast and lightweight IDE
-#
-#       Copyright 2008-2011 Nick Treleaven <nick.treleaven<at>btinternet.com>
-#       Copyright 2008-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
-#
-#       This program is free software; you can redistribute it and/or modify
-#       it under the terms of the GNU General Public License as published by
-#       the Free Software Foundation; either version 2 of the License, or
-#       (at your option) any later version.
-#
-#       This program is distributed in the hope that it will be useful,
-#       but WITHOUT ANY WARRANTY; without even the implied warranty of
-#       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#       GNU General Public License for more details.
-#
-#       You should have received a copy of the GNU General Public License
-#       along with this program; if not, write to the Free Software
-#       Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# $(Id)
-
-r"""
-Creates macros for each plugin API function pointer, e.g.:
-
-#define plugin_add_toolbar_item \
-    geany_functions->p_plugin->plugin_add_toolbar_item
-"""
-
-
-import re
-import sys
-
-
-def get_function_names():
-    names = []
-    filep = open('../src/plugins.c')
-    while 1:
-        line = filep.readline()
-        if line == "":
-            break
-        match = re.match("^\t&([a-z][a-z0-9_]+)", line)
-        if match:
-            symbol = match.group(1)
-            if not symbol.endswith('_funcs'):
-                names.append(symbol)
-    filep.close()
-    return names
-
-
-def get_api_tuple(source):
-    match = re.match("^([a-z]+)_([a-z][a-z0-9_]+)$", source)
-    return 'p_' + match.group(1), match.group(2)
-
-
-header = \
-r'''/* This file is generated automatically by genapi.py - do not edit. */
-
-/** @file %s @ref geany_functions wrappers.
- * This allows the use of normal API function names in plugins by defining macros.
- *
- * E.g.:@code
- * #define plugin_add_toolbar_item \
- * 	geany_functions->p_plugin->plugin_add_toolbar_item @endcode
- *
- * You need to declare the @ref geany_functions symbol yourself.
- *
- * Note: This must be included after all other API headers to prevent conflicts with
- * other header's function prototypes - this is done for you when using geanyplugin.h.
- */
-
-#ifndef GEANY_FUNCTIONS_H
-#define GEANY_FUNCTIONS_H
-
-'''
-
-if __name__ == "__main__":
-    outfile = 'geanyfunctions.h'
-
-    fnames = get_function_names()
-    if not fnames:
-        sys.exit("No function names read!")
-
-    f = open(outfile, 'w')
-    f.write(header % (outfile))
-
-    for fname in fnames:
-        ptr, name = get_api_tuple(fname)
-        # note: name no longer needed
-        f.write('#define %s \\\n\tgeany_functions->%s->%s\n' % (fname, ptr, fname))
-
-    f.write('\n#endif\n')
-    f.close()
-
-    if not '-q' in sys.argv:
-        sys.stdout.write('Generated %s\n' % outfile)


Modified: po/POTFILES.in
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -16,8 +16,8 @@ src/geanyentryaction.c
 src/highlighting.c
 src/keybindings.c
 src/keyfile.c
+src/libmain.c
 src/log.c
-src/main.c
 src/msgwindow.c
 src/navqueue.c
 src/notebook.c


Modified: scintilla/Makefile.am
7 lines changed, 4 insertions(+), 3 deletions(-)
===================================================================
@@ -1,7 +1,7 @@
 
 SUBDIRS = include
 
-noinst_LIBRARIES=libscintilla.a
+noinst_LTLIBRARIES=libscintilla.la
 
 AM_CXXFLAGS = -DNDEBUG -DGTK -DSCI_LEXER -DG_THREADS_IMPL_NONE
 
@@ -139,9 +139,10 @@ src/XPM.cxx \
 src/XPM.h \
 $(LEXER_SRCS)
 
-libscintilla_a_SOURCES = $(SRCS)
+libscintilla_la_SOURCES = $(SRCS)
 
-AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir)/include -I$(srcdir)/src -I$(srcdir)/lexlib @GTK_CFLAGS@
+AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir)/include -I$(srcdir)/src -I$(srcdir)/lexlib \
+	@GTK_CFLAGS@ @LIBGEANY_CFLAGS@
 
 marshallers: gtk/scintilla-marshal.list
 	glib-genmarshal --prefix scintilla_marshal gtk/scintilla-marshal.list --header > gtk/scintilla-marshal.h


Modified: scintilla/gtk/ScintillaGTK.cxx
2 lines changed, 2 insertions(+), 0 deletions(-)
===================================================================
@@ -3104,6 +3104,7 @@ sptr_t ScintillaGTK::DirectFunction(
 	return reinterpret_cast<ScintillaGTK *>(ptr)->WndProc(iMessage, wParam, lParam);
 }
 
+GEANY_API_SYMBOL
 sptr_t scintilla_send_message(ScintillaObject *sci, unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
 	ScintillaGTK *psci = reinterpret_cast<ScintillaGTK *>(sci->pscin);
 	return psci->WndProc(iMessage, wParam, lParam);
@@ -3252,6 +3253,7 @@ static void scintilla_init(ScintillaObject *sci) {
 	}
 }
 
+GEANY_API_SYMBOL
 GtkWidget* scintilla_new() {
 	GtkWidget *widget = GTK_WIDGET(g_object_new(scintilla_get_type(), NULL));
 	gtk_widget_set_direction(widget, GTK_TEXT_DIR_LTR);


Modified: scintilla/gtk/makefile.win32
4 lines changed, 3 insertions(+), 1 deletions(-)
===================================================================
@@ -32,7 +32,9 @@ vpath %.h ../src ../include ../lexlib
 vpath %.cxx ../src ../lexlib ../lexers
 
 INCLUDEDIRS=-I ../include -I ../src -I ../lexlib
-CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -DGTK -DSCI_LEXER $(INCLUDEDIRS)
+CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -DGTK -DSCI_LEXER $(INCLUDEDIRS) \
+	-DGEANY_EXPORT_SYMBOL="__declspec(dllexport)" \
+	-DGEANY_API_SYMBOL=GEANY_EXPORT_SYMBOL
 
 ifdef THREADS
 THREADFLAGS=


Modified: scintilla/scintilla_changes.patch
20 lines changed, 20 insertions(+), 0 deletions(-)
===================================================================
@@ -1,5 +1,25 @@
 A patch to Scintilla 2.29 containing our changes to Scintilla
 (removing unused lexers and an updated marshallers file).
+diff --git a/scintilla/gtk/ScintillaGTK.cxx b/scintilla/gtk/ScintillaGTK.cxx
+index 18e3358..5c405bc 100644
+--- scintilla/gtk/ScintillaGTK.cxx
++++ scintilla/gtk/ScintillaGTK.cxx
+@@ -2959,6 +2959,7 @@ sptr_t ScintillaGTK::DirectFunction(
+ 	return reinterpret_cast<ScintillaGTK *>(ptr)->WndProc(iMessage, wParam, lParam);
+ }
+ 
++GEANY_API_SYMBOL
+ sptr_t scintilla_send_message(ScintillaObject *sci, unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
+ 	ScintillaGTK *psci = reinterpret_cast<ScintillaGTK *>(sci->pscin);
+ 	return psci->WndProc(iMessage, wParam, lParam);
+@@ -3107,6 +3108,7 @@ static void scintilla_init(ScintillaObject *sci) {
+ 	}
+ }
+ 
++GEANY_API_SYMBOL
+ GtkWidget* scintilla_new() {
+ 	GtkWidget *widget = GTK_WIDGET(g_object_new(scintilla_get_type(), NULL));
+ 	gtk_widget_set_direction(widget, GTK_TEXT_DIR_LTR);
 diff -Naur scintilla_orig/gtk/scintilla-marshal.c scintilla/gtk/scintilla-marshal.c
 --- scintilla_orig/gtk/scintilla-marshal.c	2010-10-27 23:15:45.000000000 +0200
 +++ scintilla/gtk/scintilla-marshal.c	2011-04-03 17:42:59.000000000 +0200


Modified: src/Makefile.am
171 lines changed, 90 insertions(+), 81 deletions(-)
===================================================================
@@ -3,7 +3,6 @@
 
 EXTRA_DIST = \
 	gb.c \
-	win32.c win32.h \
 	plugindata.h \
 	documentprivate.h \
 	filetypesprivate.h \
@@ -12,9 +11,53 @@ EXTRA_DIST = \
 	projectprivate.h \
 	makefile.win32
 
+AM_CPPFLAGS = \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/scintilla/include \
+	-I$(top_srcdir)/tagmanager/src \
+	-DGTK \
+	-DGEANY_PRIVATE \
+	-DG_LOG_DOMAIN=\""Geany"\" \
+	@GTK_CFLAGS@ @GTHREAD_CFLAGS@ \
+	$(MAC_INTEGRATION_CFLAGS)
+
 bin_PROGRAMS = geany
+lib_LTLIBRARIES = libgeany.la
+
+geany_SOURCES = main.c
+geany_LDADD = libgeany.la $(GTK_LIBS) $(GTHREAD_LIBS) $(INTLLIBS)
+
+geany_includedir = $(includedir)/geany
+geany_include_HEADERS = \
+	app.h \
+	build.h \
+	dialogs.h \
+	document.h \
+	editor.h \
+	encodings.h \
+	filetypes.h \
+	geany.h \
+	gtkcompat.h \
+	highlighting.h \
+	keybindings.h \
+	main.h \
+	msgwindow.h \
+	navqueue.h \
+	plugindata.h \
+	pluginutils.h \
+	prefs.h \
+	project.h \
+	sciwrappers.h \
+	search.h \
+	stash.h \
+	support.h \
+	symbols.h \
+	templates.h \
+	toolbar.h \
+	ui_utils.h \
+	utils.h
 
-SRCS = \
+libgeany_la_SOURCES = \
 	about.c about.h \
 	app.h \
 	build.c build.h \
@@ -34,7 +77,7 @@ SRCS = \
 	keybindings.c keybindings.h \
 	keyfile.c keyfile.h \
 	log.c log.h \
-	main.c main.h geany.h \
+	libmain.c main.h geany.h \
 	msgwindow.c msgwindow.h \
 	navqueue.c navqueue.h \
 	notebook.c notebook.h \
@@ -58,104 +101,70 @@ SRCS = \
 	ui_utils.c ui_utils.h \
 	utils.c utils.h
 
+libgeany_la_CFLAGS  = $(AM_CPPFLAGS) @LIBGEANY_CFLAGS@
+libgeany_la_LDFLAGS = @LIBGEANY_LDFLAGS@
 
-geany_includedir = $(includedir)/geany
-
-# only install headers that define types or macros, not just functions
-geany_include_HEADERS = \
-	app.h \
-	build.h \
-	document.h \
-	editor.h \
-	encodings.h \
-	filetypes.h \
-	geany.h \
-	gtkcompat.h \
-	highlighting.h \
-	keybindings.h \
-	msgwindow.h \
-	plugindata.h \
-	prefs.h \
-	project.h \
-	search.h \
-	stash.h \
-	support.h \
-	templates.h \
-	toolbar.h \
-	ui_utils.h \
-	utils.h
-
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir) \
-	-I$(top_srcdir)/scintilla/include \
-	-I$(top_srcdir)/tagmanager/src \
-	@GTK_CFLAGS@ @GTHREAD_CFLAGS@ $(MAC_INTEGRATION_CFLAGS)
+libgeany_la_LIBADD = \
+	$(top_builddir)/scintilla/libscintilla.la \
+	$(top_builddir)/tagmanager/ctags/libctags.la \
+	$(top_builddir)/tagmanager/mio/libmio.la \
+	$(top_builddir)/tagmanager/src/libtagmanager.la \
+	@GTK_LIBS@ \
+	@GTHREAD_LIBS@ \
+	$(MAC_INTEGRATION_LIBS) \
+	$(INTLLIBS)
 
 # tell automake we have a C++ file so it uses the C++ linker we need for Scintilla
-nodist_EXTRA_geany_SOURCES = dummy.cxx
+nodist_EXTRA_libgeany_la_SOURCES = dummy1.cxx
 
+CLEANFILES =
 
 if MINGW
-# build Geany for Windows on non-Windows systems (cross-compile)
-
-geany_SOURCES = $(SRCS) win32.c win32.h
+# build Geany for Windows (possibly on non-Windows systems -- cross-compile)
 
-geany_LDADD = \
-	$(top_builddir)/scintilla/libscintilla.a \
-	$(top_builddir)/tagmanager/ctags/libctags.a \
-	$(top_builddir)/tagmanager/mio/libmio.a \
-	$(top_builddir)/tagmanager/src/libtagmanager.a \
-	@GTK_LIBS@ \
-	@GTHREAD_LIBS@ \
-	$(INTLLIBS) \
-	-lole32 -luuid -lwsock32 \
-	geany_private.res
+AM_CPPFLAGS += \
+	-DGEANY_DATADIR=\"data\" \
+	-DGEANY_DOCDIR=\"\" \
+	-DGEANY_LIBDIR=\"\" \
+	-DGEANY_LOCALEDIR=\"\" \
+	-DGEANY_PREFIX=\"\"
 
-AM_CFLAGS = -DGEANY_DATADIR=\"data\" \
-			-DGEANY_DOCDIR=\"\" \
-			-DGEANY_LIBDIR=\"\" \
-			-DGEANY_LOCALEDIR=\"\" \
-			-DGEANY_PREFIX=\"\" \
-			-DGEANY_PRIVATE \
-			-DGTK \
-			-DG_LOG_DOMAIN=\""Geany"\"
-
-geany_LDFLAGS =	-mwindows -mms-bitfields
+geany_LDADD += geany_private.res
 
 WINDRES = $(host_alias)-windres
 
 geany_private.res: $(top_srcdir)/geany_private.rc
 	$(WINDRES) -i $(top_srcdir)/geany_private.rc --input-format=rc -o $@ -O coff
 
-clean-local:
-	rm -f geany_private.res
+libgeany_la_SOURCES += win32.c win32.h
+libgeany_la_LIBADD  += -lole32 -lwsock32 -lcomdlg32
+libgeany_la_LDFLAGS += -Wl,-luuid -mwindows -mms-bitfields -no-undefined
+
+CLEANFILES += geany_private.res
 
 else
 # build Geany for all other platforms
 
-geany_SOURCES = $(SRCS) vte.c vte.h
+AM_CPPFLAGS += \
+	-DGEANY_DATADIR=\""$(datadir)"\" \
+	-DGEANY_DOCDIR=\""$(docdir)"\" \
+	-DGEANY_LIBDIR=\""$(libdir)"\" \
+	-DGEANY_LOCALEDIR=\""$(localedir)"\" \
+	-DGEANY_PREFIX=\""$(prefix)"\"
 
-geany_LDADD = \
-	$(top_builddir)/scintilla/libscintilla.a \
-	$(top_builddir)/tagmanager/ctags/libctags.a \
-	$(top_builddir)/tagmanager/mio/libmio.a \
-	$(top_builddir)/tagmanager/src/libtagmanager.a \
-	@GTK_LIBS@ \
-	@GTHREAD_LIBS@ \
-	$(MAC_INTEGRATION_LIBS) \
-	$(INTLLIBS)
+libgeany_la_SOURCES += vte.c vte.h
+
+endif
 
-AM_CFLAGS = -DGEANY_DATADIR=\""$(datadir)"\" \
-			-DGEANY_DOCDIR=\""$(docdir)"\" \
-			-DGEANY_LIBDIR=\""$(libdir)"\" \
-			-DGEANY_LOCALEDIR=\""$(localedir)"\" \
-			-DGEANY_PREFIX=\""$(prefix)"\" \
-			-DGEANY_PRIVATE \
-			-DGTK \
-			-DG_LOG_DOMAIN=\""Geany"\"
+callbacks.c: signallist.i
 
-clean-local:
+glade_file=$(top_srcdir)/data/geany.glade
 
-endif
+signallist.i: $(glade_file) Makefile
+	$(AM_V_GEN)( \
+		echo '/* This file is auto-generated, do not edit. */' && \
+		$(SED) -n 's/^.*handler="\([^"]\{1,\}\)".*$$/ITEM(\1)/p' "$(glade_file)" \
+			| $(SORT) | $(UNIQ) \
+	) > $@ || { $(RM) $@ && exit 1; }
 
+CLEANFILES += signallist.i


Modified: src/build.c
8 lines changed, 5 insertions(+), 3 deletions(-)
===================================================================
@@ -509,6 +509,7 @@ static GeanyBuildCommand *get_build_group(const GeanyBuildSource src, const Gean
  * Updates the menu.
  *
  **/
+GEANY_API_SYMBOL
 void build_remove_menu_item(const GeanyBuildSource src, const GeanyBuildGroup grp, const gint cmd)
 {
 	GeanyBuildCommand *bc;
@@ -569,6 +570,7 @@ GeanyBuildCommand *build_get_menu_item(GeanyBuildSource src, GeanyBuildGroup grp
  *         This is a pointer to an internal structure and must not be freed.
  *
  **/
+GEANY_API_SYMBOL
 const gchar *build_get_current_menu_item(const GeanyBuildGroup grp, const guint cmd,
                                          const GeanyBuildCmdEntries fld)
 {
@@ -609,7 +611,7 @@ const gchar *build_get_current_menu_item(const GeanyBuildGroup grp, const guint
  * @param val the value to set the field to, is copied
  *
  **/
-
+GEANY_API_SYMBOL
 void build_set_menu_item(const GeanyBuildSource src, const GeanyBuildGroup grp,
                          const guint cmd, const GeanyBuildCmdEntries fld, const gchar *val)
 {
@@ -654,7 +656,7 @@ void build_set_menu_item(const GeanyBuildSource src, const GeanyBuildGroup grp,
  * @param cmd the index of the command within the group.
  *
  **/
-
+GEANY_API_SYMBOL
 void build_activate_menu_item(const GeanyBuildGroup grp, const guint cmd)
 {
 	on_build_menu_item(NULL, GRP_CMD_TO_POINTER(grp, cmd));
@@ -2782,7 +2784,7 @@ void build_set_group_count(GeanyBuildGroup grp, gint count)
  * @return a count of the number of commands in the group
  *
  **/
-
+GEANY_API_SYMBOL
 guint build_get_group_count(const GeanyBuildGroup grp)
 {
 	g_return_val_if_fail(grp < GEANY_GBG_COUNT, 0);


Modified: src/callbacks.c
383 lines changed, 169 insertions(+), 214 deletions(-)
===================================================================
@@ -73,85 +73,6 @@
 #include <time.h>
 
 
-/* prototypes of Glade-only callback to let the compiler know they really are meant to be exported */
-G_MODULE_EXPORT gboolean on_window_delete_event(GtkWidget *widget, GdkEvent *event, gpointer gdata);
-G_MODULE_EXPORT void on_info1_activate(GtkMenuItem *menuitem, gpointer user_data);
-G_MODULE_EXPORT void on_change_font1_activate(GtkMenuItem *menuitem, gpointer user_data);
-G_MODULE_EXPORT void on_crlf_activate(GtkCheckMenuItem *menuitem, gpointer user_data);
-G_MODULE_EXPORT void on_lf_activate(GtkCheckMenuItem *menuitem, gpointer user_data);
-G_MODULE_EXPORT void on_cr_activate(GtkCheckMenuItem *menuitem, gpointer user_data);
-G_MODULE_EXPORT void on_hide_toolbar1_activate(GtkMenuItem *menuitem, gpointer user_data);
-G_MODULE_EXPORT void on_show_toolbar1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data);
-G_MODULE_EXPORT void on_fullscreen1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data);
-G_MODULE_EXPORT void on_markers_margin1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data);
-G_MODULE_EXPORT void on_show_messages_window1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data);
-G_MODULE_EXPORT void on_menu_color_schemes_activate(GtkImageMenuItem *imagemenuitem, gpointer user_data);
-G_MODULE_EXPORT void on_count_words1_activate(GtkMenuItem *menuitem, gpointer user_data);
-G_MODULE_EXPORT void on_edit1_activate(GtkMenuItem *menuitem, gpointer user_data);
-G_MODULE_EXPORT void on_website1_activate(GtkMenuItem *menuitem, gpointer user_data);
-G_MODULE_EXPORT void on_help_menu_item_donate_activate(GtkMenuItem *item, gpointer user_data);
-G_MODULE_EXPORT void on_help_menu_item_wiki_activate(GtkMenuItem *item, gpointer user_data);
-G_MODULE_EXPORT void on_help_menu_item_bug_report_activate(GtkMenuItem *item, gpointer user_data);
-G_MODULE_EXPORT void on_comments_function_activate(GtkMenuItem *menuitem, gpointer user_data);
-G_MODULE_EXPORT void on_comments_multiline_activate(GtkMenuItem *menuitem, gpointer user_data);
-G_MODULE_EXPORT void on_comments_changelog_activate(GtkMenuItem *menuitem, gpointer user_data);
-G_MODULE_EXPORT void on_comments_gpl_activate(GtkMenuItem *menuitem, gpointer user_data);
-G_MODULE_EXPORT void on_comments_fileheader_activate(GtkMenuItem *menuitem, gpointer user_data);
-G_MODULE_EXPORT void on_set_file_readonly1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data);
-G_MODULE_EXPORT void on_tv_notebook_switch_page(GtkNotebook *notebook, gpointer page, guint page_num, gpointer user_data);
-G_MODULE_EXPORT void on_help_shortcuts1_activate(GtkMenuItem *menuitem, gpointer user_data);
-G_MODULE_EXPORT void on_file_properties_activate(GtkMenuItem *menuitem, gpointer user_data);
-G_MODULE_EXPORT void on_show_line_numbers1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data);
-G_MODULE_EXPORT void on_use_auto_indentation1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data);
-G_MODULE_EXPORT void on_menu_fold_all1_activate(GtkMenuItem *menuitem, gpointer user_data);
-G_MODULE_EXPORT void on_menu_unfold_all1_activate(GtkMenuItem *menuitem, gpointer user_data);
-G_MODULE_EXPORT void on_notebook1_switch_page_after(GtkNotebook *notebook, gpointer page, guint page_num, gpointer user_data);
-G_MODULE_EXPORT void on_menu_write_unicode_bom1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data);
-G_MODULE_EXPORT void on_menu_comments_multiline_activate(GtkMenuItem *menuitem, gpointer user_data);
-G_MODULE_EXPORT void on_menu_comments_gpl_activate(GtkMenuItem *menuitem, gpointer user_data);
-G_MODULE_EXPORT void on_menu_comments_bsd_activate(GtkMenuItem *menuitem, gpointer user_data);
-G_MODULE_EXPORT void on_comments_bsd_activate(GtkMenuItem *menuitem, gpointer user_data);
-G_MODULE_EXPORT void on_menu_project1_activate(GtkMenuItem *menuitem, gpointer user_data);
-G_MODULE_EXPORT void on_load_tags1_activate(GtkMenuItem *menuitem, gpointer user_data);
-G_MODULE_EXPORT void on_file1_activate(GtkMenuItem *menuitem, gpointer user_data);
-G_MODULE_EXPORT void on_tv_notebook_switch_page_after(GtkNotebook *notebook, gpointer page, guint page_num, gpointer user_data);
-G_MODULE_EXPORT void on_tabs1_activate(GtkCheckMenuItem *menuitem, gpointer user_data);
-G_MODULE_EXPORT void on_spaces1_activate(GtkCheckMenuItem *menuitem, gpointer user_data);
-G_MODULE_EXPORT void on_strip_trailing_spaces1_activate(GtkMenuItem *menuitem, gpointer user_data);
-G_MODULE_EXPORT void on_page_setup1_activate(GtkMenuItem *menuitem, gpointer user_data);
-G_MODULE_EXPORT void on_search1_activate(GtkMenuItem *menuitem, gpointer user_data);
-G_MODULE_EXPORT void on_menu_reload_configuration1_activate(GtkMenuItem *menuitem, gpointer user_data);
-G_MODULE_EXPORT void on_tabs_and_spaces1_activate(GtkCheckMenuItem *menuitem, gpointer user_data);
-G_MODULE_EXPORT void on_debug_messages1_activate(GtkMenuItem *menuitem, gpointer user_data);
-G_MODULE_EXPORT void on_menu_show_white_space1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data);
-G_MODULE_EXPORT void on_menu_show_line_endings1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data);
-G_MODULE_EXPORT void on_menu_show_indentation_guides1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data);
-G_MODULE_EXPORT gboolean on_window_state_event(GtkWidget *widget, GdkEventWindowState *event, gpointer user_data);
-G_MODULE_EXPORT void on_customize_toolbar1_activate(GtkMenuItem *menuitem, gpointer user_data);
-G_MODULE_EXPORT void on_button_customize_toolbar_clicked(GtkButton *button, gpointer user_data);
-G_MODULE_EXPORT void on_cut_current_lines1_activate(GtkMenuItem *menuitem, gpointer user_data);
-G_MODULE_EXPORT void on_copy_current_lines1_activate(GtkMenuItem *menuitem, gpointer user_data);
-G_MODULE_EXPORT void on_delete_current_lines1_activate(GtkMenuItem *menuitem, gpointer user_data);
-G_MODULE_EXPORT void on_duplicate_line_or_selection1_activate(GtkMenuItem *menuitem, gpointer user_data);
-G_MODULE_EXPORT void on_select_current_lines1_activate(GtkMenuItem *menuitem, gpointer user_data);
-G_MODULE_EXPORT void on_select_current_paragraph1_activate(GtkMenuItem *menuitem, gpointer user_data);
-G_MODULE_EXPORT void on_insert_alternative_white_space1_activate(GtkMenuItem *menuitem, gpointer user_data);
-G_MODULE_EXPORT void on_go_to_next_marker1_activate(GtkMenuItem *menuitem, gpointer user_data);
-G_MODULE_EXPORT void on_go_to_previous_marker1_activate(GtkMenuItem *menuitem, gpointer user_data);
-G_MODULE_EXPORT void on_reflow_lines_block1_activate(GtkMenuItem *menuitem, gpointer user_data);
-G_MODULE_EXPORT void on_smart_line_indent1_activate(GtkMenuItem *menuitem, gpointer user_data);
-G_MODULE_EXPORT void on_move_lines_up1_activate(GtkMenuItem *menuitem, gpointer user_data);
-G_MODULE_EXPORT void on_move_lines_down1_activate(GtkMenuItem *menuitem, gpointer user_data);
-G_MODULE_EXPORT void on_goto_tag_definition1(GtkMenuItem *menuitem, gpointer user_data);
-G_MODULE_EXPORT void on_goto_tag_declaration1(GtkMenuItem *menuitem, gpointer user_data);
-G_MODULE_EXPORT void on_indent_width_activate(GtkMenuItem *menuitem, gpointer user_data);
-G_MODULE_EXPORT void on_reset_indentation1_activate(GtkMenuItem *menuitem, gpointer user_data);
-G_MODULE_EXPORT void on_mark_all1_activate(GtkMenuItem *menuitem, gpointer user_data);
-G_MODULE_EXPORT void on_detect_type_from_file_activate(GtkMenuItem *menuitem, gpointer user_data);
-G_MODULE_EXPORT void on_detect_width_from_file_activate(GtkMenuItem *menuitem, gpointer user_data);
-G_MODULE_EXPORT void on_clone1_activate(GtkMenuItem *menuitem, gpointer user_data);
-
-
 /* represents the state at switching a notebook page(in the left treeviews widget), to not emit
  * the selection-changed signal from tv.tree_openfiles */
 /*static gboolean switch_tv_notebook_page = FALSE; */
@@ -159,7 +80,7 @@ G_MODULE_EXPORT void on_clone1_activate(GtkMenuItem *menuitem, gpointer user_dat
 
 
 /* wrapper function to abort exit process if cancel button is pressed */
-G_MODULE_EXPORT gboolean on_window_delete_event(GtkWidget *widget, GdkEvent *event, gpointer gdata)
+static gboolean on_window_delete_event(GtkWidget *widget, GdkEvent *event, gpointer gdata)
 {
 	return !main_quit();
 }
@@ -169,14 +90,14 @@ G_MODULE_EXPORT gboolean on_window_delete_event(GtkWidget *widget, GdkEvent *eve
  * GUI callbacks
  */
 
-G_MODULE_EXPORT void on_new1_activate(GtkMenuItem *menuitem, gpointer user_data)
+void on_new1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	document_new_file(NULL, NULL, NULL);
 }
 
 
 /* create a new file and copy file content and properties */
-G_MODULE_EXPORT void on_clone1_activate(GtkMenuItem *menuitem, gpointer user_data)
+static void on_clone1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	GeanyDocument *old_doc = document_get_current();
 
@@ -185,7 +106,7 @@ G_MODULE_EXPORT void on_clone1_activate(GtkMenuItem *menuitem, gpointer user_dat
 }
 
 
-G_MODULE_EXPORT void on_save1_activate(GtkMenuItem *menuitem, gpointer user_data)
+void on_save1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	GeanyDocument *doc = document_get_current();
 
@@ -196,13 +117,13 @@ G_MODULE_EXPORT void on_save1_activate(GtkMenuItem *menuitem, gpointer user_data
 }
 
 
-G_MODULE_EXPORT void on_save_as1_activate(GtkMenuItem *menuitem, gpointer user_data)
+void on_save_as1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	dialogs_show_save_as();
 }
 
 
-G_MODULE_EXPORT void on_save_all1_activate(GtkMenuItem *menuitem, gpointer user_data)
+void on_save_all1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	guint i, max = (guint) gtk_notebook_get_n_pages(GTK_NOTEBOOK(main_widgets.notebook));
 	GeanyDocument *doc, *cur_doc = document_get_current();
@@ -229,13 +150,13 @@ G_MODULE_EXPORT void on_save_all1_activate(GtkMenuItem *menuitem, gpointer user_
 }
 
 
-G_MODULE_EXPORT void on_close_all1_activate(GtkMenuItem *menuitem, gpointer user_data)
+void on_close_all1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	document_close_all();
 }
 
 
-G_MODULE_EXPORT void on_close1_activate(GtkMenuItem *menuitem, gpointer user_data)
+void on_close1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	GeanyDocument *doc = document_get_current();
 
@@ -244,13 +165,13 @@ G_MODULE_EXPORT void on_close1_activate(GtkMenuItem *menuitem, gpointer user_dat
 }
 
 
-G_MODULE_EXPORT void on_quit1_activate(GtkMenuItem *menuitem, gpointer user_data)
+void on_quit1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	main_quit();
 }
 
 
-G_MODULE_EXPORT void on_file1_activate(GtkMenuItem *menuitem, gpointer user_data)
+static void on_file1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	gtk_widget_set_sensitive(ui_widgets.recent_files_menuitem,
 						g_queue_get_length(ui_prefs.recent_queue) > 0);
@@ -260,7 +181,7 @@ G_MODULE_EXPORT void on_file1_activate(GtkMenuItem *menuitem, gpointer user_data
 
 
 /* edit actions, c&p & co, from menu bar and from popup menu */
-G_MODULE_EXPORT void on_edit1_activate(GtkMenuItem *menuitem, gpointer user_data)
+static void on_edit1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	GtkWidget *item;
 	GeanyDocument *doc = document_get_current();
@@ -277,7 +198,7 @@ G_MODULE_EXPORT void on_edit1_activate(GtkMenuItem *menuitem, gpointer user_data
 }
 
 
-G_MODULE_EXPORT void on_undo1_activate(GtkMenuItem *menuitem, gpointer user_data)
+void on_undo1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	GeanyDocument *doc = document_get_current();
 
@@ -291,7 +212,7 @@ G_MODULE_EXPORT void on_undo1_activate(GtkMenuItem *menuitem, gpointer user_data
 }
 
 
-G_MODULE_EXPORT void on_redo1_activate(GtkMenuItem *menuitem, gpointer user_data)
+void on_redo1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	GeanyDocument *doc = document_get_current();
 
@@ -305,7 +226,7 @@ G_MODULE_EXPORT void on_redo1_activate(GtkMenuItem *menuitem, gpointer user_data
 }
 
 
-G_MODULE_EXPORT void on_cut1_activate(GtkMenuItem *menuitem, gpointer user_data)
+void on_cut1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	GeanyDocument *doc = document_get_current();
 	GtkWidget *focusw = gtk_window_get_focus(GTK_WINDOW(main_widgets.window));
@@ -325,7 +246,7 @@ G_MODULE_EXPORT void on_cut1_activate(GtkMenuItem *menuitem, gpointer user_data)
 }
 
 
-G_MODULE_EXPORT void on_copy1_activate(GtkMenuItem *menuitem, gpointer user_data)
+void on_copy1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	GeanyDocument *doc = document_get_current();
 	GtkWidget *focusw = gtk_window_get_focus(GTK_WINDOW(main_widgets.window));
@@ -345,7 +266,7 @@ G_MODULE_EXPORT void on_copy1_activate(GtkMenuItem *menuitem, gpointer user_data
 }
 
 
-G_MODULE_EXPORT void on_paste1_activate(GtkMenuItem *menuitem, gpointer user_data)
+void on_paste1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	GeanyDocument *doc = document_get_current();
 	GtkWidget *focusw = gtk_window_get_focus(GTK_WINDOW(main_widgets.window));
@@ -368,7 +289,7 @@ G_MODULE_EXPORT void on_paste1_activate(GtkMenuItem *menuitem, gpointer user_dat
 }
 
 
-G_MODULE_EXPORT void on_delete1_activate(GtkMenuItem *menuitem, gpointer user_data)
+void on_delete1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	GeanyDocument *doc = document_get_current();
 	GtkWidget *focusw = gtk_window_get_focus(GTK_WINDOW(main_widgets.window));
@@ -388,28 +309,28 @@ G_MODULE_EXPORT void on_delete1_activate(GtkMenuItem *menuitem, gpointer user_da
 }
 
 
-G_MODULE_EXPORT void on_preferences1_activate(GtkMenuItem *menuitem, gpointer user_data)
+void on_preferences1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	prefs_show_dialog();
 }
 
 
 /* about menu item */
-G_MODULE_EXPORT void on_info1_activate(GtkMenuItem *menuitem, gpointer user_data)
+static void on_info1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	about_dialog_show();
 }
 
 
 /* open file */
-G_MODULE_EXPORT void on_open1_activate(GtkMenuItem *menuitem, gpointer user_data)
+void on_open1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	dialogs_show_open_file();
 }
 
 
 /* reload file */
-G_MODULE_EXPORT void on_toolbutton_reload_clicked(GtkAction *action, gpointer user_data)
+void on_toolbutton_reload_clicked(GtkAction *action, gpointer user_data)
 {
 	GeanyDocument *doc = document_get_current();
 
@@ -419,7 +340,7 @@ G_MODULE_EXPORT void on_toolbutton_reload_clicked(GtkAction *action, gpointer us
 }
 
 
-G_MODULE_EXPORT void on_change_font1_activate(GtkMenuItem *menuitem, gpointer user_data)
+static void on_change_font1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	dialogs_show_open_font();
 }
@@ -484,7 +405,7 @@ void on_toolbutton_search_clicked(GtkAction *action, gpointer user_data)
 
 
 /* hides toolbar from toolbar popup menu */
-G_MODULE_EXPORT void on_hide_toolbar1_activate(GtkMenuItem *menuitem, gpointer user_data)
+static void on_hide_toolbar1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	GtkWidget *tool_item = ui_lookup_widget(GTK_WIDGET(main_widgets.window), "menu_show_toolbar1");
 	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(tool_item), FALSE);
@@ -492,7 +413,7 @@ G_MODULE_EXPORT void on_hide_toolbar1_activate(GtkMenuItem *menuitem, gpointer u
 
 
 /* zoom in from menu bar and popup menu */
-G_MODULE_EXPORT void on_zoom_in1_activate(GtkMenuItem *menuitem, gpointer user_data)
+void on_zoom_in1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	GeanyDocument *doc = document_get_current();
 
@@ -503,7 +424,7 @@ G_MODULE_EXPORT void on_zoom_in1_activate(GtkMenuItem *menuitem, gpointer user_d
 
 
 /* zoom out from menu bar and popup menu */
-G_MODULE_EXPORT void on_zoom_out1_activate(GtkMenuItem *menuitem, gpointer user_data)
+void on_zoom_out1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	GeanyDocument *doc = document_get_current();
 
@@ -513,7 +434,7 @@ G_MODULE_EXPORT void on_zoom_out1_activate(GtkMenuItem *menuitem, gpointer user_
 }
 
 
-G_MODULE_EXPORT void on_normal_size1_activate(GtkMenuItem *menuitem, gpointer user_data)
+void on_normal_size1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	GeanyDocument *doc = document_get_current();
 
@@ -532,7 +453,7 @@ static gboolean delayed_check_disk_status(gpointer data)
 
 /* Changes window-title after switching tabs and lots of other things.
  * note: using 'after' makes Scintilla redraw before the UI, appearing more responsive */
-G_MODULE_EXPORT void on_notebook1_switch_page_after(GtkNotebook *notebook, gpointer page,
+static void on_notebook1_switch_page_after(GtkNotebook *notebook, gpointer page,
 		guint page_num, gpointer user_data)
 {
 	GeanyDocument *doc;
@@ -568,7 +489,7 @@ G_MODULE_EXPORT void on_notebook1_switch_page_after(GtkNotebook *notebook, gpoin
 }
 
 
-G_MODULE_EXPORT void on_tv_notebook_switch_page(GtkNotebook *notebook, gpointer page,
+static void on_tv_notebook_switch_page(GtkNotebook *notebook, gpointer page,
 		guint page_num, gpointer user_data)
 {
 	/* suppress selection changed signal when switching to the open files list */
@@ -576,7 +497,7 @@ G_MODULE_EXPORT void on_tv_notebook_switch_page(GtkNotebook *notebook, gpointer
 }
 
 
-G_MODULE_EXPORT void on_tv_notebook_switch_page_after(GtkNotebook *notebook, gpointer page,
+static void on_tv_notebook_switch_page_after(GtkNotebook *notebook, gpointer page,
 		guint page_num, gpointer user_data)
 {
 	ignore_callback = FALSE;
@@ -595,7 +516,7 @@ static void convert_eol(gint mode)
 }
 
 
-G_MODULE_EXPORT void on_crlf_activate(GtkCheckMenuItem *menuitem, gpointer user_data)
+static void on_crlf_activate(GtkCheckMenuItem *menuitem, gpointer user_data)
 {
 	if (ignore_callback || ! gtk_check_menu_item_get_active(menuitem))
 		return;
@@ -604,7 +525,7 @@ G_MODULE_EXPORT void on_crlf_activate(GtkCheckMenuItem *menuitem, gpointer user_
 }
 
 
-G_MODULE_EXPORT void on_lf_activate(GtkCheckMenuItem *menuitem, gpointer user_data)
+static void on_lf_activate(GtkCheckMenuItem *menuitem, gpointer user_data)
 {
 	if (ignore_callback || ! gtk_check_menu_item_get_active(menuitem))
 		return;
@@ -613,7 +534,7 @@ G_MODULE_EXPORT void on_lf_activate(GtkCheckMenuItem *menuitem, gpointer user_da
 }
 
 
-G_MODULE_EXPORT void on_cr_activate(GtkCheckMenuItem *menuitem, gpointer user_data)
+static void on_cr_activate(GtkCheckMenuItem *menuitem, gpointer user_data)
 {
 	if (ignore_callback || ! gtk_check_menu_item_get_active(menuitem))
 		return;
@@ -622,7 +543,7 @@ G_MODULE_EXPORT void on_cr_activate(GtkCheckMenuItem *menuitem, gpointer user_da
 }
 
 
-G_MODULE_EXPORT void on_replace_tabs_activate(GtkMenuItem *menuitem, gpointer user_data)
+void on_replace_tabs_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	GeanyDocument *doc = document_get_current();
 
@@ -643,7 +564,7 @@ gboolean toolbar_popup_menu(GtkWidget *widget, GdkEventButton *event, gpointer u
 }
 
 
-G_MODULE_EXPORT void on_toggle_case1_activate(GtkMenuItem *menuitem, gpointer user_data)
+void on_toggle_case1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	GeanyDocument *doc = document_get_current();
 	ScintillaObject *sci;
@@ -699,7 +620,7 @@ G_MODULE_EXPORT void on_toggle_case1_activate(GtkMenuItem *menuitem, gpointer us
 }
 
 
-G_MODULE_EXPORT void on_show_toolbar1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data)
+static void on_show_toolbar1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data)
 {
 	if (ignore_callback) return;
 
@@ -708,7 +629,7 @@ G_MODULE_EXPORT void on_show_toolbar1_toggled(GtkCheckMenuItem *checkmenuitem, g
 }
 
 
-G_MODULE_EXPORT void on_fullscreen1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data)
+static void on_fullscreen1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data)
 {
 	if (ignore_callback)
 		return;
@@ -718,7 +639,7 @@ G_MODULE_EXPORT void on_fullscreen1_toggled(GtkCheckMenuItem *checkmenuitem, gpo
 }
 
 
-G_MODULE_EXPORT void on_show_messages_window1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data)
+static void on_show_messages_window1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data)
 {
 	if (ignore_callback)
 		return;
@@ -728,13 +649,13 @@ G_MODULE_EXPORT void on_show_messages_window1_toggled(GtkCheckMenuItem *checkmen
 }
 
 
-G_MODULE_EXPORT void on_menu_color_schemes_activate(GtkImageMenuItem *imagemenuitem, gpointer user_data)
+static void on_menu_color_schemes_activate(GtkImageMenuItem *imagemenuitem, gpointer user_data)
 {
 	highlighting_show_color_scheme_dialog();
 }
 
 
-G_MODULE_EXPORT void on_markers_margin1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data)
+static void on_markers_margin1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data)
 {
 	if (ignore_callback)
 		return;
@@ -744,7 +665,7 @@ G_MODULE_EXPORT void on_markers_margin1_toggled(GtkCheckMenuItem *checkmenuitem,
 }
 
 
-G_MODULE_EXPORT void on_show_line_numbers1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data)
+static void on_show_line_numbers1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data)
 {
 	if (ignore_callback)
 		return;
@@ -754,7 +675,7 @@ G_MODULE_EXPORT void on_show_line_numbers1_toggled(GtkCheckMenuItem *checkmenuit
 }
 
 
-G_MODULE_EXPORT void on_menu_show_white_space1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data)
+static void on_menu_show_white_space1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data)
 {
 	if (ignore_callback)
 		return;
@@ -764,7 +685,7 @@ G_MODULE_EXPORT void on_menu_show_white_space1_toggled(GtkCheckMenuItem *checkme
 }
 
 
-G_MODULE_EXPORT void on_menu_show_line_endings1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data)
+static void on_menu_show_line_endings1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data)
 {
 	if (ignore_callback)
 		return;
@@ -774,7 +695,7 @@ G_MODULE_EXPORT void on_menu_show_line_endings1_toggled(GtkCheckMenuItem *checkm
 }
 
 
-G_MODULE_EXPORT void on_menu_show_indentation_guides1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data)
+static void on_menu_show_indentation_guides1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data)
 {
 	if (ignore_callback)
 		return;
@@ -784,7 +705,7 @@ G_MODULE_EXPORT void on_menu_show_indentation_guides1_toggled(GtkCheckMenuItem *
 }
 
 
-G_MODULE_EXPORT void on_line_wrapping1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data)
+void on_line_wrapping1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data)
 {
 	if (! ignore_callback)
 	{
@@ -796,7 +717,7 @@ G_MODULE_EXPORT void on_line_wrapping1_toggled(GtkCheckMenuItem *checkmenuitem,
 }
 
 
-G_MODULE_EXPORT void on_set_file_readonly1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data)
+static void on_set_file_readonly1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data)
 {
 	if (! ignore_callback)
 	{
@@ -811,7 +732,7 @@ G_MODULE_EXPORT void on_set_file_readonly1_toggled(GtkCheckMenuItem *checkmenuit
 }
 
 
-G_MODULE_EXPORT void on_use_auto_indentation1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data)
+static void on_use_auto_indentation1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data)
 {
 	if (! ignore_callback)
 	{
@@ -849,13 +770,13 @@ static void find_usage(gboolean in_session)
 }
 
 
-G_MODULE_EXPORT void on_find_document_usage1_activate(GtkMenuItem *menuitem, gpointer user_data)
+void on_find_document_usage1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	find_usage(FALSE);
 }
 
 
-G_MODULE_EXPORT void on_find_usage1_activate(GtkMenuItem *menuitem, gpointer user_data)
+void on_find_usage1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	find_usage(TRUE);
 }
@@ -879,25 +800,25 @@ static void goto_tag(gboolean definition)
 }
 
 
-G_MODULE_EXPORT void on_goto_tag_definition1(GtkMenuItem *menuitem, gpointer user_data)
+static void on_goto_tag_definition1(GtkMenuItem *menuitem, gpointer user_data)
 {
 	goto_tag(TRUE);
 }
 
 
-G_MODULE_EXPORT void on_goto_tag_declaration1(GtkMenuItem *menuitem, gpointer user_data)
+static void on_goto_tag_declaration1(GtkMenuItem *menuitem, gpointer user_data)
 {
 	goto_tag(FALSE);
 }
 
 
-G_MODULE_EXPORT void on_count_words1_activate(GtkMenuItem *menuitem, gpointer user_data)
+static void on_count_words1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	tools_word_count();
 }
 
 
-G_MODULE_EXPORT void on_show_color_chooser1_activate(GtkMenuItem *menuitem, gpointer user_data)
+void on_show_color_chooser1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	gchar colour[9];
 	GeanyDocument *doc = document_get_current();
@@ -917,19 +838,19 @@ void on_toolbutton_compile_clicked(GtkAction *action, gpointer user_data)
 }
 
 
-G_MODULE_EXPORT void on_find1_activate(GtkMenuItem *menuitem, gpointer user_data)
+void on_find1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	search_show_find_dialog();
 }
 
 
-G_MODULE_EXPORT void on_find_next1_activate(GtkMenuItem *menuitem, gpointer user_data)
+void on_find_next1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	search_find_again(FALSE);
 }
 
 
-G_MODULE_EXPORT void on_find_previous1_activate(GtkMenuItem *menuitem, gpointer user_data)
+void on_find_previous1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	if (search_data.flags & GEANY_FIND_REGEXP)
 		/* Can't reverse search order for a regex (find next ignores search backwards) */
@@ -939,25 +860,25 @@ G_MODULE_EXPORT void on_find_previous1_activate(GtkMenuItem *menuitem, gpointer
 }
 
 
-G_MODULE_EXPORT void on_find_nextsel1_activate(GtkMenuItem *menuitem, gpointer user_data)
+void on_find_nextsel1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	search_find_selection(document_get_current(), FALSE);
 }
 
 
-G_MODULE_EXPORT void on_find_prevsel1_activate(GtkMenuItem *menuitem, gpointer user_data)
+void on_find_prevsel1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	search_find_selection(document_get_current(), TRUE);
 }
 
 
-G_MODULE_EXPORT void on_replace1_activate(GtkMenuItem *menuitem, gpointer user_data)
+void on_replace1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	search_show_replace_dialog();
 }
 
 
-G_MODULE_EXPORT void on_find_in_files1_activate(GtkMenuItem *menuitem, gpointer user_data)
+void on_find_in_files1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	search_show_find_in_files_dialog(NULL);
 }
@@ -978,7 +899,7 @@ static void get_line_and_offset_from_text(const gchar *text, gint *line_no, gint
 }
 
 
-G_MODULE_EXPORT void on_go_to_line_activate(GtkMenuItem *menuitem, gpointer user_data)
+void on_go_to_line_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	static gchar value[16] = "";
 	gchar *result;
@@ -1036,7 +957,7 @@ void on_toolbutton_goto_clicked(GtkAction *action, gpointer user_data)
 }
 
 
-G_MODULE_EXPORT void on_help1_activate(GtkMenuItem *menuitem, gpointer user_data)
+void on_help1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	gchar *uri;
 
@@ -1046,37 +967,37 @@ G_MODULE_EXPORT void on_help1_activate(GtkMenuItem *menuitem, gpointer user_data
 }
 
 
-G_MODULE_EXPORT void on_help_shortcuts1_activate(GtkMenuItem *menuitem, gpointer user_data)
+static void on_help_shortcuts1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	keybindings_show_shortcuts();
 }
 
 
-G_MODULE_EXPORT void on_website1_activate(GtkMenuItem *menuitem, gpointer user_data)
+static void on_website1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	utils_open_browser(GEANY_HOMEPAGE);
 }
 
 
-G_MODULE_EXPORT void on_help_menu_item_donate_activate(GtkMenuItem *item, gpointer user_data)
+static void on_help_menu_item_donate_activate(GtkMenuItem *item, gpointer user_data)
 {
 	utils_open_browser(GEANY_DONATE);
 }
 
 
-G_MODULE_EXPORT void on_help_menu_item_wiki_activate(GtkMenuItem *item, gpointer user_data)
+static void on_help_menu_item_wiki_activate(GtkMenuItem *item, gpointer user_data)
 {
 	utils_open_browser(GEANY_WIKI);
 }
 
 
-G_MODULE_EXPORT void on_help_menu_item_bug_report_activate(GtkMenuItem *item, gpointer user_data)
+static void on_help_menu_item_bug_report_activate(GtkMenuItem *item, gpointer user_data)
 {
 	utils_open_browser(GEANY_BUG_REPORT);
 }
 
 
-G_MODULE_EXPORT void on_comments_function_activate(GtkMenuItem *menuitem, gpointer user_data)
+static void on_comments_function_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	GeanyDocument *doc = document_get_current();
 	gchar *text;
@@ -1130,13 +1051,13 @@ static void insert_multiline_comment(GeanyDocument *doc, gint pos)
 }
 
 
-G_MODULE_EXPORT void on_comments_multiline_activate(GtkMenuItem *menuitem, gpointer user_data)
+static void on_comments_multiline_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	insert_multiline_comment(document_get_current(), editor_info.click_pos);
 }
 
 
-G_MODULE_EXPORT void on_menu_comments_multiline_activate(GtkMenuItem *menuitem, gpointer user_data)
+static void on_menu_comments_multiline_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	insert_multiline_comment(document_get_current(), -1);
 }
@@ -1162,31 +1083,31 @@ static void insert_comment_template(GeanyDocument *doc, gint pos, guint template
 }
 
 
-G_MODULE_EXPORT void on_comments_gpl_activate(GtkMenuItem *menuitem, gpointer user_data)
+static void on_comments_gpl_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	insert_comment_template(document_get_current(), editor_info.click_pos, GEANY_TEMPLATE_GPL);
 }
 
 
-G_MODULE_EXPORT void on_menu_comments_gpl_activate(GtkMenuItem *menuitem, gpointer user_data)
+static void on_menu_comments_gpl_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	insert_comment_template(document_get_current(), -1, GEANY_TEMPLATE_GPL);
 }
 
 
-G_MODULE_EXPORT void on_comments_bsd_activate(GtkMenuItem *menuitem, gpointer user_data)
+static void on_comments_bsd_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	insert_comment_template(document_get_current(), editor_info.click_pos, GEANY_TEMPLATE_BSD);
 }
 
 
-G_MODULE_EXPORT void on_menu_comments_bsd_activate(GtkMenuItem *menuitem, gpointer user_data)
+static void on_menu_comments_bsd_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	insert_comment_template(document_get_current(), -1, GEANY_TEMPLATE_BSD);
 }
 
 
-G_MODULE_EXPORT void on_comments_changelog_activate(GtkMenuItem *menuitem, gpointer user_data)
+static void on_comments_changelog_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	GeanyDocument *doc = document_get_current();
 	gchar *text;
@@ -1205,7 +1126,7 @@ G_MODULE_EXPORT void on_comments_changelog_activate(GtkMenuItem *menuitem, gpoin
 }
 
 
-G_MODULE_EXPORT void on_comments_fileheader_activate(GtkMenuItem *menuitem, gpointer user_data)
+static void on_comments_fileheader_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	GeanyDocument *doc = document_get_current();
 	gchar *text;
@@ -1226,7 +1147,7 @@ G_MODULE_EXPORT void on_comments_fileheader_activate(GtkMenuItem *menuitem, gpoi
 }
 
 
-G_MODULE_EXPORT void on_file_properties_activate(GtkMenuItem *menuitem, gpointer user_data)
+static void on_file_properties_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	GeanyDocument *doc = document_get_current();
 	g_return_if_fail(doc != NULL);
@@ -1235,7 +1156,7 @@ G_MODULE_EXPORT void on_file_properties_activate(GtkMenuItem *menuitem, gpointer
 }
 
 
-G_MODULE_EXPORT void on_menu_fold_all1_activate(GtkMenuItem *menuitem, gpointer user_data)
+static void on_menu_fold_all1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	GeanyDocument *doc = document_get_current();
 	g_return_if_fail(doc != NULL);
@@ -1244,7 +1165,7 @@ G_MODULE_EXPORT void on_menu_fold_all1_activate(GtkMenuItem *menuitem, gpointer
 }
 
 
-G_MODULE_EXPORT void on_menu_unfold_all1_activate(GtkMenuItem *menuitem, gpointer user_data)
+static void on_menu_unfold_all1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	GeanyDocument *doc = document_get_current();
 	g_return_if_fail(doc != NULL);
@@ -1259,7 +1180,7 @@ void on_toolbutton_run_clicked(GtkAction *action, gpointer user_data)
 }
 
 
-G_MODULE_EXPORT void on_menu_remove_indicators1_activate(GtkMenuItem *menuitem, gpointer user_data)
+void on_menu_remove_indicators1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	GeanyDocument *doc = document_get_current();
 	g_return_if_fail(doc != NULL);
@@ -1268,7 +1189,7 @@ G_MODULE_EXPORT void on_menu_remove_indicators1_activate(GtkMenuItem *menuitem,
 }
 
 
-G_MODULE_EXPORT void on_print1_activate(GtkMenuItem *menuitem, gpointer user_data)
+void on_print1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	GeanyDocument *doc = document_get_current();
 	g_return_if_fail(doc != NULL);
@@ -1277,7 +1198,7 @@ G_MODULE_EXPORT void on_print1_activate(GtkMenuItem *menuitem, gpointer user_dat
 }
 
 
-G_MODULE_EXPORT void on_menu_select_all1_activate(GtkMenuItem *menuitem, gpointer user_data)
+void on_menu_select_all1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	GeanyDocument *doc = document_get_current();
 	g_return_if_fail(doc != NULL);
@@ -1286,7 +1207,7 @@ G_MODULE_EXPORT void on_menu_select_all1_activate(GtkMenuItem *menuitem, gpointe
 }
 
 
-G_MODULE_EXPORT void on_menu_show_sidebar1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data)
+void on_menu_show_sidebar1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data)
 {
 	if (ignore_callback)
 		return;
@@ -1313,7 +1234,7 @@ G_MODULE_EXPORT void on_menu_show_sidebar1_toggled(GtkCheckMenuItem *checkmenuit
 }
 
 
-G_MODULE_EXPORT void on_menu_write_unicode_bom1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data)
+static void on_menu_write_unicode_bom1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data)
 {
 	if (! ignore_callback)
 	{
@@ -1335,7 +1256,7 @@ G_MODULE_EXPORT void on_menu_write_unicode_bom1_toggled(GtkCheckMenuItem *checkm
 }
 
 
-G_MODULE_EXPORT void on_menu_comment_line1_activate(GtkMenuItem *menuitem, gpointer user_data)
+void on_menu_comment_line1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	GeanyDocument *doc = document_get_current();
 	g_return_if_fail(doc != NULL);
@@ -1344,7 +1265,7 @@ G_MODULE_EXPORT void on_menu_comment_line1_activate(GtkMenuItem *menuitem, gpoin
 }
 
 
-G_MODULE_EXPORT void on_menu_uncomment_line1_activate(GtkMenuItem *menuitem, gpointer user_data)
+void on_menu_uncomment_line1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	GeanyDocument *doc = document_get_current();
 	g_return_if_fail(doc != NULL);
@@ -1353,7 +1274,7 @@ G_MODULE_EXPORT void on_menu_uncomment_line1_activate(GtkMenuItem *menuitem, gpo
 }
 
 
-G_MODULE_EXPORT void on_menu_toggle_line_commentation1_activate(GtkMenuItem *menuitem, gpointer user_data)
+void on_menu_toggle_line_commentation1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	GeanyDocument *doc = document_get_current();
 	g_return_if_fail(doc != NULL);
@@ -1362,7 +1283,7 @@ G_MODULE_EXPORT void on_menu_toggle_line_commentation1_activate(GtkMenuItem *men
 }
 
 
-G_MODULE_EXPORT void on_menu_increase_indent1_activate(GtkMenuItem *menuitem, gpointer user_data)
+void on_menu_increase_indent1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	GeanyDocument *doc = document_get_current();
 	g_return_if_fail(doc != NULL);
@@ -1371,7 +1292,7 @@ G_MODULE_EXPORT void on_menu_increase_indent1_activate(GtkMenuItem *menuitem, gp
 }
 
 
-G_MODULE_EXPORT void on_menu_decrease_indent1_activate(GtkMenuItem *menuitem, gpointer user_data)
+void on_menu_decrease_indent1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	GeanyDocument *doc = document_get_current();
 	g_return_if_fail(doc != NULL);
@@ -1380,7 +1301,7 @@ G_MODULE_EXPORT void on_menu_decrease_indent1_activate(GtkMenuItem *menuitem, gp
 }
 
 
-G_MODULE_EXPORT void on_next_message1_activate(GtkMenuItem *menuitem, gpointer user_data)
+void on_next_message1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	if (! ui_tree_view_find_next(GTK_TREE_VIEW(msgwindow.tree_msg),
 		msgwin_goto_messages_file_line))
@@ -1388,7 +1309,7 @@ G_MODULE_EXPORT void on_next_message1_activate(GtkMenuItem *menuitem, gpointer u
 }
 
 
-G_MODULE_EXPORT void on_previous_message1_activate(GtkMenuItem *menuitem, gpointer user_data)
+void on_previous_message1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	if (! ui_tree_view_find_previous(GTK_TREE_VIEW(msgwindow.tree_msg),
 		msgwin_goto_messages_file_line))
@@ -1396,31 +1317,31 @@ G_MODULE_EXPORT void on_previous_message1_activate(GtkMenuItem *menuitem, gpoint
 }
 
 
-G_MODULE_EXPORT void on_project_new1_activate(GtkMenuItem *menuitem, gpointer user_data)
+void on_project_new1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	project_new();
 }
 
 
-G_MODULE_EXPORT void on_project_open1_activate(GtkMenuItem *menuitem, gpointer user_data)
+void on_project_open1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	project_open();
 }
 
 
-G_MODULE_EXPORT void on_project_close1_activate(GtkMenuItem *menuitem, gpointer user_data)
+void on_project_close1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	project_close(TRUE);
 }
 
 
-G_MODULE_EXPORT void on_project_properties1_activate(GtkMenuItem *menuitem, gpointer user_data)
+void on_project_properties1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	project_properties();
 }
 
 
-G_MODULE_EXPORT void on_menu_project1_activate(GtkMenuItem *menuitem, gpointer user_data)
+static void on_menu_project1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	static GtkWidget *item_close = NULL;
 	static GtkWidget *item_properties = NULL;
@@ -1438,7 +1359,7 @@ G_MODULE_EXPORT void on_menu_project1_activate(GtkMenuItem *menuitem, gpointer u
 }
 
 
-G_MODULE_EXPORT void on_menu_open_selected_file1_activate(GtkMenuItem *menuitem, gpointer user_data)
+void on_menu_open_selected_file1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	GeanyDocument *doc = document_get_current();
 	gchar *sel = NULL;
@@ -1504,7 +1425,7 @@ G_MODULE_EXPORT void on_menu_open_selected_file1_activate(GtkMenuItem *menuitem,
 }
 
 
-G_MODULE_EXPORT void on_remove_markers1_activate(GtkMenuItem *menuitem, gpointer user_data)
+void on_remove_markers1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	GeanyDocument *doc = document_get_current();
 	g_return_if_fail(doc != NULL);
@@ -1515,13 +1436,13 @@ G_MODULE_EXPORT void on_remove_markers1_activate(GtkMenuItem *menuitem, gpointer
 }
 
 
-G_MODULE_EXPORT void on_load_tags1_activate(GtkMenuItem *menuitem, gpointer user_data)
+static void on_load_tags1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	symbols_show_load_tags_dialog();
 }
 
 
-G_MODULE_EXPORT void on_context_action1_activate(GtkMenuItem *menuitem, gpointer user_data)
+void on_context_action1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	gchar *word, *command;
 	GError *error = NULL;
@@ -1565,7 +1486,7 @@ G_MODULE_EXPORT void on_context_action1_activate(GtkMenuItem *menuitem, gpointer
 }
 
 
-G_MODULE_EXPORT void on_menu_toggle_all_additional_widgets1_activate(GtkMenuItem *menuitem, gpointer user_data)
+void on_menu_toggle_all_additional_widgets1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	static gint hide_all = -1;
 	GtkCheckMenuItem *msgw = GTK_CHECK_MENU_ITEM(
@@ -1654,25 +1575,25 @@ static void set_indent_type(GtkCheckMenuItem *menuitem, GeanyIndentType type)
 }
 
 
-G_MODULE_EXPORT void on_tabs1_activate(GtkCheckMenuItem *menuitem, gpointer user_data)
+static void on_tabs1_activate(GtkCheckMenuItem *menuitem, gpointer user_data)
 {
 	set_indent_type(menuitem, GEANY_INDENT_TYPE_TABS);
 }
 
 
-G_MODULE_EXPORT void on_spaces1_activate(GtkCheckMenuItem *menuitem, gpointer user_data)
+static void on_spaces1_activate(GtkCheckMenuItem *menuitem, gpointer user_data)
 {
 	set_indent_type(menuitem, GEANY_INDENT_TYPE_SPACES);
 }
 
 
-G_MODULE_EXPORT void on_tabs_and_spaces1_activate(GtkCheckMenuItem *menuitem, gpointer user_data)
+static void on_tabs_and_spaces1_activate(GtkCheckMenuItem *menuitem, gpointer user_data)
 {
 	set_indent_type(menuitem, GEANY_INDENT_TYPE_BOTH);
 }
 
 
-G_MODULE_EXPORT void on_strip_trailing_spaces1_activate(GtkMenuItem *menuitem, gpointer user_data)
+static void on_strip_trailing_spaces1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	GeanyDocument *doc;
 
@@ -1686,13 +1607,13 @@ G_MODULE_EXPORT void on_strip_trailing_spaces1_activate(GtkMenuItem *menuitem, g
 }
 
 
-G_MODULE_EXPORT void on_page_setup1_activate(GtkMenuItem *menuitem, gpointer user_data)
+static void on_page_setup1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	printing_page_setup_gtk();
 }
 
 
-G_MODULE_EXPORT gboolean on_escape_key_press_event(GtkWidget *widget, GdkEventKey *event, gpointer user_data)
+gboolean on_escape_key_press_event(GtkWidget *widget, GdkEventKey *event, gpointer user_data)
 {
 	guint state = keybindings_get_modifiers(event->state);
 
@@ -1706,7 +1627,7 @@ G_MODULE_EXPORT gboolean on_escape_key_press_event(GtkWidget *widget, GdkEventKe
 }
 
 
-G_MODULE_EXPORT void on_line_breaking1_activate(GtkMenuItem *menuitem, gpointer user_data)
+void on_line_breaking1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	GeanyDocument *doc;
 
@@ -1720,7 +1641,7 @@ G_MODULE_EXPORT void on_line_breaking1_activate(GtkMenuItem *menuitem, gpointer
 }
 
 
-G_MODULE_EXPORT void on_replace_spaces_activate(GtkMenuItem *menuitem, gpointer user_data)
+void on_replace_spaces_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	GeanyDocument *doc = document_get_current();
 
@@ -1730,7 +1651,7 @@ G_MODULE_EXPORT void on_replace_spaces_activate(GtkMenuItem *menuitem, gpointer
 }
 
 
-G_MODULE_EXPORT void on_search1_activate(GtkMenuItem *menuitem, gpointer user_data)
+static void on_search1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	GtkWidget *next_message = ui_lookup_widget(main_widgets.window, "next_message1");
 	GtkWidget *previous_message = ui_lookup_widget(main_widgets.window, "previous_message1");
@@ -1747,7 +1668,7 @@ G_MODULE_EXPORT void on_search1_activate(GtkMenuItem *menuitem, gpointer user_da
 
 /* simple implementation (vs. close all which doesn't close documents if cancelled),
  * if user_data is set, it is the GeanyDocument to keep */
-G_MODULE_EXPORT void on_close_other_documents1_activate(GtkMenuItem *menuitem, gpointer user_data)
+void on_close_other_documents1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	guint i;
 	GeanyDocument *cur_doc = user_data;
@@ -1768,19 +1689,19 @@ G_MODULE_EXPORT void on_close_other_documents1_activate(GtkMenuItem *menuitem, g
 }
 
 
-G_MODULE_EXPORT void on_menu_reload_configuration1_activate(GtkMenuItem *menuitem, gpointer user_data)
+static void on_menu_reload_configuration1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	main_reload_configuration();
 }
 
 
-G_MODULE_EXPORT void on_debug_messages1_activate(GtkMenuItem *menuitem, gpointer user_data)
+static void on_debug_messages1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	log_show_debug_messages_dialog();
 }
 
 
-G_MODULE_EXPORT void on_send_selection_to_vte1_activate(GtkMenuItem *menuitem, gpointer user_data)
+void on_send_selection_to_vte1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 #ifdef HAVE_VTE
 	if (vte_info.have_vte)
@@ -1789,7 +1710,7 @@ G_MODULE_EXPORT void on_send_selection_to_vte1_activate(GtkMenuItem *menuitem, g
 }
 
 
-G_MODULE_EXPORT gboolean on_window_state_event(GtkWidget *widget, GdkEventWindowState *event, gpointer user_data)
+static gboolean on_window_state_event(GtkWidget *widget, GdkEventWindowState *event, gpointer user_data)
 {
 
 	if (event->changed_mask & GDK_WINDOW_STATE_FULLSCREEN)
@@ -1823,7 +1744,7 @@ static void show_notebook_page(const gchar *notebook_name, const gchar *page_nam
 }
 
 
-G_MODULE_EXPORT void on_customize_toolbar1_activate(GtkMenuItem *menuitem, gpointer user_data)
+static void on_customize_toolbar1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	prefs_show_dialog();
 
@@ -1834,91 +1755,91 @@ G_MODULE_EXPORT void on_customize_toolbar1_activate(GtkMenuItem *menuitem, gpoin
 }
 
 
-G_MODULE_EXPORT void on_button_customize_toolbar_clicked(GtkButton *button, gpointer user_data)
+static void on_button_customize_toolbar_clicked(GtkButton *button, gpointer user_data)
 {
 	toolbar_configure(GTK_WINDOW(ui_widgets.prefs_dialog));
 }
 
 
-G_MODULE_EXPORT void on_cut_current_lines1_activate(GtkMenuItem *menuitem, gpointer user_data)
+static void on_cut_current_lines1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	keybindings_send_command(GEANY_KEY_GROUP_CLIPBOARD, GEANY_KEYS_CLIPBOARD_CUTLINE);
 }
 
 
-G_MODULE_EXPORT void on_copy_current_lines1_activate(GtkMenuItem *menuitem, gpointer user_data)
+static void on_copy_current_lines1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	keybindings_send_command(GEANY_KEY_GROUP_CLIPBOARD, GEANY_KEYS_CLIPBOARD_COPYLINE);
 }
 
 
-G_MODULE_EXPORT void on_delete_current_lines1_activate(GtkMenuItem *menuitem, gpointer user_data)
+static void on_delete_current_lines1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	keybindings_send_command(GEANY_KEY_GROUP_EDITOR, GEANY_KEYS_EDITOR_DELETELINE);
 }
 
 
-G_MODULE_EXPORT void on_duplicate_line_or_selection1_activate(GtkMenuItem *menuitem, gpointer user_data)
+static void on_duplicate_line_or_selection1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	keybindings_send_command(GEANY_KEY_GROUP_EDITOR, GEANY_KEYS_EDITOR_DUPLICATELINE);
 }
 
 
-G_MODULE_EXPORT void on_select_current_lines1_activate(GtkMenuItem *menuitem, gpointer user_data)
+static void on_select_current_lines1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	keybindings_send_command(GEANY_KEY_GROUP_SELECT, GEANY_KEYS_SELECT_LINE);
 }
 
 
-G_MODULE_EXPORT void on_select_current_paragraph1_activate(GtkMenuItem *menuitem, gpointer user_data)
+static void on_select_current_paragraph1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	keybindings_send_command(GEANY_KEY_GROUP_SELECT, GEANY_KEYS_SELECT_PARAGRAPH);
 }
 
 
-G_MODULE_EXPORT void on_insert_alternative_white_space1_activate(GtkMenuItem *menuitem, gpointer user_data)
+static void on_insert_alternative_white_space1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	keybindings_send_command(GEANY_KEY_GROUP_INSERT, GEANY_KEYS_INSERT_ALTWHITESPACE);
 }
 
 
-G_MODULE_EXPORT void on_go_to_next_marker1_activate(GtkMenuItem *menuitem, gpointer user_data)
+static void on_go_to_next_marker1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	keybindings_send_command(GEANY_KEY_GROUP_GOTO, GEANY_KEYS_GOTO_NEXTMARKER);
 }
 
 
-G_MODULE_EXPORT void on_go_to_previous_marker1_activate(GtkMenuItem *menuitem, gpointer user_data)
+static void on_go_to_previous_marker1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	keybindings_send_command(GEANY_KEY_GROUP_GOTO, GEANY_KEYS_GOTO_PREVIOUSMARKER);
 }
 
 
-G_MODULE_EXPORT void on_reflow_lines_block1_activate(GtkMenuItem *menuitem, gpointer user_data)
+static void on_reflow_lines_block1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	keybindings_send_command(GEANY_KEY_GROUP_FORMAT, GEANY_KEYS_FORMAT_REFLOWPARAGRAPH);
 }
 
 
-G_MODULE_EXPORT void on_move_lines_up1_activate(GtkMenuItem *menuitem, gpointer user_data)
+static void on_move_lines_up1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	keybindings_send_command(GEANY_KEY_GROUP_EDITOR, GEANY_KEYS_EDITOR_MOVELINEUP);
 }
 
 
-G_MODULE_EXPORT void on_move_lines_down1_activate(GtkMenuItem *menuitem, gpointer user_data)
+static void on_move_lines_down1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	keybindings_send_command(GEANY_KEY_GROUP_EDITOR, GEANY_KEYS_EDITOR_MOVELINEDOWN);
 }
 
 
-G_MODULE_EXPORT void on_smart_line_indent1_activate(GtkMenuItem *menuitem, gpointer user_data)
+static void on_smart_line_indent1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	keybindings_send_command(GEANY_KEY_GROUP_FORMAT, GEANY_KEYS_FORMAT_AUTOINDENT);
 }
 
 
-G_MODULE_EXPORT void on_plugin_preferences1_activate(GtkMenuItem *menuitem, gpointer user_data)
+void on_plugin_preferences1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 #ifdef HAVE_PLUGINS
 	plugin_show_configure(NULL);
@@ -1926,7 +1847,7 @@ G_MODULE_EXPORT void on_plugin_preferences1_activate(GtkMenuItem *menuitem, gpoi
 }
 
 
-G_MODULE_EXPORT void on_indent_width_activate(GtkMenuItem *menuitem, gpointer user_data)
+static void on_indent_width_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	GeanyDocument *doc;
 	gchar *label;
@@ -1945,7 +1866,7 @@ G_MODULE_EXPORT void on_indent_width_activate(GtkMenuItem *menuitem, gpointer us
 }
 
 
-G_MODULE_EXPORT void on_reset_indentation1_activate(GtkMenuItem *menuitem, gpointer user_data)
+static void on_reset_indentation1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	guint i;
 
@@ -1957,13 +1878,13 @@ G_MODULE_EXPORT void on_reset_indentation1_activate(GtkMenuItem *menuitem, gpoin
 }
 
 
-G_MODULE_EXPORT void on_mark_all1_activate(GtkMenuItem *menuitem, gpointer user_data)
+static void on_mark_all1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	keybindings_send_command(GEANY_KEY_GROUP_SEARCH, GEANY_KEYS_SEARCH_MARKALL);
 }
 
 
-G_MODULE_EXPORT void on_detect_type_from_file_activate(GtkMenuItem *menuitem, gpointer user_data)
+static void on_detect_type_from_file_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	GeanyDocument *doc = document_get_current();
 	GeanyIndentType type;
@@ -1976,7 +1897,7 @@ G_MODULE_EXPORT void on_detect_type_from_file_activate(GtkMenuItem *menuitem, gp
 }
 
 
-G_MODULE_EXPORT void on_detect_width_from_file_activate(GtkMenuItem *menuitem, gpointer user_data)
+static void on_detect_width_from_file_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	GeanyDocument *doc = document_get_current();
 	gint width;
@@ -1987,3 +1908,37 @@ G_MODULE_EXPORT void on_detect_width_from_file_activate(GtkMenuItem *menuitem, g
 		ui_document_show_hide(doc);
 	}
 }
+
+
+static void builder_connect_func(GtkBuilder *builder, GObject *object,
+	const gchar *signal_name, const gchar *handler_name, GObject *connect_obj,
+	GConnectFlags flags, gpointer user_data)
+{
+	GHashTable *hash = user_data;
+	GCallback callback;
+
+	callback = g_hash_table_lookup(hash, handler_name);
+	g_return_if_fail(callback);
+
+	if (connect_obj == NULL)
+		g_signal_connect_data(object, signal_name, callback, NULL, NULL, flags);
+	else
+		g_signal_connect_object(object, signal_name, callback, connect_obj, flags);
+}
+
+
+void callbacks_connect(GtkBuilder *builder)
+{
+	GHashTable *hash;
+
+	g_return_if_fail(GTK_IS_BUILDER(builder));
+
+	hash = g_hash_table_new(g_str_hash, g_str_equal);
+
+#define ITEM(n) g_hash_table_insert(hash, (gpointer) #n, G_CALLBACK(n));
+#	include "signallist.i"
+#undef ITEM
+
+	gtk_builder_connect_signals_full(builder, builder_connect_func, hash);
+	g_hash_table_destroy(hash);
+}


Modified: src/callbacks.h
123 lines changed, 63 insertions(+), 60 deletions(-)
===================================================================
@@ -26,83 +26,86 @@
 
 G_BEGIN_DECLS
 
+/* Defined in auto-generated code in signalconn.c */
+void callbacks_connect(GtkBuilder *builder);
+
 extern gboolean	ignore_callback;
 
-G_MODULE_EXPORT void on_new1_activate(GtkMenuItem *menuitem, gpointer user_data);
+void on_new1_activate(GtkMenuItem *menuitem, gpointer user_data);
 
-G_MODULE_EXPORT void on_save1_activate(GtkMenuItem *menuitem, gpointer user_data);
+void on_save1_activate(GtkMenuItem *menuitem, gpointer user_data);
 
-G_MODULE_EXPORT void on_save_as1_activate(GtkMenuItem *menuitem, gpointer user_data);
+void on_save_as1_activate(GtkMenuItem *menuitem, gpointer user_data);
 
-G_MODULE_EXPORT void on_quit1_activate(GtkMenuItem *menuitem, gpointer user_data);
+void on_quit1_activate(GtkMenuItem *menuitem, gpointer user_data);
 
-G_MODULE_EXPORT void on_open1_activate(GtkMenuItem *menuitem, gpointer user_data);
+void on_open1_activate(GtkMenuItem *menuitem, gpointer user_data);
 
-G_MODULE_EXPORT void on_save_all1_activate(GtkMenuItem *menuitem, gpointer user_data);
+void on_save_all1_activate(GtkMenuItem *menuitem, gpointer user_data);
 
-G_MODULE_EXPORT void on_close1_activate(GtkMenuItem *menuitem, gpointer user_data);
+void on_close1_activate(GtkMenuItem *menuitem, gpointer user_data);
 
-G_MODULE_EXPORT void on_close_all1_activate(GtkMenuItem *menuitem, gpointer user_data);
+void on_close_all1_activate(GtkMenuItem *menuitem, gpointer user_data);
 
-G_MODULE_EXPORT void on_replace_tabs_activate(GtkMenuItem *menuitem, gpointer user_data);
+void on_replace_tabs_activate(GtkMenuItem *menuitem, gpointer user_data);
 
 void on_toolbutton_search_clicked(GtkAction *action, gpointer user_data);
 
 gboolean toolbar_popup_menu(GtkWidget *widget, GdkEventButton *event, gpointer user_data);
 
-G_MODULE_EXPORT void on_undo1_activate(GtkMenuItem *menuitem, gpointer user_data);
+void on_undo1_activate(GtkMenuItem *menuitem, gpointer user_data);
 
-G_MODULE_EXPORT void on_redo1_activate(GtkMenuItem *menuitem, gpointer user_data);
+void on_redo1_activate(GtkMenuItem *menuitem, gpointer user_data);
 
-G_MODULE_EXPORT void on_cut1_activate(GtkMenuItem *menuitem, gpointer user_data);
+void on_cut1_activate(GtkMenuItem *menuitem, gpointer user_data);
 
-G_MODULE_EXPORT void on_copy1_activate(GtkMenuItem *menuitem, gpointer user_data);
+void on_copy1_activate(GtkMenuItem *menuitem, gpointer user_data);
 
-G_MODULE_EXPORT void on_paste1_activate(GtkMenuItem *menuitem, gpointer user_data);
+void on_paste1_activate(GtkMenuItem *menuitem, gpointer user_data);
 
-G_MODULE_EXPORT void on_delete1_activate(GtkMenuItem *menuitem, gpointer user_data);
+void on_delete1_activate(GtkMenuItem *menuitem, gpointer user_data);
 
-G_MODULE_EXPORT void on_zoom_in1_activate(GtkMenuItem *menuitem, gpointer user_data);
+void on_zoom_in1_activate(GtkMenuItem *menuitem, gpointer user_data);
 
-G_MODULE_EXPORT void on_zoom_out1_activate(GtkMenuItem *menuitem, gpointer user_data);
+void on_zoom_out1_activate(GtkMenuItem *menuitem, gpointer user_data);
 
 void on_toolbar_search_entry_changed(GtkAction *action, const gchar *text, gpointer user_data);
 
 void on_toolbar_search_entry_activate(GtkAction *action, const gchar *text, gpointer user_data);
 
-G_MODULE_EXPORT void on_toggle_case1_activate(GtkMenuItem *menuitem, gpointer user_data);
+void on_toggle_case1_activate(GtkMenuItem *menuitem, gpointer user_data);
 
-G_MODULE_EXPORT void on_find_usage1_activate(GtkMenuItem *menuitem, gpointer user_data);
+void on_find_usage1_activate(GtkMenuItem *menuitem, gpointer user_data);
 
-G_MODULE_EXPORT void on_preferences1_activate(GtkMenuItem *menuitem, gpointer user_data);
+void on_preferences1_activate(GtkMenuItem *menuitem, gpointer user_data);
 
-G_MODULE_EXPORT void on_normal_size1_activate(GtkMenuItem *menuitem, gpointer user_data);
+void on_normal_size1_activate(GtkMenuItem *menuitem, gpointer user_data);
 
-G_MODULE_EXPORT void on_show_color_chooser1_activate(GtkMenuItem *menuitem, gpointer user_data);
+void on_show_color_chooser1_activate(GtkMenuItem *menuitem, gpointer user_data);
 
-G_MODULE_EXPORT void on_find1_activate(GtkMenuItem *menuitem, gpointer user_data);
+void on_find1_activate(GtkMenuItem *menuitem, gpointer user_data);
 
-G_MODULE_EXPORT void on_find_next1_activate(GtkMenuItem *menuitem, gpointer user_data);
+void on_find_next1_activate(GtkMenuItem *menuitem, gpointer user_data);
 
-G_MODULE_EXPORT void on_find_previous1_activate(GtkMenuItem *menuitem, gpointer user_data);
+void on_find_previous1_activate(GtkMenuItem *menuitem, gpointer user_data);
 
-G_MODULE_EXPORT void on_find_nextsel1_activate(GtkMenuItem *menuitem, gpointer user_data);
+void on_find_nextsel1_activate(GtkMenuItem *menuitem, gpointer user_data);
 
-G_MODULE_EXPORT void on_find_prevsel1_activate(GtkMenuItem *menuitem, gpointer user_data);
+void on_find_prevsel1_activate(GtkMenuItem *menuitem, gpointer user_data);
 
-G_MODULE_EXPORT void on_replace1_activate(GtkMenuItem *menuitem, gpointer user_data);
+void on_replace1_activate(GtkMenuItem *menuitem, gpointer user_data);
 
-G_MODULE_EXPORT void on_find_in_files1_activate(GtkMenuItem *menuitem, gpointer user_data);
+void on_find_in_files1_activate(GtkMenuItem *menuitem, gpointer use@@ Diff output truncated at 100000 characters. @@

--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).