[gq-commit] gq/src search.c,1.48,1.49 state.c,1.5,1.6 state.h,1.3,1.4

[<bi...@us...>]

Update of /cvsroot/gqclient/gq/src
In directory sc8-pr-cvs1:/tmp/cvs-serv10434

Modified Files:
	search.c state.c state.h 
Log Message:
save/restore last used server in search mode


Index: search.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/search.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** search.c	13 Oct 2003 22:18:31 -0000	1.48
--- search.c	14 Oct 2003 07:33:25 -0000	1.49
***************
*** 65,68 ****
--- 65,71 ----
  	  state_value_set_list(state_name, "history", hist);
       }
+ 
+      state_value_set_string(state_name, "lastserver", gtk_editable_get_chars(GTK_EDITABLE(GTK_COMBO(SEARCHTAB(tab)->serverlist_combo)->entry), 0, -1));
+ 
  }
  
***************
*** 70,74 ****
  static void search_restore_snapshot(char *state_name, struct tab *tab)
  {
!      GList *searchhist;
  
       if (config->restore_search_history) {
--- 73,95 ----
  static void search_restore_snapshot(char *state_name, struct tab *tab)
  {
!      struct ldapserver *server;
!      GList *searchhist, *list;
!      int i;
!      char *lastserver;
! 
!      lastserver = state_value_get_string(state_name, "lastserver", NULL);
!      if(lastserver && lastserver[0]) {
! 	  i = 0;
! 	  list = config->servers;
! 	  while(list) {
! 	       server = (struct ldapserver *) list->data;
! 	       if(!strcasecmp(server->name, lastserver)) {
! 		    gtk_list_select_item(GTK_LIST(GTK_COMBO(SEARCHTAB(tab)->serverlist_combo)->list), i);
! 		    break;
! 	       }
! 	       i++;
! 	       list = list->next;
! 	  }
!      }
  
       if (config->restore_search_history) {

Index: state.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/state.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** state.c	12 Oct 2003 05:30:41 -0000	1.5
--- state.c	14 Oct 2003 07:33:25 -0000	1.6
***************
*** 261,265 ****
  }
  
! const char *state_value_get_string(const char *state_name,
  				   const char *value_name,
  				   const char *def) 
--- 261,265 ----
  }
  
! char *state_value_get_string(const char *state_name,
  				   const char *value_name,
  				   const char *def) 

Index: state.h
===================================================================
RCS file: /cvsroot/gqclient/gq/src/state.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** state.h	11 Oct 2003 22:34:18 -0000	1.3
--- state.h	14 Oct 2003 07:33:26 -0000	1.4
***************
*** 48,52 ****
  			 int n);
  
! const char *state_value_get_string(const char *state_name,
  				   const char *value_name,
  				   const char *def);
--- 48,52 ----
  			 int n);
  
! char *state_value_get_string(const char *state_name,
  				   const char *value_name,
  				   const char *def);