Update of /cvsroot/gqclient/gq/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15930/src
Modified Files:
prefs.c schemabrowse.c
Log Message:
2006-04-06 Sven Herzberg <he...@gn...>
* src/prefs.c: added a missing cast
* src/schemabrowse.c: (select_at_from_clist): fix a bug in the schema
browser: if an attribute has got multiple names (domainComponent, dc)
and the second name gets displayed in the objectClass browser,
double-clicking did not pop up an attributeType browser window
Index: prefs.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/prefs.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** prefs.c 5 Apr 2006 14:28:17 -0000 1.60
--- prefs.c 6 Apr 2006 02:15:45 -0000 1.61
***************
*** 1391,1395 ****
notebook = gtk_notebook_new();
! gtk_notebook_set_scrollable(notebook, TRUE);
gtk_widget_show(notebook);
gtk_box_pack_start(GTK_BOX(vbox2), notebook, TRUE, TRUE, 0);
--- 1391,1395 ----
notebook = gtk_notebook_new();
! gtk_notebook_set_scrollable(GTK_NOTEBOOK(notebook), TRUE);
gtk_widget_show(notebook);
gtk_box_pack_start(GTK_BOX(vbox2), notebook, TRUE, TRUE, 0);
Index: schemabrowse.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/schemabrowse.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** schemabrowse.c 27 Apr 2005 03:35:01 -0000 1.30
--- schemabrowse.c 6 Apr 2006 02:15:46 -0000 1.31
***************
*** 1854,1872 ****
if( (event->type == GDK_BUTTON_RELEASE && event->button == 2) ||
(event->type == GDK_2BUTTON_PRESS && event->button == 1)) {
! if( (server = gtk_object_get_data(GTK_OBJECT(clist), "server")) == NULL)
return;
! if(server->ss == NULL || server->ss->at == NULL)
return;
gtk_clist_get_text(GTK_CLIST(clist), row, column, &attrname);
! list = server->ss->at;
! while(list) {
at = list->data;
! if(at && at->at_names && at->at_names[0] &&
! !strcasecmp(at->at_names[0], attrname))
! break;
! list = list->next;
}
--- 1854,1878 ----
if( (event->type == GDK_BUTTON_RELEASE && event->button == 2) ||
(event->type == GDK_2BUTTON_PRESS && event->button == 1)) {
+ gint i;
! if( (server = gtk_object_get_data(GTK_OBJECT(clist), "server")) == NULL) {
return;
+ }
! if(server->ss == NULL || server->ss->at == NULL) {
return;
+ }
gtk_clist_get_text(GTK_CLIST(clist), row, column, &attrname);
! for(list = server->ss->at; list; list = list->next) {
at = list->data;
! //g_return_val_if_fail(at && at->at_names); // FIXME: we should require this
! for(i=0; at && at->at_names && at->at_names[i]; i++) {
! if(!strcasecmp(at->at_names[i], attrname))
! break; // the for loop
! }
! if(at && at->at_names && at->at_names[i]) { // at_names[i] == NULL after the for loop
! break; // the while loop
! }
}
|
