Diff of /trunk/src/map-tool.c

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

revision 40 by harbaum, Sun Aug 2 19:05:24 2009 UTC revision 66 by harbaum, Wed Aug 19 20:03:28 2009 UTC
# Line 1  Line 1 
1  /*  /*
2   * Copyright (C) 2008 Till Harbaum <till@harbaum.org>.   * Copyright (C) 2008-2009 Till Harbaum <till@harbaum.org>.
3   *   *
4   * This file is part of GPXView.   * This file is part of GPXView.
5   *   *
# Line 18  Line 18 
18   */   */
19    
20  #include "gpxview.h"  #include "gpxview.h"
21    #include "converter.h"
22  #include <math.h>    // for isnan  #include <math.h>    // for isnan
23    
24  #ifdef ENABLE_OSM_GPS_MAP  #ifdef ENABLE_OSM_GPS_MAP
25  #include "osm-gps-map.h"  #include "osm-gps-map.h"
26  #endif  #endif
27    
28  typedef struct {  #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENSTREETMAP
29    appdata_t *appdata;  #define GPS_DEFAULT_ZOOM 13
   GtkWidget *widget;  
   GtkWidget *zoomin, *zoomout, *gps;  
   gint handler_id;  
 #if MAEMO_VERSION_MAJOR == 5  
   GtkWidget *old_view;  
 #endif  
 } map_context_t;  
30    
31  #define PROXY_KEY  "/system/http_proxy/"  #define PROXY_KEY  "/system/http_proxy/"
32    
# Line 72  static const char *get_proxy_uri(appdata Line 66  static const char *get_proxy_uri(appdata
66    return NULL;    return NULL;
67  }  }
68    
69  static void map_zoom(map_context_t *context, int step) {  static void
70    int zoom;  cb_map_gps(map_context_t *context) {
   OsmGpsMap *map = OSM_GPS_MAP(context->widget);  
   g_object_get(map, "zoom", &zoom, NULL);  
   zoom = osm_gps_map_set_zoom(map, zoom+step);  
   
   /* enable/disable zoom buttons as required */  
   gtk_widget_set_sensitive(context->zoomin, zoom<17);  
   gtk_widget_set_sensitive(context->zoomout, zoom>1);  
 }  
   
 static gboolean  
 cb_map_zoomin(GtkButton *button, map_context_t *context) {  
   map_zoom(context, +1);  
   return FALSE;  
 }  
   
 static gboolean  
 cb_map_zoomout(GtkButton *button, map_context_t *context) {  
   map_zoom(context, -1);  
   return FALSE;  
 }  
   
 static gboolean  
 cb_map_gps(GtkButton *button, map_context_t *context) {  
71    pos_t *refpos = get_pos(context->appdata);    pos_t *refpos = get_pos(context->appdata);
72    if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {    if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
73      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
74                                refpos->lat, refpos->lon, 14);                        refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);
75    } else {    } else {
76      /* no coordinates given: display the entire world */      /* no coordinates given: display the entire world */
77      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
78                                0.0, 0.0, 1);                                0.0, 0.0, 1);
79    }    }
   
   return FALSE;  
80  }  }
81    
82  static GtkWidget  static int dist2pixel(map_context_t *context, float km, float lat) {
83  *map_add_button(const gchar *icon, GCallback cb, gpointer data,    return 1000.0*km/osm_gps_map_get_scale(OSM_GPS_MAP(context->widget));
                 char *tooltip) {  
   GtkWidget *button = gtk_button_new();  
   gtk_button_set_image(GTK_BUTTON(button),  
                        gtk_image_new_from_stock(icon, GTK_ICON_SIZE_MENU));  
   g_signal_connect(button, "clicked", cb, data);  
 #ifndef USE_MAEMO  
   gtk_widget_set_tooltip_text(button, tooltip);  
 #endif  
   return button;  
84  }  }
85    
86  static gboolean map_gps_update(gpointer data) {  static gboolean map_gps_update(gpointer data) {
87    map_context_t *context = (map_context_t*)data;    map_context_t *context = (map_context_t*)data;
88    
89      /* get reference position ... */
90    pos_t *refpos = get_pos(context->appdata);    pos_t *refpos = get_pos(context->appdata);
91    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);
92    
93    /* get reference position and go there */    /* ... and enable "goto" button if it's valid */
94    gtk_widget_set_sensitive(context->gps, ok);    osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),
95                                  OSM_GPS_MAP_OSD_GPS_CALLBACK(ok?cb_map_gps:NULL), context);
96    
97      if(ok) {
98        float heading = NAN;
99        int radius = 0;
100    
101        if(context->appdata->use_gps) {
102          heading = gps_get_heading(context->appdata);
103    
104          /* get error */
105          float eph = gps_get_eph(context->appdata);
106          if(!isnan(eph))
107            radius = dist2pixel(context, eph/1000, refpos->lat);
108        }
109    
110        g_object_set(context->widget, "gps-track-highlight-radius", radius, NULL);
111        osm_gps_map_draw_gps(OSM_GPS_MAP(context->widget),
112                             refpos->lat, refpos->lon, heading);
113      } else
114        osm_gps_map_clear_gps(OSM_GPS_MAP(context->widget));
115    
116    return TRUE;    return TRUE;
117  }  }
118    
# Line 139  static gboolean on_map_configure(GtkWidg Line 120  static gboolean on_map_configure(GtkWidg
120                                   GdkEventConfigure *event,                                   GdkEventConfigure *event,
121                                   map_context_t *context) {                                   map_context_t *context) {
122    
123    cb_map_gps(NULL, context);    /* set default values if they are invalid */
124      if(!context->appdata->map.zoom ||
125         isnan(context->appdata->map.pos.lat) ||
126         isnan(context->appdata->map.pos.lon)) {
127        printf("no valid map position found\n");
128    
129        pos_t *refpos = get_pos(context->appdata);
130        if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
131          /* use gps position if present */
132          context->appdata->map.pos = *refpos;
133          context->appdata->map.zoom = GPS_DEFAULT_ZOOM;
134        } else {
135          /* use world map otherwise */
136          context->appdata->map.pos.lat = 0.0;
137          context->appdata->map.pos.lon = 0.0;
138          context->appdata->map.zoom = 1;
139        }
140      }
141    
142      /* jump to initial position */
143      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
144                                context->appdata->map.pos.lat,
145                                context->appdata->map.pos.lon,
146                                context->appdata->map.zoom);
147    
148    return FALSE;    return FALSE;
149  }  }
150    
# Line 155  static void map_draw_cachelist(GtkWidget Line 159  static void map_draw_cachelist(GtkWidget
159    }    }
160  }  }
161    
162  #if MAEMO_VERSION_MAJOR == 5  static void
163  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {  map_cachelist_nearest(cache_t *cache, pos_t *pos,
164    printf("destroy map view\n");                        cache_t **result, float *distance) {
165      while(cache) {
166        float dist =
167          pow(cache->pos.lat - pos->lat, 2) +
168          pow(cache->pos.lon - pos->lon, 2);
169    
170        if(!(dist > *distance)) {
171          *result = cache;
172          *distance = dist;
173        }
174    
175    /* restore cur_view */      cache = cache->next;
176    context->appdata->cur_view = context->old_view;    }
177    }
178    
179    gtk_timeout_remove(context->handler_id);  static cache_t *map_closest(map_context_t *context, pos_t *pos) {
180    g_free(context);    cache_t *result = NULL;
181      float distance = NAN;
182    
183    #ifdef USE_MAEMO
184      if(!context->appdata->cur_gpx) {
185    #endif
186        /* search all geocaches */
187        gpx_t *gpx = context->appdata->gpx;
188        while(gpx) {
189          map_cachelist_nearest(gpx->cache, pos, &result, &distance);
190          gpx = gpx->next;
191        }
192    #ifdef USE_MAEMO
193      } else {
194        map_cachelist_nearest(context->appdata->cur_gpx->cache,
195                              pos, &result, &distance);
196      }
197    #endif
198    
199      return result;
200  }  }
201    
202    /* translate between osm-gps-map positions and gpxview ones */
203    pos_t coord2pos(coord_t coo) {
204      pos_t pos;
205      pos.lat = rad2deg(coo.rlat);
206      pos.lon = rad2deg(coo.rlon);
207      return pos;
208    }
209    
210    #define CLICK_FUZZ (24)
211    
212    static gboolean
213    on_map_button_press_event(GtkWidget *widget,
214                                GdkEventButton *event, map_context_t *context) {
215      OsmGpsMap *map = OSM_GPS_MAP(context->widget);
216    
217      /* got a press event without release event? eat it! */
218      if(context->press_on != NULL) {
219        printf("PRESS: already\n");
220        return TRUE;
221      }
222    
223      pos_t pos =
224        coord2pos(osm_gps_map_get_co_ordinates(map, event->x, event->y));
225    
226      cache_t *nearest = map_closest(context, &pos);
227      if(nearest) {
228        float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);
229        if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ)
230          context->press_on = nearest;
231      }
232    
233      return FALSE;
234    }
235    
236    static void
237    cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf *buf, gint x, gint y) {
238      /* convert the pixbuf into something cairo can handle */
239    
240      // Create a new ImageSurface
241      cairo_surface_t *image_surface =
242        cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
243                                   gdk_pixbuf_get_width(buf),
244                                   gdk_pixbuf_get_height(buf));
245    
246      // Create the new Context for the ImageSurface
247      cairo_t *context = cairo_create(image_surface);
248    
249      // Draw the image on the new Context
250      gdk_cairo_set_source_pixbuf(context, buf, 0.0, 0.0);
251      cairo_paint(context);
252    
253      // now draw this onto the original context
254      cairo_set_source_surface(cr, image_surface, x, y);
255    
256      cairo_paint(cr);
257    }
258    
259    #ifndef BIG_BALLOONS
260    #define LINE_SKIP  7
261    #else
262    #define LINE_SKIP  12
263  #endif  #endif
264    
265  void map(appdata_t *appdata) {  static void
266    map_context_t *context = g_new0(map_context_t, 1);  balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {
267    context->appdata = appdata;    cache_t *cache = (cache_t*)data;
268    
269  #if MAEMO_VERSION_MAJOR == 5    //  printf("draw cb for \"%s\"\n", cache->name);
270    GtkWidget *window = hildon_stackable_window_new();  
271    gtk_window_set_title(GTK_WINDOW(window), _("Map"));  #if 0
272      /* draw pink background to check clipping */
273      cairo_rectangle (cr, rect->x-20, rect->y-20, rect->w+40, rect->h+40);
274      cairo_set_source_rgba (cr, 1, 0, 0, 0.3);
275      cairo_fill_preserve (cr);
276      cairo_set_line_width (cr, 0);
277      cairo_stroke (cr);
278    #endif
279    
280      /* leave a little border top and left */
281      gint x = rect->x, y = rect->y;
282    
283      /* draw the cache type icon ... */
284      GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);
285      cairo_draw_pixbuf(cr, icon, x, y);
286    
287      /* ... and right of it the waypoint id */
288      cairo_text_extents_t extents;
289    
290      if(cache->id) {
291        cairo_select_font_face (cr, "Sans",
292                                CAIRO_FONT_SLANT_NORMAL,
293                                CAIRO_FONT_WEIGHT_BOLD);
294    
295    #ifndef BIG_BALLOONS
296        cairo_set_font_size (cr, 20.0);
297  #else  #else
298    GtkWidget *dialog = gtk_dialog_new_with_buttons(_("Map"),      cairo_set_font_size (cr, 36.0);
299                            GTK_WINDOW(appdata->window),  #endif
                           GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,  
                           GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,  
                           NULL);  
300    
301  #ifndef USE_MAEMO      cairo_text_extents (cr, cache->id, &extents);
302    gtk_window_set_default_size(GTK_WINDOW(dialog), 400, 350);  
303        /* display id right of icon vertically centered */
304        x += gdk_pixbuf_get_width(icon) + 5;
305        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
306        cairo_move_to (cr, x, y);
307        cairo_set_source_rgba (cr, 0, 0, 0, 1);
308        cairo_show_text (cr, cache->id);
309        cairo_stroke (cr);
310    
311        y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;
312      } else
313        y += gdk_pixbuf_get_height(icon);
314    
315      /* return to the left border and below icon/text */
316      x = rect->x;
317    
318      /* everything from here uses the same font */
319      cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL,
320                              CAIRO_FONT_WEIGHT_NORMAL);
321    #ifndef BIG_BALLOONS
322      cairo_set_font_size (cr, 14.0);
323  #else  #else
324    gtk_window_set_default_size(GTK_WINDOW(dialog), 800, 480);    cairo_set_font_size (cr, 22.0);
325  #endif  #endif
326    
327      if(cache->name) {
328        /* draw cache name */
329        cairo_text_extents (cr, cache->name, &extents);
330        y += extents.height;
331        cairo_move_to (cr, x, y);
332        cairo_set_source_rgba (cr, 0, 0, 0, 1);
333        cairo_show_text (cr, cache->name);
334        cairo_stroke (cr);
335    
336        /* return to the left border and below text */
337        y += LINE_SKIP;
338        x = rect->x;
339      }
340    
341      if(cache->terrain) {
342        /* draw cache rating */
343        const char *terrain = "Terrain:";
344        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
345        cairo_text_extents (cr, _(terrain), &extents);
346        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
347    
348        /* draw "Terrain:" string */
349        cairo_move_to (cr, x, y);
350        cairo_set_source_rgba (cr, 0, 0, 0, 1);
351        cairo_show_text (cr, _(terrain));
352        cairo_stroke (cr);
353        x += extents.width + 2;
354    
355        /* draw terrain stars */
356        cairo_draw_pixbuf(cr, icon, x, y -
357                          (gdk_pixbuf_get_height(icon) + extents.height)/2);
358    
359        x += gdk_pixbuf_get_width(icon) + LINE_SKIP;
360        y -= (gdk_pixbuf_get_height(icon) + extents.height)/2;
361      }
362    
363      if(cache->difficulty) {
364        const char *difficulty = "Difficulty:";
365        cairo_text_extents (cr, _(difficulty), &extents);
366        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
367    
368        /* draw "Difficulty:" string */
369        cairo_move_to (cr, x, y);
370        cairo_set_source_rgba (cr, 0, 0, 0, 1);
371        cairo_show_text (cr, _(difficulty));
372        cairo_stroke (cr);
373        x += extents.width + 2;
374    
375        icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
376        cairo_draw_pixbuf(cr, icon, x, y -
377                          (gdk_pixbuf_get_height(icon) + extents.height)/2);
378      }
379    }
380    
381    static gboolean
382    on_map_button_release_event(GtkWidget *widget,
383                                GdkEventButton *event, map_context_t *context) {
384      OsmGpsMap *map = OSM_GPS_MAP(context->widget);
385    
386      if(context->press_on) {
387        coord_t coo;
388        coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);
389    
390        pos_t pos =
391          coord2pos(osm_gps_map_get_co_ordinates(map, event->x, event->y));
392    
393        cache_t *nearest = map_closest(context, &pos);
394        if(nearest && nearest == context->press_on) {
395          float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);
396          if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ) {
397    
398            osm_gps_map_draw_balloon(map, nearest->pos.lat, nearest->pos.lon,
399                                     balloon_draw_cb, nearest);
400          }
401        }
402        context->press_on = NULL;
403      } else {
404        /* save new map position */
405        gfloat lat, lon;
406        g_object_get(map, "latitude", &lat, "longitude", &lon, NULL);
407        context->appdata->map.pos.lat = lat;
408        context->appdata->map.pos.lon = lon;
409      }
410    
411      return FALSE;
412    }
413    
414    static void on_window_destroy(GtkWidget *widget, map_context_t *context) {
415      appdata_t *appdata = context->appdata;
416    
417      printf("destroy map window\n");
418    
419      /* save map parameters */
420      OsmGpsMap *map = OSM_GPS_MAP(context->widget);
421      gint zoom;
422      g_object_get(map, "zoom", &zoom, NULL);
423      context->appdata->map.zoom = zoom;
424    
425      gfloat lat, lon;
426      g_object_get(map, "latitude", &lat, "longitude", &lon, NULL);
427      context->appdata->map.pos.lat = lat;
428      context->appdata->map.pos.lon = lon;
429    
430    #if MAEMO_VERSION_MAJOR == 5
431      /* restore cur_view */
432      context->appdata->cur_view = context->old_view;
433  #endif  #endif
434    
435    GtkWidget *hbox = gtk_hbox_new(FALSE, 0);    gtk_timeout_remove(context->handler_id);
436    
437      g_free(context);
438      appdata->map.context = NULL;
439    }
440    
441    void map(appdata_t *appdata) {
442      map_context_t *context = NULL;
443    
444      /* if the map window already exists, just raise it */
445      if(appdata->map.context) {
446        gtk_window_present(GTK_WINDOW(appdata->map.context->window));
447        return;
448      }
449    
450      context = appdata->map.context = g_new0(map_context_t, 1);
451      context->appdata = appdata;
452    
453    char *path = g_strdup_printf("%s/map/", appdata->image_path);    char *path = g_strdup_printf("%s/map/", appdata->image_path);
454    const char *proxy = get_proxy_uri(appdata);    const char *proxy = get_proxy_uri(appdata);
455    
456    context->widget = g_object_new(OSM_TYPE_GPS_MAP,    context->widget = g_object_new(OSM_TYPE_GPS_MAP,
457                  "repo-uri", MAP_SOURCE_OPENSTREETMAP,                   "map-source",               MAP_SOURCE,
458                  "tile-cache", path,                   "tile-cache",               path,
459                  proxy?"proxy-uri":NULL, proxy,                   "auto-center",              FALSE,
460                     "record-trip-history",      FALSE,
461                     "show-trip-history",        FALSE,
462                     proxy?"proxy-uri":NULL,     proxy,
463                   NULL);                   NULL);
464    
465    g_free(path);    g_free(path);
466    
467    /* draw all geocaches */    char *name = NULL;
468    gpx_t *gpx = appdata->gpx;  #ifdef USE_MAEMO
469    while(gpx) {    if(!appdata->cur_gpx) {
470      map_draw_cachelist(context->widget, gpx->cache);  #endif
471      gpx = gpx->next;      /* draw all geocaches */
472        gpx_t *gpx = appdata->gpx;
473        while(gpx) {
474          map_draw_cachelist(context->widget, gpx->cache);
475          gpx = gpx->next;
476        }
477        name = g_strdup(_("all geocaches"));
478    #ifdef USE_MAEMO
479      } else {
480        map_draw_cachelist(context->widget, appdata->cur_gpx->cache);
481        name = g_strdup(appdata->cur_gpx->name);
482    }    }
483    #endif
484    
485      char *title = g_strdup_printf(_("Map - %s"), name);
486      g_free(name);
487    
488    #ifdef USE_MAEMO
489    #ifdef USE_STACKABLE_WINDOW
490      context->window = hildon_stackable_window_new();
491    #else
492      context->window = hildon_window_new();
493    #endif
494    #else
495      context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
496    #endif
497    
498      gtk_window_set_title(GTK_WINDOW(context->window), title);
499    
500    #ifndef USE_MAEMO
501      gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);
502    #endif
503    
504      g_free(title);
505    
506    g_signal_connect(G_OBJECT(context->widget), "configure-event",    g_signal_connect(G_OBJECT(context->widget), "configure-event",
507                     G_CALLBACK(on_map_configure), context);                     G_CALLBACK(on_map_configure), context);
508  #if 0  
509      g_signal_connect(G_OBJECT(context->widget), "button-press-event",
510                       G_CALLBACK(on_map_button_press_event), context);
511    
512    g_signal_connect(G_OBJECT(context->widget), "button-release-event",    g_signal_connect(G_OBJECT(context->widget), "button-release-event",
513                     G_CALLBACK(on_map_button_release_event), context);                     G_CALLBACK(on_map_button_release_event), context);
 #endif  
514    
   gtk_box_pack_start_defaults(GTK_BOX(hbox), context->widget);  
   /* zoom button box */  
   GtkWidget *vbox = gtk_vbox_new(FALSE,0);  
   
   context->zoomin =  
     map_add_button(GTK_STOCK_ZOOM_IN, G_CALLBACK(cb_map_zoomin),  
                    context, _("Zoom in"));  
   gtk_box_pack_start(GTK_BOX(vbox), context->zoomin, FALSE, FALSE, 0);  
   
   context->zoomout =  
     map_add_button(GTK_STOCK_ZOOM_OUT, G_CALLBACK(cb_map_zoomout),  
                    context, _("Zoom out"));  
   gtk_box_pack_start(GTK_BOX(vbox), context->zoomout, FALSE, FALSE, 0);  
   
   context->gps =  
     map_add_button(GTK_STOCK_HOME, G_CALLBACK(cb_map_gps),  
                    context, _("Jump to GPS position"));  
   gtk_widget_set_sensitive(context->gps, FALSE);  
515    /* install handler for timed updates of the gps button */    /* install handler for timed updates of the gps button */
516    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
   gtk_box_pack_start(GTK_BOX(vbox), context->gps, FALSE, FALSE, 0);  
   
   gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);  
517    
518  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
519    /* prevent some of the main screen things */    /* prevent some of the main screen things */
520    context->old_view = appdata->cur_view;    context->old_view = appdata->cur_view;
521    appdata->cur_view = NULL;    appdata->cur_view = NULL;
522    #endif
523    
524    g_signal_connect(G_OBJECT(window), "destroy",    g_signal_connect(G_OBJECT(context->window), "destroy",
525                     G_CALLBACK(on_window_destroy), context);                     G_CALLBACK(on_window_destroy), context);
526    
527    gtk_container_add(GTK_CONTAINER(window), hbox);    gtk_container_add(GTK_CONTAINER(context->window), context->widget);
528    gtk_widget_show_all(GTK_WIDGET(window));    gtk_widget_show_all(GTK_WIDGET(context->window));
   
 #else  
   gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox);  
   gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_CLOSE);  
   gtk_widget_show_all(dialog);  
   gtk_dialog_run(GTK_DIALOG(dialog));  
   gtk_timeout_remove(context->handler_id);  
   gtk_widget_destroy(dialog);  
   g_free(context);  
 #endif  
529  }  }
Legend:
Removed from v.40  
changed lines
  Added in v.66