[gq-commit] gq/src browse.c,1.55,1.56

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

Update of /cvsroot/gqclient/gq/src
In directory usw-pr-cvs1:/tmp/cvs-serv9036

Modified Files:
	browse.c 
Log Message:
* Refreshing a server node now really refreshes the information presented


Index: browse.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/browse.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** browse.c	15 Jul 2002 18:44:03 -0000	1.55
--- browse.c	17 Jul 2002 21:43:43 -0000	1.56
***************
*** 477,482 ****
   * a server was selected in the tree widget.
   *
!  * FIXME: put up the server's editable info here? Easy to do, but
!  *        does it belong here?
   */
  static void server_browse_entry_selected(server_browse_entry *entry,
--- 477,481 ----
   * a server was selected in the tree widget.
   *
!  * put up some server info.
   */
  static void server_browse_entry_selected(server_browse_entry *entry,
***************
*** 491,655 ****
       int row = 0;
       char buf[128];
  
       server_name = entry->server->name; /* dn_by_node(node); */
- 
       cur_dn = g_hash_table_lookup(hash, "cur_dn");
!      if(strncmp(cur_dn->str, server_name, cur_dn->len)) {
! 	  LDAP *ld = open_connection(entry->server);
  
! 	  g_string_assign(cur_dn, server_name);
! 	  g_hash_table_insert(hash, "cur_dn", cur_dn);
  
! 	  pane2_scrwin = g_hash_table_lookup(hash, "pane2_scrwin");
! 	  pane2_vbox = gtk_object_get_data(GTK_OBJECT(pane2_scrwin), "vbox");
! /*  	  gtk_widget_destroy(pane2_vbox); */
! 	  /* remove the viewport of the scrolled window. This should
!              _really_ destroy the widgets below it. The pane2_scrwin
!              is a GtkBin Object and thus has only one child, use this
!              to obtain the viewport */
  
! 	  gtk_container_remove(GTK_CONTAINER(pane2_scrwin),
! 			       GTK_BIN(pane2_scrwin)->child);
  
! 	  pane2_vbox = gtk_vbox_new(FALSE, 2);
! 	  gtk_object_set_data(GTK_OBJECT(pane2_scrwin), "vbox", pane2_vbox);
! 	  gtk_widget_show(pane2_vbox);
! 	  gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(pane2_scrwin),
! 						pane2_vbox);
  
! 	  table = gtk_table_new(5, 2, FALSE);
! 	  gtk_container_border_width(GTK_CONTAINER(table), 5);
! 	  gtk_widget_show(table);
! 	  gtk_box_pack_start(GTK_BOX(pane2_vbox), table, FALSE, FALSE, 5);
  
! 	  /* Nickname */
! 	  label = gtk_label_new(_("Nickname"));
! 	  gtk_widget_show(label);
! 	  gtk_table_attach(GTK_TABLE(table),
! 			   label,
! 			   0, 1, row, row+1,
! 			   GTK_EXPAND | GTK_SHRINK | GTK_FILL,
! 			   GTK_EXPAND | GTK_SHRINK | GTK_FILL,
! 			   0, 0);
  
! 	  e = gtk_entry_new();
! 	  gtk_entry_set_text(GTK_ENTRY(e), server_name);
! 	  gtk_widget_set_sensitive(e, FALSE);
! 	  gtk_widget_show(e);
! 	  gtk_table_attach(GTK_TABLE(table),
! 			   e,
! 			   1, 2, row, row+1,
! 			   GTK_EXPAND | GTK_SHRINK | GTK_FILL,
! 			   GTK_EXPAND | GTK_SHRINK | GTK_FILL,
! 			   0, 0);
! 	  row++;
  
! 	  /* Host name */
! 	  label = gtk_label_new(_("Hostname"));
! 	  gtk_widget_show(label);
! 	  gtk_table_attach(GTK_TABLE(table),
! 			   label,
! 			   0, 1, row, row+1,
! 			   GTK_EXPAND | GTK_SHRINK | GTK_FILL,
! 			   GTK_EXPAND | GTK_SHRINK | GTK_FILL,
! 			   0, 0);
  
! 	  e = gtk_entry_new();
! 	  gtk_entry_set_text(GTK_ENTRY(e), entry->server->ldaphost);
! 	  gtk_widget_set_sensitive(e, FALSE);
! 	  gtk_widget_show(e);
! 	  gtk_table_attach(GTK_TABLE(table),
! 			   e,
! 			   1, 2, row, row+1,
! 			   GTK_EXPAND | GTK_SHRINK | GTK_FILL,
! 			   GTK_EXPAND | GTK_SHRINK | GTK_FILL,
! 			   0, 0);
! 	  row++;
  
! 	  /* Port */
! 	  label = gtk_label_new(_("Port"));
! 	  gtk_widget_show(label);
! 	  gtk_table_attach(GTK_TABLE(table),
! 			   label,
! 			   0, 1, row, row+1,
! 			   GTK_EXPAND | GTK_SHRINK | GTK_FILL,
! 			   GTK_EXPAND | GTK_SHRINK | GTK_FILL,
! 			   0, 0);
  
! 	  snprintf(buf, sizeof(buf), "%d", entry->server->ldapport);
! 	  e = gtk_entry_new();
! 	  gtk_entry_set_text(GTK_ENTRY(e), buf);
! 	  gtk_widget_set_sensitive(e, FALSE);
! 	  gtk_widget_show(e);
! 	  gtk_table_attach(GTK_TABLE(table),
! 			   e,
! 			   1, 2, row, row+1,
! 			   GTK_EXPAND | GTK_SHRINK | GTK_FILL,
! 			   GTK_EXPAND | GTK_SHRINK | GTK_FILL,
! 			   0, 0);
! 	  row++;
  
! 	  /* Connection caching */
! 	  label = gtk_label_new(_("Connection caching"));
! 	  gtk_widget_show(label);
! 	  gtk_table_attach(GTK_TABLE(table),
! 			   label,
! 			   0, 1, row, row+1,
! 			   GTK_EXPAND | GTK_SHRINK | GTK_FILL,
! 			   GTK_EXPAND | GTK_SHRINK | GTK_FILL,
! 			   0, 0);
  
! 	  snprintf(buf, sizeof(buf), "%s", 
! 		   entry->server->cacheconn ? _("on") : _("off"));
! 	  e = gtk_entry_new();
! 	  gtk_entry_set_text(GTK_ENTRY(e), buf);
! 	  gtk_widget_set_sensitive(e, FALSE);
! 	  gtk_widget_show(e);
! 	  gtk_table_attach(GTK_TABLE(table),
! 			   e,
! 			   1, 2, row, row+1,
! 			   GTK_EXPAND | GTK_SHRINK | GTK_FILL,
! 			   GTK_EXPAND | GTK_SHRINK | GTK_FILL,
! 			   0, 0);
  
! 	  row++;
  
! 	  /* TLS */
! 	  label = gtk_label_new(_("TLS"));
! 	  gtk_widget_show(label);
! 	  gtk_table_attach(GTK_TABLE(table),
! 			   label,
! 			   0, 1, row, row+1,
! 			   GTK_EXPAND | GTK_SHRINK | GTK_FILL,
! 			   GTK_EXPAND | GTK_SHRINK | GTK_FILL,
! 			   0, 0);
  
! 	  snprintf(buf, sizeof(buf), "%s", 
! 		   entry->server->enabletls ? _("on") : _("off"));
! 	  e = gtk_entry_new();
! 	  gtk_entry_set_text(GTK_ENTRY(e), buf);
! 	  gtk_widget_set_sensitive(e, FALSE);
! 	  gtk_widget_show(e);
! 	  gtk_table_attach(GTK_TABLE(table),
! 			   e,
! 			   1, 2, row, row+1,
! 			   GTK_EXPAND | GTK_SHRINK | GTK_FILL,
! 			   GTK_EXPAND | GTK_SHRINK | GTK_FILL,
! 			   0, 0);
  
! 	  row++;
  
! 	  /* Connections so far */
! 	  label = gtk_label_new(_("Connections so far"));
  	  gtk_widget_show(label);
  	  gtk_table_attach(GTK_TABLE(table),
  			   label,
  			   0, 1, row, row+1,
! 			   GTK_EXPAND | GTK_SHRINK | GTK_FILL,
  			   GTK_EXPAND | GTK_SHRINK | GTK_FILL,
  			   0, 0);
! 
! 	  snprintf(buf, sizeof(buf), "%d", 
! 		   entry->server->incarnation);
  	  e = gtk_entry_new();
  	  gtk_entry_set_text(GTK_ENTRY(e), buf);
--- 490,682 ----
       int row = 0;
       char buf[128];
+      LDAP *ld = open_connection(entry->server);
  
       server_name = entry->server->name; /* dn_by_node(node); */
       cur_dn = g_hash_table_lookup(hash, "cur_dn");
!      g_string_assign(cur_dn, server_name);
!      g_hash_table_insert(hash, "cur_dn", cur_dn);
  
!      pane2_scrwin = g_hash_table_lookup(hash, "pane2_scrwin");
!      pane2_vbox = gtk_object_get_data(GTK_OBJECT(pane2_scrwin), "vbox");
!      /*  	  gtk_widget_destroy(pane2_vbox); */
!      /* remove the viewport of the scrolled window. This should
! 	_really_ destroy the widgets below it. The pane2_scrwin
! 	is a GtkBin Object and thus has only one child, use this
! 	to obtain the viewport */
  
!      gtk_container_remove(GTK_CONTAINER(pane2_scrwin),
! 			  GTK_BIN(pane2_scrwin)->child);
  
!      pane2_vbox = gtk_vbox_new(FALSE, 2);
!      gtk_object_set_data(GTK_OBJECT(pane2_scrwin), "vbox", pane2_vbox);
!      gtk_widget_show(pane2_vbox);
!      gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(pane2_scrwin),
! 					   pane2_vbox);
  
!      table = gtk_table_new(5, 2, FALSE);
!      gtk_container_border_width(GTK_CONTAINER(table), 5);
!      gtk_widget_show(table);
!      gtk_box_pack_start(GTK_BOX(pane2_vbox), table, FALSE, FALSE, 5);
  
!      /* Nickname */
!      label = gtk_label_new(_("Nickname"));
!      gtk_widget_show(label);
!      gtk_table_attach(GTK_TABLE(table),
! 		      label,
! 		      0, 1, row, row+1,
! 		      GTK_SHRINK,
! 		      GTK_EXPAND | GTK_SHRINK | GTK_FILL,
! 		      0, 0);
  
!      e = gtk_entry_new();
!      gtk_entry_set_text(GTK_ENTRY(e), server_name);
!      gtk_widget_set_sensitive(e, FALSE);
!      gtk_widget_show(e);
!      gtk_table_attach(GTK_TABLE(table),
! 		      e,
! 		      1, 2, row, row+1,
! 		      GTK_EXPAND | GTK_SHRINK | GTK_FILL,
! 		      GTK_EXPAND | GTK_SHRINK | GTK_FILL,
! 		      0, 0);
!      row++;
  
!      /* Host name */
!      label = gtk_label_new(_("Hostname"));
!      gtk_widget_show(label);
!      gtk_table_attach(GTK_TABLE(table),
! 		      label,
! 		      0, 1, row, row+1,
! 		      GTK_SHRINK,
! 		      GTK_EXPAND | GTK_SHRINK | GTK_FILL,
! 		      0, 0);
  
!      e = gtk_entry_new();
!      gtk_entry_set_text(GTK_ENTRY(e), entry->server->ldaphost);
!      gtk_widget_set_sensitive(e, FALSE);
!      gtk_widget_show(e);
!      gtk_table_attach(GTK_TABLE(table),
! 		      e,
! 		      1, 2, row, row+1,
! 		      GTK_EXPAND | GTK_SHRINK | GTK_FILL,
! 		      GTK_EXPAND | GTK_SHRINK | GTK_FILL,
! 		      0, 0);
!      row++;
  
!      /* Port */
!      label = gtk_label_new(_("Port"));
!      gtk_widget_show(label);
!      gtk_table_attach(GTK_TABLE(table),
! 		      label,
! 		      0, 1, row, row+1,
! 		      GTK_SHRINK,
! 		      GTK_EXPAND | GTK_SHRINK | GTK_FILL,
! 		      0, 0);
  
!      snprintf(buf, sizeof(buf), "%d", entry->server->ldapport);
!      e = gtk_entry_new();
!      gtk_entry_set_text(GTK_ENTRY(e), buf);
!      gtk_widget_set_sensitive(e, FALSE);
!      gtk_widget_show(e);
!      gtk_table_attach(GTK_TABLE(table),
! 		      e,
! 		      1, 2, row, row+1,
! 		      GTK_EXPAND | GTK_SHRINK | GTK_FILL,
! 		      GTK_EXPAND | GTK_SHRINK | GTK_FILL,
! 		      0, 0);
!      row++;
  
!      /* Connection caching */
!      label = gtk_label_new(_("Connection caching"));
!      gtk_widget_show(label);
!      gtk_table_attach(GTK_TABLE(table),
! 		      label,
! 		      0, 1, row, row+1,
! 		      GTK_SHRINK,
! 		      GTK_EXPAND | GTK_SHRINK | GTK_FILL,
! 		      0, 0);
  
!      snprintf(buf, sizeof(buf), "%s", 
! 	      entry->server->cacheconn ? _("on") : _("off"));
!      e = gtk_entry_new();
!      gtk_entry_set_text(GTK_ENTRY(e), buf);
!      gtk_widget_set_sensitive(e, FALSE);
!      gtk_widget_show(e);
!      gtk_table_attach(GTK_TABLE(table),
! 		      e,
! 		      1, 2, row, row+1,
! 		      GTK_EXPAND | GTK_SHRINK | GTK_FILL,
! 		      GTK_EXPAND | GTK_SHRINK | GTK_FILL,
! 		      0, 0);
  
!      row++;
  
!      /* TLS */
!      label = gtk_label_new(_("TLS"));
!      gtk_widget_show(label);
!      gtk_table_attach(GTK_TABLE(table),
! 		      label,
! 		      0, 1, row, row+1,
! 		      GTK_SHRINK,
! 		      GTK_EXPAND | GTK_SHRINK | GTK_FILL,
! 		      0, 0);
  
!      snprintf(buf, sizeof(buf), "%s", 
! 	      entry->server->enabletls ? _("on") : _("off"));
!      e = gtk_entry_new();
!      gtk_entry_set_text(GTK_ENTRY(e), buf);
!      gtk_widget_set_sensitive(e, FALSE);
!      gtk_widget_show(e);
!      gtk_table_attach(GTK_TABLE(table),
! 		      e,
! 		      1, 2, row, row+1,
! 		      GTK_EXPAND | GTK_SHRINK | GTK_FILL,
! 		      GTK_EXPAND | GTK_SHRINK | GTK_FILL,
! 		      0, 0);
  
!      row++;
  
!      /* Connections so far */
!      label = gtk_label_new(_("Connections so far"));
!      gtk_widget_show(label);
!      gtk_table_attach(GTK_TABLE(table),
! 		      label,
! 		      0, 1, row, row+1,
! 		      GTK_SHRINK,
! 		      GTK_EXPAND | GTK_SHRINK | GTK_FILL,
! 		      0, 0);
  
!      snprintf(buf, sizeof(buf), "%d", 
! 	      entry->server->incarnation);
!      e = gtk_entry_new();
!      gtk_entry_set_text(GTK_ENTRY(e), buf);
!      gtk_widget_set_sensitive(e, FALSE);
!      gtk_widget_show(e);
!      gtk_table_attach(GTK_TABLE(table),
! 		      e,
! 		      1, 2, row, row+1,
! 		      GTK_EXPAND | GTK_SHRINK | GTK_FILL,
! 		      GTK_EXPAND | GTK_SHRINK | GTK_FILL,
! 		      0, 0);
! 
!      row++;
! 
!      if (ld) {
! 	  int intdata;
! 	  int rc;
! 	  /*  	       void *optdata; */
! 
! 	  rc = ldap_get_option(ld, LDAP_OPT_PROTOCOL_VERSION, &intdata);
! 
! 	  /* LDAP protocol version */
! 	  label = gtk_label_new(_("LDAP protocol version"));
  	  gtk_widget_show(label);
  	  gtk_table_attach(GTK_TABLE(table),
  			   label,
  			   0, 1, row, row+1,
! 			   GTK_SHRINK,
  			   GTK_EXPAND | GTK_SHRINK | GTK_FILL,
  			   0, 0);
! 	       
! 	  snprintf(buf, sizeof(buf), "%d", intdata);
  	  e = gtk_entry_new();
  	  gtk_entry_set_text(GTK_ENTRY(e), buf);
***************
*** 662,704 ****
  			   GTK_EXPAND | GTK_SHRINK | GTK_FILL,
  			   0, 0);
- 
- 	  row++;
- 
- 	  if (ld) {
- 	       int intdata;
- 	       int rc;
- /*  	       void *optdata; */
- 
- 	       rc = ldap_get_option(ld, LDAP_OPT_PROTOCOL_VERSION, &intdata);
- 
- 	       /* LDAP protocol version */
- 	       label = gtk_label_new(_("LDAP protocol version"));
- 	       gtk_widget_show(label);
- 	       gtk_table_attach(GTK_TABLE(table),
- 				label,
- 				0, 1, row, row+1,
- 				GTK_EXPAND | GTK_SHRINK | GTK_FILL,
- 				GTK_EXPAND | GTK_SHRINK | GTK_FILL,
- 				0, 0);
  	       
! 	       snprintf(buf, sizeof(buf), "%d", intdata);
! 	       e = gtk_entry_new();
! 	       gtk_entry_set_text(GTK_ENTRY(e), buf);
! 	       gtk_widget_set_sensitive(e, FALSE);
! 	       gtk_widget_show(e);
! 	       gtk_table_attach(GTK_TABLE(table),
! 				e,
! 				1, 2, row, row+1,
! 				GTK_EXPAND | GTK_SHRINK | GTK_FILL,
! 				GTK_EXPAND | GTK_SHRINK | GTK_FILL,
! 				0, 0);
! 	       
! 	       row++;
! 
! 	       close_connection(entry->server, FALSE);
! 	  }
  
! /*  	  gtk_box_pack_start(GTK_BOX(pane2_vbox), label, FALSE, FALSE, 0); */
       }
  }
  
--- 689,699 ----
  			   GTK_EXPAND | GTK_SHRINK | GTK_FILL,
  			   0, 0);
  	       
! 	  row++;
  
! 	  close_connection(entry->server, FALSE);
       }
+ 
+      /*  	  gtk_box_pack_start(GTK_BOX(pane2_vbox), label, FALSE, FALSE, 0); */
  }
  
***************
*** 717,723 ****
       gtk_clist_freeze(GTK_CLIST(ctree));
  
!      /* toggle expansion twice to fire the expand callback */
!      gtk_ctree_toggle_expansion(ctree, node);
!      gtk_ctree_toggle_expansion(ctree, node);
  
       gtk_clist_thaw(GTK_CLIST(ctree));
--- 712,720 ----
       gtk_clist_freeze(GTK_CLIST(ctree));
  
!      server_browse_entry_selected(entry, ctree, node, hash);
! 
! /*      /\* toggle expansion twice to fire the expand callback *\/ */
! /*      gtk_ctree_toggle_expansion(ctree, node); */
! /*      gtk_ctree_toggle_expansion(ctree, node); */
  
       gtk_clist_thaw(GTK_CLIST(ctree));