From git-noreply at xxxxx  Tue Oct  2 14:25:59 2018
From: git-noreply at xxxxx (=?utf-8?q?Frank_Lanitz?=)
Date: Tue, 02 Oct 2018 14:25:59 -0000
Subject: [geany/geany-plugins] dc6558: Treebrowser: Improve wording
Message-ID: <20181002142610.D6CB91EAAC0@mail.geany.org>

Branch:      refs/heads/master
Author:      Frank Lanitz <frank at frank.uvena.de>
Committer:   GitHub <noreply at github.com>
Date:        Tue, 02 Oct 2018 14:25:59 UTC
Commit:      dc65581ae3fa4af81495983a2e768ba81a913665
             https://github.com/geany/geany-plugins/commit/dc65581ae3fa4af81495983a2e768ba81a913665

Log Message:
-----------
Treebrowser: Improve wording


Modified Paths:
--------------
    treebrowser/src/treebrowser.c

Modified: treebrowser/src/treebrowser.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1039,7 +1039,7 @@ on_menu_create_new_object(GtkMenuItem *menuitem, const gchar *type)
 	if (uri_new)
 	{
 		if (!(g_file_test(uri_new, G_FILE_TEST_EXISTS) &&
-			!dialogs_show_question(_("Target file '%s' exists\n, do you really want to replace it with empty file?"), uri_new)))
+			!dialogs_show_question(_("Target file '%s' exists.\nDo you really want to replace it with an empty file?"), uri_new)))
 		{
 			gboolean creation_success = FALSE;
 



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

From git-noreply at xxxxx  Fri Oct 12 08:15:23 2018
From: git-noreply at xxxxx (=?utf-8?q?Abel_Serrano_Juste?=)
Date: Fri, 12 Oct 2018 08:15:23 -0000
Subject: [geany/plugins.geany.org] 9eaaa9: Removed old links to sourceforge.
 Fixes partially #5
Message-ID: <20181013101555.E2A861EAD03@mail.geany.org>

Branch:      refs/heads/master
Author:      Abel Serrano Juste <akronix5 at gmail.com>
Committer:   Abel Serrano Juste <akronix5 at gmail.com>
Date:        Fri, 12 Oct 2018 08:15:23 UTC
Commit:      9eaaa927149f4cf1a99be1073c08278d78eea373
             https://github.com/geany/plugins.geany.org/commit/9eaaa927149f4cf1a99be1073c08278d78eea373

Log Message:
-----------
Removed old links to sourceforge. Fixes partially #5


Modified Paths:
--------------
    content/start.html
    templates/template.html

Modified: content/start.html
14 lines changed, 5 insertions(+), 9 deletions(-)
===================================================================
@@ -1,8 +1,7 @@
 <h2>Welcome</h2>
 
 <p> What you will find here is a lot of plugin stuff for <a href=
-"http://www.geany.org">Geany</a>. There is a <a href=
-"https://sourceforge.net/projects/geany-plugins/">Geany Plugins project</a>
+"http://www.geany.org">Geany</a>. There is a Geany Plugins project</a>
 containing a lot of plugins, which is developed by various developers on <a
 href="https://github.com/geany/geany-plugins">GitHub</a>. </p>
 
@@ -23,14 +22,11 @@ <h2>Welcome</h2>
 <p> The pages for any plugin delivered with the Geany Plugins project are
 automatically generated by a shell script using <a href=
 "http://docutils.sourceforge.net/">rst2html from doctools</a> and <a href=
-"http://tidy.sourceforge.net/">HTML Tidy</a>. Basis for that are the README
+"http://www.html-tidy.org/">HTML Tidy</a>. Basis for that are the README
 files for each plugin, checked out and updated from <a href=
-"https://github.com/geany/geany-plugins">Git</a>, so if you think there's
-something wrong, you can feel free to <a href=
-"https://sourceforge.net/tracker/?group_id=222729&amp;atid=1056532">report
-issues</a> against the according plugin (or even this website) at <a href=
-"https://sourceforge.net/tracker/?group_id=222729&amp;atid=1056532">
-SourceForge</a> or <a href="https://github.com/geany/geany-plugins/issues">GitHub</a>.<br />
+"https://github.com/geany/geany-plugins">GitHub</a>, so if you think there's
+something wrong, you can feel free to report
+issues against the according plugin (or even this website) at <a href="https://github.com/geany/geany-plugins/issues">GitHub</a>.<br />
 
 The <a href= "https://github.com/geany/plugins.geany.org" >source code of
 this script</a> (including the whole source for the plugins.geany.org


Modified: templates/template.html
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -98,10 +98,10 @@ <h3>License</h3>
 <div class="section" id="ideas-questions-patches-and-bug-reports">
 	<h3>Ideas, questions, patches and bug reports</h3>
 	<p>If your plugins concerns to the Geany Plugins project, you can leave the
-	sourceforge tracker linked as it is, you decided yourself what information
+	Github issue tracker linked as it is, you decided yourself what information
 	you will provide to contact you.</p>
 
-	<p><a class="reference external" href="http://sourceforge.net/tracker/?group_id=222729">http://sourceforge.net/tracker/?group_id=222729</a></p>
+	<p><a class="reference external" href="https://github.com/geany/geany-plugins/issues">Github issue tracker</a></p>
 
 	<p><a href="#index">back to top</a></p>
 </div>



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

From git-noreply at xxxxx  Sat Oct 13 10:15:50 2018
From: git-noreply at xxxxx (=?utf-8?q?Dominic_Hopf?=)
Date: Sat, 13 Oct 2018 10:15:50 -0000
Subject: [geany/plugins.geany.org] f642dc: Merge pull request #14 from
 Akronix/remove-sourceforge
Message-ID: <20181013101556.78EF01EAD54@mail.geany.org>

Branch:      refs/heads/master
Author:      Dominic Hopf <dmaphy at googlemail.com>
Committer:   GitHub <noreply at github.com>
Date:        Sat, 13 Oct 2018 10:15:50 UTC
Commit:      f642dc8a3e5fca1e4e1d262f0ac1987118be43f8
             https://github.com/geany/plugins.geany.org/commit/f642dc8a3e5fca1e4e1d262f0ac1987118be43f8

Log Message:
-----------
Merge pull request #14 from Akronix/remove-sourceforge

Removed old links to sourceforge. Fixes partially #5


Modified Paths:
--------------
    content/start.html
    templates/template.html

Modified: content/start.html
14 lines changed, 5 insertions(+), 9 deletions(-)
===================================================================
@@ -1,8 +1,7 @@
 <h2>Welcome</h2>
 
 <p> What you will find here is a lot of plugin stuff for <a href=
-"http://www.geany.org">Geany</a>. There is a <a href=
-"https://sourceforge.net/projects/geany-plugins/">Geany Plugins project</a>
+"http://www.geany.org">Geany</a>. There is a Geany Plugins project</a>
 containing a lot of plugins, which is developed by various developers on <a
 href="https://github.com/geany/geany-plugins">GitHub</a>. </p>
 
@@ -23,14 +22,11 @@ <h2>Welcome</h2>
 <p> The pages for any plugin delivered with the Geany Plugins project are
 automatically generated by a shell script using <a href=
 "http://docutils.sourceforge.net/">rst2html from doctools</a> and <a href=
-"http://tidy.sourceforge.net/">HTML Tidy</a>. Basis for that are the README
+"http://www.html-tidy.org/">HTML Tidy</a>. Basis for that are the README
 files for each plugin, checked out and updated from <a href=
-"https://github.com/geany/geany-plugins">Git</a>, so if you think there's
-something wrong, you can feel free to <a href=
-"https://sourceforge.net/tracker/?group_id=222729&amp;atid=1056532">report
-issues</a> against the according plugin (or even this website) at <a href=
-"https://sourceforge.net/tracker/?group_id=222729&amp;atid=1056532">
-SourceForge</a> or <a href="https://github.com/geany/geany-plugins/issues">GitHub</a>.<br />
+"https://github.com/geany/geany-plugins">GitHub</a>, so if you think there's
+something wrong, you can feel free to report
+issues against the according plugin (or even this website) at <a href="https://github.com/geany/geany-plugins/issues">GitHub</a>.<br />
 
 The <a href= "https://github.com/geany/plugins.geany.org" >source code of
 this script</a> (including the whole source for the plugins.geany.org


Modified: templates/template.html
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -98,10 +98,10 @@ <h3>License</h3>
 <div class="section" id="ideas-questions-patches-and-bug-reports">
 	<h3>Ideas, questions, patches and bug reports</h3>
 	<p>If your plugins concerns to the Geany Plugins project, you can leave the
-	sourceforge tracker linked as it is, you decided yourself what information
+	Github issue tracker linked as it is, you decided yourself what information
 	you will provide to contact you.</p>
 
-	<p><a class="reference external" href="http://sourceforge.net/tracker/?group_id=222729">http://sourceforge.net/tracker/?group_id=222729</a></p>
+	<p><a class="reference external" href="https://github.com/geany/geany-plugins/issues">Github issue tracker</a></p>
 
 	<p><a href="#index">back to top</a></p>
 </div>



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

From git-noreply at xxxxx  Sat Oct 13 10:40:06 2018
From: git-noreply at xxxxx (=?utf-8?q?Dominic_Hopf?=)
Date: Sat, 13 Oct 2018 10:40:06 -0000
Subject: [geany/geany-plugins] fe7c7a: Alphabetically sort plugin listing in
 README
Message-ID: <20181013104053.95C3C1EAD03@mail.geany.org>

Branch:      refs/heads/master
Author:      Dominic Hopf <dmaphy at fedoraproject.org>
Committer:   Dominic Hopf <dmaphy at fedoraproject.org>
Date:        Sat, 13 Oct 2018 10:40:06 UTC
Commit:      fe7c7ad27f0ccd4a4b690b4ad32e51c23031123d
             https://github.com/geany/geany-plugins/commit/fe7c7ad27f0ccd4a4b690b4ad32e51c23031123d

Log Message:
-----------
Alphabetically sort plugin listing in README


Modified Paths:
--------------
    README

Modified: README
8 lines changed, 4 insertions(+), 4 deletions(-)
===================================================================
@@ -57,15 +57,16 @@ Available plugins are:
 * ``automark`` -- the Automark plugin
 * ``codenav`` -- the CodeNav plugin
 * ``commander`` -- the Commander plugin
+* ``cppcheck`` -- static code analysis using cppcheck (see also HACKING)
 * ``debugger`` -- the Debugger plugin
 * ``defineformat`` -- the Defineformat plugin
 * ``devhelp`` -- the devhelp plugin
+* ``extra-c-warnings`` -- extra C Compiler warnings (see also HACKING)
 * ``geanyctags`` -- the GeanyCtags plugin
 * ``geanydoc`` -- the GeanyDoc plugin
 * ``geanyextrasel`` -- the GeanyExtraSel plugin
 * ``geanygendoc`` -- the GeanyGenDoc plugin
 * ``geanyinsertnum`` -- the GeanyInsertNum plugin
-* ``latex`` -- the LaTeX plugin
 * ``geanylua`` -- the GeanyLua plugin
 * ``geanymacro`` -- the GeanyMacro plugin
 * ``geanyminiscript`` -- the GeanyMiniScript plugin
@@ -77,6 +78,7 @@ Available plugins are:
 * ``geniuspaste`` -- the paste to a pastebin plugin
 * ``gitchangebar`` -- the GitChangeBar plugin
 * ``gtkspell`` -- GeanyVC's spell-check support
+* ``latex`` -- the LaTeX plugin
 * ``lineoperations`` -- simple line functions that can be applied to an open file
 * ``lipsum`` -- the Lipsum plugin
 * ``markdown`` -- the Markdown plugin
@@ -91,13 +93,11 @@ Available plugins are:
 * ``sendmail`` -- the GeanySendmail plugin
 * ``shiftcolumn`` -- the ShiftColumn plugin
 * ``spellcheck`` -- the spellcheck plugin
-* ``treebrowser`` -- the Treebrowser plugin
 * ``tableconvert`` -- the Tableconvert plugin
+* ``treebrowser`` -- the Treebrowser plugin
 * ``updatechecker`` -- the Updatechecker plugin
 * ``webhelper`` -- the WebHelper plugin
 * ``xmlsnippets`` -- the XMLSnippets plugin
-* ``extra-c-warnings`` -- extra C Compiler warnings (see also HACKING)
-* ``cppcheck`` -- static code analysis using cppcheck (see also HACKING)
 
 Example::
 



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

From git-noreply at xxxxx  Sat Oct 13 10:20:38 2018
From: git-noreply at xxxxx (=?utf-8?q?Dominic_Hopf?=)
Date: Sat, 13 Oct 2018 10:20:38 -0000
Subject: [geany/plugins.geany.org] 179153: Fix indendation
Message-ID: <20181013114253.C424F1EAD03@mail.geany.org>

Branch:      refs/heads/master
Author:      Dominic Hopf <dmaphy at googlemail.com>
Committer:   Dominic Hopf <dmaphy at googlemail.com>
Date:        Sat, 13 Oct 2018 10:20:38 UTC
Commit:      1791533a374e2cce14d1c86a19bae23784f5878c
             https://github.com/geany/plugins.geany.org/commit/1791533a374e2cce14d1c86a19bae23784f5878c

Log Message:
-----------
Fix indendation


Modified Paths:
--------------
    index.php

Modified: index.php
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -115,7 +115,7 @@
 		</ul>
 	</div>
 
-		<div id="content">
+	<div id="content">
 		<?php include_once CONTENTFILE; ?>
 	</div>
 



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

From git-noreply at xxxxx  Sat Oct 13 10:29:48 2018
From: git-noreply at xxxxx (=?utf-8?q?Dominic_Hopf?=)
Date: Sat, 13 Oct 2018 10:29:48 -0000
Subject: [geany/plugins.geany.org] 85d6a8: http -> https
Message-ID: <20181013114254.5A0F71EAD03@mail.geany.org>

Branch:      refs/heads/master
Author:      Dominic Hopf <dmaphy at googlemail.com>
Committer:   Dominic Hopf <dmaphy at googlemail.com>
Date:        Sat, 13 Oct 2018 10:29:48 UTC
Commit:      85d6a87c239b6e672d39244675a6c1e2056d92b0
             https://github.com/geany/plugins.geany.org/commit/85d6a87c239b6e672d39244675a6c1e2056d92b0

Log Message:
-----------
http -> https


Modified Paths:
--------------
    index.php

Modified: index.php
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -72,7 +72,7 @@
 			<li><a href="djynn.html">Djynn</a></li>
 			<li><a href="newline-plugin.html">Newline Plugin</a></li>
 			<li><a href="https://sourceforge.net/projects/geanyeasyunicodeinput/">GeanyEasyUnicodeInput</a></li>
-			<li><a href="http://sourceforge.net/projects/geanyunicodetocodepoint/">GeanyUnicodeToCodepoint</a></li>
+			<li><a href="https://sourceforge.net/projects/geanyunicodetocodepoint/">GeanyUnicodeToCodepoint</a></li>
 			<li><a href="https://sourceforge.net/projects/geanyhighlightselectedword/">GeanyHighlightSelectedWord</a></li>
 			<li><a href="jsonprettifier.html">JSON Prettifier Plugin</a></li>
 			<li><a href="quick_open_file.html">Geany Quick Open File Plugin</a></li>



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

From git-noreply at xxxxx  Sat Oct 13 11:32:10 2018
From: git-noreply at xxxxx (=?utf-8?q?Dominic_Hopf?=)
Date: Sat, 13 Oct 2018 11:32:10 -0000
Subject: [geany/plugins.geany.org] 112b72: Update .gitignore
Message-ID: <20181013114254.C228E1EAD54@mail.geany.org>

Branch:      refs/heads/master
Author:      Dominic Hopf <dmaphy at googlemail.com>
Committer:   Dominic Hopf <dmaphy at googlemail.com>
Date:        Sat, 13 Oct 2018 11:32:10 UTC
Commit:      112b729750a995ef2a201eba835ac3ced84682f3
             https://github.com/geany/plugins.geany.org/commit/112b729750a995ef2a201eba835ac3ced84682f3

Log Message:
-----------
Update .gitignore


Modified Paths:
--------------
    .gitignore

Modified: .gitignore
42 lines changed, 33 insertions(+), 9 deletions(-)
===================================================================
@@ -1,17 +1,31 @@
 /.README.html
-content/0.17.1/
-content/0.18.0/
-content/0.19.0/
-content/0.20.0/
-content/0.21.1/
-content/1.22/
+/content/0.17.1/
+/content/0.18.0/
+/content/0.19.0/
+/content/0.20.0/
+/content/0.21.1/
+/content/1.22/
+/content/1.23.0/
+/content/1.24/
+/content/1.25/
+/content/1.26.0/
+/content/1.27.0/
+/content/1.28.0/
+/content/1.29.0/
+/content/1.30.0/
+/content/1.31.0/
+/content/1.32.0/
 /content/addons.html
+/content/autoclose.html
+/content/automark.html
 /content/codenav.html
 /content/commander.html
 /content/debugger.html
+/content/defineformat.html
 /content/devhelp.html
 /content/geany-plugins-listing.html
 /content/geanycfp.html
+/content/geanyctags.html
 /content/geanydoc.html
 /content/geanyextrasel.html
 /content/geanygdb.html
@@ -23,21 +37,31 @@ content/1.22/
 /content/geanynumberedbookmarks.html
 /content/geanypg.html
 /content/geanyprj.html
+/content/geanypy.html
 /content/geanyvc.html
 /content/geniuspaste.html
-/content/gproject.html
+/content/git-changebar.html
+/content/keyrecord.html
+/content/latex.html
+/content/lineoperations.html
+/content/lipsum.html
 /content/markdown.html
 /content/multiterm.html
+/content/overview.html
 /content/pairtaghighlighter.html
 /content/pohelper.html
 /content/pretty-printer.html
-/content/shiftcolumn.html
+/content/projectorganizer.html
 /content/scope.html
+/content/shiftcolumn.html
 /content/spellcheck.html
 /content/tableconvert.html
 /content/treebrowser.html
 /content/updatechecker.html
+/content/utils.html
+/content/vimode.html
 /content/webhelper.html
+/content/workbench.html
 /content/xmlsnippets.html
-/gencontent_logs/
 /geany-plugins/
+/gencontent_logs/



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

From git-noreply at xxxxx  Sat Oct 13 11:37:22 2018
From: git-noreply at xxxxx (=?utf-8?q?Dominic_Hopf?=)
Date: Sat, 13 Oct 2018 11:37:22 -0000
Subject: [geany/plugins.geany.org] ef3417: Update version number for newline
 plugin: 2014-03 -> 2015-03
Message-ID: <20181013114255.456D51EAD03@mail.geany.org>

Branch:      refs/heads/master
Author:      Dominic Hopf <dmaphy at googlemail.com>
Committer:   Dominic Hopf <dmaphy at googlemail.com>
Date:        Sat, 13 Oct 2018 11:37:22 UTC
Commit:      ef3417cf44dc8bbe0de9dd839ccea2f5b1407262
             https://github.com/geany/plugins.geany.org/commit/ef3417cf44dc8bbe0de9dd839ccea2f5b1407262

Log Message:
-----------
Update version number for newline plugin: 2014-03 -> 2015-03


Modified Paths:
--------------
    content/newline-plugin.html

Modified: content/newline-plugin.html
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -30,7 +30,7 @@
 </div><div class="section" id="download"><h3>Download Files List</h3>
 <p>project discussion page on <a target="_blank" href="https://sourceforge.net/p/newline-plugin/discussion/">sourceforge</a></p>
 <h5>Sources</h5>
-<p><a target="_blank" href="https://sourceforge.net/projects/newline-plugin/files/latest/download">newline-2014-03.zip</a> - these other 5 files expect to be placed with the external sources</p>
+<p><a target="_blank" href="https://sourceforge.net/projects/newline-plugin/files/latest/download">newline-2015-03.zip</a> - these other 5 files expect to be placed with the external sources</p>
 <p>newline_bat.cpp, newline.c, newline_sh.c - source files</p>
 <p>newline.bat, newline_sh - build scripts for each platform</p>
 <h5>External Tools</h5>
@@ -139,4 +139,4 @@ <h5>Notepad specific</h5>
 <p>notepad word select was hidden accidentally</p>
 
 </div>
-	</div>
\ No newline at end of file
+	</div>



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

From git-noreply at xxxxx  Sat Oct 13 11:46:15 2018
From: git-noreply at xxxxx (=?utf-8?q?Enrico_Tr=C3=B6ger?=)
Date: Sat, 13 Oct 2018 11:46:15 -0000
Subject: [geany/plugins.geany.org] 25e6a7: Rename GeanyLatex and remove
 Sendmail from exclude list
Message-ID: <20181013114614.A2F571EAD03@mail.geany.org>

Branch:      refs/heads/master
Author:      Enrico Tröger <enrico.troeger at uvena.de>
Committer:   Enrico Tröger <enrico.troeger at uvena.de>
Date:        Sat, 03 Mar 2018 14:29:18 UTC
Commit:      25e6a714181b2ef276f0679de79866c113cee8ff
             https://github.com/geany/plugins.geany.org/commit/25e6a714181b2ef276f0679de79866c113cee8ff

Log Message:
-----------
Rename GeanyLatex and remove Sendmail from exclude list

We don't have a replacement HTML file for Sendmail, so use the upstream
README.
Fix broken link to upstream LaTeX documentation.


Modified Paths:
--------------
    content/geanylatex.html
    content/latex.html
    gencontent.sh

Modified: content/geanylatex.html
4 lines changed, 1 insertions(+), 3 deletions(-)
===================================================================
@@ -1,6 +1,4 @@
 <h2>GeanyLaTeX</h2>
 <p>
-  The documentation for the GeanyLaTeX plugin can be found at
-  <a class="reference external" href=
-  "http://frank.uvena.de/en/Geany/geanylatex">http://frank.uvena.de/en/Geany/geanylatex</a>.
+  The plugin has been renamed an can now be found <a href="http://plugins.geany.org/latex.html">here</a>.
 </p>


Modified: content/latex.html
6 lines changed, 6 insertions(+), 0 deletions(-)
===================================================================
@@ -0,0 +1,6 @@
+<h2>GeanyLaTeX</h2>
+<p>
+  The documentation for the GeanyLaTeX plugin can be found at
+  <a class="reference external" href=
+  "https://plugins.geany.org/latex/">https://plugins.geany.org/latex/</a>.
+</p>


Modified: gencontent.sh
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -68,7 +68,7 @@ LOGDIR=${WORKDIR}"gencontent_logs/"
 
 # plugins to exclude from the nightly re-generation via rst2html because they
 # have a separate HTML page not generated from the README file
-declare -a EXCLUDE_PLUGINS=( geanylatex geanylua jsonprettifier quick_open_file sendmail togglebar pynav )
+declare -a EXCLUDE_PLUGINS=( latex geanylua jsonprettifier quick_open_file togglebar pynav )
 
 RST2HTML=$(which rst2html)
 TIDY=$(which tidy)



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

From git-noreply at xxxxx  Sat Oct 13 11:46:10 2018
From: git-noreply at xxxxx (=?utf-8?q?Dominic_Hopf?=)
Date: Sat, 13 Oct 2018 11:46:10 -0000
Subject: [geany/plugins.geany.org] a9ea08: Merge pull request #11 from
 eht16/issue8_update_plugins
Message-ID: <20181013114615.252E51EAD54@mail.geany.org>

Branch:      refs/heads/master
Author:      Dominic Hopf <dmaphy at googlemail.com>
Committer:   GitHub <noreply at github.com>
Date:        Sat, 13 Oct 2018 11:46:10 UTC
Commit:      a9ea08e410f6b40bb926f20fb1d5fe0bd02e2f0e
             https://github.com/geany/plugins.geany.org/commit/a9ea08e410f6b40bb926f20fb1d5fe0bd02e2f0e

Log Message:
-----------
Merge pull request #11 from eht16/issue8_update_plugins

Rename GeanyLatex and remove Sendmail from exclude list


Modified Paths:
--------------
    content/geanylatex.html
    content/latex.html
    gencontent.sh

Modified: content/geanylatex.html
4 lines changed, 1 insertions(+), 3 deletions(-)
===================================================================
@@ -1,6 +1,4 @@
 <h2>GeanyLaTeX</h2>
 <p>
-  The documentation for the GeanyLaTeX plugin can be found at
-  <a class="reference external" href=
-  "http://frank.uvena.de/en/Geany/geanylatex">http://frank.uvena.de/en/Geany/geanylatex</a>.
+  The plugin has been renamed an can now be found <a href="http://plugins.geany.org/latex.html">here</a>.
 </p>


Modified: content/latex.html
6 lines changed, 6 insertions(+), 0 deletions(-)
===================================================================
@@ -0,0 +1,6 @@
+<h2>GeanyLaTeX</h2>
+<p>
+  The documentation for the GeanyLaTeX plugin can be found at
+  <a class="reference external" href=
+  "https://plugins.geany.org/latex/">https://plugins.geany.org/latex/</a>.
+</p>


Modified: gencontent.sh
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -68,7 +68,7 @@ LOGDIR=${WORKDIR}"gencontent_logs/"
 
 # plugins to exclude from the nightly re-generation via rst2html because they
 # have a separate HTML page not generated from the README file
-declare -a EXCLUDE_PLUGINS=( geanylatex geanylua jsonprettifier quick_open_file sendmail togglebar pynav )
+declare -a EXCLUDE_PLUGINS=( latex geanylua jsonprettifier quick_open_file togglebar pynav )
 
 RST2HTML=$(which rst2html)
 TIDY=$(which tidy)



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

From git-noreply at xxxxx  Sat Oct 13 11:47:40 2018
From: git-noreply at xxxxx (=?utf-8?q?Dominic_Hopf?=)
Date: Sat, 13 Oct 2018 11:47:40 -0000
Subject: [geany/plugins.geany.org] fe7397: https://plugins.geany.org/latex/ ->
 https://plugins.geany.org/latex.html
Message-ID: <20181013114756.5DC201EAD03@mail.geany.org>

Branch:      refs/heads/master
Author:      Dominic Hopf <dmaphy at googlemail.com>
Committer:   Dominic Hopf <dmaphy at googlemail.com>
Date:        Sat, 13 Oct 2018 11:47:40 UTC
Commit:      fe73972839fd832009bb658c913f887e4b276948
             https://github.com/geany/plugins.geany.org/commit/fe73972839fd832009bb658c913f887e4b276948

Log Message:
-----------
https://plugins.geany.org/latex/ -> https://plugins.geany.org/latex.html


Modified Paths:
--------------
    content/latex.html

Modified: content/latex.html
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -2,5 +2,5 @@ <h2>GeanyLaTeX</h2>
 <p>
   The documentation for the GeanyLaTeX plugin can be found at
   <a class="reference external" href=
-  "https://plugins.geany.org/latex/">https://plugins.geany.org/latex/</a>.
+  "https://plugins.geany.org/latex.html">https://plugins.geany.org/latex.html</a>.
 </p>



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

From git-noreply at xxxxx  Fri Oct 12 08:36:52 2018
From: git-noreply at xxxxx (=?utf-8?q?Abel_Serrano_Juste?=)
Date: Fri, 12 Oct 2018 08:36:52 -0000
Subject: [geany/geany-plugins] 0793ef: Update link to geany latex plugin docs
Message-ID: <20181013115113.278B61EAD03@mail.geany.org>

Branch:      refs/heads/master
Author:      Abel Serrano Juste <akronix5 at gmail.com>
Committer:   GitHub <noreply at github.com>
Date:        Fri, 12 Oct 2018 08:36:52 UTC
Commit:      0793ef9844acc8e58508d11c85a204937e5a2996
             https://github.com/geany/geany-plugins/commit/0793ef9844acc8e58508d11c85a204937e5a2996

Log Message:
-----------
Update link to geany latex plugin docs

Closes https://github.com/geany/plugins.geany.org/issues/8


Modified Paths:
--------------
    latex/README

Modified: latex/README
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1,4 +1,4 @@
 Documentation has been moved into doc subfolder. There you you should
 find a PDF or HTML file shipped with sources of this plugin. If there
 is no documentation available there, please check
-http://frank.uvena.de/en/Geany/geanylatex instead.
+https://plugins.geany.org/latex.html instead.



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

From git-noreply at xxxxx  Sat Oct 13 11:51:08 2018
From: git-noreply at xxxxx (=?utf-8?q?Dominic_Hopf?=)
Date: Sat, 13 Oct 2018 11:51:08 -0000
Subject: [geany/geany-plugins] a1b9df: Merge pull request #781 from
 Akronix/patch-1
Message-ID: <20181013115113.B3B561EAD03@mail.geany.org>

Branch:      refs/heads/master
Author:      Dominic Hopf <dmaphy at googlemail.com>
Committer:   GitHub <noreply at github.com>
Date:        Sat, 13 Oct 2018 11:51:08 UTC
Commit:      a1b9df6cdf10fb8c35f9701458469ece9e32e68f
             https://github.com/geany/geany-plugins/commit/a1b9df6cdf10fb8c35f9701458469ece9e32e68f

Log Message:
-----------
Merge pull request #781 from Akronix/patch-1

Update link to geany latex plugin docs


Modified Paths:
--------------
    latex/README

Modified: latex/README
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1,4 +1,4 @@
 Documentation has been moved into doc subfolder. There you you should
 find a PDF or HTML file shipped with sources of this plugin. If there
 is no documentation available there, please check
-http://frank.uvena.de/en/Geany/geanylatex instead.
+https://plugins.geany.org/latex.html instead.



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

From git-noreply at xxxxx  Sat Oct 13 11:54:51 2018
From: git-noreply at xxxxx (=?utf-8?q?Dominic_Hopf?=)
Date: Sat, 13 Oct 2018 11:54:51 -0000
Subject: [geany/plugins.geany.org] 5e3a32: #8: Generate the HTML page for
 latex plugin instead of maintaining our own
Message-ID: <20181013115508.757641EAD03@mail.geany.org>

Branch:      refs/heads/master
Author:      Dominic Hopf <dmaphy at googlemail.com>
Committer:   Dominic Hopf <dmaphy at googlemail.com>
Date:        Sat, 13 Oct 2018 11:54:51 UTC
Commit:      5e3a32c18f82abaed5e88e4abb41c247e1c00762
             https://github.com/geany/plugins.geany.org/commit/5e3a32c18f82abaed5e88e4abb41c247e1c00762

Log Message:
-----------
#8: Generate the HTML page for latex plugin instead of maintaining our own


Modified Paths:
--------------
    content/latex.html
    gencontent.sh

Modified: content/latex.html
6 lines changed, 0 insertions(+), 6 deletions(-)
===================================================================
@@ -1,6 +0,0 @@
-<h2>GeanyLaTeX</h2>
-<p>
-  The documentation for the GeanyLaTeX plugin can be found at
-  <a class="reference external" href=
-  "https://plugins.geany.org/latex.html">https://plugins.geany.org/latex.html</a>.
-</p>


Modified: gencontent.sh
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -68,7 +68,7 @@ LOGDIR=${WORKDIR}"gencontent_logs/"
 
 # plugins to exclude from the nightly re-generation via rst2html because they
 # have a separate HTML page not generated from the README file
-declare -a EXCLUDE_PLUGINS=( latex geanylua jsonprettifier quick_open_file togglebar pynav )
+declare -a EXCLUDE_PLUGINS=( geanylua jsonprettifier quick_open_file togglebar pynav )
 
 RST2HTML=$(which rst2html)
 TIDY=$(which tidy)



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

From git-noreply at xxxxx  Sat Oct 13 12:30:07 2018
From: git-noreply at xxxxx (=?utf-8?q?Dominic_Hopf?=)
Date: Sat, 13 Oct 2018 12:30:07 -0000
Subject: [geany/plugins.geany.org] 207275: Apply change to downloads.html
 which has been made manually on the server
Message-ID: <20181013123019.C1DF41EAD03@mail.geany.org>

Branch:      refs/heads/master
Author:      Dominic Hopf <dmaphy at googlemail.com>
Committer:   Dominic Hopf <dmaphy at googlemail.com>
Date:        Sat, 13 Oct 2018 12:30:07 UTC
Commit:      207275968517fce28416026c1babc77ce5bdfbef
             https://github.com/geany/plugins.geany.org/commit/207275968517fce28416026c1babc77ce5bdfbef

Log Message:
-----------
Apply change to downloads.html which has been made manually on the server


Modified Paths:
--------------
    content/downloads.html

Modified: content/downloads.html
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -29,7 +29,7 @@ <h2>Download Geany-Plugins</h2>
 	$version = max($versions);
 	$wversion = max($wversions);
 
-	echo "The latest version is " . $version . ", you should take a look at the <a href=\"https://raw.githubusercontent.com/geany/geany-plugins/". $version ."/NEWS\">release notes</a>.<br />\n";
+	echo "The latest version is " . $version . ", you should take a look at the <a href=\"https://raw.githubusercontent.com/geany/geany-plugins/". $version .".0/NEWS\">release notes</a>.<br />\n";
 	echo "<table>";
 	echo "<tr>";
 	echo "	<th>Download</th>";



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

From git-noreply at xxxxx  Sat Oct 13 12:34:13 2018
From: git-noreply at xxxxx (=?utf-8?q?Dominic_Hopf?=)
Date: Sat, 13 Oct 2018 12:34:13 -0000
Subject: [geany/plugins.geany.org] 5affe6: Add /content/0.21.0/ to .gitignore
Message-ID: <20181013123430.F09CE1EAD03@mail.geany.org>

Branch:      refs/heads/master
Author:      Dominic Hopf <dmaphy at googlemail.com>
Committer:   Dominic Hopf <dmaphy at googlemail.com>
Date:        Sat, 13 Oct 2018 12:34:13 UTC
Commit:      5affe66dd6b7a8dec02164890d2bfaa5a2a90a5f
             https://github.com/geany/plugins.geany.org/commit/5affe66dd6b7a8dec02164890d2bfaa5a2a90a5f

Log Message:
-----------
Add /content/0.21.0/ to .gitignore


Modified Paths:
--------------
    .gitignore

Modified: .gitignore
1 lines changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -3,6 +3,7 @@
 /content/0.18.0/
 /content/0.19.0/
 /content/0.20.0/
+/content/0.21.0/
 /content/0.21.1/
 /content/1.22/
 /content/1.23.0/



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

From git-noreply at xxxxx  Sat Oct 13 16:23:39 2018
From: git-noreply at xxxxx (=?utf-8?q?Matthew_Brush?=)
Date: Sat, 13 Oct 2018 16:23:39 -0000
Subject: [geany/geany-plugins] a3b52f: Devhelp: Update email address in README
Message-ID: <20181013162345.A0B491EAD55@mail.geany.org>

Branch:      refs/heads/master
Author:      Matthew Brush <matt at geany.org>
Committer:   GitHub <noreply at github.com>
Date:        Sat, 13 Oct 2018 16:23:39 UTC
Commit:      a3b52ff68fda0aabb87633628850644af2cfa642
             https://github.com/geany/geany-plugins/commit/a3b52ff68fda0aabb87633628850644af2cfa642

Log Message:
-----------
Devhelp: Update email address in README


Modified Paths:
--------------
    devhelp/README

Modified: devhelp/README
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -111,4 +111,4 @@ Requirements
 Contact developers
 ------------------
 
-You can email me at <codebrainz at users.sourceforge.net>, or find me on the #geany IRC channel on FreeNode, with the nickname 'codebrainz'.
+You can email me at <matt at geany.org>, or find me on the #geany IRC channel on FreeNode, with the nickname 'codebrainz'.



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

From git-noreply at xxxxx  Sun Oct 28 22:40:21 2018
From: git-noreply at xxxxx (=?utf-8?q?elextr?=)
Date: Sun, 28 Oct 2018 22:40:21 -0000
Subject: [geany/geany-plugins] 32082c: Merge pull request #750 from
 LarsGit223/scope-gtk-2and3
Message-ID: <20181028224029.719851EAD58@mail.geany.org>

Branch:      refs/heads/master
Author:      elextr <elextr at gmail.com>
Committer:   GitHub <noreply at github.com>
Date:        Sun, 28 Oct 2018 22:40:21 UTC
Commit:      32082cf4ce2577bd03bc37867b82c74501bbe521
             https://github.com/geany/geany-plugins/commit/32082cf4ce2577bd03bc37867b82c74501bbe521

Log Message:
-----------
Merge pull request #750 from LarsGit223/scope-gtk-2and3

scope: added GTK3 support (keeping GTK2 support)


Modified Paths:
--------------
    build/scope.m4
    po/POTFILES.in
    scope/data/Makefile.am
    scope/data/scope_gtk3.glade
    scope/src/Makefile.am
    scope/src/conterm.c
    scope/src/plugme.c
    scope/src/prefs.c
    scope/src/prefs.h
    scope/src/scope.c
    scope/src/utils.c
    utils/src/Makefile.am
    utils/src/gp_gtkcompat.h
    utils/src/gp_vtecompat.c
    utils/src/gp_vtecompat.h

Modified: build/scope.m4
8 lines changed, 5 insertions(+), 3 deletions(-)
===================================================================
@@ -1,16 +1,18 @@
 AC_DEFUN([GP_CHECK_SCOPE],
 [
     GP_ARG_DISABLE([Scope], [auto])
-    GP_CHECK_PLUGIN_GTK2_ONLY([Scope])
 
     case "$host_os" in
         cygwin* | mingw* | win32*)
             PTY_LIBS=""
             ;;
 
         *)
-            GP_CHECK_PLUGIN_DEPS([scope], [VTE],
-                                 [vte >= 0.17])
+
+            GP_CHECK_GTK3([vte_package=vte-2.91], [vte_package="vte >= 0.17"])
+            GP_CHECK_PLUGIN_DEPS([scope], [VTE], [$vte_package])
+            AM_CONDITIONAL([GP_VTE291_USED], [test "$enable_scope" != no && test "$vte_package" = vte-2.91])
+
             AC_CHECK_HEADERS([util.h pty.h libutil.h])
             PTY_LIBS="-lutil"
             ;;


Modified: po/POTFILES.in
1 lines changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -267,6 +267,7 @@ projectorganizer/src/prjorg-sidebar.c
 
 # Scope
 scope/data/scope.glade
+scope/data/scope_gtk3.glade
 scope/src/break.c
 scope/src/conterm.c
 scope/src/debug.c


Modified: scope/data/Makefile.am
3 lines changed, 2 insertions(+), 1 deletions(-)
===================================================================
@@ -29,4 +29,5 @@ dist_plugindata_DATA = \
 	StepOver.png \
 	StepOver22.png \
 	StepOver24.png \
-	scope.glade
+	scope.glade \
+	scope_gtk3.glade


Modified: scope/data/scope_gtk3.glade
3982 lines changed, 3982 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online


Modified: scope/src/Makefile.am
6 lines changed, 4 insertions(+), 2 deletions(-)
===================================================================
@@ -51,11 +51,13 @@ scope_la_SOURCES = \
 	store/scptreestore.h \
 	store/scptreestore.c
 
-scope_la_LIBADD = $(COMMONLIBS) $(VTE_LIBS) $(PTY_LIBS)
+scope_la_LIBADD = $(COMMONLIBS) $(VTE_LIBS) $(PTY_LIBS) \
+				  $(top_builddir)/utils/src/libgeanypluginutils.la
 
 scope_la_CPPFLAGS = $(AM_CPPFLAGS) -DG_LOG_DOMAIN=\"Scope\"
 scope_la_CFLAGS = $(AM_CFLAGS) $(VTE_CFLAGS) \
 	-DPLUGINHTMLDOCDIR=\"$(plugindocdir)/html\" \
-	-Wno-shadow
+	-Wno-shadow \
+	-I$(top_srcdir)/utils/src
 
 include $(top_srcdir)/build/cppcheck.mk


Modified: scope/src/conterm.c
45 lines changed, 44 insertions(+), 1 deletions(-)
===================================================================
@@ -33,6 +33,7 @@
 
 #ifdef G_OS_UNIX
 #include <vte/vte.h>
+#include <gp_vtecompat.h>
 /* instead of detecting N kinds of *nix */
 #if defined(HAVE_UTIL_H)
 #include <util.h>
@@ -394,19 +395,53 @@ void conterm_load_config(void)
 	pref_vte_font = utils_get_setting_string(config, "VTE", "font", "Monospace 10");
 	pref_vte_scrollback = utils_get_setting_integer(config, "VTE", "scrollback_lines", 500);
 	tmp_string = utils_get_setting_string(config, "VTE", "colour_fore", "#ffffff");
+#if !GTK_CHECK_VERSION(3, 14, 0)
 	gdk_color_parse(tmp_string, &pref_vte_colour_fore);
+#else
+	gdk_rgba_parse(&pref_vte_colour_fore, tmp_string);
+#endif
 	g_free(tmp_string);
 	tmp_string = utils_get_setting_string(config, "VTE", "colour_back", "#000000");
+#if !GTK_CHECK_VERSION(3, 14, 0)
 	gdk_color_parse(tmp_string, &pref_vte_colour_back);
+#else
+	gdk_rgba_parse(&pref_vte_colour_back, tmp_string);
+#endif
 	g_free(tmp_string);
 	g_key_file_free(config);
 	g_free(configfile);
 }
 
 static void context_apply_config(GtkWidget *console)
 {
+#if !GTK_CHECK_VERSION(3, 0, 0)
 	gtk_widget_modify_base(console, GTK_STATE_NORMAL, &pref_vte_colour_back);
 	gtk_widget_modify_cursor(console, &pref_vte_colour_fore, &pref_vte_colour_back);
+#else
+	GString *css_string;
+	GtkStyleContext *context;
+	GtkCssProvider *provider;
+	gchar *css_code, *color, *background_color;
+
+	color = gdk_rgba_to_string (&pref_vte_colour_fore);
+	background_color = gdk_rgba_to_string (&pref_vte_colour_back);
+
+	gtk_widget_set_name(console, "scope-console");
+	context = gtk_widget_get_style_context(console);
+	provider = gtk_css_provider_new();
+	gtk_style_context_add_provider(context, GTK_STYLE_PROVIDER(provider),
+		GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+
+	css_string = g_string_new(NULL);
+	g_string_printf(css_string, "#scope-console { color: %s; background-color: %s; }",
+		color, background_color);
+	css_code = g_string_free(css_string, FALSE);
+
+	gtk_css_provider_load_from_data(GTK_CSS_PROVIDER(provider), css_code, -1, NULL);
+
+	g_free(css_code);
+	g_object_unref(provider);
+#endif
 	ui_widget_modify_font_from_string(console, pref_vte_font);
 }
 
@@ -457,7 +492,15 @@ void conterm_init(void)
 	{
 		gint vte_border_x, vte_border_y;
 
-#if VTE_CHECK_VERSION(0, 24, 0)
+#if GTK_CHECK_VERSION(3, 4, 0)
+		GtkStyleContext *context;
+		GtkBorder border;
+
+		context = gtk_widget_get_style_context (console);
+		gtk_style_context_get_padding (context, GTK_STATE_FLAG_NORMAL, &border);
+		vte_border_x = border.left + border.right;
+		vte_border_y = border.top + border.bottom;
+#elif VTE_CHECK_VERSION(0, 24, 0)
 		GtkBorder *border = NULL;
 
 		gtk_widget_style_get(console, "inner-border", &border, NULL);


Modified: scope/src/plugme.c
4 lines changed, 4 insertions(+), 0 deletions(-)
===================================================================
@@ -23,6 +23,10 @@
 
 #include <string.h>
 
+#include "common.h"
+
+#include <gp_gtkcompat.h>
+
 #include "geanyplugin.h"
 
 extern GeanyData *geany_data;


Modified: scope/src/prefs.c
6 lines changed, 6 insertions(+), 0 deletions(-)
===================================================================
@@ -76,8 +76,14 @@ gboolean pref_vte_blinken;
 gchar *pref_vte_emulation;
 gchar *pref_vte_font;
 gint pref_vte_scrollback;
+
+#if !GTK_CHECK_VERSION(3, 14, 0)
 GdkColor pref_vte_colour_fore;
 GdkColor pref_vte_colour_back;
+#else
+GdkRGBA pref_vte_colour_fore;
+GdkRGBA pref_vte_colour_back;
+#endif
 
 typedef struct _MarkerStyle
 {


Modified: scope/src/prefs.h
6 lines changed, 6 insertions(+), 0 deletions(-)
===================================================================
@@ -64,8 +64,14 @@ extern gboolean pref_vte_blinken;
 extern gchar *pref_vte_emulation;
 extern gchar *pref_vte_font;
 extern gint pref_vte_scrollback;
+
+#if !GTK_CHECK_VERSION(3, 14, 0)
 extern GdkColor pref_vte_colour_fore;
 extern GdkColor pref_vte_colour_back;
+#else
+extern GdkRGBA pref_vte_colour_fore;
+extern GdkRGBA pref_vte_colour_back;
+#endif
 
 void prefs_apply(GeanyDocument *doc);
 char *prefs_file_name(void);


Modified: scope/src/scope.c
8 lines changed, 8 insertions(+), 0 deletions(-)
===================================================================
@@ -25,6 +25,10 @@
 
 #include "common.h"
 
+#include <vte/vte.h>
+
+#include <gp_gtkcompat.h>
+
 GeanyPlugin *geany_plugin;
 GeanyData *geany_data;
 
@@ -545,7 +549,11 @@ static gchar *get_data_dir_path(const gchar *filename)
 void plugin_init(G_GNUC_UNUSED GeanyData *gdata)
 {
 	GeanyKeyGroup *scope_key_group;
+#if GTK_CHECK_VERSION(3, 0, 0)
+	char *gladefile = get_data_dir_path("scope_gtk3.glade");
+#else
 	char *gladefile = get_data_dir_path("scope.glade");
+#endif
 	GError *gerror = NULL;
 	GtkWidget *menubar1 = ui_lookup_widget(geany->main_widgets->window, "menubar1");
 	guint item;


Modified: scope/src/utils.c
11 lines changed, 11 insertions(+), 0 deletions(-)
===================================================================
@@ -437,10 +437,21 @@ void utils_remark(GeanyDocument *doc)
 
 guint utils_parse_sci_color(const gchar *string)
 {
+#if !GTK_CHECK_VERSION(3, 14, 0)
 	GdkColor color;
 
 	gdk_color_parse(string, &color);
 	return ((color.blue >> 8) << 16) + (color.green & 0xFF00) + (color.red >> 8);
+#else
+	GdkRGBA color;
+	guint blue, green, red;
+
+	gdk_rgba_parse(&color, string);
+	blue = color.blue * 0xFF;
+	green = color.green * 0xFF;
+	red = color.red * 0xFF;
+	return (blue << 16) + (green << 8) + red;
+#endif
 }
 
 gboolean utils_key_file_write_to_file(GKeyFile *config, const char *configfile)


Modified: utils/src/Makefile.am
11 lines changed, 9 insertions(+), 2 deletions(-)
===================================================================
@@ -6,9 +6,16 @@ libgeanypluginutils_la_SOURCES = \
 	filelist.h \
 	filelist.c
 
+if GP_VTE291_USED
+libgeanypluginutils_la_SOURCES += \
+	gp_vtecompat.h \
+	gp_vtecompat.c
+endif
+
 libgeanypluginutils_la_CPPFLAGS = $(AM_CPPFLAGS) \
 	-DG_LOG_DOMAIN=\"Utils\"
-libgeanypluginutils_la_CFLAGS = $(AM_CFLAGS)
-libgeanypluginutils_la_LIBADD = $(COMMONLIBS)
+libgeanypluginutils_la_CFLAGS = $(AM_CFLAGS) $(VTE_CFLAGS)
+libgeanypluginutils_la_LIBADD = $(COMMONLIBS) $(VTE_LIBS)
 libgeanypluginutils_la_LDFLAGS = -no-undefined $(GP_LDFLAGS)
 include $(top_srcdir)/build/cppcheck.mk
+


Modified: utils/src/gp_gtkcompat.h
57 lines changed, 57 insertions(+), 0 deletions(-)
===================================================================
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2017 LarsGit223
+ *
+ * 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.
+ */
+
+/* Compatibility macros to support different GTK versions */
+
+#ifndef GP_GTKCOMPAT_H
+#define GP_GTKCOMPAT_H
+
+G_BEGIN_DECLS
+
+/* Remove gtk_window_set_has_resize_grip() starting from version 3.14 */
+#if GTK_CHECK_VERSION(3, 14, 0)
+#define gtk_window_set_has_resize_grip(window, value)
+#endif
+
+/* Replace calls to gtk_widget_set_state() with call to
+   gtk_widget_set_state_flags() and translate States to State-Flags.
+   Starting from version 3.0.*/
+#if GTK_CHECK_VERSION(3, 0, 0)
+#define GTK_STATE_NORMAL       GTK_STATE_FLAG_NORMAL
+#define GTK_STATE_ACTIVE       GTK_STATE_FLAG_ACTIVE
+#define GTK_STATE_PRELIGHT     GTK_STATE_FLAG_PRELIGHT
+#define GTK_STATE_SELECTED     GTK_STATE_FLAG_SELECTED
+#define GTK_STATE_INSENSITIVE  GTK_STATE_FLAG_INSENSITIVE
+#define GTK_STATE_INCONSISTENT GTK_STATE_FLAG_INCONSISTENT
+#define GTK_STATE_FOCUSED      GTK_STATE_FLAG_FOCUSED
+#define gtk_widget_set_state(widget, state) \
+        gtk_widget_set_state_flags(widget, state, FALSE)
+#endif
+
+/* Replace some GTK_STOCK constants with labels.
+   Add new ones on-demand. Starting from version 3.10 */
+#if GTK_CHECK_VERSION(3, 10, 0)
+#undef GTK_STOCK_OPEN
+#undef GTK_STOCK_CANCEL
+#define GTK_STOCK_OPEN   _("_Open")
+#define GTK_STOCK_CANCEL _("_Cancel")
+#endif
+G_END_DECLS
+
+#endif /* GP_GTKCOMPAT_H */
+


Modified: utils/src/gp_vtecompat.c
47 lines changed, 47 insertions(+), 0 deletions(-)
===================================================================
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2017 LarsGit223
+ *
+ * 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.
+ */
+
+#include <glib.h>
+#include <glib/gstdio.h>
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef G_OS_UNIX
+#include <vte/vte.h>
+#include <../../utils/src/gp_vtecompat.h>
+#endif
+
+/** Set font from string.
+ *
+ * Compatibility function to replace deprecated vte_terminal_set_font_from_string().
+ *
+ * @param vte  Pointer to VteTerminal
+ * @param font Font specification as string
+ *
+ **/
+void gp_vtecompat_set_font_from_string(VteTerminal *vte, char *font)
+{
+    PangoFontDescription *font_desc;
+
+    font_desc = pango_font_description_from_string(font);
+    vte_terminal_set_font(vte, font_desc);
+    pango_font_description_free (font_desc);
+}
+


Modified: utils/src/gp_vtecompat.h
60 lines changed, 60 insertions(+), 0 deletions(-)
===================================================================
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2017 LarsGit223
+ *
+ * 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.
+ */
+
+/* Compatibility macros to support different VTE versions */
+
+#ifndef GP_VTECOMPAT_H
+#define GP_VTECOMPAT_H
+
+G_BEGIN_DECLS
+
+/* Replace call to vte_terminal_copy_clipboard() with a call to
+   vte_terminal_copy_clipboard_format starting from version 0.50 */
+#if VTE_CHECK_VERSION(0, 50, 0)
+#define vte_terminal_copy_clipboard(terminal) \
+        vte_terminal_copy_clipboard_format(terminal, VTE_FORMAT_TEXT)
+#endif
+
+/* Version info for VTE is incomplete so we use all the macros below
+   simply if GTK3 is used. */
+#if GTK_CHECK_VERSION(3, 0, 0)
+/* Remove vte_terminal_set_emulation() starting from 0.26.2 version */
+#define vte_terminal_set_emulation(vte, emulation)
+
+/* Replace call to vte_terminal_set_font_from_string() with a call to
+   gp_vtecompat_set_font_from_string() starting from version 0.26.2 */
+#define vte_terminal_set_font_from_string(vte, font) \
+        gp_vtecompat_set_font_from_string(vte, font)
+
+/* Replace call to vte_pty_new_foreign() with a call to
+   vte_pty_new_foreign_sync() starting from version 0.26.2 */
+#define vte_pty_new_foreign(pty, error) \
+        vte_pty_new_foreign_sync(pty, NULL, error)
+
+/* Replace call to vte_terminal_set_pty_object() with a call to
+   vte_terminal_set_pty() starting from version 0.26.2 */
+#define vte_terminal_set_pty_object(terminal, pty) \
+        vte_terminal_set_pty(terminal, pty)
+
+void gp_vtecompat_set_font_from_string(VteTerminal *vte, char *font);
+#endif
+
+G_END_DECLS
+
+#endif /* GP_VTECOMPAT_H */
+



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

From git-noreply at xxxxx  Sat Oct 20 09:43:08 2018
From: git-noreply at xxxxx (=?utf-8?q?Lars_Paulsen?=)
Date: Sat, 20 Oct 2018 09:43:08 -0000
Subject: [geany/geany-plugins] f0dbab: scope: added GTK3 support (keeping GTK2
 support)
Message-ID: <20181028224028.C28951EAAC0@mail.geany.org>

Branch:      refs/heads/master
Author:      Lars Paulsen <lars_paulsen at web.de>
Committer:   LarsGit223 <lars_paulsen at web.de>
Date:        Sat, 20 Oct 2018 09:43:08 UTC
Commit:      f0dbabab09f2ffc0f25054deb58ea7f32b8256e9
             https://github.com/geany/geany-plugins/commit/f0dbabab09f2ffc0f25054deb58ea7f32b8256e9

Log Message:
-----------
scope: added GTK3 support (keeping GTK2 support)

- use vte-2.91 for GTK3 and vte >= 0.17 for GTK2
- for GTK 3.4 and higher use CSS padding instead of deprecated 'inner-border' style property
  This prevents a warning in the debug messages.
- Fixed overlapping widgets in 'command_dialog':
  A gtk3 specific glade file was created. In the 'command_dialog' the
  deprecated 'GtkVBox' was replaced by 'GtkBox'. Also less frames were used.
  This fixed overlapping of the widgets 'command_view' and 'command_history'.
- Corrected missing 'min-content-height' for 'command_view' in 'command_dialog'


Modified Paths:
--------------
    build/scope.m4
    po/POTFILES.in
    scope/data/Makefile.am
    scope/data/scope_gtk3.glade
    scope/src/Makefile.am
    scope/src/conterm.c
    scope/src/plugme.c
    scope/src/prefs.c
    scope/src/prefs.h
    scope/src/scope.c
    scope/src/utils.c
    utils/src/Makefile.am
    utils/src/gp_gtkcompat.h
    utils/src/gp_vtecompat.c
    utils/src/gp_vtecompat.h

Modified: build/scope.m4
8 lines changed, 5 insertions(+), 3 deletions(-)
===================================================================
@@ -1,16 +1,18 @@
 AC_DEFUN([GP_CHECK_SCOPE],
 [
     GP_ARG_DISABLE([Scope], [auto])
-    GP_CHECK_PLUGIN_GTK2_ONLY([Scope])
 
     case "$host_os" in
         cygwin* | mingw* | win32*)
             PTY_LIBS=""
             ;;
 
         *)
-            GP_CHECK_PLUGIN_DEPS([scope], [VTE],
-                                 [vte >= 0.17])
+
+            GP_CHECK_GTK3([vte_package=vte-2.91], [vte_package="vte >= 0.17"])
+            GP_CHECK_PLUGIN_DEPS([scope], [VTE], [$vte_package])
+            AM_CONDITIONAL([GP_VTE291_USED], [test "$enable_scope" != no && test "$vte_package" = vte-2.91])
+
             AC_CHECK_HEADERS([util.h pty.h libutil.h])
             PTY_LIBS="-lutil"
             ;;


Modified: po/POTFILES.in
1 lines changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -267,6 +267,7 @@ projectorganizer/src/prjorg-sidebar.c
 
 # Scope
 scope/data/scope.glade
+scope/data/scope_gtk3.glade
 scope/src/break.c
 scope/src/conterm.c
 scope/src/debug.c


Modified: scope/data/Makefile.am
3 lines changed, 2 insertions(+), 1 deletions(-)
===================================================================
@@ -29,4 +29,5 @@ dist_plugindata_DATA = \
 	StepOver.png \
 	StepOver22.png \
 	StepOver24.png \
-	scope.glade
+	scope.glade \
+	scope_gtk3.glade


Modified: scope/data/scope_gtk3.glade
3982 lines changed, 3982 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online


Modified: scope/src/Makefile.am
6 lines changed, 4 insertions(+), 2 deletions(-)
===================================================================
@@ -51,11 +51,13 @@ scope_la_SOURCES = \
 	store/scptreestore.h \
 	store/scptreestore.c
 
-scope_la_LIBADD = $(COMMONLIBS) $(VTE_LIBS) $(PTY_LIBS)
+scope_la_LIBADD = $(COMMONLIBS) $(VTE_LIBS) $(PTY_LIBS) \
+				  $(top_builddir)/utils/src/libgeanypluginutils.la
 
 scope_la_CPPFLAGS = $(AM_CPPFLAGS) -DG_LOG_DOMAIN=\"Scope\"
 scope_la_CFLAGS = $(AM_CFLAGS) $(VTE_CFLAGS) \
 	-DPLUGINHTMLDOCDIR=\"$(plugindocdir)/html\" \
-	-Wno-shadow
+	-Wno-shadow \
+	-I$(top_srcdir)/utils/src
 
 include $(top_srcdir)/build/cppcheck.mk


Modified: scope/src/conterm.c
45 lines changed, 44 insertions(+), 1 deletions(-)
===================================================================
@@ -33,6 +33,7 @@
 
 #ifdef G_OS_UNIX
 #include <vte/vte.h>
+#include <gp_vtecompat.h>
 /* instead of detecting N kinds of *nix */
 #if defined(HAVE_UTIL_H)
 #include <util.h>
@@ -394,19 +395,53 @@ void conterm_load_config(void)
 	pref_vte_font = utils_get_setting_string(config, "VTE", "font", "Monospace 10");
 	pref_vte_scrollback = utils_get_setting_integer(config, "VTE", "scrollback_lines", 500);
 	tmp_string = utils_get_setting_string(config, "VTE", "colour_fore", "#ffffff");
+#if !GTK_CHECK_VERSION(3, 14, 0)
 	gdk_color_parse(tmp_string, &pref_vte_colour_fore);
+#else
+	gdk_rgba_parse(&pref_vte_colour_fore, tmp_string);
+#endif
 	g_free(tmp_string);
 	tmp_string = utils_get_setting_string(config, "VTE", "colour_back", "#000000");
+#if !GTK_CHECK_VERSION(3, 14, 0)
 	gdk_color_parse(tmp_string, &pref_vte_colour_back);
+#else
+	gdk_rgba_parse(&pref_vte_colour_back, tmp_string);
+#endif
 	g_free(tmp_string);
 	g_key_file_free(config);
 	g_free(configfile);
 }
 
 static void context_apply_config(GtkWidget *console)
 {
+#if !GTK_CHECK_VERSION(3, 0, 0)
 	gtk_widget_modify_base(console, GTK_STATE_NORMAL, &pref_vte_colour_back);
 	gtk_widget_modify_cursor(console, &pref_vte_colour_fore, &pref_vte_colour_back);
+#else
+	GString *css_string;
+	GtkStyleContext *context;
+	GtkCssProvider *provider;
+	gchar *css_code, *color, *background_color;
+
+	color = gdk_rgba_to_string (&pref_vte_colour_fore);
+	background_color = gdk_rgba_to_string (&pref_vte_colour_back);
+
+	gtk_widget_set_name(console, "scope-console");
+	context = gtk_widget_get_style_context(console);
+	provider = gtk_css_provider_new();
+	gtk_style_context_add_provider(context, GTK_STYLE_PROVIDER(provider),
+		GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+
+	css_string = g_string_new(NULL);
+	g_string_printf(css_string, "#scope-console { color: %s; background-color: %s; }",
+		color, background_color);
+	css_code = g_string_free(css_string, FALSE);
+
+	gtk_css_provider_load_from_data(GTK_CSS_PROVIDER(provider), css_code, -1, NULL);
+
+	g_free(css_code);
+	g_object_unref(provider);
+#endif
 	ui_widget_modify_font_from_string(console, pref_vte_font);
 }
 
@@ -457,7 +492,15 @@ void conterm_init(void)
 	{
 		gint vte_border_x, vte_border_y;
 
-#if VTE_CHECK_VERSION(0, 24, 0)
+#if GTK_CHECK_VERSION(3, 4, 0)
+		GtkStyleContext *context;
+		GtkBorder border;
+
+		context = gtk_widget_get_style_context (console);
+		gtk_style_context_get_padding (context, GTK_STATE_FLAG_NORMAL, &border);
+		vte_border_x = border.left + border.right;
+		vte_border_y = border.top + border.bottom;
+#elif VTE_CHECK_VERSION(0, 24, 0)
 		GtkBorder *border = NULL;
 
 		gtk_widget_style_get(console, "inner-border", &border, NULL);


Modified: scope/src/plugme.c
4 lines changed, 4 insertions(+), 0 deletions(-)
===================================================================
@@ -23,6 +23,10 @@
 
 #include <string.h>
 
+#include "common.h"
+
+#include <gp_gtkcompat.h>
+
 #include "geanyplugin.h"
 
 extern GeanyData *geany_data;


Modified: scope/src/prefs.c
6 lines changed, 6 insertions(+), 0 deletions(-)
===================================================================
@@ -76,8 +76,14 @@ gboolean pref_vte_blinken;
 gchar *pref_vte_emulation;
 gchar *pref_vte_font;
 gint pref_vte_scrollback;
+
+#if !GTK_CHECK_VERSION(3, 14, 0)
 GdkColor pref_vte_colour_fore;
 GdkColor pref_vte_colour_back;
+#else
+GdkRGBA pref_vte_colour_fore;
+GdkRGBA pref_vte_colour_back;
+#endif
 
 typedef struct _MarkerStyle
 {


Modified: scope/src/prefs.h
6 lines changed, 6 insertions(+), 0 deletions(-)
===================================================================
@@ -64,8 +64,14 @@ extern gboolean pref_vte_blinken;
 extern gchar *pref_vte_emulation;
 extern gchar *pref_vte_font;
 extern gint pref_vte_scrollback;
+
+#if !GTK_CHECK_VERSION(3, 14, 0)
 extern GdkColor pref_vte_colour_fore;
 extern GdkColor pref_vte_colour_back;
+#else
+extern GdkRGBA pref_vte_colour_fore;
+extern GdkRGBA pref_vte_colour_back;
+#endif
 
 void prefs_apply(GeanyDocument *doc);
 char *prefs_file_name(void);


Modified: scope/src/scope.c
8 lines changed, 8 insertions(+), 0 deletions(-)
===================================================================
@@ -25,6 +25,10 @@
 
 #include "common.h"
 
+#include <vte/vte.h>
+
+#include <gp_gtkcompat.h>
+
 GeanyPlugin *geany_plugin;
 GeanyData *geany_data;
 
@@ -545,7 +549,11 @@ static gchar *get_data_dir_path(const gchar *filename)
 void plugin_init(G_GNUC_UNUSED GeanyData *gdata)
 {
 	GeanyKeyGroup *scope_key_group;
+#if GTK_CHECK_VERSION(3, 0, 0)
+	char *gladefile = get_data_dir_path("scope_gtk3.glade");
+#else
 	char *gladefile = get_data_dir_path("scope.glade");
+#endif
 	GError *gerror = NULL;
 	GtkWidget *menubar1 = ui_lookup_widget(geany->main_widgets->window, "menubar1");
 	guint item;


Modified: scope/src/utils.c
11 lines changed, 11 insertions(+), 0 deletions(-)
===================================================================
@@ -437,10 +437,21 @@ void utils_remark(GeanyDocument *doc)
 
 guint utils_parse_sci_color(const gchar *string)
 {
+#if !GTK_CHECK_VERSION(3, 14, 0)
 	GdkColor color;
 
 	gdk_color_parse(string, &color);
 	return ((color.blue >> 8) << 16) + (color.green & 0xFF00) + (color.red >> 8);
+#else
+	GdkRGBA color;
+	guint blue, green, red;
+
+	gdk_rgba_parse(&color, string);
+	blue = color.blue * 0xFF;
+	green = color.green * 0xFF;
+	red = color.red * 0xFF;
+	return (blue << 16) + (green << 8) + red;
+#endif
 }
 
 gboolean utils_key_file_write_to_file(GKeyFile *config, const char *configfile)


Modified: utils/src/Makefile.am
11 lines changed, 9 insertions(+), 2 deletions(-)
===================================================================
@@ -6,9 +6,16 @@ libgeanypluginutils_la_SOURCES = \
 	filelist.h \
 	filelist.c
 
+if GP_VTE291_USED
+libgeanypluginutils_la_SOURCES += \
+	gp_vtecompat.h \
+	gp_vtecompat.c
+endif
+
 libgeanypluginutils_la_CPPFLAGS = $(AM_CPPFLAGS) \
 	-DG_LOG_DOMAIN=\"Utils\"
-libgeanypluginutils_la_CFLAGS = $(AM_CFLAGS)
-libgeanypluginutils_la_LIBADD = $(COMMONLIBS)
+libgeanypluginutils_la_CFLAGS = $(AM_CFLAGS) $(VTE_CFLAGS)
+libgeanypluginutils_la_LIBADD = $(COMMONLIBS) $(VTE_LIBS)
 libgeanypluginutils_la_LDFLAGS = -no-undefined $(GP_LDFLAGS)
 include $(top_srcdir)/build/cppcheck.mk
+


Modified: utils/src/gp_gtkcompat.h
57 lines changed, 57 insertions(+), 0 deletions(-)
===================================================================
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2017 LarsGit223
+ *
+ * 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.
+ */
+
+/* Compatibility macros to support different GTK versions */
+
+#ifndef GP_GTKCOMPAT_H
+#define GP_GTKCOMPAT_H
+
+G_BEGIN_DECLS
+
+/* Remove gtk_window_set_has_resize_grip() starting from version 3.14 */
+#if GTK_CHECK_VERSION(3, 14, 0)
+#define gtk_window_set_has_resize_grip(window, value)
+#endif
+
+/* Replace calls to gtk_widget_set_state() with call to
+   gtk_widget_set_state_flags() and translate States to State-Flags.
+   Starting from version 3.0.*/
+#if GTK_CHECK_VERSION(3, 0, 0)
+#define GTK_STATE_NORMAL       GTK_STATE_FLAG_NORMAL
+#define GTK_STATE_ACTIVE       GTK_STATE_FLAG_ACTIVE
+#define GTK_STATE_PRELIGHT     GTK_STATE_FLAG_PRELIGHT
+#define GTK_STATE_SELECTED     GTK_STATE_FLAG_SELECTED
+#define GTK_STATE_INSENSITIVE  GTK_STATE_FLAG_INSENSITIVE
+#define GTK_STATE_INCONSISTENT GTK_STATE_FLAG_INCONSISTENT
+#define GTK_STATE_FOCUSED      GTK_STATE_FLAG_FOCUSED
+#define gtk_widget_set_state(widget, state) \
+        gtk_widget_set_state_flags(widget, state, FALSE)
+#endif
+
+/* Replace some GTK_STOCK constants with labels.
+   Add new ones on-demand. Starting from version 3.10 */
+#if GTK_CHECK_VERSION(3, 10, 0)
+#undef GTK_STOCK_OPEN
+#undef GTK_STOCK_CANCEL
+#define GTK_STOCK_OPEN   _("_Open")
+#define GTK_STOCK_CANCEL _("_Cancel")
+#endif
+G_END_DECLS
+
+#endif /* GP_GTKCOMPAT_H */
+


Modified: utils/src/gp_vtecompat.c
47 lines changed, 47 insertions(+), 0 deletions(-)
===================================================================
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2017 LarsGit223
+ *
+ * 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.
+ */
+
+#include <glib.h>
+#include <glib/gstdio.h>
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef G_OS_UNIX
+#include <vte/vte.h>
+#include <../../utils/src/gp_vtecompat.h>
+#endif
+
+/** Set font from string.
+ *
+ * Compatibility function to replace deprecated vte_terminal_set_font_from_string().
+ *
+ * @param vte  Pointer to VteTerminal
+ * @param font Font specification as string
+ *
+ **/
+void gp_vtecompat_set_font_from_string(VteTerminal *vte, char *font)
+{
+    PangoFontDescription *font_desc;
+
+    font_desc = pango_font_description_from_string(font);
+    vte_terminal_set_font(vte, font_desc);
+    pango_font_description_free (font_desc);
+}
+


Modified: utils/src/gp_vtecompat.h
60 lines changed, 60 insertions(+), 0 deletions(-)
===================================================================
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2017 LarsGit223
+ *
+ * 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.
+ */
+
+/* Compatibility macros to support different VTE versions */
+
+#ifndef GP_VTECOMPAT_H
+#define GP_VTECOMPAT_H
+
+G_BEGIN_DECLS
+
+/* Replace call to vte_terminal_copy_clipboard() with a call to
+   vte_terminal_copy_clipboard_format starting from version 0.50 */
+#if VTE_CHECK_VERSION(0, 50, 0)
+#define vte_terminal_copy_clipboard(terminal) \
+        vte_terminal_copy_clipboard_format(terminal, VTE_FORMAT_TEXT)
+#endif
+
+/* Version info for VTE is incomplete so we use all the macros below
+   simply if GTK3 is used. */
+#if GTK_CHECK_VERSION(3, 0, 0)
+/* Remove vte_terminal_set_emulation() starting from 0.26.2 version */
+#define vte_terminal_set_emulation(vte, emulation)
+
+/* Replace call to vte_terminal_set_font_from_string() with a call to
+   gp_vtecompat_set_font_from_string() starting from version 0.26.2 */
+#define vte_terminal_set_font_from_string(vte, font) \
+        gp_vtecompat_set_font_from_string(vte, font)
+
+/* Replace call to vte_pty_new_foreign() with a call to
+   vte_pty_new_foreign_sync() starting from version 0.26.2 */
+#define vte_pty_new_foreign(pty, error) \
+        vte_pty_new_foreign_sync(pty, NULL, error)
+
+/* Replace call to vte_terminal_set_pty_object() with a call to
+   vte_terminal_set_pty() starting from version 0.26.2 */
+#define vte_terminal_set_pty_object(terminal, pty) \
+        vte_terminal_set_pty(terminal, pty)
+
+void gp_vtecompat_set_font_from_string(VteTerminal *vte, char *font);
+#endif
+
+G_END_DECLS
+
+#endif /* GP_VTECOMPAT_H */
+



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

From git-noreply at xxxxx  Sun Oct 28 22:48:47 2018
From: git-noreply at xxxxx (=?utf-8?q?Lars_Paulsen?=)
Date: Sun, 28 Oct 2018 22:48:47 -0000
Subject: [geany/geany-plugins] c98fb3: scope: removed invalid signal
 'project-before-save' and callback function
Message-ID: <20181028224846.7EFB51EAAC0@mail.geany.org>

Branch:      refs/heads/master
Author:      Lars Paulsen <lars_paulsen at web.de>
Committer:   Lars Paulsen <lars_paulsen at web.de>
Date:        Tue, 05 Jun 2018 17:35:02 UTC
Commit:      c98fb3fa2f11e95b4981f7e0195964f2e577ce77
             https://github.com/geany/geany-plugins/commit/c98fb3fa2f11e95b4981f7e0195964f2e577ce77

Log Message:
-----------
scope: removed invalid signal 'project-before-save' and callback function

This prevents a debug message like "signal 'project-before-save' is invalid for instance
'0xd7da10' of type 'GeanyObject'" being generated on loading the scope plugin.


Modified Paths:
--------------
    scope/src/scope.c

Modified: scope/src/scope.c
7 lines changed, 0 insertions(+), 7 deletions(-)
===================================================================
@@ -351,12 +351,6 @@ static void on_settings_save(G_GNUC_UNUSED GObject *obj, G_GNUC_UNUSED GKeyFile
 	schedule_settings_saved(TRUE);
 }
 
-static void on_project_before_save(G_GNUC_UNUSED GObject *obj, G_GNUC_UNUSED GKeyFile *keyfile,
-	G_GNUC_UNUSED gpointer gdata)
-{
-	schedule_settings_saved(FALSE);
-}
-
 static gboolean on_editor_notify(G_GNUC_UNUSED GObject *obj, GeanyEditor *editor,
 	SCNotification *nt, G_GNUC_UNUSED gpointer gdata)
 {
@@ -438,7 +432,6 @@ static const ScopeCallback scope_callbacks[] =
 	{ "document-filetype-set",    G_CALLBACK(on_document_filetype_set) },
 	{ "document-activate",        G_CALLBACK(on_document_activate) },
 	{ "document-save",            G_CALLBACK(on_document_activate) },
-	{ "project-before-save",      G_CALLBACK(on_project_before_save) },
 	{ "project-open",             G_CALLBACK(on_project_open) },
 	{ "project-close",            G_CALLBACK(on_project_close) },
 	{ "geany-startup-complete",   G_CALLBACK(on_geany_startup_complete) },



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

From git-noreply at xxxxx  Sun Oct 28 22:48:42 2018
From: git-noreply at xxxxx (=?utf-8?q?elextr?=)
Date: Sun, 28 Oct 2018 22:48:42 -0000
Subject: [geany/geany-plugins] b8d4f5: Merge pull request #751 from
 LarsGit223/ScopeInvSignal
Message-ID: <20181028224847.1458D1EAAC0@mail.geany.org>

Branch:      refs/heads/master
Author:      elextr <elextr at gmail.com>
Committer:   GitHub <noreply at github.com>
Date:        Sun, 28 Oct 2018 22:48:42 UTC
Commit:      b8d4f57bafb8c16b495620f3aab84f4314ec78bb
             https://github.com/geany/geany-plugins/commit/b8d4f57bafb8c16b495620f3aab84f4314ec78bb

Log Message:
-----------
Merge pull request #751 from LarsGit223/ScopeInvSignal

scope: removed invalid signal 'project-before-save' and callback function


Modified Paths:
--------------
    scope/src/scope.c

Modified: scope/src/scope.c
7 lines changed, 0 insertions(+), 7 deletions(-)
===================================================================
@@ -355,12 +355,6 @@ static void on_settings_save(G_GNUC_UNUSED GObject *obj, G_GNUC_UNUSED GKeyFile
 	schedule_settings_saved(TRUE);
 }
 
-static void on_project_before_save(G_GNUC_UNUSED GObject *obj, G_GNUC_UNUSED GKeyFile *keyfile,
-	G_GNUC_UNUSED gpointer gdata)
-{
-	schedule_settings_saved(FALSE);
-}
-
 static gboolean on_editor_notify(G_GNUC_UNUSED GObject *obj, GeanyEditor *editor,
 	SCNotification *nt, G_GNUC_UNUSED gpointer gdata)
 {
@@ -442,7 +436,6 @@ static const ScopeCallback scope_callbacks[] =
 	{ "document-filetype-set",    G_CALLBACK(on_document_filetype_set) },
 	{ "document-activate",        G_CALLBACK(on_document_activate) },
 	{ "document-save",            G_CALLBACK(on_document_activate) },
-	{ "project-before-save",      G_CALLBACK(on_project_before_save) },
 	{ "project-open",             G_CALLBACK(on_project_open) },
 	{ "project-close",            G_CALLBACK(on_project_close) },
 	{ "geany-startup-complete",   G_CALLBACK(on_geany_startup_complete) },



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