Branch: refs/heads/master
Author: Atanas Beloborodov <arrtedone(a)gmail.com>
Committer: Matthew Brush <matt(a)geany.org>
Date: Fri, 26 Apr 2013 00:30:09 UTC
Commit: a3da0467d4808ec729667b866f13eda2e480d43e
https://github.com/geany/geany/commit/a3da0467d4808ec729667b866f13eda2e480d…
Log Message:
-----------
Add version check around deprecated g_thread_init() call.
g_thread_init has been deprecated since GLib version 2.32
Modified Paths:
--------------
src/main.c
Modified: src/main.c
8 files changed, 6 insertions(+), 2 deletions(-)
===================================================================
@@ -1050,12 +1050,16 @@ gint main(gint argc, gchar **argv)
#endif
parse_command_line_options(&argc, &argv);
+#if ! GLIB_CHECK_VERSION(2, 32, 0)
/* Initialize GLib's thread system in case any plugins want to use it or their
- * dependencies (e.g. WebKit, Soup, ...) */
+ * dependencies (e.g. WebKit, Soup, ...). Deprecated since GLIB 2.32. */
if (!g_thread_supported())
g_thread_init(NULL);
- /* removed as signal handling was wrong, see signal_cb()
+#endif
+
+ /* removed as signal handling was wrong, see signal_cb()
signal(SIGTERM, signal_cb); */
+
#ifdef G_OS_UNIX
/* ignore SIGPIPE signal for preventing sudden death of program */
signal(SIGPIPE, SIG_IGN);
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Enrico Troeger <enrico.troeger(a)uvena.de>
Committer: Enrico Troeger <enrico.troeger(a)uvena.de>
Date: Wed, 24 Apr 2013 20:05:56 UTC
Commit: 9edd4f4a907a213347003c525629c4476df733c2
https://github.com/geany/geany/commit/9edd4f4a907a213347003c525629c4476df73…
Log Message:
-----------
For now disable detecion of MSVC on Windows
Modified Paths:
--------------
wscript
Modified: wscript
5 files changed, 5 insertions(+), 0 deletions(-)
===================================================================
@@ -46,6 +46,7 @@ from waflib import Logs, Options, Scripting, Utils
from waflib.Configure import ConfigurationContext
from waflib.Errors import WafError
from waflib.TaskGen import feature, before_method
+from waflib.Tools.compiler_c import c_compiler
APPNAME = 'geany'
@@ -302,6 +303,10 @@ def configure(conf):
def options(opt):
+ # Disable MSVC detetion on win32: building Geany with MSVC is currently not supported
+ # If anyone wants to add support for building with MSVC, this hack should be removed.
+ c_compiler['win32'] = ['gcc']
+
opt.load('compiler_cc')
opt.load('compiler_cxx')
opt.load('intltool')
--------------
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: Mon, 22 Apr 2013 18:20:53 UTC
Commit: 5868c6991c74ce75991c73748b85fa83774141bc
https://github.com/geany/geany/commit/5868c6991c74ce75991c73748b85fa8377414…
Log Message:
-----------
Fix leaks upon symbol list updating
Modified Paths:
--------------
src/symbols.c
Modified: src/symbols.c
17 files changed, 16 insertions(+), 1 deletions(-)
===================================================================
@@ -1384,6 +1384,21 @@ static void tags_table_remove(GHashTable *table, TMTag *tag)
}
+static void tags_table_destroy(GHashTable *table)
+{
+ /* free any leftover elements. note that we can't register a value_free_func when
+ * creating the hash table because we only want to free it when destroying the table,
+ * not when inserting a duplicate (we handle this manually) */
+ GHashTableIter iter;
+ gpointer value;
+
+ g_hash_table_iter_init(&iter, table);
+ while (g_hash_table_iter_next(&iter, NULL, &value))
+ g_list_free(value);
+ g_hash_table_destroy(table);
+}
+
+
/*
* Updates the tag tree for a document with the tags in *list.
* @param doc a document
@@ -1562,7 +1577,7 @@ static void update_tree_tags(GeanyDocument *doc, GList **tags)
}
g_hash_table_destroy(parents_table);
- g_hash_table_destroy(tags_table);
+ tags_table_destroy(tags_table);
}
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Eugene Arshinov <earshinov(a)gmail.com>
Committer: elextr <elextr(a)gmail.com>
Date: Sun, 21 Apr 2013 01:45:09 UTC
Commit: 390646a412120375c63db41773950b0f32b68390
https://github.com/geany/geany/commit/390646a412120375c63db41773950b0f32b68…
Log Message:
-----------
rewrite_reflow: Extract `split_line` function
Extract `split_line` function from `reflow_lines` to reimplement it in
the future without using SCI_SPLITLINES to achieve the
behaviour consistent with the "Line breaking" option.
Modified Paths:
--------------
src/keybindings.c
Modified: src/keybindings.c
21 files changed, 15 insertions(+), 6 deletions(-)
===================================================================
@@ -2099,6 +2099,20 @@ static gint get_reflow_column(GeanyEditor *editor)
}
+/* Split the line where the cursor is positioned, on `column`,
+ possibly many times if the line is long.
+ Return the number of lines added because of the splitting. */
+static gint split_line(GeanyEditor *editor, gint column)
+{
+ gint linescount = sci_get_line_count(editor->sci);
+ sci_set_anchor(editor->sci, -1);
+ sci_target_from_selection(editor->sci);
+ sci_lines_split(editor->sci, column * sci_text_width(editor->sci, STYLE_DEFAULT, " "));
+ /* use lines count to determine how many lines appeared after splitting */
+ return sci_get_line_count(editor->sci) - linescount;
+}
+
+
static void reflow_lines(GeanyEditor *editor, gint column)
{
gint start, indent, linescount, i;
@@ -2133,12 +2147,7 @@ static void reflow_lines(GeanyEditor *editor, gint column)
indent = sci_get_line_indentation(editor->sci, start);
sci_set_line_indentation(editor->sci, start, 0);
- sci_target_from_selection(editor->sci);
- linescount = sci_get_line_count(editor->sci);
- sci_lines_split(editor->sci,
- (column - indent) * sci_text_width(editor->sci, STYLE_DEFAULT, " "));
- /* use lines count to determine how many lines appeared after splitting */
- linescount = sci_get_line_count(editor->sci) - linescount;
+ linescount = split_line(editor, column - indent);
/* Fix indentation. */
for (i = start; i <= start + linescount; i++)
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).