[Groundstation-commits] CVS: gpredict/src ChangeLog,1.6,1.7 satmap.c,1.26,1.27

[Alexandru C. <cs...@us...>]

Update of /cvsroot/groundstation/gpredict/src
In directory usw-pr-cvs1:/tmp/cvs-serv9064

Modified Files:
	ChangeLog satmap.c 
Log Message:
Reenabled check for opened maps in satmap_open.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/groundstation/gpredict/src/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ChangeLog	25 Feb 2002 18:08:32 -0000	1.6
--- ChangeLog	25 Feb 2002 18:40:51 -0000	1.7
***************
*** 9,11 ****
--- 9,13 ----
  	gnome_config_clean_key (bug #522484).
  	* callbacks.c/h: Updated copyright info.
+ 	* satmap.c: Enabled check for opened maps in satmap_open
+ 	so that the same map can not be opened twice.
  	

Index: satmap.c
===================================================================
RCS file: /cvsroot/groundstation/gpredict/src/satmap.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** satmap.c	24 Feb 2002 02:15:08 -0000	1.26
--- satmap.c	25 Feb 2002 18:40:51 -0000	1.27
***************
*** 124,135 ****
  
  	/* is there a module with the specified name already open? */
! 	/* NO NEED FOR IT BECAUSE SATMOD WILL DO THE CHECK */
! 	/* BUT CAN CAUSE BUG #521816 ON THE OTHER HAND... */
! /*  	if (satmodules_test_open_modules (name, SATMOD_TYPE_MAP)) { */
! /*  		gnome_app_error (GNOME_APP (app), */
! /*  				 _("There is already a MAP with the selected name open.\n"\ */
! /*  				   "Please close that MAP or specify another name.")); */
! /*  		return -1; */
! /*  	} */
  
    	if (addtolist)
--- 124,133 ----
  
  	/* is there a module with the specified name already open? */
! 	if (satmodules_test_open_modules (name, SATMOD_TYPE_MAP)) {
! 		gnome_app_error (GNOME_APP (app),
! 				 _("There is already a MAP with the selected name open.\n"\
! 				   "Please close that MAP or specify another name."));
! 		return -1;
! 	}
  
    	if (addtolist)
***************
*** 256,261 ****
  	sattabs_add_tab (vbox, name);
  
- 	g_print ("NAME: %s\nOBJ: %s\n", name, gtk_object_get_data (GTK_OBJECT (vbox), "name"));
- 
  	g_free (configfile);
  
--- 254,257 ----
***************
*** 446,447 ****
--- 442,444 ----
  
  }
+