Branch: refs/heads/master Author: Colomban Wendling ban@herbesfolles.org Committer: Colomban Wendling ban@herbesfolles.org Date: Sun, 13 Mar 2016 01:32:23 UTC Commit: ea73b65af2d7fa6fd780664a9ae89c05fcf70928 https://github.com/geany/geany-plugins/commit/ea73b65af2d7fa6fd780664a9ae89c...
Log Message: ----------- Merge pull request #406 from b4n/mingw-paths-fixes
Fix some paths under Windows.
Closes #402, #404, #405, #407.
Modified Paths: -------------- addons/src/Makefile.am autoclose/src/Makefile.am automark/src/Makefile.am build/common.m4 build/vars.build.mk codenav/src/Makefile.am commander/src/Makefile.am defineformat/src/Makefile.am geanyctags/src/Makefile.am geanydoc/src/Makefile.am geanydoc/tests/Makefile.am geanyextrasel/src/Makefile.am geanygendoc/src/ggd-plugin.c geanygendoc/src/ggd-utils.c geanyinsertnum/src/Makefile.am geanylatex/src/Makefile.am geanylipsum/src/Makefile.am geanymacro/src/Makefile.am geanyminiscript/src/Makefile.am geanynumberedbookmarks/src/Makefile.am geanypg/src/Makefile.am geanyprj/src/Makefile.am geanypy/src/Makefile.am geanysendmail/src/Makefile.am geanyvc/src/Makefile.am geniuspaste/src/Makefile.am geniuspaste/src/geniuspaste.c git-changebar/src/Makefile.am git-changebar/src/gcb-plugin.c lineoperations/src/Makefile.am markdown/src/Makefile.am markdown/src/plugin.c overview/overview/Makefile.am overview/overview/overviewprefspanel.c pairtaghighlighter/src/Makefile.am pohelper/src/gph-plugin.c pretty-printer/src/Makefile.am projectorganizer/src/Makefile.am scope/src/Makefile.am shiftcolumn/src/Makefile.am spellcheck/src/Makefile.am tableconvert/src/Makefile.am treebrowser/src/Makefile.am xmlsnippets/src/Makefile.am
Modified: addons/src/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,4 +1,5 @@ include $(top_srcdir)/build/vars.build.mk +plugin = addons
geanyplugins_LTLIBRARIES = addons.la
Modified: autoclose/src/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,4 +1,5 @@ include $(top_srcdir)/build/vars.build.mk +plugin = autoclose
geanyplugins_LTLIBRARIES = autoclose.la
Modified: automark/src/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,4 +1,5 @@ include $(top_srcdir)/build/vars.build.mk +plugin = automark
geanyplugins_LTLIBRARIES = automark.la
Modified: build/common.m4 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -65,7 +65,7 @@ AC_DEFUN([GP_COMMIT_PLUGIN_STATUS], GP_STATUS_PLUGIN_ADD([$1], [$m4_tolower(AS_TR_SH(enable_$1))]) ])
-dnl GEANY_CHECK_MINGW +dnl GP_CHECK_MINGW dnl Checks whether we're building for MinGW, and defines appropriate stuff dnl if it is the case. dnl Most importantly, AM_CODITIONALs MINGW
Modified: build/vars.build.mk 45 lines changed, 28 insertions(+), 17 deletions(-) =================================================================== @@ -1,28 +1,39 @@ if MINGW -LOCAL_AM_CFLAGS = \ - -DLOCALEDIR=""share/locale"" \ - -DPREFIX="" \ - -DDOCDIR="" \ - -DGEANYPLUGINS_DATADIR="share" \ - -DPKGDATADIR=""share/geany-plugins"" \ - -DLIBDIR=""lib"" \ - -DPKGLIBDIR="" +GP_PREFIX = . +GP_DATADIR = $(GP_PREFIX)/share +GP_LOCALEDIR = $(GP_DATADIR)/locale +GP_DOCDIR = $(GP_DATADIR)/doc/$(PACKAGE) +GP_PKGDATADIR = $(GP_DATADIR)/$(PACKAGE) +GP_LIBDIR = $(GP_PREFIX)/lib +GP_PKGLIBDIR = $(GP_LIBDIR)/$(PACKAGE) else -LOCAL_AM_CFLAGS = \ - -DLOCALEDIR=""$(LOCALEDIR)"" \ - -DPREFIX=""$(prefix)"" \ - -DDOCDIR=""$(docdir)"" \ - -DGEANYPLUGINS_DATADIR=""$(datadir)"" \ - -DPKGDATADIR=""$(pkgdatadir)"" \ - -DLIBDIR=""$(libdir)"" \ - -DPKGLIBDIR=""$(pkglibdir)"" +GP_PREFIX = $(prefix) +GP_DATADIR = $(datadir) +GP_LOCALEDIR = $(LOCALEDIR) +GP_DOCDIR = $(docdir) +GP_PKGDATADIR = $(pkgdatadir) +GP_LIBDIR = $(libdir) +GP_PKGLIBDIR = $(pkglibdir) endif
+LOCAL_AM_CFLAGS = \ + -DLOCALEDIR=""$(GP_LOCALEDIR)"" \ + -DPREFIX=""$(GP_PREFIX)"" \ + -DDOCDIR=""$(GP_DOCDIR)"" \ + -DGEANYPLUGINS_DATADIR=""$(GP_DATADIR)"" \ + -DPKGDATADIR=""$(GP_PKGDATADIR)"" \ + -DLIBDIR=""$(GP_LIBDIR)"" \ + -DPKGLIBDIR=""$(GP_PKGLIBDIR)"" \ + -DPLUGINDATADIR=""$(GP_PKGDATADIR)/$(plugin)"" \ + -DPLUGINDOCDIR=""$(GP_DOCDIR)/$(plugin)"" \ + -DPLUGINLIBDIR=""$(GP_PKGLIBDIR)/$(plugin)"" \ + -DPLUGIN=""$(plugin)"" + AM_CFLAGS = \ ${LOCAL_AM_CFLAGS} \ $(GEANY_CFLAGS) \ $(GP_CFLAGS) - +
AM_LDFLAGS = -module -avoid-version -no-undefined $(GP_LDFLAGS)
Modified: codenav/src/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,4 +1,5 @@ include $(top_srcdir)/build/vars.build.mk +plugin = codenav
geanyplugins_LTLIBRARIES = codenav.la
Modified: commander/src/Makefile.am 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -6,7 +6,6 @@ geanyplugins_LTLIBRARIES = commander.la
commander_la_SOURCES = commander-plugin.c commander_la_CPPFLAGS = $(AM_CPPFLAGS) \ - -DPLUGIN="$(plugin)" \ -DG_LOG_DOMAIN="Commander" commander_la_CFLAGS = $(AM_CFLAGS) \ $(COMMANDER_CFLAGS)
Modified: defineformat/src/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,4 +1,5 @@ include $(top_srcdir)/build/vars.build.mk +plugin = defineformat
geanyplugins_LTLIBRARIES = defineformat.la
Modified: geanyctags/src/Makefile.am 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -9,7 +9,6 @@ geanyctags_la_SOURCES = \ readtags.c
geanyctags_la_CPPFLAGS = $(AM_CPPFLAGS) \ - -DPLUGIN="$(plugin)" \ -DG_LOG_DOMAIN="GeanyCtags" geanyctags_la_CFLAGS = $(AM_CFLAGS) geanyctags_la_LIBADD = $(COMMONLIBS)
Modified: geanydoc/src/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,4 +1,5 @@ include $(top_srcdir)/build/vars.build.mk +plugin = geanydoc
geanyplugins_LTLIBRARIES = geanydoc.la
Modified: geanydoc/tests/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,5 +1,6 @@ if UNITTESTS include $(top_srcdir)/build/vars.build.mk +plugin = geanydoc TESTS=unittests noinst_PROGRAMS=unittests unittests_SOURCES = unittests.c
Modified: geanyextrasel/src/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,4 +1,5 @@ include $(top_srcdir)/build/vars.build.mk +plugin = geanyextrasel
geanyplugins_LTLIBRARIES = geanyextrasel.la
Modified: geanygendoc/src/ggd-plugin.c 13 lines changed, 12 insertions(+), 1 deletions(-) =================================================================== @@ -365,7 +365,18 @@ static void open_manual_handler (GtkWidget *widget, gpointer data) { - utils_open_browser (DOCDIR "/" GGD_PLUGIN_CNAME "/html/manual.html"); +#ifdef G_OS_WIN32 + gchar *prefix = g_win32_get_package_installation_directory_of_module (NULL); +#else + gchar *prefix = NULL; +#endif + gchar *path = g_build_filename (prefix ? prefix : "", PLUGINDOCDIR, + "/html/manual.html", NULL); + + utils_open_browser (path); + + g_free (path); + g_free (prefix); }
/* handler that reloads the configuration */
Modified: geanygendoc/src/ggd-utils.c 9 lines changed, 8 insertions(+), 1 deletions(-) =================================================================== @@ -161,6 +161,7 @@ ggd_get_config_file (const gchar *name, GError **error) { gchar *path = NULL; + gchar *system_prefix = NULL; gchar *user_dir; gchar *user_path; gchar *system_dir; @@ -169,12 +170,17 @@ ggd_get_config_file (const gchar *name, g_return_val_if_fail (name != NULL, NULL); g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+#ifdef G_OS_WIN32 + system_prefix = g_win32_get_package_installation_directory_of_module (NULL); +#endif + /* here we guess the locale encoding is ASCII-compatible, anyway it's the case * on Windows since we use UTF-8 and on UNIX it would cause too much troubles * everywhere if it is not anyway */ user_dir = g_build_filename (geany->app->configdir, "plugins", GGD_PLUGIN_CNAME, section, NULL); - system_dir = g_build_filename (PKGDATADIR, GGD_PLUGIN_CNAME, section, NULL); + system_dir = g_build_filename (system_prefix ? system_prefix : "", + PLUGINDATADIR, section, NULL); user_path = g_build_filename (user_dir, name, NULL); system_path = g_build_filename (system_dir, name, NULL); if (perms_req & GGD_PERM_R) { @@ -253,6 +259,7 @@ ggd_get_config_file (const gchar *name, if (path != system_path) g_free (system_path); g_free (user_dir); g_free (system_dir); + g_free (system_prefix);
return path; }
Modified: geanyinsertnum/src/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,4 +1,5 @@ include $(top_srcdir)/build/vars.build.mk +plugin = geanyinsertnum
geanyplugins_LTLIBRARIES = geanyinsertnum.la
Modified: geanylatex/src/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,4 +1,5 @@ include $(top_srcdir)/build/vars.build.mk +plugin = geanylatex
geanyplugins_LTLIBRARIES = geanylatex.la
Modified: geanylipsum/src/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,4 +1,5 @@ include $(top_srcdir)/build/vars.build.mk +plugin = geanylipsum
geanyplugins_LTLIBRARIES = geanylipsum.la
Modified: geanymacro/src/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,4 +1,5 @@ include $(top_srcdir)/build/vars.build.mk +plugin = geanymacro
geanyplugins_LTLIBRARIES = geanymacro.la
Modified: geanyminiscript/src/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,4 +1,5 @@ include $(top_srcdir)/build/vars.build.mk +plugin = geanyminiscript
geanyplugins_LTLIBRARIES = geanyminiscript.la
Modified: geanynumberedbookmarks/src/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,4 +1,5 @@ include $(top_srcdir)/build/vars.build.mk +plugin = geanynumberedbookmarks
geanyplugins_LTLIBRARIES = geanynumberedbookmarks.la
Modified: geanypg/src/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,4 +1,5 @@ include $(top_srcdir)/build/vars.build.mk +plugin = geanypg
geanyplugins_LTLIBRARIES = geanypg.la
Modified: geanyprj/src/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,4 +1,5 @@ include $(top_srcdir)/build/vars.build.mk +plugin = geanyprj
geanyplugins_LTLIBRARIES = geanyprj.la
Modified: geanypy/src/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,4 +1,5 @@ include $(top_srcdir)/build/vars.build.mk +plugin = geanypy
geanyplugin_LTLIBRARIES = geanypy.la geanyplugindir = $(libdir)/geany
Modified: geanysendmail/src/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,4 +1,5 @@ include $(top_srcdir)/build/vars.build.mk +plugin = geanysendmail
geanyplugins_LTLIBRARIES = geanysendmail.la
Modified: geanyvc/src/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,4 +1,5 @@ include $(top_srcdir)/build/vars.build.mk +plugin = geanyvc
geanyplugins_LTLIBRARIES = geanyvc.la
Modified: geniuspaste/src/Makefile.am 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -7,7 +7,6 @@ geanyplugins_LTLIBRARIES = geniuspaste.la geniuspaste_la_SOURCES = geniuspaste.c geniuspaste_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ - -DPLUGINDATADIR="$(plugindatadir)" \ -DGEANY_VERSION="$(GEANY_VERSION)" \ -DG_LOG_DOMAIN="GeniusPaste" geniuspaste_la_CFLAGS = \
Modified: geniuspaste/src/geniuspaste.c 9 lines changed, 8 insertions(+), 1 deletions(-) =================================================================== @@ -238,10 +238,15 @@ static void load_pastebins_in_dir(const gchar *path)
static void load_all_pastebins(void) { +#ifdef G_OS_WIN32 + gchar *prefix = g_win32_get_package_installation_directory_of_module(NULL); +#else + gchar *prefix = NULL; +#endif gchar *paths[] = { g_build_filename(geany->app->configdir, "plugins", "geniuspaste", "pastebins", NULL), - g_build_filename(PLUGINDATADIR, "pastebins", NULL) + g_build_filename(prefix ? prefix : "", PLUGINDATADIR, "pastebins", NULL) }; guint i;
@@ -251,6 +256,8 @@ static void load_all_pastebins(void) g_free(paths[i]); } pastebins = g_slist_sort(pastebins, sort_pastebins); + + g_free(prefix); }
static void free_all_pastebins(void)
Modified: git-changebar/src/Makefile.am 3 lines changed, 1 insertions(+), 2 deletions(-) =================================================================== @@ -4,8 +4,7 @@ plugin = git-changebar geanyplugins_LTLIBRARIES = git-changebar.la
git_changebar_la_SOURCES = gcb-plugin.c -git_changebar_la_CPPFLAGS = $(AM_CPPFLAGS) -DG_LOG_DOMAIN="GitChangeBar" \ - -DPLUGIN=""$(plugin)"" +git_changebar_la_CPPFLAGS = $(AM_CPPFLAGS) -DG_LOG_DOMAIN="GitChangeBar" git_changebar_la_CFLAGS = $(AM_CFLAGS) $(GITCHANGEBAR_CFLAGS) git_changebar_la_LIBADD = $(COMMONLIBS) \ $(GITCHANGEBAR_LIBS)
Modified: git-changebar/src/gcb-plugin.c 12 lines changed, 10 insertions(+), 2 deletions(-) =================================================================== @@ -1352,10 +1352,16 @@ plugin_configure (GtkDialog *dialog) GError *error = NULL; GtkWidget *base = NULL; GtkBuilder *builder = gtk_builder_new (); +#ifdef G_OS_WIN32 + gchar *prefix = g_win32_get_package_installation_directory_of_module (NULL); +#else + gchar *prefix = NULL; +#endif + gchar *path = g_build_filename (prefix ? prefix : "", PLUGINDATADIR, + "prefs.ui", NULL);
gtk_builder_set_translation_domain (builder, GETTEXT_PACKAGE); - if (! gtk_builder_add_from_file (builder, PKGDATADIR"/"PLUGIN"/prefs.ui", - &error)) { + if (! gtk_builder_add_from_file (builder, path, &error)) { g_critical (_("Failed to load UI definition, please check your " "installation. The error was: %s"), error->message); g_error_free (error); @@ -1397,6 +1403,8 @@ plugin_configure (GtkDialog *dialog) cw, (GClosureNotify) configure_widgets_free, 0); }
+ g_free (path); + g_free (prefix); g_object_unref (builder);
return base;
Modified: lineoperations/src/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,4 +1,5 @@ include $(top_srcdir)/build/vars.build.mk +plugin = lineoperations
geanyplugins_LTLIBRARIES = lineoperations.la
Modified: markdown/src/Makefile.am 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -18,9 +18,9 @@ noinst_HEADERS = \ markdown_la_CFLAGS = \ $(AM_CFLAGS) \ $(MARKDOWN_CFLAGS) \ - -DMARKDOWN_DATA_DIR="$(pkgdatadir)/markdown" \ - -DMARKDOWN_DOC_DIR="$(docdir)/markdown" \ - -DMARKDOWN_HELP_FILE="$(docdir)/markdown/html/help.html" + -DMARKDOWN_DATA_DIR=PLUGINDATADIR \ + -DMARKDOWN_DOC_DIR=PLUGINDOCDIR \ + -DMARKDOWN_HELP_FILE="$(GP_DOCDIR)/$(plugin)/html/help.html"
markdown_la_CPPFLAGS = $(AM_CPPFLAGS) -DG_LOG_DOMAIN="Markdown" markdown_la_LIBADD = \
Modified: markdown/src/plugin.c 13 lines changed, 11 insertions(+), 2 deletions(-) =================================================================== @@ -45,7 +45,6 @@ PLUGIN_SET_TRANSLATABLE_INFO(LOCALEDIR, GETTEXT_PACKAGE, #ifndef MARKDOWN_HELP_FILE # define MARKDOWN_HELP_FILE MARKDOWN_DOC_DIR "/html/help.html" #endif -#define MARKDOWN_HELP_FILE_URI "file://" MARKDOWN_HELP_FILE
#define MARKDOWN_PREVIEW_LABEL _("Markdown Preview")
@@ -137,7 +136,17 @@ GtkWidget *plugin_configure(GtkDialog *dialog) /* Called to show the plugin's help */ void plugin_help(void) { - utils_open_browser(MARKDOWN_HELP_FILE_URI); +#ifdef G_OS_WIN32 + gchar *prefix = g_win32_get_package_installation_directory_of_module(NULL); +#else + gchar *prefix = NULL; +#endif + gchar *uri = g_strconcat("file://", prefix ? prefix : "", MARKDOWN_HELP_FILE, NULL); + + utils_open_browser(uri); + + g_free(uri); + g_free(prefix); }
/* All of the various signal handlers call this function to update the
Modified: overview/overview/Makefile.am 3 lines changed, 1 insertions(+), 2 deletions(-) =================================================================== @@ -21,8 +21,7 @@ overview_la_SOURCES = \ overview_la_CPPFLAGS = $(AM_CPPFLAGS) -DG_LOG_DOMAIN="Overview" overview_la_CFLAGS = \ $(AM_CFLAGS) \ - -I$(srcdir)/.. \ - -DOVERVIEW_PREFS_UI_FILE=""$(pkgdatadir)/overview/prefs.ui"" + -I$(srcdir)/..
overview_la_LIBADD = \ $(COMMONLIBS)
Modified: overview/overview/overviewprefspanel.c 13 lines changed, 11 insertions(+), 2 deletions(-) =================================================================== @@ -198,16 +198,25 @@ overview_prefs_panel_init (OverviewPrefsPanel *self) GtkBuilder *builder; GError *error = NULL; GtkWidget *overlay_frame; +#ifdef G_OS_WIN32 + gchar *prefix = g_win32_get_package_installation_directory_of_module (NULL); +#else + gchar *prefix = NULL; +#endif + gchar *ui_file_path = g_build_filename (prefix ? prefix : "", PLUGINDATADIR, "prefs.ui", NULL);
builder = gtk_builder_new (); - if (! gtk_builder_add_from_file (builder, OVERVIEW_PREFS_UI_FILE, &error)) + if (! gtk_builder_add_from_file (builder, ui_file_path, &error)) { - g_critical ("failed to open UI file '%s': %s", OVERVIEW_PREFS_UI_FILE, error->message); + g_critical ("failed to open UI file '%s': %s", ui_file_path, error->message); g_error_free (error); g_object_unref (builder); return; }
+ g_free (ui_file_path); + g_free (prefix); + self->prefs_table = builder_get_widget (builder, "prefs-table"); self->width_spin = builder_get_widget (builder, "width-spin"); self->zoom_spin = builder_get_widget (builder, "zoom-spin");
Modified: pairtaghighlighter/src/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,4 +1,5 @@ include $(top_srcdir)/build/vars.build.mk +plugin = pairtaghighlighter
geanyplugins_LTLIBRARIES = pairtaghighlighter.la
Modified: pohelper/src/gph-plugin.c 27 lines changed, 23 insertions(+), 4 deletions(-) =================================================================== @@ -1357,6 +1357,22 @@ on_color_button_color_notify (GtkWidget *widget, gtk_color_button_get_color (GTK_COLOR_BUTTON (widget), user_data); }
+static gchar * +get_data_dir_path (const gchar *filename) +{ +#ifdef G_OS_WIN32 + gchar *prefix = g_win32_get_package_installation_directory_of_module (NULL); +#else + gchar *prefix = NULL; +#endif + gchar *path = g_build_filename (prefix ? prefix : "", PLUGINDATADIR, + filename, NULL); + + g_free (prefix); + + return path; +} + static void show_stats_dialog (guint all, guint translated, @@ -1364,11 +1380,11 @@ show_stats_dialog (guint all, guint untranslated) { GError *error = NULL; + gchar *ui_filename = get_data_dir_path ("stats.ui");; GtkBuilder *builder = gtk_builder_new ();
gtk_builder_set_translation_domain (builder, GETTEXT_PACKAGE); - if (! gtk_builder_add_from_file (builder, PKGDATADIR"/pohelper/stats.ui", - &error)) { + if (! gtk_builder_add_from_file (builder, ui_filename, &error)) { g_critical (_("Failed to load UI definition, please check your " "installation. The error was: %s"), error->message); g_error_free (error); @@ -1448,6 +1464,7 @@ show_stats_dialog (guint all, gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (GTK_WIDGET (dialog)); } + g_free (ui_filename); g_object_unref (builder); }
@@ -1694,14 +1711,15 @@ plugin_init (GeanyData *data) { GtkBuilder *builder; GError *error = NULL; + gchar *ui_filename; guint i;
load_config ();
+ ui_filename = get_data_dir_path ("menus.ui"); builder = gtk_builder_new (); gtk_builder_set_translation_domain (builder, GETTEXT_PACKAGE); - if (! gtk_builder_add_from_file (builder, PKGDATADIR"/pohelper/menus.ui", - &error)) { + if (! gtk_builder_add_from_file (builder, ui_filename, &error)) { g_critical (_("Failed to load UI definition, please check your " "installation. The error was: %s"), error->message); g_error_free (error); @@ -1721,6 +1739,7 @@ plugin_init (GeanyData *data) g_signal_connect (obj, "toggled", G_CALLBACK (on_update_headers_upon_save_toggled), NULL); } + g_free (ui_filename);
/* signal handlers */ plugin_signal_connect (geany_plugin, NULL, "document-activate", TRUE,
Modified: pretty-printer/src/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,4 +1,5 @@ include $(top_srcdir)/build/vars.build.mk +plugin = pretty-printer
geanyplugins_LTLIBRARIES = pretty-printer.la
Modified: projectorganizer/src/Makefile.am 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,5 @@ include $(top_srcdir)/build/vars.build.mk +plugin = projectorganizer
geanyplugins_LTLIBRARIES = projectorganizer.la
@@ -14,7 +15,6 @@ projectorganizer_la_SOURCES = \ prjorg-menu.c
projectorganizer_la_CPPFLAGS = $(AM_CPPFLAGS) \ - -DPLUGIN="$(plugin)" \ -DG_LOG_DOMAIN="ProjectOrganizer" projectorganizer_la_CFLAGS = $(AM_CFLAGS) projectorganizer_la_LIBADD = $(COMMONLIBS)
Modified: scope/src/Makefile.am 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -55,7 +55,6 @@ scope_la_LIBADD = $(COMMONLIBS) $(VTE_LIBS) $(PTY_LIBS)
scope_la_CPPFLAGS = $(AM_CPPFLAGS) -DG_LOG_DOMAIN="Scope" scope_la_CFLAGS = $(AM_CFLAGS) $(VTE_CFLAGS) \ - -DPLUGINDATADIR="$(plugindatadir)" \ -DPLUGINHTMLDOCDIR="$(plugindocdir)/html" \ -Wno-shadow
Modified: shiftcolumn/src/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,4 +1,5 @@ include $(top_srcdir)/build/vars.build.mk +plugin = shiftcolumn
geanyplugins_LTLIBRARIES = shiftcolumn.la
Modified: spellcheck/src/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,4 +1,5 @@ include $(top_srcdir)/build/vars.build.mk +plugin = spellcheck
geanyplugins_LTLIBRARIES = spellcheck.la
Modified: tableconvert/src/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,4 +1,5 @@ include $(top_srcdir)/build/vars.build.mk +plugin = tableconvert
geanyplugins_LTLIBRARIES = tableconvert.la
Modified: treebrowser/src/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,4 +1,5 @@ include $(top_srcdir)/build/vars.build.mk +plugin = treebrowser
geanyplugins_LTLIBRARIES = treebrowser.la
Modified: xmlsnippets/src/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,4 +1,5 @@ include $(top_srcdir)/build/vars.build.mk +plugin = xmlsnippets
geanyplugins_LTLIBRARIES = xmlsnippets.la
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).