Plugins-Commits March 2015

plugins-commits@lists.geany.org

1 participants
32 discussions

[geany/geany-plugins] 085c83: pairtaghighlighter: Fix clearing previous indicators
by Colomban Wendling 09 Mar '15

09 Mar '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 09 Mar 2015 16:06:34 UTC Commit: 085c83309ebf5c3a368b021b7f52d9af5a5e5fec https://github.com/geany/geany-plugins/commit/085c83309ebf5c3a368b021b7f52d… Log Message: ----------- pairtaghighlighter: Fix clearing previous indicators The second argument for SCI_INDICATORCLEARRANGE is the length to clear, not the end position. This used to work on earlier versions of Scintilla for some reason, probably because it didn't check length, but current versions do nothing with an invalid length. Modified Paths: -------------- pairtaghighlighter/src/pair_tag_highlighter.c Modified: pairtaghighlighter/src/pair_tag_highlighter.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -150,7 +150,7 @@ static void highlight_matching_pair(ScintillaObject *sci) static void clear_previous_highlighting(ScintillaObject *sci, gint rangeStart, gint rangeEnd) { scintilla_send_message(sci, SCI_SETINDICATORCURRENT, INDICATOR_TAGMATCH, 0); - scintilla_send_message(sci, SCI_INDICATORCLEARRANGE, rangeStart, rangeEnd+1); + scintilla_send_message(sci, SCI_INDICATORCLEARRANGE, rangeStart, rangeEnd-rangeStart+1); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 9f9627: Merge branch 'master' of github.com:geany/geany-plugins
by Dimitar Zhekov 07 Mar '15

07 Mar '15

Branch: refs/heads/master Author: Dimitar Zhekov <dimitar.zhekov(a)gmail.com> Committer: Dimitar Zhekov <dimitar.zhekov(a)gmail.com> Date: Sat, 07 Mar 2015 13:19:34 UTC Commit: 9f962756fb5e18ff8c9c1410c29e047d40ff8e84 https://github.com/geany/geany-plugins/commit/9f962756fb5e18ff8c9c1410c29e0… Log Message: ----------- Merge branch 'master' of github.com:geany/geany-plugins Modified Paths: -------------- debugger/src/dconfig.c geanylua/glspi_sci.c git-changebar/src/gcb-plugin.c Modified: debugger/src/dconfig.c 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -392,6 +392,8 @@ void config_set_panel(int config_part, gpointer config_value, ...) } } + va_end(ap); + panel_config_changed = TRUE; g_mutex_unlock(change_config_mutex); } Modified: geanylua/glspi_sci.c 3 lines changed, 1 insertions(+), 2 deletions(-) =================================================================== @@ -229,7 +229,7 @@ static gint glspi_batch(lua_State* L) /* Return the "word" at the given position */ static gint glspi_word(lua_State* L) { - const gchar* word_chars = NULL; + const gchar* word_chars = GEANY_WORDCHARS; gint pos,linenum, bol, bow, eow; gchar *text=NULL; DOC_REQUIRED @@ -251,7 +251,6 @@ static gint glspi_word(lua_State* L) if (lua_isstring(L, -1)) { word_chars=lua_tostring(L, -1); } else { - word_chars=GEANY_WORDCHARS; lua_getglobal(L, LUA_MODULE_NAME); lua_pushstring(L,tokenWordChars); lua_pushstring(L,word_chars); Modified: git-changebar/src/gcb-plugin.c 47 lines changed, 13 insertions(+), 34 deletions(-) =================================================================== @@ -112,16 +112,11 @@ struct GotoNextHunkData { }; -static void on_git_head_changed (GFileMonitor *monitor, +static void on_git_repo_changed (GFileMonitor *monitor, GFile *file, GFile *other_file, GFileMonitorEvent event_type, - gpointer user_data); -static void on_git_ref_changed (GFileMonitor *monitor, - GFile *file, - GFile *other_file, - GFileMonitorEvent event_type, - gpointer user_data); + gpointer force); static gboolean on_sci_query_tooltip (GtkWidget *widget, gint x, gint y, @@ -327,11 +322,11 @@ worker_thread (gpointer data) /* we need to monitor HEAD, in case of e.g. branch switch (e.g. * git checkout -b will switch the ref we need to watch) */ monitors[0] = monitor_repo_file (repo, "HEAD", - G_CALLBACK (on_git_head_changed), - job->user_data); + G_CALLBACK (on_git_repo_changed), + GINT_TO_POINTER (TRUE)); /* and of course the real ref (branch) for when changes get committed */ - monitors[1] = monitor_head_ref (repo, G_CALLBACK (on_git_ref_changed), - job->user_data); + monitors[1] = monitor_head_ref (repo, G_CALLBACK (on_git_repo_changed), + GINT_TO_POINTER (FALSE)); } } @@ -359,7 +354,6 @@ worker_thread (gpointer data) return NULL; } -/* @user_data will also be used to the file monitor callback */ static void get_cached_blob_async (const gchar *path, gboolean force, @@ -872,32 +866,17 @@ on_startup_complete (GObject *obj, } static void -on_git_head_changed (GFileMonitor *monitor, - GFile *file, - GFile *other_file, - GFileMonitorEvent event_type, - gpointer user_data) +on_git_repo_changed (GFileMonitor *monitor, + GFile *file, + GFile *other_file, + GFileMonitorEvent event_type, + gpointer force) { - GeanyDocument *doc = document_find_by_id (GPOINTER_TO_UINT (user_data)); - - if (doc) { - clear_cached_blob (); - update_diff_push (doc, TRUE); - } -} - -static void -on_git_ref_changed (GFileMonitor *monitor, - GFile *file, - GFile *other_file, - GFileMonitorEvent event_type, - gpointer user_data) -{ - GeanyDocument *doc = document_find_by_id (GPOINTER_TO_UINT (user_data)); + GeanyDocument *doc = document_get_current (); if (doc) { clear_cached_blob (); - update_diff_push (doc, FALSE); + update_diff_push (doc, GPOINTER_TO_INT (force)); } } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 26edf9: scope: fixed WINVER / _WIN32_WINNT definition for Win~1
by Dimitar Zhekov 07 Mar '15

07 Mar '15

Branch: refs/heads/master Author: Dimitar Zhekov <dimitar.zhekov(a)gmail.com> Committer: Dimitar Zhekov <dimitar.zhekov(a)gmail.com> Date: Sat, 07 Mar 2015 13:18:37 UTC Commit: 26edf9c1e604cb1ef20db7f335fab0000a2c1d56 https://github.com/geany/geany-plugins/commit/26edf9c1e604cb1ef20db7f335fab… Log Message: ----------- scope: fixed WINVER / _WIN32_WINNT definition for Win~1 Modified Paths: -------------- scope/src/thread.c Modified: scope/src/thread.c 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -17,6 +17,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#define _WIN32_WINNT 0x0501 /* for DebugBreakProcess(), must be before any #include-s */ + #include <ctype.h> #include <stdlib.h> #include <string.h> @@ -27,7 +29,6 @@ #ifdef G_OS_UNIX #include <signal.h> #else -#define WINVER 0x0501 #include <limits.h> #include <windows.h> #endif -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 7c45d2: autotools: Simplify geanyvc and geanyprj test setup
by Colomban Wendling 05 Mar '15

05 Mar '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Thu, 05 Mar 2015 22:06:06 UTC Commit: 7c45d275e8349857c2a65eddd13247e0f63278c5 https://github.com/geany/geany-plugins/commit/7c45d275e8349857c2a65eddd1324… Log Message: ----------- autotools: Simplify geanyvc and geanyprj test setup As both plugins actually rebuild source files differently for the tests, put the test controller in the same directory. Modified Paths: -------------- build/geanyprj.m4 build/geanyvc.m4 geanyprj/Makefile.am geanyprj/src/Makefile.am geanyprj/src/unittests.c geanyprj/tests/Makefile.am geanyvc/Makefile.am geanyvc/src/Makefile.am geanyvc/src/unittests.c geanyvc/tests/Makefile.am Modified: build/geanyprj.m4 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -6,6 +6,5 @@ AC_DEFUN([GP_CHECK_GEANYPRJ], AC_CONFIG_FILES([ geanyprj/Makefile geanyprj/src/Makefile - geanyprj/tests/Makefile ]) ]) Modified: build/geanyvc.m4 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -27,6 +27,5 @@ AC_DEFUN([GP_CHECK_GEANYVC], AC_CONFIG_FILES([ geanyvc/Makefile geanyvc/src/Makefile - geanyvc/tests/Makefile ]) ]) Modified: geanyprj/Makefile.am 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,4 @@ include $(top_srcdir)/build/vars.auxfiles.mk -SUBDIRS = src tests +SUBDIRS = src plugin = geanyprj Modified: geanyprj/src/Makefile.am 14 lines changed, 7 insertions(+), 7 deletions(-) =================================================================== @@ -13,13 +13,13 @@ geanyprj_la_SOURCES = geanyprj.c \ geanyprj_la_CFLAGS = $(AM_CFLAGS) geanyprj_la_LIBADD = $(COMMONLIBS) -check_LTLIBRARIES = libgeanyprj-test.la - -libgeanyprj_test_la_SOURCES = \ - utils.c -libgeanyprj_test_la_CPPFLAGS = $(AM_CFLAGS) -DUNITTESTS -libgeanyprj_test_la_LDFLAGS = -avoid-version $(GP_LDFLAGS) -libgeanyprj_test_la_LIBADD = $(COMMONLIBS) +if UNITTESTS +TESTS = unittests +check_PROGRAMS = unittests +unittests_SOURCES = unittests.c utils.c +unittests_CFLAGS = $(GEANY_CFLAGS) -DUNITTESTS +unittests_LDADD = @GEANY_LIBS@ $(INTLLIBS) @CHECK_LIBS@ +endif AM_CPPCHECKFLAGS = --suppress='constStatement:*' AM_CPPCHECKFLAGS += --suppress='memleak:utils.c:72' Modified: geanyprj/src/unittests.c 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: geanyprj/tests/Makefile.am 9 lines changed, 0 insertions(+), 9 deletions(-) =================================================================== @@ -1,9 +0,0 @@ -if UNITTESTS -include $(top_srcdir)/build/vars.build.mk -TESTS=unittests -check_PROGRAMS=unittests -unittests_SOURCES = unittests.c -unittests_CFLAGS = $(GEANY_CFLAGS) -I$(srcdir)/../src -DUNITTESTS -unittests_LDADD = @GEANY_LIBS@ $(INTLLIBS) @CHECK_LIBS@ \ - ../src/libgeanyprj-test.la -endif Modified: geanyvc/Makefile.am 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,4 @@ include $(top_srcdir)/build/vars.auxfiles.mk -SUBDIRS = src tests +SUBDIRS = src plugin = geanyvc Modified: geanyvc/src/Makefile.am 14 lines changed, 7 insertions(+), 7 deletions(-) =================================================================== @@ -22,12 +22,12 @@ geanyvc_la_LIBADD = \ $(GTKSPELL_LIBS) \ $(COMMONLIBS) -check_LTLIBRARIES = libgeanyvc-test.la - -libgeanyvc_test_la_SOURCES = \ - utils.c -libgeanyvc_test_la_CFLAGS = $(AM_CFLAGS) -DUNITTESTS -libgeanyvc_test_la_LDFLAGS = -avoid-version $(GP_LDFLAGS) -libgeanyvc_test_la_LIBADD = $(COMMONLIBS) +if UNITTESTS +TESTS = unittests +check_PROGRAMS = unittests +unittests_SOURCES = unittests.c utils.c +unittests_CFLAGS = $(GEANY_CFLAGS) -DUNITTESTS +unittests_LDADD = @GEANY_LIBS@ $(INTLLIBS) @CHECK_LIBS@ +endif include $(top_srcdir)/build/cppcheck.mk Modified: geanyvc/src/unittests.c 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: geanyvc/tests/Makefile.am 9 lines changed, 0 insertions(+), 9 deletions(-) =================================================================== @@ -1,9 +0,0 @@ -if UNITTESTS -include $(top_srcdir)/build/vars.build.mk -TESTS=unittests -check_PROGRAMS=unittests -unittests_SOURCES = unittests.c -unittests_CFLAGS = $(GEANY_CFLAGS) -DUNITTESTS -unittests_LDADD = @GEANY_LIBS@ $(INTLLIBS) @CHECK_LIBS@ \ - ../src/libgeanyvc-test.la -endif -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] bd20c6: autotools: Enable subdir-objects
by Colomban Wendling 05 Mar '15

05 Mar '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Thu, 05 Mar 2015 22:06:05 UTC Commit: bd20c631cb1564935d71a7b81044d452cf002530 https://github.com/geany/geany-plugins/commit/bd20c631cb1564935d71a7b81044d… Log Message: ----------- autotools: Enable subdir-objects This required tweaking geanyprj and geanyvc build system because they used an unsupported feature of re-building and object from a directory that already built objects, leading to a unexpected failure on cleanup. Modified Paths: -------------- configure.ac geanyprj/src/Makefile.am geanyprj/tests/Makefile.am geanyvc/src/Makefile.am geanyvc/tests/Makefile.am Modified: configure.ac 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1,7 +1,7 @@ AC_PREREQ([2.61]) dnl Don't forget when updating version number to do GP_CHECK_GEANY also AC_INIT([geany-plugins], [1.25]) -AM_INIT_AUTOMAKE([1.8 foreign dist-bzip2 tar-ustar]) +AM_INIT_AUTOMAKE([1.8 foreign dist-bzip2 tar-ustar subdir-objects]) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) @@ -10,6 +10,7 @@ AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([build/cache]) AC_PROG_CC +AC_PROG_CC_C_O AC_DISABLE_STATIC AC_PROG_LIBTOOL Modified: geanyprj/src/Makefile.am 8 lines changed, 8 insertions(+), 0 deletions(-) =================================================================== @@ -13,6 +13,14 @@ geanyprj_la_SOURCES = geanyprj.c \ geanyprj_la_CFLAGS = $(AM_CFLAGS) geanyprj_la_LIBADD = $(COMMONLIBS) +check_LTLIBRARIES = libgeanyprj-test.la + +libgeanyprj_test_la_SOURCES = \ + utils.c +libgeanyprj_test_la_CPPFLAGS = $(AM_CFLAGS) -DUNITTESTS +libgeanyprj_test_la_LDFLAGS = -avoid-version $(GP_LDFLAGS) +libgeanyprj_test_la_LIBADD = $(COMMONLIBS) + AM_CPPCHECKFLAGS = --suppress='constStatement:*' AM_CPPCHECKFLAGS += --suppress='memleak:utils.c:72' Modified: geanyprj/tests/Makefile.am 5 lines changed, 3 insertions(+), 2 deletions(-) =================================================================== @@ -2,7 +2,8 @@ if UNITTESTS include $(top_srcdir)/build/vars.build.mk TESTS=unittests check_PROGRAMS=unittests -unittests_SOURCES = unittests.c ../src/utils.c +unittests_SOURCES = unittests.c unittests_CFLAGS = $(GEANY_CFLAGS) -I$(srcdir)/../src -DUNITTESTS -unittests_LDADD = @GEANY_LIBS@ $(INTLLIBS) @CHECK_LIBS@ +unittests_LDADD = @GEANY_LIBS@ $(INTLLIBS) @CHECK_LIBS@ \ + ../src/libgeanyprj-test.la endif Modified: geanyvc/src/Makefile.am 8 lines changed, 8 insertions(+), 0 deletions(-) =================================================================== @@ -22,4 +22,12 @@ geanyvc_la_LIBADD = \ $(GTKSPELL_LIBS) \ $(COMMONLIBS) +check_LTLIBRARIES = libgeanyvc-test.la + +libgeanyvc_test_la_SOURCES = \ + utils.c +libgeanyvc_test_la_CFLAGS = $(AM_CFLAGS) -DUNITTESTS +libgeanyvc_test_la_LDFLAGS = -avoid-version $(GP_LDFLAGS) +libgeanyvc_test_la_LIBADD = $(COMMONLIBS) + include $(top_srcdir)/build/cppcheck.mk Modified: geanyvc/tests/Makefile.am 5 lines changed, 3 insertions(+), 2 deletions(-) =================================================================== @@ -2,7 +2,8 @@ if UNITTESTS include $(top_srcdir)/build/vars.build.mk TESTS=unittests check_PROGRAMS=unittests -unittests_SOURCES = unittests.c ../src/utils.c +unittests_SOURCES = unittests.c unittests_CFLAGS = $(GEANY_CFLAGS) -DUNITTESTS -unittests_LDADD = @GEANY_LIBS@ $(INTLLIBS) @CHECK_LIBS@ +unittests_LDADD = @GEANY_LIBS@ $(INTLLIBS) @CHECK_LIBS@ \ + ../src/libgeanyvc-test.la endif -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] c92f78: git-changebar: Fix repository monitoring after closing a file
by Colomban Wendling 05 Mar '15

05 Mar '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Thu, 05 Mar 2015 21:51:40 UTC Commit: c92f785f13d9c74b482dffa43d5d7ccfb3efcd1c https://github.com/geany/geany-plugins/commit/c92f785f13d9c74b482dffa43d5d7… Log Message: ----------- git-changebar: Fix repository monitoring after closing a file The monitoring callbacks used to only push an update to the very document for which the monitoring was initially setup. However, as monitoring is not reset when switching to another file in the same repository, it was easy to nullify the monitoring by opening two files from the same repository and closing the first one, as then the monitoring callbacks couldn't push the update to the closed document. So, fix the monitoring callbacks to push an update to the current document at the moment they are fired. This is not a problem because the monitoring is properly reset when switching between different repositories' files, and the update doesn't enforce a repository anyway. Modified Paths: -------------- git-changebar/src/gcb-plugin.c Modified: git-changebar/src/gcb-plugin.c 47 lines changed, 13 insertions(+), 34 deletions(-) =================================================================== @@ -112,16 +112,11 @@ struct GotoNextHunkData { }; -static void on_git_head_changed (GFileMonitor *monitor, +static void on_git_repo_changed (GFileMonitor *monitor, GFile *file, GFile *other_file, GFileMonitorEvent event_type, - gpointer user_data); -static void on_git_ref_changed (GFileMonitor *monitor, - GFile *file, - GFile *other_file, - GFileMonitorEvent event_type, - gpointer user_data); + gpointer force); static gboolean on_sci_query_tooltip (GtkWidget *widget, gint x, gint y, @@ -327,11 +322,11 @@ worker_thread (gpointer data) /* we need to monitor HEAD, in case of e.g. branch switch (e.g. * git checkout -b will switch the ref we need to watch) */ monitors[0] = monitor_repo_file (repo, "HEAD", - G_CALLBACK (on_git_head_changed), - job->user_data); + G_CALLBACK (on_git_repo_changed), + GINT_TO_POINTER (TRUE)); /* and of course the real ref (branch) for when changes get committed */ - monitors[1] = monitor_head_ref (repo, G_CALLBACK (on_git_ref_changed), - job->user_data); + monitors[1] = monitor_head_ref (repo, G_CALLBACK (on_git_repo_changed), + GINT_TO_POINTER (FALSE)); } } @@ -359,7 +354,6 @@ worker_thread (gpointer data) return NULL; } -/* @user_data will also be used to the file monitor callback */ static void get_cached_blob_async (const gchar *path, gboolean force, @@ -872,32 +866,17 @@ on_startup_complete (GObject *obj, } static void -on_git_head_changed (GFileMonitor *monitor, - GFile *file, - GFile *other_file, - GFileMonitorEvent event_type, - gpointer user_data) +on_git_repo_changed (GFileMonitor *monitor, + GFile *file, + GFile *other_file, + GFileMonitorEvent event_type, + gpointer force) { - GeanyDocument *doc = document_find_by_id (GPOINTER_TO_UINT (user_data)); - - if (doc) { - clear_cached_blob (); - update_diff_push (doc, TRUE); - } -} - -static void -on_git_ref_changed (GFileMonitor *monitor, - GFile *file, - GFile *other_file, - GFileMonitorEvent event_type, - gpointer user_data) -{ - GeanyDocument *doc = document_find_by_id (GPOINTER_TO_UINT (user_data)); + GeanyDocument *doc = document_get_current (); if (doc) { clear_cached_blob (); - update_diff_push (doc, FALSE); + update_diff_push (doc, GPOINTER_TO_INT (force)); } } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 007c9d: geanylua: Fix possible NULL pointer dereference
by Colomban Wendling 05 Mar '15

05 Mar '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Thu, 05 Mar 2015 01:17:07 UTC Commit: 007c9d3284c2d2510cfb8507f2a4ed8970dcb7e1 https://github.com/geany/geany-plugins/commit/007c9d3284c2d2510cfb8507f2a4e… Log Message: ----------- geanylua: Fix possible NULL pointer dereference `word_char` was only conditionally set to a non-NULL value, but unconditionally dereferenced through a `strchr()` call. While it seems highly unlikely to actually happen, play it safe and set the fallback value by default. Found by cppcheck. Modified Paths: -------------- geanylua/glspi_sci.c Modified: geanylua/glspi_sci.c 3 lines changed, 1 insertions(+), 2 deletions(-) =================================================================== @@ -229,7 +229,7 @@ static gint glspi_batch(lua_State* L) /* Return the "word" at the given position */ static gint glspi_word(lua_State* L) { - const gchar* word_chars = NULL; + const gchar* word_chars = GEANY_WORDCHARS; gint pos,linenum, bol, bow, eow; gchar *text=NULL; DOC_REQUIRED @@ -251,7 +251,6 @@ static gint glspi_word(lua_State* L) if (lua_isstring(L, -1)) { word_chars=lua_tostring(L, -1); } else { - word_chars=GEANY_WORDCHARS; lua_getglobal(L, LUA_MODULE_NAME); lua_pushstring(L,tokenWordChars); lua_pushstring(L,word_chars); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 7b3655: debugger: Add missing va_end() call
by Colomban Wendling 05 Mar '15

05 Mar '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Thu, 05 Mar 2015 01:12:02 UTC Commit: 7b3655784116463c30afd8e77e906ce437a9ae8f https://github.com/geany/geany-plugins/commit/7b3655784116463c30afd8e77e906… Log Message: ----------- debugger: Add missing va_end() call Found by cppcheck. Modified Paths: -------------- debugger/src/dconfig.c Modified: debugger/src/dconfig.c 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -392,6 +392,8 @@ void config_set_panel(int config_part, gpointer config_value, ...) } } + va_end(ap); + panel_config_changed = TRUE; g_mutex_unlock(change_config_mutex); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 3adef4: scope: added waf check for openpty in pty.h or util.h, required
by Dimitar Zhekov 03 Mar '15

03 Mar '15

Branch: refs/heads/master Author: Dimitar Zhekov <dimitar.zhekov(a)gmail.com> Committer: Dimitar Zhekov <dimitar.zhekov(a)gmail.com> Date: Tue, 03 Mar 2015 15:43:39 UTC Commit: 3adef41d6ced6ce60a621a0cda94d3d79d7f8d3d https://github.com/geany/geany-plugins/commit/3adef41d6ced6ce60a621a0cda94d… Log Message: ----------- scope: added waf check for openpty in pty.h or util.h, required for -lutil. Should be used debugger too, since it checks only for openpty in pty.h, even though util.h is supported in the source. Modified Paths: -------------- scope/wscript_configure Modified: scope/wscript_configure 10 lines changed, 10 insertions(+), 0 deletions(-) =================================================================== @@ -27,3 +27,13 @@ if not target_is_win32(bld) : package='vte', uselib_store='VTE', args='--cflags --libs') + try : + conf.check_cc(function_name='openpty', + header_name='pty.h', + lib='util', + uselib_store='UTIL') + except : + conf.check_cc(function_name='openpty', + header_name='util.h', + lib='util', + uselib_store='UTIL') -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] c074a3: webhelper: Fix bookmark completion on GTK 2.24
by Colomban Wendling 03 Mar '15

03 Mar '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 03 Mar 2015 01:24:34 UTC Commit: c074a30c25fefa5e20928d6a4fdf0b22561256b7 https://github.com/geany/geany-plugins/commit/c074a30c25fefa5e20928d6a4fdf0… Log Message: ----------- webhelper: Fix bookmark completion on GTK 2.24 Geany hides the GtkComboBoxText API on GTK 2.24 because it wants to keep the very same ABI on all GTK2 builds. So, we have to do the same otherwise we get mixed APIs which doesn't quite work. While at it, remove the redundant API mappings. Closes #193. Modified Paths: -------------- webhelper/src/gwh-browser.c Modified: webhelper/src/gwh-browser.c 12 lines changed, 5 insertions(+), 7 deletions(-) =================================================================== @@ -51,15 +51,13 @@ (GTK_WIDGET_MAPPED ((w))) # endif /* defined (gtk_widget_get_mapped) */ #endif /* GTK_CHECK_VERSION (2, 20, 0) */ -#if ! GTK_CHECK_VERSION (2, 24, 0) -# define GtkComboBoxText GtkComboBox -# define GTK_COMBO_BOX_TEXT GTK_COMBO_BOX -# define GTK_IS_COMBO_BOX_TEXT GTK_IS_COMBO_BOX -# define gtk_combo_box_text_new_with_entry gtk_combo_box_entry_new_text +#if ! GTK_CHECK_VERSION (3, 0, 0) +/* the GtkComboBoxText API is actually available in 2.24, but Geany's + * gtkcompat.h hides it on < 3.0.0 to keep ABI compatibility on all 2.x, so we + * need to use the old API there too. */ # define gtk_combo_box_get_entry_text_column(c) \ (gtk_combo_box_entry_get_text_column (GTK_COMBO_BOX_ENTRY (c))) -# define gtk_combo_box_text_append_text gtk_combo_box_append_text -#endif /* GTK_CHECK_VERSION (2, 24, 0) */ +#endif /* GTK_CHECK_VERSION (3, 0, 0) */ #if ! GTK_CHECK_VERSION (3, 0, 0) static void combo_box_text_remove_all (GtkComboBoxText *combo_box) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

Plugins-Commits March 2015