From 1b66b99cbb621bd97d917ef7830697b93fa36ae5 Mon Sep 17 00:00:00 2001 From: Cyrille Bagard Date: Tue, 3 Jun 2014 05:58:17 +0000 Subject: Disabled all accesses to GTK3 from Python. git-svn-id: svn://svn.gna.org/svn/chrysalide/trunk@376 abbe820e-26c8-41b2-8c08-b7b2b41f8b0a --- ChangeLog | 11 +++++++++++ plugins/pychrysa/pychrysa.c | 5 ++++- src/glibext/gbuffersegment.c | 2 +- src/main.c | 4 ++-- 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 518c671..c55cad9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +14-06-03 Cyrille Bagard + + * plugins/pychrysa/pychrysa.c: + Disable all accesses to GTK3 from Python (to be restored). + + * src/glibext/gbuffersegment.c: + Print segments faster. + + * src/main.c: + Enable the loading of plugins. + 14-06-02 Cyrille Bagard * src/gtkext/gtkbufferview.c: diff --git a/plugins/pychrysa/pychrysa.c b/plugins/pychrysa/pychrysa.c index 8f4db00..f2dbf0f 100644 --- a/plugins/pychrysa/pychrysa.c +++ b/plugins/pychrysa/pychrysa.c @@ -158,6 +158,9 @@ bool init_plugin(GPluginModule *plugin, GObject *ref) if (entry.d_name[0] == '.') continue; //if (strcmp(entry.d_name, "test") != 0) continue; + printf("NAME :: '%s'\n", entry.d_name); + if (strcmp(entry.d_name, "apkfiles") != 0) continue; + filename = strdup(entry.d_name); filename = stradd(filename, "."); filename = stradd(filename, "__init__"); @@ -282,7 +285,7 @@ PyMODINIT_FUNC initpychrysa(void) PyObject *module; init_pygobject(); - init_pygtk(); + //init_pygtk(); pychrysalide_init_quirks(); diff --git a/src/glibext/gbuffersegment.c b/src/glibext/gbuffersegment.c index eb7bd31..a289cd0 100644 --- a/src/glibext/gbuffersegment.c +++ b/src/glibext/gbuffersegment.c @@ -463,7 +463,7 @@ void g_buffer_segment_draw(GBufferSegment *segment, cairo_t *cairo, gint *x, gin /* Fond du texte */ - if (segment->style != SRS_CLASSIC || 1) + if (segment->style != SRS_CLASSIC) { cairo_set_source_rgb(cairo, segment->cache_bg.red / 65535.0, diff --git a/src/main.c b/src/main.c index 618bef3..b9764ca 100644 --- a/src/main.c +++ b/src/main.c @@ -169,7 +169,7 @@ int main(int argc, char **argv) init_work_queue(G_OBJECT(editor)); - //init_all_plugins(G_OBJECT(editor)); + init_all_plugins(G_OBJECT(editor)); server = g_db_server_new("localhost", 1337); g_db_server_start(server); @@ -189,7 +189,7 @@ int main(int argc, char **argv) g_db_server_stop(server); - //exit_all_plugins(); + exit_all_plugins(); exit_binary_portion_colors(); -- cgit v0.11.2-87-g4458