summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDon Scorgie <dscorgie@src.gnome.org>2006-08-05 18:04:26 +0000
committerDon Scorgie <dscorgie@src.gnome.org>2006-08-05 18:04:26 +0000
commit69f5aa00e2eda97a5ffa8f3e82b37406bedcf54c (patch)
treeb84a7168e0a54edc7c2a4b701dc31181413fe6c2
parent832498af0e6fa8fd1093d9420a93ec6190aaa563 (diff)
downloadyelp-69f5aa00e2eda97a5ffa8f3e82b37406bedcf54c.tar.gz
Initialise dbus threading before gnome-vfs. Bug #350079
* src/yelp-main.c: Initialise dbus threading before gnome-vfs. Bug #350079
-rw-r--r--ChangeLog5
-rw-r--r--src/yelp-main.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index fa597503..f1bd680c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-05 Don Scorgie <dscorgie@cvs.gnome.org>
+
+ * src/yelp-main.c:
+ Initialise dbus threading before gnome-vfs. Bug #350079
+
2006-07-25 Shaun McCance <shaunm@gnome.org>
* data/toc.xml.in:
diff --git a/src/yelp-main.c b/src/yelp-main.c
index c9ae09dc..c3cfcce8 100644
--- a/src/yelp-main.c
+++ b/src/yelp-main.c
@@ -362,6 +362,8 @@ main (int argc, char **argv)
GNOME_PROGRAM_STANDARD_PROPERTIES,
GNOME_PARAM_GOPTION_CONTEXT, context,
GNOME_PARAM_NONE);
+ dbus_g_thread_init();
+
if (!startup_id) {
Time tmp;
tmp = slowly_and_stupidly_obtain_timestamp (gdk_display);