← Back to branch summary

~ubuntu-branches/ubuntu/trusty/tangogps/trusty

« back to all changes in this revision

Viewing changes to src/init.c

  • Committer: Bazaar Package Importer
  • Author(s): Daniel Baumann
  • Date: 2009-11-22 15:48:27 UTC
  • mfrom: (1.2.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20091122154827-ozkoksne364vm0et
Tags: 0.99.1+debian-1
http://bugs.debian.org/557513
* Merging upstream version 0.99.1+debian (Closes: #557513).
* Updating README.source.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/init.c
58
58
                                gpsdata->hdop,
59
59
                                buffer);
60
60
                
61
 
                if (fp) fprintf(fp,data);
 
61
                if (fp) fprintf(fp, "%s", data);
62
62
        }
63
63
}
64
64
 
476
476
        {
477
477
                repo_t *repo1 = g_new0(repo_t, 1);
478
478
                repo_t *repo2 = g_new0(repo_t, 1);
479
 
                repo_t *repo3 = g_new0(repo_t, 1);
 
479
 
480
480
                repo_t *repo4 = g_new0(repo_t, 1);
481
481
                repo_t *repo5 = g_new0(repo_t, 1);
482
482
 
494
494
                repo2->inverted_zoom = 0;
495
495
                global_repo_list = g_slist_append(global_repo_list, repo2);
496
496
                
497
 
                repo3->name = g_strdup("Aerial");
498
 
                repo3->uri  = g_strdup("openaerial");
499
 
                repo3->dir  = g_strdup_printf("%s/Maps/openaerial",global_home_dir);
500
 
                repo3->inverted_zoom = 0;
501
 
                global_repo_list = g_slist_append(global_repo_list, repo3);
502
497
                
503
498
                repo4->name = g_strdup("Opencyclemap");
504
499
                repo4->uri  = g_strdup("http://a.andy.sandbox.cloudmade.com/tiles/cycle/%d/%d/%d.png");
594
589
        
595
590
        GSList          *list;
596
591
        const gchar     *reponame;
 
592
        int unused;
597
593
        
598
594
        for(list = global_repo_list; list != NULL; list = list->next)
599
595
        {
614
610
                printf("Resetting repo_name and exiting now.\n\n");
615
611
                printf("If problem persists after restart, \n");
616
612
                printf("execute in a terminal: gconftool-2 -u /apps/tangogps/repos");
617
 
                system("gconftool-2 -u /apps/tangogps/repo_name");
 
613
                unused = system("gconftool-2 -u /apps/tangogps/repo_name");
618
614
                exit(EXIT_FAILURE);             
619
615
        }
620
616
}
900
896
        
901
897
        widget = lookup_widget(window1, "label117");
902
898
#ifdef VERSION
903
 
        gtk_label_set_label(GTK_LABEL(widget), "<i>tangoGPS version: " VERSION "\nDeveloper: Marcus Bauer</i>");
 
899
        gtk_label_set_label(GTK_LABEL(widget), "<i><small>tangoGPS version: " VERSION "\nDeveloper: Marcus Bauer</small></i>");
904
900
#endif
905
901
 
906
902
        str = gconf_client_get_string(global_gconfclient, GCONF"/gpsd_host",&err);