4 files changed, 13 insertions, 15 deletions
diff --git a/gtk/ansi_a_stat.c b/gtk/ansi_a_stat.c
index df57744b46..b4550ad6ab 100644
--- a/gtk/ansi_a_stat.c
+++ b/gtk/ansi_a_stat.c
@@ -408,7 +408,7 @@ ansi_a_stat_gtk_bsmap_cb(
 	i++;
     }
 
-    ansi_a_stat_draw(NULL);
+    ansi_a_stat_draw(&stat);
 }
 
 
@@ -448,7 +448,7 @@ ansi_a_stat_gtk_dtap_cb(
 	i++;
     }
 
-    ansi_a_stat_draw(NULL);
+    ansi_a_stat_draw(&stat);
 }
 
 
diff --git a/gtk/ansi_map_stat.c b/gtk/ansi_map_stat.c
index 03270be211..764cdb78c8 100644
--- a/gtk/ansi_map_stat.c
+++ b/gtk/ansi_map_stat.c
@@ -412,7 +412,7 @@ ansi_map_stat_gtk_cb(
 	i++;
     }
 
-    ansi_map_stat_draw(NULL);
+    ansi_map_stat_draw(&stat);
 }
 
 
diff --git a/gtk/gsm_a_stat.c b/gtk/gsm_a_stat.c
index 9a13081092..9e558a35fa 100644
--- a/gtk/gsm_a_stat.c
+++ b/gtk/gsm_a_stat.c
@@ -495,7 +495,7 @@ gsm_a_stat_gtk_bssmap_cb(
 	i++;
     }
 
-    gsm_a_stat_draw(NULL);
+    gsm_a_stat_draw(&stat);
 }
 
 
@@ -538,7 +538,7 @@ gsm_a_stat_gtk_dtap_cb(
 	i++;
     }
 
-    gsm_a_stat_draw(NULL);
+    gsm_a_stat_draw(&stat);
 }
 
 static void
diff --git a/gtk/gsm_map_stat.c b/gtk/gsm_map_stat.c
index b7ef591b3d..7e4391d841 100644
--- a/gtk/gsm_map_stat.c
+++ b/gtk/gsm_map_stat.c
@@ -430,15 +430,13 @@ gsm_map_stat_gtk_cb(
 
 	dlg.entries[1] = g_strdup(gsm_map_opr_code_strings[i].strptr);
 
-	dlg.entries[2] = g_strdup("0");
-	dlg.entries[3] = g_strdup("0");
-	dlg.entries[4] = g_strdup("0");
-	dlg.entries[5] = g_strdup("0");
-	dlg.entries[6] = g_strdup("0");
-	dlg.entries[7] = g_strdup("0");
-	dlg.entries[8] = g_strdup("0");
-	dlg.entries[9] = g_strdup("0");
-	dlg.entries[10] = g_strdup("0");
+        /*
+         * set the rest of the columns
+         */
+        for (i = 2; i < GSM_MAP_INIT_TABLE_NUM_COLUMNS; i++)
+        {
+            dlg.entries[i] = g_strdup("0");
+        }
 
 	gtk_clist_insert(GTK_CLIST(dlg.table), i, dlg.entries);
 	gtk_clist_set_row_data(GTK_CLIST(dlg.table), i, (gpointer) i);
@@ -446,7 +444,7 @@ gsm_map_stat_gtk_cb(
 	i++;
     }
 
-    gsm_map_stat_draw(NULL);
+    gsm_map_stat_draw(&gsm_map_stat);
 }