[Groundstation-commits] CVS: gpredict/src main.c,1.82,1.83 satmap.c,1.27,1.28 satmap.h,1.8,1.9

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

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

Modified Files:
	main.c satmap.c satmap.h 
Log Message:
Misc. updates.

Index: main.c
===================================================================
RCS file: /cvsroot/groundstation/gpredict/src/main.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -C2 -d -r1.82 -r1.83
*** main.c	24 Feb 2002 01:09:01 -0000	1.82
--- main.c	25 Feb 2002 20:19:23 -0000	1.83
***************
*** 171,175 ****
  
  	/* reload "session" */
! 	reopen_modules ();
  
  	gtk_main ();
--- 171,175 ----
  
  	/* reload "session" */
! //	reopen_modules ();
  
  	gtk_main ();

Index: satmap.c
===================================================================
RCS file: /cvsroot/groundstation/gpredict/src/satmap.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** satmap.c	25 Feb 2002 18:40:51 -0000	1.27
--- satmap.c	25 Feb 2002 20:19:23 -0000	1.28
***************
*** 53,60 ****
  
  
- //#ifdef HAVE_GDK_PIXBUF
  #include <gdk-pixbuf/gdk-pixbuf.h>
  #include <gdk-pixbuf/gnome-canvas-pixbuf.h>
- //#endif
  
  
--- 53,58 ----
***************
*** 84,87 ****
--- 82,87 ----
  
  
+ 
+ 
  gint satmap_open (gchar *name, gboolean addtolist)
  {
***************
*** 101,110 ****
  	GnomeCanvasItem *mapitem,*qthmark,*qthlabel;
  	GdkPixbuf *map;
- 
  	/* sat related */
  	sat_t *sat;             /* pointer to a single sat struct */
  	satmap_sat_t *smsat = NULL;    /* pointer to a single satmap sat struct */
  	GList *slist = NULL;    /* list of satmap sat structs */
- 
  	/* other vars */
  	gchar *configfile;
--- 101,108 ----
***************
*** 112,115 ****
--- 110,114 ----
  	gint argc,i,timer;
  
+ 
  	/**** FIXME: If there is an open module with the specified name, the new
  	      module will not be created, but the contents of the config file
***************
*** 123,136 ****
  		return -1;
  
! 	/* 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)
    		satmodules_add_module (name, SATMOD_TYPE_MAP);
  
  	/* Create config file path and get sats */
--- 122,135 ----
  		return -1;
  
! 	if (addtolist) {
! 		/* 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;
! 		}
    		satmodules_add_module (name, SATMOD_TYPE_MAP);
+ 	}
  
  	/* Create config file path and get sats */
***************
*** 442,444 ****
  
  }
- 
--- 441,442 ----

Index: satmap.h
===================================================================
RCS file: /cvsroot/groundstation/gpredict/src/satmap.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** satmap.h	24 Feb 2002 00:36:08 -0000	1.8
--- satmap.h	25 Feb 2002 20:19:23 -0000	1.9
***************
*** 60,63 ****
--- 60,64 ----
  	GnomeCanvasItem *mark;
  	GnomeCanvasItem *text;
+ 	GnomeCanvasItem *range;
  };