osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Revision 45146 fixed only the first map. This patch fixes all maps. 

#BACKPORT(1.6, 1.8)

svn path=/trunk/; revision=45148
This commit is contained in:
Chris Maynard 2012-09-26 12:54:46 +00:00
parent 0b194f98ad
commit d70f250406
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ui/gtk/hostlist_table.c
View File

@ -932,12 +932,19 @@ typedef struct {
hostlist_table *talkers;
} map_t;
static char *map_endpoint_opener;
static void
map_init(void)
{
map_endpoint_opener = "{\n";
}
/* XXX output in C locale */
static gboolean
map_handle(GtkTreeModel *model, GtkTreePath *path _U_, GtkTreeIter *iter,
gpointer data)
{
static char *opener = "{\n";
map_t *map = (map_t *)data;
gchar *table_entry, *esc_entry;
guint64 value;
@ -963,7 +970,7 @@ map_handle(GtkTreeModel *model, GtkTreePath *path _U_, GtkTreeIter *iter,
},
*/
fputs(opener, map->out_file);
fputs(map_endpoint_opener, map->out_file);
fputs(" 'type': 'Feature', 'geometry': { 'type': 'Point', 'coordinates': [", map->out_file);
/* Longitude */
@ -1029,7 +1036,7 @@ map_handle(GtkTreeModel *model, GtkTreePath *path _U_, GtkTreeIter *iter,
fputs("' }\n", map->out_file);
fputs("}", map->out_file);
opener = ",\n{\n";
map_endpoint_opener = ",\n{\n";
map->hosts_written = TRUE;
@ -1142,6 +1149,7 @@ open_as_map_cb(GtkWindow *copy_bt, gpointer data _U_)
fputs(tpl_line, map.out_file);
/* MUST match ipmap.html */
if (strstr(tpl_line, "// Start endpoint list")) {
map_init();
gtk_tree_model_foreach(GTK_TREE_MODEL(store), map_handle, &map);
}
}