[gq-commit] gq/src prefs.c,1.50,1.51

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

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

Modified Files:
	prefs.c 
Log Message:
* Fixed SF bugs 830376 and 830377


Index: prefs.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/prefs.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** prefs.c	23 Oct 2003 05:31:34 -0000	1.50
--- prefs.c	27 Oct 2003 22:12:23 -0000	1.51
***************
*** 1100,1116 ****
  
  
! void serverstab_editbutton_callback(GtkWidget *widget, 
! 				    struct prefs_windata *pw)
  {
       GtkWidget *clist = pw->serverstab_server_clist;
       void *data = gtk_object_get_data(GTK_OBJECT(clist),
  				      "selected-row");
!      if (data) {
! 	  gint row = GPOINTER_TO_INT(data);
! 	  struct ldapserver *server = gtk_clist_get_row_data(GTK_CLIST(clist),
! 							     row);
! 	  /* quietly ignore editbutton if no server selected */
! 	  if(server) create_edit_server_window(server, pw->prefswindow);
!      }
  }
  
--- 1100,1115 ----
  
  
! static void serverstab_editbutton_callback(GtkWidget *widget, 
! 					   struct prefs_windata *pw)
  {
       GtkWidget *clist = pw->serverstab_server_clist;
       void *data = gtk_object_get_data(GTK_OBJECT(clist),
  				      "selected-row");
! 
!      gint row = GPOINTER_TO_INT(data);
!      struct ldapserver *server = gtk_clist_get_row_data(GTK_CLIST(clist),
! 							row);
!      /* quietly ignore editbutton if no server selected */
!      if(server) create_edit_server_window(server, pw->prefswindow);
  }
  
***************
*** 2028,2032 ****
  	  return;
  
!      create_template_edit_window(server, NULL);
  }
  
--- 2027,2031 ----
  	  return;
  
!      create_template_edit_window(server, NULL, pw->prefswindow);
  }
  
***************
*** 2052,2056 ****
  	  return;
  
!      create_template_edit_window(server, templatename);
  
  }
--- 2051,2055 ----
  	  return;
  
!      create_template_edit_window(server, templatename, pw->prefswindow);
  
  }
***************
*** 2060,2067 ****
  				GdkEventButton *event, struct prefs_windata *data)
  {
! 
!      if(event && event->type != GDK_BUTTON_PRESS)
! 	  template_edit_callback(NULL, data);
! 
  }
  
--- 2059,2067 ----
  				GdkEventButton *event, struct prefs_windata *data)
  {
!      if (event) {
! 	  if(event->type == GDK_2BUTTON_PRESS) {
! 	       template_edit_callback(NULL, data);
! 	  }
!      }
  }