diff options
| author | Brent Smith <bmsmith@src.gnome.org> | 2006-07-23 21:52:42 +0000 |
|---|---|---|
| committer | Brent Smith <bmsmith@src.gnome.org> | 2006-07-23 21:52:42 +0000 |
| commit | 1b6d271535343ae5c969c2a210e200f670ca9164 (patch) | |
| tree | 5085a3b4d1a484ef6ef4bce13f7a9b3cdf04306f | |
| parent | b8079abd8ce2302a1851fd24bac81c62b82f1be8 (diff) | |
| download | yelp-1b6d271535343ae5c969c2a210e200f670ca9164.tar.gz | |
Depend on beagle 0.2.4 since that is the first version with the
* configure.in: Depend on beagle 0.2.4 since that is the first version
with the beagle_util_daemon_is_running() function.
* src/yelp-search-pager.c: (search_pager_class_init):
Use beagle_util_daemon_is_running() to make sure that the daemon is
actually running, and the socket at ~/.beagle/socket is not stale.
Fixes #348362
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | src/yelp-search-pager.c | 8 |
3 files changed, 19 insertions, 4 deletions
@@ -1,3 +1,12 @@ +2006-07-23 Brent Smith <gnome@nextreality.net> + + * configure.in: Depend on beagle 0.2.4 since that is the first version + with the beagle_util_daemon_is_running() function. + * src/yelp-search-pager.c: (search_pager_class_init): + Use beagle_util_daemon_is_running() to make sure that the daemon is + actually running, and the socket at ~/.beagle/socket is not stale. + Fixes #348362 + 2006-07-23 Don Scorgie <dscorgie@cvs.gnome.org> * src/yelp-search-pager.c: @@ -50,7 +59,7 @@ * src/yelp-search-pager.c: Clean up some compiler warnings (Casts and unused variables) - + 2006-07-19 Don Scorgie <dscorgie@cvs.gnome.org> * src/yelp-toc-pager.c: @@ -58,6 +67,8 @@ Fixes bug #347816 Clean up a couple of compiler warnings +==================== 2.15.4 ==================== + 2006-07-10 Brent Smith <gnome@nextreality.net> * NEWS: diff --git a/configure.in b/configure.in index 17375c69..137a5fb4 100644 --- a/configure.in +++ b/configure.in @@ -154,7 +154,7 @@ dnl ****** dnl beagle dnl ****** -BEAGLE_MODULES="libbeagle-0.0 >= 0.2.0" +BEAGLE_MODULES="libbeagle-0.0 >= 0.2.4" AC_ARG_WITH([search], [AC_HELP_STRING([--with-search=basic|beagle|auto|no], diff --git a/src/yelp-search-pager.c b/src/yelp-search-pager.c index 8102f7ff..213d9afa 100644 --- a/src/yelp-search-pager.c +++ b/src/yelp-search-pager.c @@ -216,8 +216,12 @@ search_pager_class_init (YelpSearchPagerClass *klass) parent_class = g_type_class_peek_parent (klass); #ifdef ENABLE_BEAGLE - beagle_client = beagle_client_new (NULL); - debug_print (DB_DEBUG, "client: %p\n", beagle_client); + if (beagle_util_daemon_is_running()) { + beagle_client = beagle_client_new (NULL); + debug_print (DB_DEBUG, "client: %p\n", beagle_client); + } else { + beagle_client = NULL; + } #endif /* ENABLE_BEAGLE */ langs = g_get_language_names (); |