Diff of /trunk/src/main.c

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

revision 288 by harbaum, Mon Jun 7 19:19:50 2010 UTC revision 289 by harbaum, Tue Jun 8 19:11:05 2010 UTC
# Line 716  static GtkWidget *cachelist_create(appda Line 716  static GtkWidget *cachelist_create(appda
716    g_signal_connect(G_OBJECT(view), "focus-out-event",    g_signal_connect(G_OBJECT(view), "focus-out-event",
717                     G_CALLBACK(on_cachelist_focus_out), container);                     G_CALLBACK(on_cachelist_focus_out), container);
718    
   /* make sure window can control gps */  
   g_signal_connect(G_OBJECT(appdata->window), "focus-in-event",  
                    G_CALLBACK(on_main_focus_change), appdata);  
   
   g_signal_connect(G_OBJECT(appdata->window), "focus-out-event",  
                    G_CALLBACK(on_main_focus_change), appdata);  
   
719  #ifndef USE_PANNABLE_AREA  #ifndef USE_PANNABLE_AREA
720    g_signal_connect(gtk_scrolled_window_get_vadjustment(    g_signal_connect(gtk_scrolled_window_get_vadjustment(
721                 GTK_SCROLLED_WINDOW(container)),                 GTK_SCROLLED_WINDOW(container)),
# Line 798  void cachelist_dialog(appdata_t *appdata Line 791  void cachelist_dialog(appdata_t *appdata
791    hildon_window_set_app_menu(HILDON_WINDOW(window),    hildon_window_set_app_menu(HILDON_WINDOW(window),
792                               menu_create(appdata, MENU_CACHELIST));                               menu_create(appdata, MENU_CACHELIST));
793    
794      /* make sure window can control gps */
795      g_signal_connect(G_OBJECT(window), "focus-in-event",
796                       G_CALLBACK(on_main_focus_change), appdata);
797    
798      g_signal_connect(G_OBJECT(window), "focus-out-event",
799                       G_CALLBACK(on_main_focus_change), appdata);
800    
801    g_signal_connect(G_OBJECT(window), "destroy",    g_signal_connect(G_OBJECT(window), "destroy",
802                     G_CALLBACK(on_cachelist_destroy), appdata);                     G_CALLBACK(on_cachelist_destroy), appdata);
803    
# Line 2599  int main(int argc, char *argv[]) { Line 2599  int main(int argc, char *argv[]) {
2599    appdata.gps_state = gps_init();    appdata.gps_state = gps_init();
2600    gps_change_state(&appdata);    gps_change_state(&appdata);
2601    
2602      gps_register_callback(appdata.gps_state,
2603              LATLON_CHANGED | TRACK_CHANGED | HERR_CHANGED | SATELLITE_CHANGED,
2604              main_gps_cb, &appdata);
2605    
2606    /* make sure window can control gps */    /* make sure window can control gps */
2607    g_signal_connect(G_OBJECT(appdata.window), "focus-in-event",    g_signal_connect(G_OBJECT(appdata.window), "focus-in-event",
2608                     G_CALLBACK(on_main_focus_change), &appdata);                     G_CALLBACK(on_main_focus_change), &appdata);
Legend:
Removed from v.288  
changed lines
  Added in v.289