Branch: refs/heads/master
Author: Colomban Wendling <ban(a)herbesfolles.org>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Mon, 28 Nov 2016 11:01:14 UTC
Commit: 405f772b39f26ed5305d567700edd484dbfcfabb
https://github.com/geany/geany/commit/405f772b39f26ed5305d567700edd484dbfcf…
Log Message:
-----------
Fix loading the default open encoding option
This got broken by 907a79263d907fa354d3b4c6570f33047801dd84 back in
2011 as encoding names started to be compared more permissively,
leading to "none" matching the "None" encoding.
This shouldn't be too much of a problem as trying the None encoding
first should not cause any issue, but fix loading of the option anyway.
This however won't restore settings from existing configuration files
that used the previous code, as there is no way to tell whether the
user selected the None encoding voluntarily or not.
Modified Paths:
--------------
src/keyfile.c
Modified: src/keyfile.c
4 lines changed, 3 insertions(+), 1 deletions(-)
===================================================================
@@ -826,7 +826,9 @@ static void load_dialog_prefs(GKeyFile *config)
"none");
if (tmp_string)
{
- const GeanyEncoding *enc = encodings_get_from_charset(tmp_string);
+ const GeanyEncoding *enc = NULL;
+ if (strcmp(tmp_string, "none") != 0)
+ enc = encodings_get_from_charset(tmp_string);
if (enc != NULL)
file_prefs.default_open_encoding = enc->idx;
else
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Enrico Tröger <enrico.troeger(a)uvena.de>
Committer: Enrico Tröger <enrico.troeger(a)uvena.de>
Date: Tue, 19 Mar 2019 10:05:16 UTC
Commit: 70ebfbd52988c8af5e57d5a59791c88db3dec048
https://github.com/geany/geany/commit/70ebfbd52988c8af5e57d5a59791c88db3dec…
Log Message:
-----------
Fix regex to resolve confusion on the removed double space
Also fix a typo in the variable name for the output.
Modified Paths:
--------------
scripts/update-year-in-po.sh
Modified: scripts/update-year-in-po.sh
6 lines changed, 3 insertions(+), 3 deletions(-)
===================================================================
@@ -5,13 +5,13 @@ set -e
# match the files'. Unlikely, but doesn't hurt.
export LANG=C
-year=$(grep -Po '(?<="Copyright \(c\) 2005-)20[0-9][0-9](?=\\n)' src/about.c)
-echo "new years are: $years"
+year=$(grep -Po '(?<="Copyright \(c\) 2005-)20[0-9][0-9](?=\\n)' src/about.c)
+echo "new years are: $year"
for f in po/*.po; do
echo "processing $f..."
sed -f /dev/stdin -i "$f" <<EOF
-/^"Copyright (c) 2005-20[0-9][0-9]\\\\n"\$/{
+/^"Copyright (c) 2005-20[0-9][0-9]\\\\n"\$/{
s/\\(2005-\\)20[0-9][0-9]/\\1$year/
n
:loop
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Enrico Tröger <enrico.troeger(a)uvena.de>
Committer: Enrico Tröger <enrico.troeger(a)uvena.de>
Date: Sun, 07 Apr 2019 09:33:05 UTC
Commit: d951db1e8a9f4ad154055a2534c1e965df6a44b7
https://github.com/geany/geany/commit/d951db1e8a9f4ad154055a2534c1e965df6a4…
Log Message:
-----------
On Windows, raise the main window only when needed for IPC calls
We need to explicitly raise the main window on IPC commands
only when opening files and similar.
For query commands like "doclist" the focus should stay on the
remote instance.
Modified Paths:
--------------
src/socket.c
Modified: src/socket.c
13 lines changed, 7 insertions(+), 6 deletions(-)
===================================================================
@@ -326,15 +326,16 @@ gint socket_init(gint argc, gchar **argv)
/* remote command mode, here we have another running instance and want to use it */
-#ifdef G_OS_WIN32
- /* first we send a request to retrieve the window handle and focus the window */
- socket_fd_write_all(sock, "window\n", 7);
- if (socket_fd_read(sock, (gchar *)&hwnd, sizeof(hwnd)) == sizeof(hwnd))
- SetForegroundWindow(hwnd);
-#endif
/* now we send the command line args */
if (argc > 1)
{
+#ifdef G_OS_WIN32
+ /* first we send a request to retrieve the window handle and focus the window */
+ socket_fd_write_all(sock, "window\n", 7);
+ if (socket_fd_read(sock, (gchar *)&hwnd, sizeof(hwnd)) == sizeof(hwnd))
+ SetForegroundWindow(hwnd);
+#endif
+
send_open_command(sock, argc, argv);
}
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).