[gq-commit] gq/src schemabrowse.c,1.20,1.21

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

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

Modified Files:
	schemabrowse.c 
Log Message:
fixed segfault when refreshing server in schemabrowse tree
fixed segfault when selecting an item in a tree that had been refreshed


Index: schemabrowse.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/schemabrowse.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** schemabrowse.c	10 Oct 2003 06:58:59 -0000	1.20
--- schemabrowse.c	11 Oct 2003 00:18:04 -0000	1.21
***************
*** 135,138 ****
--- 135,139 ----
  	  gtk_signal_connect(GTK_OBJECT(new_item), "button_press_event",
  			     GTK_SIGNAL_FUNC(schema_button_tree), NULL);
+ 	  gtk_object_set_data(GTK_OBJECT(new_item), "tab", tab);
  	  gtk_object_set_data(GTK_OBJECT(new_item), "server",
  			      (gpointer) server);
***************
*** 367,370 ****
--- 368,372 ----
       GtkWidget *new_subtree;
       struct ldapserver *server;
+      struct tab *tab;
  
       if( (server = gtk_object_get_data(GTK_OBJECT(item), "server")) == NULL)
***************
*** 377,381 ****
--- 379,387 ----
  
  	  /* this is a workaround -- lots of GTK warnings if I don't do this :-( */
+ #if GTK_MAJOR < 2
  	  sel = GTK_TREE_SELECTION(tree);
+ #else
+ 	  sel = GTK_TREE_SELECTION_OLD(tree);
+ #endif
  	  while(sel) {
  	       if(sel->data)
***************
*** 388,393 ****
  	  new_subtree = gtk_tree_new();
  	  gtk_tree_item_set_subtree(GTK_TREE_ITEM(item), new_subtree);
  	  gtk_signal_connect(GTK_OBJECT(item), "expand",
! 			     GTK_SIGNAL_FUNC(attach_server_schema), NULL);
       }
  }
--- 394,400 ----
  	  new_subtree = gtk_tree_new();
  	  gtk_tree_item_set_subtree(GTK_TREE_ITEM(item), new_subtree);
+ 	  tab = gtk_object_get_data(GTK_OBJECT(item), "tab");
  	  gtk_signal_connect(GTK_OBJECT(item), "expand",
! 			     GTK_SIGNAL_FUNC(attach_server_schema), tab);
       }
  }