Diff of /trunk/src/gps.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 185 by harbaum, Wed Apr 1 12:47:35 2009 UTC revision 186 by harbaum, Fri Jul 3 14:07:27 2009 UTC
# Line 82  void gps_init(appdata_t *appdata) { Line 82  void gps_init(appdata_t *appdata) {
82  #if MAEMO_VERSION_MAJOR < 5  #if MAEMO_VERSION_MAJOR < 5
83    gps_state->control = location_gpsd_control_get_default();    gps_state->control = location_gpsd_control_get_default();
84    
85    if(appdata->gps_enabled && gps_state->control &&    if(gps_state->control && gps_state->control->can_control) {
      gps_state->control->can_control) {  
86      printf("Having control over GPSD and GPS is to be enabled, starting it\n");      printf("Having control over GPSD and GPS is to be enabled, starting it\n");
87      location_gpsd_control_start(gps_state->control);      location_gpsd_control_start(gps_state->control);
88    }    }
# Line 111  void gps_release(appdata_t *appdata) { Line 110  void gps_release(appdata_t *appdata) {
110    
111  void gps_enable(appdata_t *appdata, gboolean enable) {  void gps_enable(appdata_t *appdata, gboolean enable) {
112    appdata->gps_enabled = enable;    appdata->gps_enabled = enable;
   
 #if MAEMO_VERSION_MAJOR < 5  
   gps_state_t *gps_state = appdata->gps_state;  
   if(gps_state->control && gps_state->control->can_control) {  
     printf("Having control over GPSD, %sing it\n",  
            enable?"start":"stop");  
   
     if(enable)  
       location_gpsd_control_start(gps_state->control);  
     else  
       location_gpsd_control_stop(gps_state->control);  
   }  
 #endif  
113  }  }
114    
115  #else  // ENABLE_LIBLOCATION  #else  // ENABLE_LIBLOCATION

Legend:
Removed from v.185  
changed lines
  Added in v.186