summaryrefslogtreecommitdiff
path: root/navit/gui
diff options
context:
space:
mode:
Diffstat (limited to 'navit/gui')
-rw-r--r--navit/gui/gtk/gui_gtk_action.c4
-rw-r--r--navit/gui/gtk/gui_gtk_window.c6
-rw-r--r--navit/gui/internal/gui_internal_command.c8
-rw-r--r--navit/gui/qt5_qml/backend.cpp6
4 files changed, 13 insertions, 11 deletions
diff --git a/navit/gui/gtk/gui_gtk_action.c b/navit/gui/gtk/gui_gtk_action.c
index ca5ff9427..7b700c7d5 100644
--- a/navit/gui/gtk/gui_gtk_action.c
+++ b/navit/gui/gtk/gui_gtk_action.c
@@ -158,6 +158,7 @@ static void info_action(GtkWidget *w, struct gui_priv *gui, void *dummy) {
struct coord lt, rb;
struct point p;
struct transformation *t;
+ int retval;
t=navit_get_trans(gui->nav);
transform_get_size(t, &mw, &mh);
@@ -169,7 +170,8 @@ static void info_action(GtkWidget *w, struct gui_priv *gui, void *dummy) {
transform_reverse(t, &p, &rb);
sprintf(buffer,"./info.sh %d,%d 0x%x,0x%x 0x%x,0x%x", mw, mh, lt.x, lt.y, rb.x, rb.y);
- system(buffer);
+ retval=system(buffer);
+ dbg(lvl_debug,"calling %s returned %d", buffer, retval);
}
diff --git a/navit/gui/gtk/gui_gtk_window.c b/navit/gui/gtk/gui_gtk_window.c
index 858904ddb..008659c44 100644
--- a/navit/gui/gtk/gui_gtk_window.c
+++ b/navit/gui/gtk/gui_gtk_window.c
@@ -413,7 +413,7 @@ static void gui_gtk_layouts_init(struct gui_priv *this) {
int count=0;
char *name;
- iter=navit_attr_iter_new();
+ iter=navit_attr_iter_new(NULL);
while(navit_get_attr(this->nav, attr_layout, &attr, iter)) {
name=g_strdup_printf("Layout %d", count++);
data=g_new(struct action_cb_data, 1);
@@ -466,7 +466,7 @@ static void gui_gtk_vehicles_update(struct gui_priv *this) {
g_list_free(this->vehicle_menuitems);
this->vehicle_menuitems = NULL;
- iter=navit_attr_iter_new();
+ iter=navit_attr_iter_new(NULL);
while(navit_get_attr(this->nav, attr_vehicle, &attr, iter)) {
vehicle_get_attr(attr.u.vehicle, attr_name, &vattr, NULL);
name=g_strdup_printf("Vehicle %d", count++);
@@ -495,7 +495,7 @@ static void gui_gtk_maps_init(struct gui_priv *this) {
int count=0;
char *name, *label;
- iter=navit_attr_iter_new();
+ iter=navit_attr_iter_new(NULL);
while(navit_get_attr(this->nav, attr_map, &attr, iter)) {
name=g_strdup_printf("Map %d", count++);
if (! map_get_attr(attr.u.map, attr_type, &type, NULL))
diff --git a/navit/gui/internal/gui_internal_command.c b/navit/gui/internal/gui_internal_command.c
index 910e2e8cf..ffd795b7d 100644
--- a/navit/gui/internal/gui_internal_command.c
+++ b/navit/gui/internal/gui_internal_command.c
@@ -200,7 +200,7 @@ static void gui_internal_cmd2_setting_vehicle(struct gui_priv *this, char *funct
struct attr_iter *iter;
struct attr active_vehicle;
- iter=navit_attr_iter_new();
+ iter=navit_attr_iter_new(NULL);
if (navit_get_attr(this->nav, attr_vehicle, &attr, iter) && !navit_get_attr(this->nav, attr_vehicle, &attr2, iter)) {
vehicle_get_attr(attr.u.vehicle, attr_name, &vattr, NULL);
navit_attr_iter_destroy(iter);
@@ -215,7 +215,7 @@ static void gui_internal_cmd2_setting_vehicle(struct gui_priv *this, char *funct
gui_internal_widget_append(wb, w);
if (!navit_get_attr(this->nav, attr_vehicle, &active_vehicle, NULL))
active_vehicle.u.vehicle=NULL;
- iter=navit_attr_iter_new();
+ iter=navit_attr_iter_new(NULL);
while(navit_get_attr(this->nav, attr_vehicle, &attr, iter)) {
vehicle_get_attr(attr.u.vehicle, attr_name, &vattr, NULL);
wl=gui_internal_button_new_with_callback(this, vattr.u.str,
@@ -278,7 +278,7 @@ static void gui_internal_cmd2_setting_maps(struct gui_priv *this, char *function
//w->spy=this->spacing*3;
w = gui_internal_widget_table_new(this,gravity_left_top | flags_fill | flags_expand |orientation_vertical,1);
gui_internal_widget_append(wb, w);
- iter=navit_attr_iter_new();
+ iter=navit_attr_iter_new(NULL);
on.type=off.type=attr_active;
on.u.num=1;
off.u.num=0;
@@ -323,7 +323,7 @@ static void gui_internal_cmd2_setting_layout(struct gui_priv *this, char *functi
wb=gui_internal_menu(this, _("Layout"));
w=gui_internal_widget_table_new(this, gravity_top_center|orientation_vertical|flags_expand|flags_fill,1);
gui_internal_widget_append(wb, w);
- iter=navit_attr_iter_new();
+ iter=navit_attr_iter_new(NULL);
while(navit_get_attr(this->nav, attr_layout, &attr, iter)) {
gui_internal_widget_append(w, row=gui_internal_widget_table_row_new(this,
gravity_left|orientation_horizontal|flags_fill));
diff --git a/navit/gui/qt5_qml/backend.cpp b/navit/gui/qt5_qml/backend.cpp
index 7a455c2a6..c9733b173 100644
--- a/navit/gui/qt5_qml/backend.cpp
+++ b/navit/gui/qt5_qml/backend.cpp
@@ -69,7 +69,7 @@ void Backend::get_maps() {
struct attr_iter * iter;
_maps.clear();
- iter = navit_attr_iter_new();
+ iter = navit_attr_iter_new(NULL);
on.type = off.type = attr_active;
on.u.num = 1;
off.u.num = 0;
@@ -106,7 +106,7 @@ void Backend::get_vehicles() {
struct attr active_vehicle;
_vehicles.clear();
- iter=navit_attr_iter_new();
+ iter=navit_attr_iter_new(NULL);
if (navit_get_attr(this->nav, attr_vehicle, &attr, iter) && !navit_get_attr(this->nav, attr_vehicle, &attr2, iter)) {
vehicle_get_attr(attr.u.vehicle, attr_name, &vattr, NULL);
navit_attr_iter_destroy(iter);
@@ -119,7 +119,7 @@ void Backend::get_vehicles() {
if (!navit_get_attr(this->nav, attr_vehicle, &active_vehicle, NULL))
active_vehicle.u.vehicle=NULL;
- iter=navit_attr_iter_new();
+ iter=navit_attr_iter_new(NULL);
while(navit_get_attr(this->nav, attr_vehicle, &attr, iter)) {
vehicle_get_attr(attr.u.vehicle, attr_name, &vattr, NULL);
dbg(lvl_debug, "adding vehicle %s", vattr.u.str);
View Lorry Controller Status