Branch: refs/heads/master
Author: Enrico Tröger <enrico.troeger(a)uvena.de>
Committer: Enrico Tröger <enrico.troeger(a)uvena.de>
Date: Mon, 04 Mar 2013 21:58:18 UTC
Commit: e260eefe6850c5ee237feca95906bb8cdf8d6eee
https://github.com/geany/geany-plugins/commit/e260eefe6850c5ee237feca95906b…
Log Message:
-----------
Use slashes as directory separator also on Windows
Backslashes would be more correct but lead to problems as interpreted as
escape sequences in the generated config.h and would require even more
hacking to get them properly quoted.
Fortunately, Windows accepts slashes as well.
Modified Paths:
--------------
wscript
Modified: wscript
6 files changed, 3 insertions(+), 3 deletions(-)
===================================================================
@@ -174,9 +174,9 @@ def setup_configuration_env(conf):
add_to_env_and_define(conf, 'GEANYPLUGINS_DATADIR', conf.env['DATADIR'], quote=True)
conf.env['GEANYPLUGINS_DATADIR'] = conf.env['DATADIR']
# common
- pkgdatadir = os.path.join(conf.env['GEANYPLUGINS_DATADIR'], 'geany-plugins')
- pkglibdir = os.path.join(conf.env['LIBDIR'], 'geany-plugins')
- pkgincludedir = os.path.join(conf.env['G_PREFIX'], 'include')
+ pkgdatadir = '%s/%s' % (conf.env['GEANYPLUGINS_DATADIR'], 'geany-plugins')
+ pkglibdir = '%s/%s' % (conf.env['LIBDIR'], 'geany-plugins')
+ pkgincludedir = '%s/%s' % (conf.env['G_PREFIX'], 'include')
add_to_env_and_define(conf, 'INCLUDEDIR', pkgincludedir, quote=True)
add_to_env_and_define(conf, 'DATAROOTDIR', conf.env['GEANYPLUGINS_DATADIR'], quote=True)
add_to_env_and_define(conf, 'PKGDATADIR', pkgdatadir, quote=True)
--------------
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, 04 Mar 2013 20:56:35 UTC
Commit: b38142adbe214ad598e669e797473904d389e1dd
https://github.com/geany/geany-plugins/commit/b38142adbe214ad598e669e797473…
Log Message:
-----------
TreeBrowser: Fix gtk_tree_store_iter_clear_nodes()
The removing a node, no need to manually delete its children. Also,
the code used to try removing the child nodes with children twice,
leading to runtime assertions failures.
Modified Paths:
--------------
treebrowser/src/treebrowser.c
Modified: treebrowser/src/treebrowser.c
7 files changed, 3 insertions(+), 4 deletions(-)
===================================================================
@@ -791,11 +791,10 @@ enum
{
GtkTreeIter i;
- while (gtk_tree_model_iter_children(GTK_TREE_MODEL(treestore), &i, iter))
+ if (gtk_tree_model_iter_children(GTK_TREE_MODEL(treestore), &i, iter))
{
- if (gtk_tree_model_iter_has_child(GTK_TREE_MODEL(treestore), &i))
- gtk_tree_store_iter_clear_nodes(&i, TRUE);
- gtk_tree_store_remove(GTK_TREE_STORE(treestore), &i);
+ while (gtk_tree_store_remove(GTK_TREE_STORE(treestore), &i))
+ /* do nothing */;
}
if (delete_root)
gtk_tree_store_remove(GTK_TREE_STORE(treestore), iter);
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).