update:gui:gtk somehow shows up, but frequent segfaults

navit-gps · Jun 22, 2020 · 240f177 · 240f177
1 parent dce54b3
commit 240f177
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/navit/gui/gtk/destination.c b/navit/gui/gtk/destination.c
@@ -545,7 +545,7 @@ int destination_address(struct navit *nav) {
     gtk_widget_grab_focus(search->entry_city);
 
     gtk_box_pack_start(GTK_BOX(vbox), table, TRUE, TRUE, 0);
-    keyboard=gtk_socket_new();
+//    keyboard=gtk_socket_new();
     gtk_box_pack_end(GTK_BOX(vbox), keyboard, FALSE, FALSE, 0);
     gtk_container_add(GTK_CONTAINER(window2), vbox);
 #if 0
@@ -554,7 +554,7 @@ int destination_address(struct navit *nav) {
     gtk_widget_show_all(window2);
 
 #ifndef _WIN32
-    gtk_socket_steal(GTK_SOCKET(keyboard), spawn_xkbd("xkbd","-geometry 200x100"));
+//    gtk_socket_steal(GTK_SOCKET(keyboard), spawn_xkbd("xkbd","-geometry 200x100"));
 #endif
 
     country_attr=country_default();

diff --git a/navit/gui/gtk/gui_gtk_poi.c b/navit/gui/gtk/gui_gtk_poi.c
@@ -19,6 +19,7 @@
 
 #include <stdlib.h>
 #include <gtk/gtk.h>
+#include <gtk/gtkx.h>
 #include "gui_gtk_poi.h"
 #include "popup.h"
 #include "debug.h"
@@ -384,7 +385,9 @@ void gtk_gui_poi(struct navit *nav) {
         search->label_distance = gtk_label_new(_("Select a search radius from screen center in miles"));
     }
 
-    search->entry_distance=gtk_entry_new_with_max_length(2);
+    //search->entry_distance=gtk_entry_new_with_max_length(2);
+    search->entry_distance=gtk_entry_new();
+    gtk_entry_set_max_length(GTK_ENTRY(search->entry_distance),2);
     gtk_entry_set_text(GTK_ENTRY(search->entry_distance),"10");
 
     search->treeview_cat=gtk_tree_view_new();

diff --git a/navit/gui/gtk/gui_gtk_window.c b/navit/gui/gtk/gui_gtk_window.c
@@ -27,6 +27,7 @@
 #include <X11/XF86keysym.h>
 #endif
 #include <gtk/gtk.h>
+#include <gtk/gtkx.h>
 #include "config.h"
 #include "item.h"
 #include "xmlconfig.h"