Diff of /trunk/src/main.c

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

revision 142 by harbaum, Mon Oct 26 10:40:06 2009 UTC revision 157 by harbaum, Tue Nov 3 20:20:39 2009 UTC
# Line 19  Line 19 
19  #include <string.h>  #include <string.h>
20  #include <math.h>  #include <math.h>
21    
22    #include <curl/curl.h>
23    
24  #include <time.h>  #include <time.h>
25  #include <sys/time.h>  #include <sys/time.h>
26    
# Line 921  static GtkWidget *gpxlist_create_view_an Line 923  static GtkWidget *gpxlist_create_view_an
923    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),
924                    -1, "Icon", renderer,                    -1, "Icon", renderer,
925                    "pixbuf", GPXLIST_COL_ICON,                    "pixbuf", GPXLIST_COL_ICON,
926                //                  "sensitive", GPXLIST_COL_OPEN,  #ifdef USE_PANNABLE_AREA
927            /* at least one entry needs to be sensitive. */
928            /* This is the delete icon if the PANNABLE_AREA is used */
929                      "sensitive", GPXLIST_COL_OPEN,
930    #endif
931                    NULL);                    NULL);
932    
933    /* --- "FileName" column --- */    /* --- "FileName" column --- */
# Line 977  static GtkWidget *gpxlist_create_view_an Line 983  static GtkWidget *gpxlist_create_view_an
983    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),
984                    -1, "Del", renderer,                    -1, "Del", renderer,
985                    "pixbuf", GPXLIST_COL_DELETE,                    "pixbuf", GPXLIST_COL_DELETE,
986                    "sensitive", GPXLIST_COL_OPEN,                //                  "sensitive", GPXLIST_COL_OPEN,
987                    NULL);                    NULL);
988  #endif  #endif
989    
# Line 1088  cb_menu_about(GtkWidget *window, gpointe Line 1094  cb_menu_about(GtkWidget *window, gpointe
1094    const gchar *authors[] = {    const gchar *authors[] = {
1095      "Till Harbaum <till@harbaum.org>",      "Till Harbaum <till@harbaum.org>",
1096      "John Stowers <john.stowers@gmail.com>",      "John Stowers <john.stowers@gmail.com>",
1097        "GCVote: Guido Wegener <guido.wegener@gmx.de>",
1098      NULL };      NULL };
1099    
1100    context.dialog = g_object_new(GTK_TYPE_ABOUT_DIALOG,    context.dialog = g_object_new(GTK_TYPE_ABOUT_DIALOG,
# Line 1296  gpx_t *search_do(appdata_t *appdata, gpx Line 1303  gpx_t *search_do(appdata_t *appdata, gpx
1303        else if(cache->long_description && (what & SEARCH_DESC) &&        else if(cache->long_description && (what & SEARCH_DESC) &&
1304                strcasestr(cache->long_description, phrase))                strcasestr(cache->long_description, phrase))
1305          hit = 1;          hit = 1;
1306        else if(cache->owner && (what & SEARCH_OWNER) &&        else if(cache->owner && cache->owner->name && (what & SEARCH_OWNER) &&
1307                strcasestr(cache->owner, phrase))                strcasestr(cache->owner->name, phrase))
1308          hit = 1;          hit = 1;
1309    
1310        if(hit) {        if(hit) {
# Line 2291  int main(int argc, char *argv[]) { Line 2298  int main(int argc, char *argv[]) {
2298    
2299    gtk_init (&argc, &argv);    gtk_init (&argc, &argv);
2300    
2301      curl_global_init(CURL_GLOBAL_ALL);
2302    
2303  #ifdef USE_MAEMO  #ifdef USE_MAEMO
2304    printf("Installing osso context for \"org.harbaum." APP "\"\n");    printf("Installing osso context for \"org.harbaum." APP "\"\n");
2305    appdata.osso_context = osso_initialize("org.harbaum."APP,    appdata.osso_context = osso_initialize("org.harbaum."APP,
Legend:
Removed from v.142  
changed lines
  Added in v.157