[gq-commit] gq/src configfile.c,1.35,1.36 configfile.h,1.24,1.25

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

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

Modified Files:
	configfile.c configfile.h 
Log Message:
* Support to write the new GUI prefs
* Reintroduced several config-write routines into the global namespace


Index: configfile.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/configfile.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** configfile.c	5 Oct 2003 13:34:49 -0000	1.35
--- configfile.c	5 Oct 2003 22:24:47 -0000	1.36
***************
*** 73,85 ****
  };
  
- static void config_write(struct writeconfig *wc, const char *string);
- static void config_write_bool(struct writeconfig *wc,
- 			      int value, const char *entity);
- static void config_write_int(struct writeconfig *wc,
- 			     int value, const char *entity);
- static void config_write_string(struct writeconfig *wc,
- 				const char *value, const char *entity);
- static void config_write_string_ne(struct writeconfig *wc,
- 				   const char *value, const char *entity);
  
  /* malloc ldapserver struct */
--- 73,76 ----
***************
*** 148,151 ****
--- 139,143 ----
  }
  
+ /* returns the homedir-path, returned string must be g_free'd */
  char *homedir(void)
  {
***************
*** 155,159 ****
       pwent = getpwuid(getuid());
       if(pwent && pwent->pw_dir)
! 	  result = strdup(pwent->pw_dir);
       else
  	  result = NULL;
--- 147,151 ----
       pwent = getpwuid(getuid());
       if(pwent && pwent->pw_dir)
! 	  result = g_strdup(pwent->pw_dir);
       else
  	  result = NULL;
***************
*** 181,185 ****
  
       sprintf(rcpath, "%s/%s", home, RCFILE);
!      free(home);
  
       return(rcpath);
--- 173,177 ----
  
       sprintf(rcpath, "%s/%s", home, RCFILE);
!      g_free(home);
  
       return(rcpath);
***************
*** 243,247 ****
  
  /* just a pretty printer */
! static void config_write(struct writeconfig *wc, const char *string)
  {
       int i;
--- 235,239 ----
  
  /* just a pretty printer */
! void config_write(struct writeconfig *wc, const char *string)
  {
       int i;
***************
*** 255,259 ****
  
  
! static void config_write_bool(struct writeconfig *wc, int value, const char *entity)
  {
       char outstr[128];
--- 247,251 ----
  
  
! void config_write_bool(struct writeconfig *wc, int value, const char *entity)
  {
       char outstr[128];
***************
*** 266,270 ****
  
  
! static void config_write_int(struct writeconfig *wc, int value, const char *entity)
  {
       char outstr[128];
--- 258,262 ----
  
  
! void config_write_int(struct writeconfig *wc, int value, const char *entity)
  {
       char outstr[128];
***************
*** 277,281 ****
  
  
! static void config_write_string(struct writeconfig *wc, const char *value, const char *entity)
  {
       GString *outstr;
--- 269,273 ----
  
  
! void config_write_string(struct writeconfig *wc, const char *value, const char *entity)
  {
       GString *outstr;
***************
*** 316,320 ****
  
  
! static void config_write_string_ne(struct writeconfig *wc, const char *value, const char *entity)
  {
       if(value && strlen(value))
--- 308,313 ----
  
  
! void config_write_string_ne(struct writeconfig *wc,
! 			    const char *value, const char *entity)
  {
       if(value && strlen(value))
***************
*** 373,377 ****
       if(!wc->outfile) {
  	  error_push(write_context,
! 		     _("unable to open %1$s for writing:\n%2$s\n"), rcpath,
  		     strerror(errno));
  	  g_free(tmprcpath);
--- 366,370 ----
       if(!wc->outfile) {
  	  error_push(write_context,
! 		     _("Unable to open %1$s for writing:\n%2$s\n"), rcpath,
  		     strerror(errno));
  	  g_free(tmprcpath);
***************
*** 413,416 ****
--- 406,417 ----
       config_write_bool(wc, cfg->sort_search, "sort-search-mode");
       config_write_bool(wc, cfg->sort_browse, "sort-browse-mode");
+ 
+      config_write_bool(wc, cfg->restore_window_sizes,
+ 		       "restore-window-sizes");
+      config_write_bool(wc, cfg->restore_window_positions,
+ 		       "restore-window-positions");
+      config_write_bool(wc, cfg->restore_search_history, 
+ 		       "restore-search-history");
+ 
       config_write_string(wc, detokenize(token_ldifformat, cfg->ldifformat), "ldif-format");
       if(strlen(cfg->schemaserver))

Index: configfile.h
===================================================================
RCS file: /cvsroot/gqclient/gq/src/configfile.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** configfile.h	5 Oct 2003 13:34:49 -0000	1.24
--- configfile.h	5 Oct 2003 22:24:47 -0000	1.25
***************
*** 37,111 ****
  
  #define RCFILE           ".gq"
! 
! #if 0
! /* do not forget to set T_HIGHEST to the highest used token value below */
! 
! /* tokens for config file */
! #define T_UNKNOWN             0
! #define T_XML_VERSION         1
! #define T_COMMENT             2
! #define T_GQ_CONFIG          10
! 
! #define T_CONFIRM_MOD        11
! #define T_SEARCH_ARGUMENT    12
! #define T_SHOWDN             13
! #define T_SHOWOC             14
! #define T_SORT_SEARCH        15
! #define T_SORT_BROWSE        16
! #define T_SHOW_RDN_ONLY	     17
! #define T_SCHEMASERVER       18
! 
! 
! /* per-server tokens */
! #define T_LDAPSERVER         20
! #define T_NAME               21
! #define T_LDAPHOST           22
! #define T_LDAPPORT           23
! #define T_BASEDN             24
! #define T_BINDDN             25
! #define T_BINDPW             26
! #define T_BINDTYPE           27
! #define T_SASLMECHANISM      54
! #define T_SEARCHATTR         28
! #define T_MAXENTRIES         29
! #define T_CACHECONN          30
! #define T_ENABLETLS          31
! #define T_LDIF_FORMAT        32
! #define T_LOCAL_CACHE_TIMEOUT 33
! #define T_ASK_PW	     34
! #define T_HIDE_INTERNAL	     35
! #define T_SHOW_REF	     36
! #define T_PWENCODING	     37
! 
! /* template tokens */
! #define T_TEMPLATE           40
! /* T_NAME already defined in per-server tokens */
! #define T_OBJECTCLASS        41
! 
! /* filter tokens */
! #define T_FILTER             42
! /* T_NAME already defined in per-server tokens */
! #define T_LDAPFILTER         43
! #define T_SERVERNAME         44
! 
! /* defaults tokens */
! #define T_DEFAULTS	     45
! #define T_DISPLAY_TYPES	     46
! #define T_DISPLAY_TYPE	     47
! #define T_DT_ATTRIBUTE	     48
! #define T_DT_DEFAULT         49
! 
! #define T_DATA               50
! 
! #define T_CONFIG_VERSION     51
! #define T_ASKED_CONFIG_VERSION 52
! #define T_LAST_ASKED	     53
! 
! #define T_HIGHEST	     54
  
  /* bitwise flags used in keywordlist.flags */
  #define NEEDS_CLOSE   1
  #define NEEDS_DATA    2
- #endif
  
  
--- 37,45 ----
  
  #define RCFILE           ".gq"
! #define STATEFILE        ".gq-state"
  
  /* bitwise flags used in keywordlist.flags */
  #define NEEDS_CLOSE   1
  #define NEEDS_DATA    2
  
  
***************
*** 163,166 ****
--- 97,103 ----
       int show_rdn_only;
       char *schemaserver;
+      int restore_window_sizes;
+      int restore_window_positions;
+      int restore_search_history;
  
       GHashTable *defaultDT;
***************
*** 174,206 ****
  };
  
- #if 0
- enum parselevel {
-      TOP, IN_TAG, END
- };
- 
- enum entitytype {
-      IGNORE, OPEN, CLOSE
- };
- 
- struct configfile {
-      char *rcfile;
-      int p;
-      int line;
-      enum parselevel status;
-      char cur_string[128];
-      int cur_token;
-      int cur_token_flags;
-      enum entitytype cur_entity_type;
-      int stack[16];
-      int sp;
- 
-      int err_context;
- 
-      struct ldapserver	*cur_ldapserver;
-      struct gq_template	*cur_template;
-      struct gq_filter	*cur_filter;
-      char		*cur_dt_attr;
- };
- #endif
  
  /* handy for writing config file */
--- 111,114 ----
***************
*** 209,212 ****
--- 117,131 ----
       int indent;
  };
+ 
+ 
+ void config_write(struct writeconfig *wc, const char *string);
+ void config_write_bool(struct writeconfig *wc,
+ 		       int value, const char *entity);
+ void config_write_int(struct writeconfig *wc,
+ 		      int value, const char *entity);
+ void config_write_string(struct writeconfig *wc,
+ 			 const char *value, const char *entity);
+ void config_write_string_ne(struct writeconfig *wc,
+ 			    const char *value, const char *entity);