[gq-commit] gq/src prefs.c,1.49,1.50 search.c,1.57,1.58

[<sta...@us...>]

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

Modified Files:
	prefs.c search.c 
Log Message:
* Obsoleted the "Sort search result" preference setting. Superseeded by the
  sort-support in the search result itself (via the column headers)


Index: prefs.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/prefs.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** prefs.c	23 Oct 2003 05:26:37 -0000	1.49
--- prefs.c	23 Oct 2003 05:31:34 -0000	1.50
***************
*** 1199,1204 ****
--- 1199,1206 ----
       CONFIG_TOGGLE_BUTTON(config, pw, show_rdn_only);
  
+ #if 0
       /* Sorting: search mode */
       CONFIG_TOGGLE_BUTTON(config, pw, sort_search);
+ #endif
  
       /* Sorting: browse mode */
***************
*** 1645,1649 ****
       GtkWidget *stframe, *vbox_st, *viewframe, *vbox_view;
       GtkWidget *stradiobutton, *dnbutton; /* , *ocbutton; */
!      GtkWidget *hbox_options, *sort_search_button;
       GSList *stgroup;
  
--- 1647,1652 ----
       GtkWidget *stframe, *vbox_st, *viewframe, *vbox_view;
       GtkWidget *stradiobutton, *dnbutton; /* , *ocbutton; */
!      GtkWidget *hbox_options;
! /* , *sort_search_button; */
       GSList *stgroup;
  
***************
*** 1763,1766 ****
--- 1766,1770 ----
  #endif
  
+ #if 0
       /* Sort in search mode button */
       sort_search_button = gq_check_button_new_with_label(_("Sort _results"));
***************
*** 1773,1776 ****
--- 1777,1781 ----
       gtk_widget_show(sort_search_button);
       gtk_box_pack_start(GTK_BOX(vbox_view), sort_search_button, FALSE, TRUE, 5);
+ #endif
  }
  

Index: search.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/search.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** search.c	21 Oct 2003 04:59:18 -0000	1.57
--- search.c	23 Oct 2003 05:31:34 -0000	1.58
***************
*** 1621,1627 ****
  #if 0  /* too many performance problems */
  			      if (row % 16 == 0) {
! 				   if(config->sort_search) {
! 					gtk_clist_sort(GTK_CLIST(new_main_clist));
! 				   }	  
  				   gtk_clist_thaw(GTK_CLIST(new_main_clist));
  				   gtk_clist_freeze(GTK_CLIST(new_main_clist));
--- 1621,1627 ----
  #if 0  /* too many performance problems */
  			      if (row % 16 == 0) {
! /* 				   if(config->sort_search) { */
! /* 					gtk_clist_sort(GTK_CLIST(new_main_clist)); */
! /* 				   }	   */
  				   gtk_clist_thaw(GTK_CLIST(new_main_clist));
  				   gtk_clist_freeze(GTK_CLIST(new_main_clist));
***************
*** 1670,1674 ****
       free(filter);
  	  
!      
       if(config->sort_search) {
  	  gtk_clist_set_sort_column(GTK_CLIST(new_main_clist), 0);
--- 1670,1675 ----
       free(filter);
  	  
! #if 0
!      /* obsolete */
       if(config->sort_search) {
  	  gtk_clist_set_sort_column(GTK_CLIST(new_main_clist), 0);
***************
*** 1677,1681 ****
  	  gtk_clist_sort(GTK_CLIST(new_main_clist));
       }	  
! 
       for(i = 0; i < MAX_NUM_ATTRIBUTES; i++) {
  	  g_string_free(tolist[i], TRUE);
--- 1678,1682 ----
  	  gtk_clist_sort(GTK_CLIST(new_main_clist));
       }	  
! #endif
       for(i = 0; i < MAX_NUM_ATTRIBUTES; i++) {
  	  g_string_free(tolist[i], TRUE);