diff options
author | David Bremner <bremner@debian.org> | 2011-12-06 19:39:33 -0400 |
---|---|---|
committer | David Bremner <bremner@debian.org> | 2011-12-06 19:39:33 -0400 |
commit | f0e0053149bb3b51f4a0cd43371292b639f236a8 (patch) | |
tree | f79945f6c0970190ed80b0d31df8b95bacab38b1 /lib | |
parent | c4d824bc1ee4e49c86315cd3e7f0a4756aff3811 (diff) | |
parent | 07bb8b9e895541006eca88430925f1c6524c4708 (diff) |
Merge branch 'release'
Conflicts:
NEWS
Conflicts resolved by inserting the 0.10.2 stanza before 0.11
Diffstat (limited to 'lib')
-rw-r--r-- | lib/database.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/database.cc b/lib/database.cc index e4ef14e0..98f101e6 100644 --- a/lib/database.cc +++ b/lib/database.cc @@ -26,6 +26,7 @@ #include <signal.h> #include <glib.h> /* g_free, GPtrArray, GHashTable */ +#include <glib-object.h> /* g_type_init */ using namespace std; @@ -600,6 +601,9 @@ notmuch_database_open (const char *path, goto DONE; } + /* Initialize the GLib type system and threads */ + g_type_init (); + notmuch = talloc (NULL, notmuch_database_t); notmuch->exception_reported = FALSE; notmuch->path = talloc_strdup (notmuch, path); |