Branch: refs/heads/master
Author: Enrico Tröger <enrico.troeger(a)uvena.de>
Committer: GitHub <noreply(a)github.com>
Date: Wed, 25 Apr 2018 18:05:07 UTC
Commit: 1507f867cebca0a0cf329005bc613375b764c1ce
https://github.com/geany/geany/commit/1507f867cebca0a0cf329005bc613375b764c…
Log Message:
-----------
Merge pull request #1840 from paulmenzel/use-https-url-for-www.geany.org
Use HTTPS URL for domain www.geany.org
Modified Paths:
--------------
HACKING
README
README.I18N
data/ui_toolbar.xml
doc/geany.1.in
doc/geany.txt
doc/plugins.dox
geany.nsi.in
geany.spec.in
src/geany.h
src/toolbar.c
Modified: HACKING
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -39,7 +39,7 @@ tool:
The documentation will be output to doc/reference/index.html.
Alternatively you can view the API documentation online at
-http://www.geany.org/manual/reference/.
+https://www.geany.org/manual/reference/.
Pull requests
-------------
Modified: README
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -41,7 +41,7 @@ and many more.
Installation on Mac OS and Windows
----------------------------------
Prebuilt binary packages for Mac OS and Windows can be found on
-http://www.geany.org.
+https://www.geany.org.
Installation from sources
@@ -133,7 +133,7 @@ included with the source code of this program.
Ideas, questions, patches and bug reports
-----------------------------------------
-See http://www.geany.org/.
+See https://www.geany.org/.
If you add something, or fix a bug, please create a pull request at
https://github.com/geany/geany/. Also see the HACKING file.
Modified: README.I18N
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -81,10 +81,10 @@ I18n mailing list
-----------------
There is also a mailing list dedicated to translation issues. Please visit
-http://www.geany.org/Support/MailingList#geany-i18 for more information.
+https://www.geany.org/Support/MailingList#geany-i18 for more information.
[1] http://i18n.geany.org/
[2] http://www.poedit.net/
-[3] http://www.geany.org/Support/MailingList#geany-i18
+[3] https://www.geany.org/Support/MailingList#geany-i18
[4] Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
Modified: data/ui_toolbar.xml
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -12,7 +12,7 @@ For changes to take effect, you need to restart Geany. Alternatively you can use
editor in Geany.
A list of available actions can be found in the documentation included with Geany or
-at http://www.geany.org/manual/current/index.html#customizing-the-toolbar.
+at https://www.geany.org/manual/current/index.html#customizing-the-toolbar.
-->
<ui>
Modified: doc/geany.1.in
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -11,7 +11,7 @@ Geany is a small and fast editor with basic features of an integrated developmen
Some of its features: syntax highlighting, code completion, code folding, symbol/tag lists and
many supported filetypes like C(++), Java, PHP, HTML, DocBook, Perl and more.
.PP
-Homepage: http://www.geany.org/
+Homepage: https://www.geany.org/
.SH "OPTIONS"
.IP "\fB\fP \fBfiles ...\fP " 10
A space-separated list of filenames. Absolute and relative filenames can be used. Geany also
Modified: doc/geany.txt
12 lines changed, 6 insertions(+), 6 deletions(-)
===================================================================
@@ -64,9 +64,9 @@ Some basic features of Geany:
Where to get it
---------------
-You can obtain Geany from http://www.geany.org/ or perhaps also from
+You can obtain Geany from https://www.geany.org/ or perhaps also from
your distribution. For a list of available packages, please see
-http://www.geany.org/Download/ThirdPartyPackages.
+https://www.geany.org/Download/ThirdPartyPackages.
@@ -89,7 +89,7 @@ About this document
-------------------
This documentation is available in HTML and text formats.
-The latest version can always be found at http://www.geany.org/.
+The latest version can always be found at https://www.geany.org/.
If you want to contribute to it, see `Contributing to this document`_.
@@ -113,7 +113,7 @@ Binary packages
---------------
There are many binary packages available. For an up-to-date but maybe
-incomplete list see http://www.geany.org/Download/ThirdPartyPackages.
+incomplete list see https://www.geany.org/Download/ThirdPartyPackages.
Source compilation
@@ -1425,7 +1425,7 @@ You can use regular expressions in the Find and Replace dialogs
by selecting the *Use regular expressions* check box (see `Matching
options`_). The syntax is Perl compatible. Basic syntax is described
in the table below. For full details, see
-http://www.geany.org/manual/gtk/glib/glib-regex-syntax.html.
+https://www.geany.org/manual/gtk/glib/glib-regex-syntax.html.
By default regular expressions are matched on a line-by-line basis.
If you are interested in multi-line regular expressions, matched against
@@ -1529,7 +1529,7 @@ While the syntax is the same, a few practical differences applies:
======= ============================================================
. Matches any character but newlines. This behavior can be changed
to also match newlines using the (?s) option, see
- http://www.geany.org/manual/gtk/glib/glib-regex-syntax.html#idp5671632
+ https://www.geany.org/manual/gtk/glib/glib-regex-syntax.html#idp5671632
[^...] A negative range (see above) *will* match newlines if they are
not explicitly listed in that negative range. For example, range
Modified: doc/plugins.dox
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -84,7 +84,7 @@ them at all.
@subsection ideas Getting a plugin idea
If you want to write a plugin but don't know yet what it should do, have a look at
-http://www.geany.org/Support/PluginWishlist to get an idea about what users wish.
+https://www.geany.org/Support/PluginWishlist to get an idea about what users wish.
@subsection code Managing the source code
@@ -171,7 +171,7 @@ Basically, you are done at this point and could continue with writing the plugin
[1] For Windows, it is basically the same but you might have some more work on setting up
the general build environment (compiler, GTK development files, ...). This is described on
-Geany's website at http://www.geany.org/Support/BuildingOnWin32.
+Geany's website at https://www.geany.org/Support/BuildingOnWin32.
@section helloworld "Hello World"
Modified: geany.nsi.in
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -35,7 +35,7 @@ RequestExecutionLevel highest ; set execution level for Windows Vista
!define PRODUCT_VERSION "@VERSION@"
!define PRODUCT_VERSION_ID "@VERSION@.0.0"
!define PRODUCT_PUBLISHER "The Geany developer team"
-!define PRODUCT_WEB_SITE "http://www.geany.org/"
+!define PRODUCT_WEB_SITE "https://www.geany.org/"
!define PRODUCT_DIR_REGKEY "Software\Geany"
!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
!define PRODUCT_EXE "$INSTDIR\bin\Geany.exe"
Modified: geany.spec.in
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -9,7 +9,7 @@ Summary: A fast and lightweight IDE using GTK+
Group: Development/Tools
License: GPLv2+
-URL: http://www.geany.org/
+URL: https://www.geany.org/
Vendor: The Geany developer team <info(a)geany.org>
Packager: Dominic Hopf <dmaphy(a)googlemail.com>
Source: http://download.geany.org/%{name}-%{version}.tar.bz2
Modified: src/geany.h
6 lines changed, 3 insertions(+), 3 deletions(-)
===================================================================
@@ -43,10 +43,10 @@ G_BEGIN_DECLS
#define GEANY_TEMPLATES_SUBDIR "templates"
#define GEANY_TAGS_SUBDIR "tags"
#define GEANY_CODENAME "Keong"
-#define GEANY_HOMEPAGE "http://www.geany.org/"
+#define GEANY_HOMEPAGE "https://www.geany.org/"
#define GEANY_WIKI "http://wiki.geany.org/"
-#define GEANY_BUG_REPORT "http://www.geany.org/Support/Bugs"
-#define GEANY_DONATE "http://www.geany.org/service/donate/"
+#define GEANY_BUG_REPORT "https://www.geany.org/Support/Bugs"
+#define GEANY_DONATE "https://www.geany.org/service/donate/"
#define GEANY_STRING_UNTITLED _("untitled")
#define GEANY_DEFAULT_DIALOG_HEIGHT 350
#define GEANY_WINDOW_DEFAULT_WIDTH 900
Modified: src/toolbar.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -897,7 +897,7 @@ Everything you add or change must be inside the /ui/toolbar/ path.\n\n\
For changes to take effect, you need to restart Geany. Alternatively you can use the toolbar\n\
editor in Geany.\n\n\
A list of available actions can be found in the documentation included with Geany or\n\
-at http://www.geany.org/manual/current/index.html#customizing-the-toolbar.\n-->\n\
+at https://www.geany.org/manual/current/index.html#customizing-the-toolbar.\n-->\n\
\t<toolbar name='GeanyToolbar'>\n";
gchar *filename;
GString *str = g_string_new(template);
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Paul Menzel <pmenzel(a)molgen.mpg.de>
Committer: Paul Menzel <pmenzel(a)molgen.mpg.de>
Date: Mon, 23 Apr 2018 15:11:37 UTC
Commit: b10b2a716784d7fa3fd953ebde55982c39878313
https://github.com/geany/geany/commit/b10b2a716784d7fa3fd953ebde55982c39878…
Log Message:
-----------
Use HTTPS URL for domain www.geany.org
Replace all occurrences with the command below.
git grep -l 'http://www.geany.org' | xargs sed -i 's,http://www.geany.org,https://www.geany.org,g'
Modified Paths:
--------------
HACKING
README
README.I18N
data/ui_toolbar.xml
doc/geany.1.in
doc/geany.txt
doc/plugins.dox
geany.nsi.in
geany.spec.in
src/geany.h
src/toolbar.c
Modified: HACKING
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -39,7 +39,7 @@ tool:
The documentation will be output to doc/reference/index.html.
Alternatively you can view the API documentation online at
-http://www.geany.org/manual/reference/.
+https://www.geany.org/manual/reference/.
Pull requests
-------------
Modified: README
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -41,7 +41,7 @@ and many more.
Installation on Mac OS and Windows
----------------------------------
Prebuilt binary packages for Mac OS and Windows can be found on
-http://www.geany.org.
+https://www.geany.org.
Installation from sources
@@ -133,7 +133,7 @@ included with the source code of this program.
Ideas, questions, patches and bug reports
-----------------------------------------
-See http://www.geany.org/.
+See https://www.geany.org/.
If you add something, or fix a bug, please create a pull request at
https://github.com/geany/geany/. Also see the HACKING file.
Modified: README.I18N
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -81,10 +81,10 @@ I18n mailing list
-----------------
There is also a mailing list dedicated to translation issues. Please visit
-http://www.geany.org/Support/MailingList#geany-i18 for more information.
+https://www.geany.org/Support/MailingList#geany-i18 for more information.
[1] http://i18n.geany.org/
[2] http://www.poedit.net/
-[3] http://www.geany.org/Support/MailingList#geany-i18
+[3] https://www.geany.org/Support/MailingList#geany-i18
[4] Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
Modified: data/ui_toolbar.xml
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -12,7 +12,7 @@ For changes to take effect, you need to restart Geany. Alternatively you can use
editor in Geany.
A list of available actions can be found in the documentation included with Geany or
-at http://www.geany.org/manual/current/index.html#customizing-the-toolbar.
+at https://www.geany.org/manual/current/index.html#customizing-the-toolbar.
-->
<ui>
Modified: doc/geany.1.in
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -11,7 +11,7 @@ Geany is a small and fast editor with basic features of an integrated developmen
Some of its features: syntax highlighting, code completion, code folding, symbol/tag lists and
many supported filetypes like C(++), Java, PHP, HTML, DocBook, Perl and more.
.PP
-Homepage: http://www.geany.org/
+Homepage: https://www.geany.org/
.SH "OPTIONS"
.IP "\fB\fP \fBfiles ...\fP " 10
A space-separated list of filenames. Absolute and relative filenames can be used. Geany also
Modified: doc/geany.txt
12 lines changed, 6 insertions(+), 6 deletions(-)
===================================================================
@@ -64,9 +64,9 @@ Some basic features of Geany:
Where to get it
---------------
-You can obtain Geany from http://www.geany.org/ or perhaps also from
+You can obtain Geany from https://www.geany.org/ or perhaps also from
your distribution. For a list of available packages, please see
-http://www.geany.org/Download/ThirdPartyPackages.
+https://www.geany.org/Download/ThirdPartyPackages.
@@ -89,7 +89,7 @@ About this document
-------------------
This documentation is available in HTML and text formats.
-The latest version can always be found at http://www.geany.org/.
+The latest version can always be found at https://www.geany.org/.
If you want to contribute to it, see `Contributing to this document`_.
@@ -113,7 +113,7 @@ Binary packages
---------------
There are many binary packages available. For an up-to-date but maybe
-incomplete list see http://www.geany.org/Download/ThirdPartyPackages.
+incomplete list see https://www.geany.org/Download/ThirdPartyPackages.
Source compilation
@@ -1425,7 +1425,7 @@ You can use regular expressions in the Find and Replace dialogs
by selecting the *Use regular expressions* check box (see `Matching
options`_). The syntax is Perl compatible. Basic syntax is described
in the table below. For full details, see
-http://www.geany.org/manual/gtk/glib/glib-regex-syntax.html.
+https://www.geany.org/manual/gtk/glib/glib-regex-syntax.html.
By default regular expressions are matched on a line-by-line basis.
If you are interested in multi-line regular expressions, matched against
@@ -1529,7 +1529,7 @@ While the syntax is the same, a few practical differences applies:
======= ============================================================
. Matches any character but newlines. This behavior can be changed
to also match newlines using the (?s) option, see
- http://www.geany.org/manual/gtk/glib/glib-regex-syntax.html#idp5671632
+ https://www.geany.org/manual/gtk/glib/glib-regex-syntax.html#idp5671632
[^...] A negative range (see above) *will* match newlines if they are
not explicitly listed in that negative range. For example, range
Modified: doc/plugins.dox
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -84,7 +84,7 @@ them at all.
@subsection ideas Getting a plugin idea
If you want to write a plugin but don't know yet what it should do, have a look at
-http://www.geany.org/Support/PluginWishlist to get an idea about what users wish.
+https://www.geany.org/Support/PluginWishlist to get an idea about what users wish.
@subsection code Managing the source code
@@ -171,7 +171,7 @@ Basically, you are done at this point and could continue with writing the plugin
[1] For Windows, it is basically the same but you might have some more work on setting up
the general build environment (compiler, GTK development files, ...). This is described on
-Geany's website at http://www.geany.org/Support/BuildingOnWin32.
+Geany's website at https://www.geany.org/Support/BuildingOnWin32.
@section helloworld "Hello World"
Modified: geany.nsi.in
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -35,7 +35,7 @@ RequestExecutionLevel highest ; set execution level for Windows Vista
!define PRODUCT_VERSION "@VERSION@"
!define PRODUCT_VERSION_ID "@VERSION@.0.0"
!define PRODUCT_PUBLISHER "The Geany developer team"
-!define PRODUCT_WEB_SITE "http://www.geany.org/"
+!define PRODUCT_WEB_SITE "https://www.geany.org/"
!define PRODUCT_DIR_REGKEY "Software\Geany"
!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
!define PRODUCT_EXE "$INSTDIR\bin\Geany.exe"
Modified: geany.spec.in
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -9,7 +9,7 @@ Summary: A fast and lightweight IDE using GTK+
Group: Development/Tools
License: GPLv2+
-URL: http://www.geany.org/
+URL: https://www.geany.org/
Vendor: The Geany developer team <info(a)geany.org>
Packager: Dominic Hopf <dmaphy(a)googlemail.com>
Source: http://download.geany.org/%{name}-%{version}.tar.bz2
Modified: src/geany.h
6 lines changed, 3 insertions(+), 3 deletions(-)
===================================================================
@@ -43,10 +43,10 @@ G_BEGIN_DECLS
#define GEANY_TEMPLATES_SUBDIR "templates"
#define GEANY_TAGS_SUBDIR "tags"
#define GEANY_CODENAME "Keong"
-#define GEANY_HOMEPAGE "http://www.geany.org/"
+#define GEANY_HOMEPAGE "https://www.geany.org/"
#define GEANY_WIKI "http://wiki.geany.org/"
-#define GEANY_BUG_REPORT "http://www.geany.org/Support/Bugs"
-#define GEANY_DONATE "http://www.geany.org/service/donate/"
+#define GEANY_BUG_REPORT "https://www.geany.org/Support/Bugs"
+#define GEANY_DONATE "https://www.geany.org/service/donate/"
#define GEANY_STRING_UNTITLED _("untitled")
#define GEANY_DEFAULT_DIALOG_HEIGHT 350
#define GEANY_WINDOW_DEFAULT_WIDTH 900
Modified: src/toolbar.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -897,7 +897,7 @@ Everything you add or change must be inside the /ui/toolbar/ path.\n\n\
For changes to take effect, you need to restart Geany. Alternatively you can use the toolbar\n\
editor in Geany.\n\n\
A list of available actions can be found in the documentation included with Geany or\n\
-at http://www.geany.org/manual/current/index.html#customizing-the-toolbar.\n-->\n\
+at https://www.geany.org/manual/current/index.html#customizing-the-toolbar.\n-->\n\
\t<toolbar name='GeanyToolbar'>\n";
gchar *filename;
GString *str = g_string_new(template);
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Colomban Wendling <ban(a)herbesfolles.org>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Thu, 05 Apr 2018 19:47:30 UTC
Commit: 1611e3f94960a821ced0af9b99052afa6ade2111
https://github.com/geany/geany/commit/1611e3f94960a821ced0af9b99052afa6ade2…
Log Message:
-----------
Merge pull request #1748 from kugel-/msgwin-api
Add GI-compatible msgwin_*_add()
Closes #1748.
Modified Paths:
--------------
src/msgwindow.c
src/msgwindow.h
src/plugindata.h
Modified: src/msgwindow.c
132 lines changed, 95 insertions(+), 37 deletions(-)
===================================================================
@@ -106,9 +106,11 @@ void msgwin_show_hide_tabs(void)
}
-/** Sets the Messages path for opening any parsed filenames without absolute path
- * from message lines.
- * @param messages_dir The directory. **/
+/**
+ * Sets the Messages path for opening any parsed filenames without absolute path from message lines.
+ *
+ * @param messages_dir The directory.
+ **/
GEANY_API_SYMBOL
void msgwin_set_messages_dir(const gchar *messages_dir)
{
@@ -315,11 +317,15 @@ static const GdkColor *get_color(gint msg_color)
/**
- * Adds a new message in the compiler tab treeview in the messages window.
+ * Adds a formatted message in the compiler tab treeview in the messages window.
+ *
+ * @param msg_color A color to be used for the text. It must be an element of #MsgColors.
+ * @param format @c printf()-style format string.
+ * @param ... Arguments for the @c format string.
*
- * @param msg_color A color to be used for the text. It must be an element of #MsgColors.
- * @param format @c printf()-style format string.
- * @param ... Arguments for the @c format string.
+ * @see msgwin_compiler_add_string()
+ *
+ * @since 0.16
**/
GEANY_API_SYMBOL
void msgwin_compiler_add(gint msg_color, const gchar *format, ...)
@@ -334,7 +340,17 @@ void msgwin_compiler_add(gint msg_color, const gchar *format, ...)
g_free(string);
}
-
+/**
+ * Adds a new message in the compiler tab treeview in the messages window.
+ *
+ * @param msg_color A color to be used for the text. It must be an element of #MsgColors.
+ * @param msg Compiler message to be added.
+ *
+ * @see msgwin_compiler_add()
+ *
+ * @since 1.34 (API 236)
+ **/
+GEANY_API_SYMBOL
void msgwin_compiler_add_string(gint msg_color, const gchar *msg)
{
GtkTreeIter iter;
@@ -383,17 +399,20 @@ void msgwin_show_hide(gboolean show)
/**
- * Adds a new message in the messages tab treeview in the messages window.
- * If @a line and @a doc are set, clicking on this line jumps into the file which is specified
- * by @a doc into the line specified with @a line.
+ * Adds a formatted message in the messages tab treeview in the messages window.
*
- * @param msg_color A color to be used for the text. It must be an element of #MsgColors.
- * @param line The document's line where the message belongs to. Set to @c -1 to ignore.
- * @param doc The document. Set to @c NULL to ignore.
- * @param format @c printf()-style format string.
- * @param ... Arguments for the @c format string.
+ * If @a line and @a doc are set, clicking on this line jumps into the file
+ * which is specified by @a doc into the line specified with @a line.
*
- * @since 0.15
+ * @param msg_color A color to be used for the text. It must be an element of #MsgColors.
+ * @param line The document's line where the message belongs to. Set to @c -1 to ignore.
+ * @param doc @nullable The document. Set to @c NULL to ignore.
+ * @param format @c printf()-style format string.
+ * @param ... Arguments for the @c format string.
+ *
+ * @see msgwin_msg_add_string()
+ *
+ * @since 0.16
**/
GEANY_API_SYMBOL
void msgwin_msg_add(gint msg_color, gint line, GeanyDocument *doc, const gchar *format, ...)
@@ -410,7 +429,22 @@ void msgwin_msg_add(gint msg_color, gint line, GeanyDocument *doc, const gchar *
}
-/* adds string to the msg treeview */
+/**
+ * Adds a new message in the messages tab treeview in the messages window.
+ *
+ * If @a line and @a doc are set, clicking on this line jumps into the
+ * file which is specified by @a doc into the line specified with @a line.
+ *
+ * @param msg_color A color to be used for the text. It must be an element of #MsgColors.
+ * @param line The document's line where the message belongs to. Set to @c -1 to ignore.
+ * @param doc @nullable The document. Set to @c NULL to ignore.
+ * @param string Message to be added.
+ *
+ * @see msgwin_msg_add()
+ *
+ * @since 1.34 (API 236)
+ **/
+GEANY_API_SYMBOL
void msgwin_msg_add_string(gint msg_color, gint line, GeanyDocument *doc, const gchar *string)
{
GtkTreeIter iter;
@@ -448,29 +482,26 @@ void msgwin_msg_add_string(gint msg_color, gint line, GeanyDocument *doc, const
/**
- * Logs a status message *without* setting the status bar.
- * (Use ui_set_statusbar() to display text on the statusbar)
+ * Logs a new status message *without* setting the status bar.
+ *
+ * Use @ref ui_set_statusbar() to display text on the statusbar.
+ *
+ * @param string Status message to be logged.
*
- * @param format @c printf()-style format string.
- * @param ... Arguments for the @c format string.
+ * @see msgwin_status_add()
+ *
+ * @since 1.34 (API 236)
**/
GEANY_API_SYMBOL
-void msgwin_status_add(const gchar *format, ...)
+void msgwin_status_add_string(const gchar *string)
{
GtkTreeIter iter;
- gchar *string;
gchar *statusmsg, *time_str;
- va_list args;
-
- va_start(args, format);
- string = g_strdup_vprintf(format, args);
- va_end(args);
/* add a timestamp to status messages */
time_str = utils_get_current_time_string();
statusmsg = g_strconcat(time_str, ": ", string, NULL);
g_free(time_str);
- g_free(string);
/* add message to Status window */
gtk_list_store_append(msgwindow.store_status, &iter);
@@ -488,6 +519,32 @@ void msgwin_status_add(const gchar *format, ...)
}
}
+/**
+ * Logs a formatted status message *without* setting the status bar.
+ *
+ * Use @ref ui_set_statusbar() to display text on the statusbar.
+ *
+ * @param format @c printf()-style format string.
+ * @param ... Arguments for the @c format string.
+ *
+ * @see msgwin_status_add_string()
+ *
+ * @since 0.12
+ **/
+GEANY_API_SYMBOL
+void msgwin_status_add(const gchar *format, ...)
+{
+ gchar *string;
+ va_list args;
+
+ va_start(args, format);
+ string = g_strdup_vprintf(format, args);
+ va_end(args);
+
+ msgwin_status_add_string(string);
+ g_free(string);
+}
+
static void
on_message_treeview_clear_activate(GtkMenuItem *menuitem, gpointer user_data)
@@ -1237,12 +1294,13 @@ static gboolean on_msgwin_button_press_event(GtkWidget *widget, GdkEventButton *
/**
- * Switches to the given notebook tab of the messages window and shows the messages window
- * if it was previously hidden and @a show is set to @c TRUE.
+ * Switches to the given notebook tab of the messages window.
+ *
+ * The messages window is shown if it was previously hidden and @a show is set to @c TRUE.
*
- * @param tabnum An index of a tab in the messages window. Valid values are all elements of
- * #MessageWindowTabNum.
- * @param show Whether to show the messages window at all if it was hidden before.
+ * @param tabnum An index of a tab in the messages window. Valid values are
+ * all elements of #MessageWindowTabNum.
+ * @param show Whether to show the messages window at all if it was hidden before.
*
* @since 0.15
**/
@@ -1274,9 +1332,9 @@ void msgwin_switch_tab(gint tabnum, gboolean show)
/**
- * Removes all messages from a tab specified by @a tabnum in the messages window.
+ * Removes all messages from a tab specified by @a tabnum in the messages window.
*
- * @param tabnum An index of a tab in the messages window which should be cleared.
+ * @param tabnum An index of a tab in the messages window which should be cleared.
* Valid values are @c MSG_STATUS, @c MSG_COMPILER and @c MSG_MESSAGE.
*
* @since 0.15
Modified: src/msgwindow.h
7 lines changed, 3 insertions(+), 4 deletions(-)
===================================================================
@@ -53,11 +53,14 @@ typedef enum
void msgwin_status_add(const gchar *format, ...) G_GNUC_PRINTF (1, 2);
+void msgwin_status_add_string(const gchar *msg);
void msgwin_compiler_add(gint msg_color, const gchar *format, ...) G_GNUC_PRINTF (2, 3);
+void msgwin_compiler_add_string(gint msg_color, const gchar *msg);
void msgwin_msg_add(gint msg_color, gint line, GeanyDocument *doc, const gchar *format, ...)
G_GNUC_PRINTF (4, 5);
+void msgwin_msg_add_string(gint msg_color, gint line, GeanyDocument *doc, const char *msg);
void msgwin_clear_tab(gint tabnum);
@@ -93,10 +96,6 @@ void msgwin_finalize(void);
void msgwin_show_hide(gboolean show);
-void msgwin_msg_add_string(gint msg_color, gint line, GeanyDocument *doc, const gchar *string);
-
-void msgwin_compiler_add_string(gint msg_color, const gchar *msg);
-
void msgwin_show_hide_tabs(void);
Modified: src/plugindata.h
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -59,7 +59,7 @@ G_BEGIN_DECLS
* @warning You should not test for values below 200 as previously
* @c GEANY_API_VERSION was defined as an enum value, not a macro.
*/
-#define GEANY_API_VERSION 235
+#define GEANY_API_VERSION 236
/* hack to have a different ABI when built with GTK3 because loading GTK2-linked plugins
* with GTK3-linked Geany leads to crash */
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Thomas Martitz <kugel(a)rockbox.org>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Thu, 05 Apr 2018 19:44:43 UTC
Commit: cb179943ad8819e7c1bf9a8e359264cf87ee27f4
https://github.com/geany/geany/commit/cb179943ad8819e7c1bf9a8e359264cf87ee2…
Log Message:
-----------
msgwin: beautify doxygen comments a bit
Modified Paths:
--------------
src/msgwindow.c
Modified: src/msgwindow.c
93 lines changed, 51 insertions(+), 42 deletions(-)
===================================================================
@@ -106,9 +106,11 @@ void msgwin_show_hide_tabs(void)
}
-/** Sets the Messages path for opening any parsed filenames without absolute path
- * from message lines.
- * @param messages_dir The directory. **/
+/**
+ * Sets the Messages path for opening any parsed filenames without absolute path from message lines.
+ *
+ * @param messages_dir The directory.
+ **/
GEANY_API_SYMBOL
void msgwin_set_messages_dir(const gchar *messages_dir)
{
@@ -315,11 +317,13 @@ static const GdkColor *get_color(gint msg_color)
/**
- * Adds a new message in the compiler tab treeview in the messages window.
+ * Adds a new message in the compiler tab treeview in the messages window.
*
- * @param msg_color A color to be used for the text. It must be an element of #MsgColors.
- * @param format @c printf()-style format string.
- * @param ... Arguments for the @c format string.
+ * @param msg_color A color to be used for the text. It must be an element of #MsgColors.
+ * @param format @c printf()-style format string.
+ * @param ... Arguments for the @c format string.
+ *
+ * @since 0.15
**/
GEANY_API_SYMBOL
void msgwin_compiler_add(gint msg_color, const gchar *format, ...)
@@ -335,12 +339,12 @@ void msgwin_compiler_add(gint msg_color, const gchar *format, ...)
}
/**
- * Adds a new message in the compiler tab treeview in the messages window.
+ * Adds a new message in the compiler tab treeview in the messages window.
*
- * @param msg_color A color to be used for the text. It must be an element of #MsgColors.
- * @param msg Compiler message to be added.
+ * @param msg_color A color to be used for the text. It must be an element of #MsgColors.
+ * @param msg Compiler message to be added.
*
- * @since @todo
+ * @since @todo
**/
GEANY_API_SYMBOL
void msgwin_compiler_add_string(gint msg_color, const gchar *msg)
@@ -391,15 +395,16 @@ void msgwin_show_hide(gboolean show)
/**
- * Adds a new message in the messages tab treeview in the messages window.
- * If @a line and @a doc are set, clicking on this line jumps into the file which is specified
- * by @a doc into the line specified with @a line.
+ * Adds a new message in the messages tab treeview in the messages window.
*
- * @param msg_color A color to be used for the text. It must be an element of #MsgColors.
- * @param line The document's line where the message belongs to. Set to @c -1 to ignore.
- * @param doc The document. Set to @c NULL to ignore.
- * @param format @c printf()-style format string.
- * @param ... Arguments for the @c format string.
+ * If @a line and @a doc are set, clicking on this line jumps into the file
+ * which is specified by @a doc into the line specified with @a line.
+ *
+ * @param msg_color A color to be used for the text. It must be an element of #MsgColors.
+ * @param line The document's line where the message belongs to. Set to @c -1 to ignore.
+ * @param doc @nullable The document. Set to @c NULL to ignore.
+ * @param format @c printf()-style format string.
+ * @param ... Arguments for the @c format string.
*
* @since 0.15
**/
@@ -419,16 +424,17 @@ void msgwin_msg_add(gint msg_color, gint line, GeanyDocument *doc, const gchar *
/**
- * Adds a new message in the messages tab treeview in the messages window.
- * If @a line and @a doc are set, clicking on this line jumps into the
- * file which is specified by @a doc into the line specified with @a line.
+ * Adds a new message in the messages tab treeview in the messages window.
+ *
+ * If @a line and @a doc are set, clicking on this line jumps into the
+ * file which is specified by @a doc into the line specified with @a line.
*
- * @param msg_color A color to be used for the text. It must be an element of #MsgColors.
- * @param line The document's line where the message belongs to. Set to @c -1 to ignore.
- * @param doc The document. Set to @c NULL to ignore.
- * @param string Message to be added.
+ * @param msg_color A color to be used for the text. It must be an element of #MsgColors.
+ * @param line The document's line where the message belongs to. Set to @c -1 to ignore.
+ * @param doc @nullable The document. Set to @c NULL to ignore.
+ * @param string Message to be added.
*
- * @since @todo
+ * @since @todo
**/
GEANY_API_SYMBOL
void msgwin_msg_add_string(gint msg_color, gint line, GeanyDocument *doc, const gchar *string)
@@ -468,12 +474,13 @@ void msgwin_msg_add_string(gint msg_color, gint line, GeanyDocument *doc, const
/**
- * Logs a status message *without* setting the status bar.
- * (Use ui_set_statusbar() to display text on the statusbar)
+ * Logs a status message *without* setting the status bar.
+ *
+ * Use @ref ui_set_statusbar() to display text on the statusbar.
*
- * @param string Status message to be logged.
+ * @param string Status message to be logged.
*
- * @since @todo
+ * @since @todo
**/
GEANY_API_SYMBOL
void msgwin_status_add_string(const gchar *string)
@@ -503,11 +510,12 @@ void msgwin_status_add_string(const gchar *string)
}
/**
- * Logs a status message *without* setting the status bar.
- * (Use ui_set_statusbar() to display text on the statusbar)
+ * Logs a status message *without* setting the status bar.
*
- * @param format @c printf()-style format string.
- * @param ... Arguments for the @c format string.
+ * Use @ref ui_set_statusbar() to display text on the statusbar.
+ *
+ * @param format @c printf()-style format string.
+ * @param ... Arguments for the @c format string.
**/
GEANY_API_SYMBOL
void msgwin_status_add(const gchar *format, ...)
@@ -1272,12 +1280,13 @@ static gboolean on_msgwin_button_press_event(GtkWidget *widget, GdkEventButton *
/**
- * Switches to the given notebook tab of the messages window and shows the messages window
- * if it was previously hidden and @a show is set to @c TRUE.
+ * Switches to the given notebook tab of the messages window.
+ *
+ * The messages window is shown if it was previously hidden and @a show is set to @c TRUE.
*
- * @param tabnum An index of a tab in the messages window. Valid values are all elements of
- * #MessageWindowTabNum.
- * @param show Whether to show the messages window at all if it was hidden before.
+ * @param tabnum An index of a tab in the messages window. Valid values are
+ * all elements of #MessageWindowTabNum.
+ * @param show Whether to show the messages window at all if it was hidden before.
*
* @since 0.15
**/
@@ -1309,9 +1318,9 @@ void msgwin_switch_tab(gint tabnum, gboolean show)
/**
- * Removes all messages from a tab specified by @a tabnum in the messages window.
+ * Removes all messages from a tab specified by @a tabnum in the messages window.
*
- * @param tabnum An index of a tab in the messages window which should be cleared.
+ * @param tabnum An index of a tab in the messages window which should be cleared.
* Valid values are @c MSG_STATUS, @c MSG_COMPILER and @c MSG_MESSAGE.
*
* @since 0.15
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Thomas Martitz <kugel(a)rockbox.org>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Thu, 05 Apr 2018 19:44:43 UTC
Commit: d3417b7b37d289fc2a7d985f54c5b8a5385f295e
https://github.com/geany/geany/commit/d3417b7b37d289fc2a7d985f54c5b8a5385f2…
Log Message:
-----------
api: add non-variadic variants of msgwin_*_add to the API
The variadic variants cannot be gobject-introspected, i.e. are not available
in Peasy.
In fact, msgwin_compiler_add_string() and msgwin_msg_add_string() already
existed and have just been exported. msgwin_status_add_string() is new but
msgwin_status_add() becaume a wrapper around it in the same fashion as the
other two pairs.
Modified Paths:
--------------
src/msgwindow.c
src/msgwindow.h
Modified: src/msgwindow.c
59 lines changed, 47 insertions(+), 12 deletions(-)
===================================================================
@@ -334,7 +334,15 @@ void msgwin_compiler_add(gint msg_color, const gchar *format, ...)
g_free(string);
}
-
+/**
+ * Adds a new message in the compiler tab treeview in the messages window.
+ *
+ * @param msg_color A color to be used for the text. It must be an element of #MsgColors.
+ * @param msg Compiler message to be added.
+ *
+ * @since @todo
+ **/
+GEANY_API_SYMBOL
void msgwin_compiler_add_string(gint msg_color, const gchar *msg)
{
GtkTreeIter iter;
@@ -410,7 +418,19 @@ void msgwin_msg_add(gint msg_color, gint line, GeanyDocument *doc, const gchar *
}
-/* adds string to the msg treeview */
+/**
+ * Adds a new message in the messages tab treeview in the messages window.
+ * If @a line and @a doc are set, clicking on this line jumps into the
+ * file which is specified by @a doc into the line specified with @a line.
+ *
+ * @param msg_color A color to be used for the text. It must be an element of #MsgColors.
+ * @param line The document's line where the message belongs to. Set to @c -1 to ignore.
+ * @param doc The document. Set to @c NULL to ignore.
+ * @param string Message to be added.
+ *
+ * @since @todo
+ **/
+GEANY_API_SYMBOL
void msgwin_msg_add_string(gint msg_color, gint line, GeanyDocument *doc, const gchar *string)
{
GtkTreeIter iter;
@@ -451,26 +471,20 @@ void msgwin_msg_add_string(gint msg_color, gint line, GeanyDocument *doc, const
* Logs a status message *without* setting the status bar.
* (Use ui_set_statusbar() to display text on the statusbar)
*
- * @param format @c printf()-style format string.
- * @param ... Arguments for the @c format string.
+ * @param string Status message to be logged.
+ *
+ * @since @todo
**/
GEANY_API_SYMBOL
-void msgwin_status_add(const gchar *format, ...)
+void msgwin_status_add_string(const gchar *string)
{
GtkTreeIter iter;
- gchar *string;
gchar *statusmsg, *time_str;
- va_list args;
-
- va_start(args, format);
- string = g_strdup_vprintf(format, args);
- va_end(args);
/* add a timestamp to status messages */
time_str = utils_get_current_time_string();
statusmsg = g_strconcat(time_str, ": ", string, NULL);
g_free(time_str);
- g_free(string);
/* add message to Status window */
gtk_list_store_append(msgwindow.store_status, &iter);
@@ -488,6 +502,27 @@ void msgwin_status_add(const gchar *format, ...)
}
}
+/**
+ * Logs a status message *without* setting the status bar.
+ * (Use ui_set_statusbar() to display text on the statusbar)
+ *
+ * @param format @c printf()-style format string.
+ * @param ... Arguments for the @c format string.
+ **/
+GEANY_API_SYMBOL
+void msgwin_status_add(const gchar *format, ...)
+{
+ gchar *string;
+ va_list args;
+
+ va_start(args, format);
+ string = g_strdup_vprintf(format, args);
+ va_end(args);
+
+ msgwin_status_add_string(string);
+ g_free(string);
+}
+
static void
on_message_treeview_clear_activate(GtkMenuItem *menuitem, gpointer user_data)
Modified: src/msgwindow.h
7 lines changed, 3 insertions(+), 4 deletions(-)
===================================================================
@@ -53,11 +53,14 @@ typedef enum
void msgwin_status_add(const gchar *format, ...) G_GNUC_PRINTF (1, 2);
+void msgwin_status_add_string(const gchar *msg);
void msgwin_compiler_add(gint msg_color, const gchar *format, ...) G_GNUC_PRINTF (2, 3);
+void msgwin_compiler_add_string(gint msg_color, const gchar *msg);
void msgwin_msg_add(gint msg_color, gint line, GeanyDocument *doc, const gchar *format, ...)
G_GNUC_PRINTF (4, 5);
+void msgwin_msg_add_string(gint msg_color, gint line, GeanyDocument *doc, const char *msg);
void msgwin_clear_tab(gint tabnum);
@@ -93,10 +96,6 @@ void msgwin_finalize(void);
void msgwin_show_hide(gboolean show);
-void msgwin_msg_add_string(gint msg_color, gint line, GeanyDocument *doc, const gchar *string);
-
-void msgwin_compiler_add_string(gint msg_color, const gchar *msg);
-
void msgwin_show_hide_tabs(void);
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Thomas Martitz <kugel(a)rockbox.org>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Thu, 05 Apr 2018 19:44:43 UTC
Commit: 78644a8260ae6ee1e8828ad4330275d4685c7a1c
https://github.com/geany/geany/commit/78644a8260ae6ee1e8828ad4330275d4685c7…
Log Message:
-----------
msgwin: improve doxygen comments
Make the brief text be distinct between msgwin_*_add and msgwin_*_add_string().
Also add @see directives where appropriate. Lastly, add @since to
msgwin_status_add() for completeness.
Modified Paths:
--------------
src/msgwindow.c
Modified: src/msgwindow.c
26 lines changed, 20 insertions(+), 6 deletions(-)
===================================================================
@@ -317,13 +317,15 @@ static const GdkColor *get_color(gint msg_color)
/**
- * Adds a new message in the compiler tab treeview in the messages window.
+ * Adds a formatted message in the compiler tab treeview in the messages window.
*
* @param msg_color A color to be used for the text. It must be an element of #MsgColors.
* @param format @c printf()-style format string.
* @param ... Arguments for the @c format string.
*
- * @since 0.15
+ * @see msgwin_compiler_add_string()
+ *
+ * @since 0.16
**/
GEANY_API_SYMBOL
void msgwin_compiler_add(gint msg_color, const gchar *format, ...)
@@ -344,6 +346,8 @@ void msgwin_compiler_add(gint msg_color, const gchar *format, ...)
* @param msg_color A color to be used for the text. It must be an element of #MsgColors.
* @param msg Compiler message to be added.
*
+ * @see msgwin_compiler_add()
+ *
* @since @todo
**/
GEANY_API_SYMBOL
@@ -395,7 +399,7 @@ void msgwin_show_hide(gboolean show)
/**
- * Adds a new message in the messages tab treeview in the messages window.
+ * Adds a formatted message in the messages tab treeview in the messages window.
*
* If @a line and @a doc are set, clicking on this line jumps into the file
* which is specified by @a doc into the line specified with @a line.
@@ -406,7 +410,9 @@ void msgwin_show_hide(gboolean show)
* @param format @c printf()-style format string.
* @param ... Arguments for the @c format string.
*
- * @since 0.15
+ * @see msgwin_msg_add_string()
+ *
+ * @since 0.16
**/
GEANY_API_SYMBOL
void msgwin_msg_add(gint msg_color, gint line, GeanyDocument *doc, const gchar *format, ...)
@@ -434,6 +440,8 @@ void msgwin_msg_add(gint msg_color, gint line, GeanyDocument *doc, const gchar *
* @param doc @nullable The document. Set to @c NULL to ignore.
* @param string Message to be added.
*
+ * @see msgwin_msg_add()
+ *
* @since @todo
**/
GEANY_API_SYMBOL
@@ -474,12 +482,14 @@ void msgwin_msg_add_string(gint msg_color, gint line, GeanyDocument *doc, const
/**
- * Logs a status message *without* setting the status bar.
+ * Logs a new status message *without* setting the status bar.
*
* Use @ref ui_set_statusbar() to display text on the statusbar.
*
* @param string Status message to be logged.
*
+ * @see msgwin_status_add()
+ *
* @since @todo
**/
GEANY_API_SYMBOL
@@ -510,12 +520,16 @@ void msgwin_status_add_string(const gchar *string)
}
/**
- * Logs a status message *without* setting the status bar.
+ * Logs a formatted status message *without* setting the status bar.
*
* Use @ref ui_set_statusbar() to display text on the statusbar.
*
* @param format @c printf()-style format string.
* @param ... Arguments for the @c format string.
+ *
+ * @see msgwin_status_add_string()
+ *
+ * @since 0.12
**/
GEANY_API_SYMBOL
void msgwin_status_add(const gchar *format, ...)
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Colomban Wendling <ban(a)herbesfolles.org>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Sat, 10 Mar 2018 22:23:29 UTC
Commit: 99150b0ccac9a0f43b9ca342a5aca31c3bdc1768
https://github.com/geany/geany/commit/99150b0ccac9a0f43b9ca342a5aca31c3bdc1…
Log Message:
-----------
Check plugin actually has a help function before invoking it
This should not be needed in normal operation, but is safer if the UI
gets out of sync for some reason.
Modified Paths:
--------------
src/plugins.c
Modified: src/plugins.c
3 lines changed, 3 insertions(+), 0 deletions(-)
===================================================================
@@ -1865,7 +1865,10 @@ static void pm_on_plugin_button_clicked(G_GNUC_UNUSED GtkButton *button, gpointe
if (GPOINTER_TO_INT(user_data) == PM_BUTTON_CONFIGURE)
plugin_show_configure(&p->public);
else if (GPOINTER_TO_INT(user_data) == PM_BUTTON_HELP)
+ {
+ g_return_if_fail(p->cbs.help != NULL);
p->cbs.help(&p->public, p->cb_data);
+ }
else if (GPOINTER_TO_INT(user_data) == PM_BUTTON_KEYBINDINGS && p->key_group && p->key_group->plugin_key_count > 0)
keybindings_dialog_show_prefs_scroll(p->info.name);
}
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Colomban Wendling <ban(a)herbesfolles.org>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Sat, 10 Mar 2018 22:37:31 UTC
Commit: 373852c737a4181dd576c02ffe085a915b79a953
https://github.com/geany/geany/commit/373852c737a4181dd576c02ffe085a915b79a…
Log Message:
-----------
Fix plugin manager UI synchronization on double click
When toggling a plugin, we temporarily set the tree store's row entry
for the plugin pointer to NULL as we destroy and reload the selected
plugin, and its pointer would be invalid in the meantime. This results
in the filter we use to display search results to temporarily hide the
row, changing the actual number of rows and thus, depending on timing,
this will or will not change the selected row (it will when double
clicking, not when single-clicking), in a seemingly more or less random
fashion as we use a sorted model.
Finally, as we manually update the buttons visibility for the toggled
plugin (as we otherwise do only for changing selection, which should
not happen in this case -- well, most of the time as you can see), this
can lead to the buttons to be updated for a now unselected row, getting
those out of sync.
The fix here is not to actually hide rows with a NULL plugin, because
it can only happen in 2 cases, where we actually want to see it:
1. while toggling a plugin, as explained above, in which case it had to
match the search already.
2. when there is no plugins and we want to display a "No plugins
available" message, and the search should not affect this.
This incidentally also fix the "No plugins available" so it's actually
visible, instead of always hidden.
Fixes #1781.
Modified Paths:
--------------
src/plugins.c
Modified: src/plugins.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1767,7 +1767,7 @@ static gboolean pm_tree_filter_func(GtkTreeModel *model, GtkTreeIter *iter, gpoi
gtk_tree_model_get(model, iter, PLUGIN_COLUMN_PLUGIN, &plugin, -1);
if (!plugin)
- return FALSE;
+ return TRUE;
key = gtk_entry_get_text(GTK_ENTRY(pm_widgets.filter_entry));
filename = g_path_get_basename(plugin->filename);
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).