[gq-commit] gq/src common.h,1.30,1.31 configfile.h,1.32,1.33 prefs.c,1.46,1.47

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

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

Modified Files:
	common.h configfile.h prefs.c 
Log Message:
* Obsoleted the show objectclass preferences setting
* Obsoleted the show referrals preferences setting


Index: common.h
===================================================================
RCS file: /cvsroot/gqclient/gq/src/common.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** common.h	18 Oct 2003 08:26:59 -0000	1.30
--- common.h	20 Oct 2003 08:22:49 -0000	1.31
***************
*** 88,92 ****
       long  local_cache_timeout;
       int   ask_pw;
!      int   show_ref;
       int   hide_internal;
  
--- 88,92 ----
       long  local_cache_timeout;
       int   ask_pw;
!      int   show_ref;	/* obsolete - kept for configfile compatibility */
       int   hide_internal;
  

Index: configfile.h
===================================================================
RCS file: /cvsroot/gqclient/gq/src/configfile.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** configfile.h	18 Oct 2003 08:26:59 -0000	1.32
--- configfile.h	20 Oct 2003 08:22:49 -0000	1.33
***************
*** 98,102 ****
       int confirm_mod; /* not used yet */
       int showdn;
!      int showoc;
       int sort_search;
       int sort_browse;
--- 98,102 ----
       int confirm_mod; /* not used yet */
       int showdn;
!      int showoc;	/* obsolete */
       int sort_search;
       int sort_browse;

Index: prefs.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/prefs.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** prefs.c	19 Oct 2003 12:01:31 -0000	1.46
--- prefs.c	20 Oct 2003 08:22:49 -0000	1.47
***************
*** 303,309 ****
--- 303,311 ----
       server->hide_internal = GTK_TOGGLE_BUTTON(field)->active ? 1 : 0;
  
+ #if 0
       /* Show ref */
       field = sw->show_ref;
       server->show_ref = GTK_TOGGLE_BUTTON(field)->active ? 1 : 0;
+ #endif
  
       /* Cache connection */
***************
*** 984,987 ****
--- 986,990 ----
  			  );
  
+ #if 0		/* obsolete */
       /* Show ref */
       button = gq_check_button_new_with_label(_("Show _referrals"));
***************
*** 995,1000 ****
       gtk_table_attach(GTK_TABLE(table3), button, 1, 2, z, z + 1,
  		      GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
-      z++;
- 
  
       gtk_tooltips_set_tip(tips, button,
--- 998,1001 ----
***************
*** 1002,1005 ****
--- 1003,1009 ----
  			  S_("tooltip|")
  			  );
+ #endif
+ 
+      z++;
  
       /* Enable TLS */
***************
*** 1183,1188 ****
--- 1187,1194 ----
       CONFIG_TOGGLE_BUTTON(config, pw, showdn);
  
+ #if 0
       /* Show OC */
       CONFIG_TOGGLE_BUTTON(config, pw, showoc);
+ #endif
  
       /* Show RDN only */
***************
*** 1727,1730 ****
--- 1733,1737 ----
       gtk_box_pack_start(GTK_BOX(vbox_view), dnbutton, FALSE, TRUE, 5);
  
+ #if 0 /* obsolete */
       /* Show Objectclass checkbox */
       ocbutton = gq_check_button_new_with_label(_("Show O_bjectclass"));
***************
*** 1737,1740 ****
--- 1744,1748 ----
       gtk_widget_show(ocbutton);
       gtk_box_pack_start(GTK_BOX(vbox_view), ocbutton, FALSE, TRUE, 5);
+ #endif
  
       /* Sort in search mode button */