Plugins-Commits August 2012

plugins-commits@lists.geany.org

1 participants
62 discussions

[geany/geany-plugins] 5bc63f: Merge pull request #71 from b4n/fixes/waf
by Frank Lanitz 27 Aug '12

27 Aug '12

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Mon, 27 Aug 2012 15:10:31 Commit: 5bc63fa80e7497279a2e1091d520176875d742f7 https://github.com/geany/geany-plugins/commit/5bc63fa80e7497279a2e1091d5201… Log Message: ----------- Merge pull request #71 from b4n/fixes/waf Fixes/waf Modified Paths: -------------- geanygendoc/wscript_build markdown/wscript_build markdown/wscript_configure Modified: geanygendoc/wscript_build 14 files changed, 13 insertions(+), 1 deletions(-) =================================================================== @@ -26,8 +26,20 @@ from build.wafutils import build_plugin, target_is_win32 name = 'GeanyGenDoc' includes = ['geanygendoc/src'] libraries = ['CTPL'] +sources = [ 'src/ggd.c', + 'src/ggd-doc-setting.c', + 'src/ggd-doc-type.c', + 'src/ggd-file-type.c', + 'src/ggd-file-type-loader.c', + 'src/ggd-file-type-manager.c', + 'src/ggd-tag-utils.c', + 'src/ggd-options.c', + 'src/ggd-plugin.c', + 'src/ggd-utils.c', + 'src/ggd-widget-frame.c', + 'src/ggd-widget-doctype-selector.c' ] -build_plugin(bld, name, includes=includes, libraries=libraries) +build_plugin(bld, name, sources=sources, includes=includes, libraries=libraries) is_win32 = target_is_win32(bld) Modified: markdown/wscript_build 67 files changed, 67 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,67 @@ +# -*- coding: utf-8 -*- +# +# WAF build script for geany-plugins - Markdown +# +# Copyright 2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> +# Copyright 2011 Frank Lanitz <frnk(at)frank(dot)uvena(dot)de> +# Copyright 2012 Colomban Wendling <ban(at)herbesfolles(dot)org> +# +# 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. + +from build.wafutils import build_plugin +from waflib.Utils import subst_vars + +name = 'Markdown' +includes = [ 'src', 'discount' ] +defines = [ subst_vars('MARKDOWN_DATA_DIR="${PKGDATADIR}/markdown"', bld.env), + subst_vars('MARKDOWN_DOC_DIR="${DOCDIR}/markdown"', bld.env), + subst_vars('MARKDOWN_HELP_FILE="${DOCDIR}/markdown/html/help.html"', bld.env) ] +libraries = [ 'GTK', 'GTHREAD', 'WEBKIT' ] +sources = [ "discount/amalloc.c", + "discount/basename.c", + "discount/Csio.c", + "discount/css.c", + "discount/docheader.c", + "discount/dumptree.c", + "discount/emmatch.c", + "discount/flags.c", + "discount/generate.c", + "discount/html5.c", + "discount/markdown.c", + "discount/mkdio.c", + "discount/resource.c", + "discount/setup.c", + "discount/tags.c", + "discount/toc.c", + "discount/version.c", + "discount/xml.c", + "discount/xmlpage.c", + "src/conf.c", + "src/plugin.c", + "src/viewer.c" ] + +build_plugin(bld, name, sources=sources, includes=includes, libraries=libraries, defines=defines) + +# install docs +helpfiles = [ 'docs/help.html', + 'docs/plugin.png', + 'docs/plugin_mgr.png', + 'docs/plugin_prefs.png', + 'docs/plugin_small.png', + 'docs/set_filetype.png', + 'docs/settings.png' ] + +docdir = '${G_PREFIX}/doc/plugins' if target_is_win32(bld) else '${DOCDIR}' +bld.install_files('%s/markdown/html' % docdir, helpfiles) Modified: markdown/wscript_configure 35 files changed, 35 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,35 @@ +# -*- coding: utf-8 -*- +# +# WAF build script for geany-plugins - Markdown +# +# Copyright 2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> +# Copyright 2011 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> +# Copyright 2012 Colomban Wendling <ban(at)herbesfolles(dot)org> +# +# 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. + +from build.wafutils import check_cfg_cached + +packages = [ ('gtk+-2.0', '2.16', 'GTK'), + ('gthread-2.0', '', 'GTHREAD'), + ('webkit-1.0', '1.1.13', 'WEBKIT') ] + +for package_name, package_version, uselib_store in packages: + check_cfg_cached(conf, + package=package_name, + atleast_version=package_version, + uselib_store=uselib_store, + mandatory=True, + args='--cflags --libs') @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany-plugins] a9d841: Merge pull request #70 from b4n/fixes/markdown
by Frank Lanitz 27 Aug '12

27 Aug '12

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Mon, 27 Aug 2012 15:09:56 Commit: a9d8417f88719aec36503943c8a7f1792cd44353 https://github.com/geany/geany-plugins/commit/a9d8417f88719aec36503943c8a7f… Log Message: ----------- Merge pull request #70 from b4n/fixes/markdown Fixes/markdown Modified Paths: -------------- markdown/discount/Makefile.am markdown/docs/Makefile.am markdown/src/conf.c markdown/src/viewer.c Modified: markdown/discount/Makefile.am 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -3,6 +3,7 @@ noinst_LTLIBRARIES = libdiscount.la libdiscount_la_SOURCES = \ amalloc.c \ amalloc.h \ + blocktags \ basename.c \ config.h \ Csio.c \ Modified: markdown/docs/Makefile.am 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,6 +1,6 @@ helpdir = $(docdir)/markdown/html -help_DATA = \ +dist_help_DATA = \ help.html \ plugin.png \ plugin_mgr.png \ Modified: markdown/src/conf.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -83,7 +83,7 @@ struct _MarkdownConfigPrivate gchar filename[PATH_MAX]; GKeyFile *kf; guint handle; - guint dlg_handle; + gulong dlg_handle; gboolean initialized; gchar *tmpl_text; gsize tmpl_text_len; @@ -433,7 +433,7 @@ static gboolean on_idle_timeout(MarkdownConfig *conf) contents = g_key_file_to_data(conf->priv->kf, &len, &error); - //g_debug("Saving: %s\n%s", conf->priv->filename, contents); + /*g_debug("Saving: %s\n%s", conf->priv->filename, contents);*/ if (error) { g_warning("Error getting config data as string: %s", error->message); @@ -452,7 +452,7 @@ static gboolean on_idle_timeout(MarkdownConfig *conf) return success; } -gchar * +static gchar * color_button_get_color(GtkColorButton *color_button) { GdkColor color; Modified: markdown/src/viewer.c 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -39,9 +39,9 @@ enum struct _MarkdownViewerPrivate { MarkdownConfig *conf; - guint load_handle; + gulong load_handle; guint update_handle; - guint prop_handle; + gulong prop_handle; GString *text; gchar enc[MD_ENC_MAX]; gdouble vscroll_pos; @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany-plugins] a62cfa: markdown: Fix a few trivial warnings in the plugin code
by Colomban Wendling 27 Aug '12

27 Aug '12

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 27 Aug 2012 14:57:01 Commit: a62cfae4e01071378fb2c858b5200e0ef76d4fb7 https://github.com/geany/geany-plugins/commit/a62cfae4e01071378fb2c858b5200… Log Message: ----------- markdown: Fix a few trivial warnings in the plugin code Modified Paths: -------------- markdown/src/conf.c markdown/src/viewer.c Modified: markdown/src/conf.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -83,7 +83,7 @@ struct _MarkdownConfigPrivate gchar filename[PATH_MAX]; GKeyFile *kf; guint handle; - guint dlg_handle; + gulong dlg_handle; gboolean initialized; gchar *tmpl_text; gsize tmpl_text_len; @@ -433,7 +433,7 @@ static gboolean on_idle_timeout(MarkdownConfig *conf) contents = g_key_file_to_data(conf->priv->kf, &len, &error); - //g_debug("Saving: %s\n%s", conf->priv->filename, contents); + /*g_debug("Saving: %s\n%s", conf->priv->filename, contents);*/ if (error) { g_warning("Error getting config data as string: %s", error->message); @@ -452,7 +452,7 @@ static gboolean on_idle_timeout(MarkdownConfig *conf) return success; } -gchar * +static gchar * color_button_get_color(GtkColorButton *color_button) { GdkColor color; Modified: markdown/src/viewer.c 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -39,9 +39,9 @@ enum struct _MarkdownViewerPrivate { MarkdownConfig *conf; - guint load_handle; + gulong load_handle; guint update_handle; - guint prop_handle; + gulong prop_handle; GString *text; gchar enc[MD_ENC_MAX]; gdouble vscroll_pos; @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany-plugins] e6fe23: markdown: Fix Autotools build system
by Colomban Wendling 27 Aug '12

27 Aug '12

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 27 Aug 2012 13:26:17 Commit: e6fe234f43243547394a2c748d1411d748b81c98 https://github.com/geany/geany-plugins/commit/e6fe234f43243547394a2c748d141… Log Message: ----------- markdown: Fix Autotools build system Modified Paths: -------------- markdown/discount/Makefile.am markdown/docs/Makefile.am Modified: markdown/discount/Makefile.am 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -3,6 +3,7 @@ noinst_LTLIBRARIES = libdiscount.la libdiscount_la_SOURCES = \ amalloc.c \ amalloc.h \ + blocktags \ basename.c \ config.h \ Csio.c \ Modified: markdown/docs/Makefile.am 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,6 +1,6 @@ helpdir = $(docdir)/markdown/html -help_DATA = \ +dist_help_DATA = \ help.html \ plugin.png \ plugin_mgr.png \ @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany-plugins] d66dce: markdown: Add to Waf build system
by Colomban Wendling 27 Aug '12

27 Aug '12

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 27 Aug 2012 13:25:22 Commit: d66dcefc527be26343ee49e53195320fba7a1d57 https://github.com/geany/geany-plugins/commit/d66dcefc527be26343ee49e531953… Log Message: ----------- markdown: Add to Waf build system Modified Paths: -------------- markdown/wscript_build markdown/wscript_configure Modified: markdown/wscript_build 67 files changed, 67 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,67 @@ +# -*- coding: utf-8 -*- +# +# WAF build script for geany-plugins - Markdown +# +# Copyright 2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> +# Copyright 2011 Frank Lanitz <frnk(at)frank(dot)uvena(dot)de> +# Copyright 2012 Colomban Wendling <ban(at)herbesfolles(dot)org> +# +# 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. + +from build.wafutils import build_plugin +from waflib.Utils import subst_vars + +name = 'Markdown' +includes = [ 'src', 'discount' ] +defines = [ subst_vars('MARKDOWN_DATA_DIR="${PKGDATADIR}/markdown"', bld.env), + subst_vars('MARKDOWN_DOC_DIR="${DOCDIR}/markdown"', bld.env), + subst_vars('MARKDOWN_HELP_FILE="${DOCDIR}/markdown/html/help.html"', bld.env) ] +libraries = [ 'GTK', 'GTHREAD', 'WEBKIT' ] +sources = [ "discount/amalloc.c", + "discount/basename.c", + "discount/Csio.c", + "discount/css.c", + "discount/docheader.c", + "discount/dumptree.c", + "discount/emmatch.c", + "discount/flags.c", + "discount/generate.c", + "discount/html5.c", + "discount/markdown.c", + "discount/mkdio.c", + "discount/resource.c", + "discount/setup.c", + "discount/tags.c", + "discount/toc.c", + "discount/version.c", + "discount/xml.c", + "discount/xmlpage.c", + "src/conf.c", + "src/plugin.c", + "src/viewer.c" ] + +build_plugin(bld, name, sources=sources, includes=includes, libraries=libraries, defines=defines) + +# install docs +helpfiles = [ 'docs/help.html', + 'docs/plugin.png', + 'docs/plugin_mgr.png', + 'docs/plugin_prefs.png', + 'docs/plugin_small.png', + 'docs/set_filetype.png', + 'docs/settings.png' ] + +docdir = '${G_PREFIX}/doc/plugins' if target_is_win32(bld) else '${DOCDIR}' +bld.install_files('%s/markdown/html' % docdir, helpfiles) Modified: markdown/wscript_configure 35 files changed, 35 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,35 @@ +# -*- coding: utf-8 -*- +# +# WAF build script for geany-plugins - Markdown +# +# Copyright 2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> +# Copyright 2011 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> +# Copyright 2012 Colomban Wendling <ban(at)herbesfolles(dot)org> +# +# 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. + +from build.wafutils import check_cfg_cached + +packages = [ ('gtk+-2.0', '2.16', 'GTK'), + ('gthread-2.0', '', 'GTHREAD'), + ('webkit-1.0', '1.1.13', 'WEBKIT') ] + +for package_name, package_version, uselib_store in packages: + check_cfg_cached(conf, + package=package_name, + atleast_version=package_version, + uselib_store=uselib_store, + mandatory=True, + args='--cflags --libs') @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany-plugins] d801fe: geanygendoc: Explicitly list source files in Waf build
by Colomban Wendling 27 Aug '12

27 Aug '12

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 27 Aug 2012 12:03:07 Commit: d801fed2761bde6117188422638421fa22c968ec https://github.com/geany/geany-plugins/commit/d801fed2761bde611718842263842… Log Message: ----------- geanygendoc: Explicitly list source files in Waf build This prevents the build from failing if any untracked, unwanted and non-building C file lands in a source directory. Modified Paths: -------------- geanygendoc/wscript_build Modified: geanygendoc/wscript_build 14 files changed, 13 insertions(+), 1 deletions(-) =================================================================== @@ -26,8 +26,20 @@ from build.wafutils import build_plugin, target_is_win32 name = 'GeanyGenDoc' includes = ['geanygendoc/src'] libraries = ['CTPL'] +sources = [ 'src/ggd.c', + 'src/ggd-doc-setting.c', + 'src/ggd-doc-type.c', + 'src/ggd-file-type.c', + 'src/ggd-file-type-loader.c', + 'src/ggd-file-type-manager.c', + 'src/ggd-tag-utils.c', + 'src/ggd-options.c', + 'src/ggd-plugin.c', + 'src/ggd-utils.c', + 'src/ggd-widget-frame.c', + 'src/ggd-widget-doctype-selector.c' ] -build_plugin(bld, name, includes=includes, libraries=libraries) +build_plugin(bld, name, sources=sources, includes=includes, libraries=libraries) is_win32 = target_is_win32(bld) @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany-plugins] 113437: devhelp: Fix using some functions from API newer than dependency
by Matthew Brush 27 Aug '12

27 Aug '12

Branch: refs/heads/master Author: Matthew Brush <matt(a)geany.org> Committer: Matthew Brush <matt(a)geany.org> Date: Sun, 05 Aug 2012 14:34:36 Commit: 113437406cfe18bbdb640dcf7d1da22658eae4b5 https://github.com/geany/geany-plugins/commit/113437406cfe18bbdb640dcf7d1da… Log Message: ----------- devhelp: Fix using some functions from API newer than dependency Modified Paths: -------------- devhelp/src/dhp-object.c devhelp/src/dhp-settings.c Modified: devhelp/src/dhp-object.c 13 files changed, 12 insertions(+), 1 deletions(-) =================================================================== @@ -562,8 +562,15 @@ DevhelpPlugin *devhelp_plugin_new(void) */ const gchar *devhelp_plugin_get_webview_uri(DevhelpPlugin *self) { + WebKitWebFrame *frame; + g_return_val_if_fail(DEVHELP_IS_PLUGIN(self), NULL); - return webkit_web_view_get_uri(WEBKIT_WEB_VIEW(self->priv->webview)); + + frame = webkit_web_view_get_main_frame(WEBKIT_WEB_VIEW(self->priv->webview)); + if (frame) + return webkit_web_frame_get_uri(WEBKIT_WEB_FRAME(frame)); + else + return NULL; } @@ -1026,7 +1033,11 @@ gboolean devhelp_plugin_get_have_man_prog(DevhelpPlugin *self) gboolean devhelp_plugin_get_devhelp_sidebar_visible(DevhelpPlugin *self) { g_return_val_if_fail(DEVHELP_IS_PLUGIN(self), FALSE); +#if GTK_CHECK_VERSION(2,18,0) return gtk_widget_get_visible(self->priv->sb_notebook); +#else + return GTK_WIDGET_VISIBLE(self->priv->sb_notebook); +#endif } Modified: devhelp/src/dhp-settings.c 8 files changed, 7 insertions(+), 1 deletions(-) =================================================================== @@ -309,7 +309,13 @@ void devhelp_plugin_store_settings(DevhelpPlugin *self, const gchar *filename) g_key_file_set_boolean(kf, "doc_providers", "man_pages", self->priv->use_man); g_key_file_set_boolean(kf, "doc_providers", "codesearch", self->priv->use_codesearch); - g_key_file_set_boolean(kf, "devhelp", "show_devhelp_sidebar", gtk_widget_get_visible(self->priv->sb_notebook)); + g_key_file_set_boolean(kf, "devhelp", "show_devhelp_sidebar", +#if GTK_CHECK_VERSION(2,18,0) + gtk_widget_get_visible(self->priv->sb_notebook) +#else + GTK_WIDGET_VISIBLE(self->priv->sb_notebook) +#endif + ); g_key_file_set_boolean(kf, "devhelp", "set_sidebar_tabs_bottom", devhelp_plugin_get_sidebar_tabs_bottom(self)); g_key_file_set_boolean(kf, "devhelp", "focus_sidebar_on_search", self->priv->focus_sidebar_on_search); @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany-plugins] d4cf1f: Merge pull request #64 from codebrainz/devhelp-deps
by Frank Lanitz 27 Aug '12

27 Aug '12

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Sun, 26 Aug 2012 22:59:03 Commit: d4cf1f16551f804ce36b952b8045da9a849a271a https://github.com/geany/geany-plugins/commit/d4cf1f16551f804ce36b952b8045d… Log Message: ----------- Merge pull request #64 from codebrainz/devhelp-deps devhelp: Fix using some functions from API newer than dependency Modified Paths: -------------- devhelp/src/dhp-object.c devhelp/src/dhp-settings.c Modified: devhelp/src/dhp-object.c 13 files changed, 12 insertions(+), 1 deletions(-) =================================================================== @@ -562,8 +562,15 @@ DevhelpPlugin *devhelp_plugin_new(void) */ const gchar *devhelp_plugin_get_webview_uri(DevhelpPlugin *self) { + WebKitWebFrame *frame; + g_return_val_if_fail(DEVHELP_IS_PLUGIN(self), NULL); - return webkit_web_view_get_uri(WEBKIT_WEB_VIEW(self->priv->webview)); + + frame = webkit_web_view_get_main_frame(WEBKIT_WEB_VIEW(self->priv->webview)); + if (frame) + return webkit_web_frame_get_uri(WEBKIT_WEB_FRAME(frame)); + else + return NULL; } @@ -1026,7 +1033,11 @@ gboolean devhelp_plugin_get_have_man_prog(DevhelpPlugin *self) gboolean devhelp_plugin_get_devhelp_sidebar_visible(DevhelpPlugin *self) { g_return_val_if_fail(DEVHELP_IS_PLUGIN(self), FALSE); +#if GTK_CHECK_VERSION(2,18,0) return gtk_widget_get_visible(self->priv->sb_notebook); +#else + return GTK_WIDGET_VISIBLE(self->priv->sb_notebook); +#endif } Modified: devhelp/src/dhp-settings.c 8 files changed, 7 insertions(+), 1 deletions(-) =================================================================== @@ -309,7 +309,13 @@ void devhelp_plugin_store_settings(DevhelpPlugin *self, const gchar *filename) g_key_file_set_boolean(kf, "doc_providers", "man_pages", self->priv->use_man); g_key_file_set_boolean(kf, "doc_providers", "codesearch", self->priv->use_codesearch); - g_key_file_set_boolean(kf, "devhelp", "show_devhelp_sidebar", gtk_widget_get_visible(self->priv->sb_notebook)); + g_key_file_set_boolean(kf, "devhelp", "show_devhelp_sidebar", +#if GTK_CHECK_VERSION(2,18,0) + gtk_widget_get_visible(self->priv->sb_notebook) +#else + GTK_WIDGET_VISIBLE(self->priv->sb_notebook) +#endif + ); g_key_file_set_boolean(kf, "devhelp", "set_sidebar_tabs_bottom", devhelp_plugin_get_sidebar_tabs_bottom(self)); g_key_file_set_boolean(kf, "devhelp", "focus_sidebar_on_search", self->priv->focus_sidebar_on_search); @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany-plugins] 33521c: support for new thread group creation message: fixing bug
by Alexander Petukhov 27 Aug '12

27 Aug '12

Branch: refs/heads/master Author: Alexander Petukhov <devel(a)apetukhov.ru> Committer: Alexander Petukhov <devel(a)apetukhov.ru> Date: Sun, 01 Jul 2012 16:02:15 Commit: 33521c8f1fd0add20c0bacc90089da424ff007f5 https://github.com/geany/geany-plugins/commit/33521c8f1fd0add20c0bacc90089d… Log Message: ----------- support for new thread group creation message: fixing bug Modified Paths: -------------- debugger/src/dbm_gdb.c Modified: debugger/src/dbm_gdb.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -446,7 +446,7 @@ static gboolean on_read_from_gdb(GIOChannel * src, GIOCondition cond, gpointer d else if (!target_pid && g_str_has_prefix(line, "=thread-group-started")) { *(strrchr(line, '\"')) = '\0'; - target_pid = atoi(strrchr(line, '\"') + 2); + target_pid = atoi(strrchr(line, '\"') + 1); } else if (g_str_has_prefix(line, "=thread-created")) { @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany-plugins] 24175c: support for new thread group creation message
by Alexander Petukhov 27 Aug '12

27 Aug '12

Branch: refs/heads/master Author: Alexander Petukhov <devel(a)apetukhov.ru> Committer: Alexander Petukhov <devel(a)apetukhov.ru> Date: Sun, 01 Jul 2012 12:41:52 Commit: 24175c12372917df58915f0b6a83f77443e0367d https://github.com/geany/geany-plugins/commit/24175c12372917df58915f0b6a83f… Log Message: ----------- support for new thread group creation message Modified Paths: -------------- debugger/src/dbm_gdb.c Modified: debugger/src/dbm_gdb.c 5 files changed, 5 insertions(+), 0 deletions(-) =================================================================== @@ -443,6 +443,11 @@ static gboolean on_read_from_gdb(GIOChannel * src, GIOCondition cond, gpointer d *(strrchr(line, '\"')) = '\0'; target_pid = atoi(line + strlen("=thread-group-created,id=\"")); } + else if (!target_pid && g_str_has_prefix(line, "=thread-group-started")) + { + *(strrchr(line, '\"')) = '\0'; + target_pid = atoi(strrchr(line, '\"') + 2); + } else if (g_str_has_prefix(line, "=thread-created")) { int thread_id; @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

Plugins-Commits August 2012