Merge branch 'master' into bytarget_block

diff --combined src/client.c
index 5df785d,0a1eb61..8751137
--- 1/src/client.c
--- 2/src/client.c
+++ b/src/client.c
@@@ -162,6 -162,11 +162,11 @@@ enum client_state client_get_state(stru
      return cl->state;
  }
  
+ void client_set_state_nb(struct client *cl, enum client_state st)
+ {
+     cl->state = st;
+ }
+ 
  void client_set_state(struct client *cl, enum client_state st)
  {
      int was_active = 0;
@@@ -179,8 -184,6 +184,8 @@@
                  client_get_id(cl), no_active);
          if (no_active == 0) {
              session_alert_watch(cl->session, SESSION_WATCH_SHOW);
 +            session_alert_watch(cl->session, SESSION_WATCH_BYTARGET);
 +            session_alert_watch(cl->session, SESSION_WATCH_TERMLIST);
              session_alert_watch(cl->session, SESSION_WATCH_SHOW_PREF);
          }
      }
@@@ -551,8 -554,6 +556,8 @@@ void client_got_records(struct client *
      {
          client_unlock(cl);
          session_alert_watch(se, SESSION_WATCH_SHOW);
 +        session_alert_watch(se, SESSION_WATCH_BYTARGET);
 +        session_alert_watch(se, SESSION_WATCH_TERMLIST);
          session_alert_watch(se, SESSION_WATCH_RECORD);
          client_lock(cl);
      }
@@@ -1191,7 -1192,7 +1196,7 @@@ const char * client_get_suggestions_xml
      struct suggestions *suggestions = cl->suggestions;
  
      if (!suggestions) {
 -        yaz_log(YLOG_DEBUG, "No suggestions found");
 +        //yaz_log(YLOG_DEBUG, "No suggestions found");
          return "";
      }
      if (suggestions->passthrough) {