[Groundstation-commits] CVS: gpredict/src satconfig.c,1.14,1.15

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

Update of /cvsroot/groundstation/gpredict/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4895

Modified Files:
	satconfig.c 
Log Message:
Added radio and rotator setup pages.

Index: satconfig.c
===================================================================
RCS file: /cvsroot/groundstation/gpredict/src/satconfig.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** satconfig.c	22 Mar 2004 07:40:38 -0000	1.14
--- satconfig.c	25 Mar 2004 18:57:57 -0000	1.15
***************
*** 38,41 ****
--- 38,44 ----
  */
  
+ #ifdef HAVE_CONFIG_H
+ #  include <config.h>
+ #endif
  
  #include <gnome.h>
***************
*** 47,55 ****
  #include "satconfig.h"
  #include "satconfig-locations.h"
  #include "satlog.h"
  
- #ifdef HAVE_CONFIG_H
- #  include <config.h>
- #endif
  
  
--- 50,57 ----
  #include "satconfig.h"
  #include "satconfig-locations.h"
+ #include "satconfig-rig.h"
+ #include "satconfig-rot.h"
  #include "satlog.h"
  
  
  
***************
*** 121,124 ****
--- 123,132 ----
  				 GNOME_DRUID_PAGE (satconfig_locations_open ()));
  
+ #if defined (HAVE_HAMLIB)
+ 	gnome_druid_append_page (GNOME_DRUID (druid),
+ 				 GNOME_DRUID_PAGE (satconfig_rig_create ()));
+ 	gnome_druid_append_page (GNOME_DRUID (druid),
+ 				 GNOME_DRUID_PAGE (satconfig_rot_create ()));
+ #endif
  
  	/* end page */
***************
*** 149,154 ****
  
  
! static GtkWidget
! *satconfig_page_start ()
  {
  	/* This function creates the start page in the
--- 157,162 ----
  
  
! static GtkWidget *
! satconfig_page_start ()
  {
  	/* This function creates the start page in the
***************
*** 185,190 ****
  
  
! static GtkWidget
! *satconfig_page_finish ()
  {
  	/* This function creates the last page in the
--- 193,198 ----
  
  
! static GtkWidget *
! satconfig_page_finish ()
  {
  	/* This function creates the last page in the
***************
*** 226,229 ****
--- 234,242 ----
  	satconfig_locations_cancel ();
  
+ #if defined (HAVE_HAMLIB)
+ 	satconfig_rig_cancel ();
+ 	satconfig_rot_cancel ();
+ #endif
+ 
  	gtk_widget_destroy (GTK_WIDGET (druidwin));
  	gtk_main_quit ();
***************
*** 312,315 ****
--- 325,334 ----
  	satconfig_locations_finish ();
  
+ #if defined (HAVE_HAMLIB)
+ 	satconfig_rig_finish ();
+ 	satconfig_rot_finish ();
+ #endif
+ 
+ 	gconf_client_suggest_sync (client, NULL);
  
  	gtk_widget_destroy (GTK_WIDGET (druidwin));