Fix:Core:Cleaned up setting event system

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@2073 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c b/navit/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c
index 5b41397..a119874 100644 (file)
--- a/navit/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c
+++ b/navit/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c
@@ -921,6 +921,9 @@ graphics_gtk_drawing_area_new(struct navit *nav, struct graphics_methods *meth,
        GtkWidget *draw;
        struct attr *attr;
 
+       if (! event_request_system("glib","graphics_gtk_drawing_area_new"))
+               return NULL;
+
        draw=gtk_drawing_area_new();
        struct graphics_priv *this=graphics_gtk_drawing_area_new_helper(meth);
        this->nav = nav;

diff --git a/navit/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp b/navit/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp
index e0c91bb..d4fe04f 100644 (file)
--- a/navit/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp
+++ b/navit/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp
@@ -1155,6 +1155,9 @@ static struct graphics_priv * graphics_qt_qpainter_new(struct navit *nav, struct
                return NULL;
        if (! event_request_system("qt","graphics_qt_qpainter_new"))
                return NULL;
+#else
+       if (! event_request_system("glib","graphics_qt_qpainter_new"))
+               return NULL;
 #endif
 #if 1
         font_freetype_new=(struct font_priv *(*)(void *))plugin_get_font_type("freetype");

diff --git a/navit/navit/gui/gtk/gui_gtk_window.c b/navit/navit/gui/gtk/gui_gtk_window.c
index 76eaffc..7283749 100644 (file)
--- a/navit/navit/gui/gtk/gui_gtk_window.c
+++ b/navit/navit/gui/gtk/gui_gtk_window.c
@@ -668,6 +668,9 @@ gui_gtk_new(struct navit *nav, struct gui_methods *meth, struct attr **attrs)
        GtkWidget *widget;
        int fullscreen = 0;
 
+        if (! event_request_system("glib","gui_gtk_new"))
+                return NULL;
+
        if (cp) {
                xid = strtol(cp, NULL, 0);
        }

diff --git a/navit/navit/start.c b/navit/navit/start.c
index 91ba170..275dbae 100644 (file)
--- a/navit/navit/start.c
+++ b/navit/navit/start.c
@@ -164,9 +164,6 @@ int main(int argc, char **argv)
        } while (!file_exists(config_file));
        g_list_free(list);
 
-#ifdef HAVE_GLIB
-       event_request_system("glib","start");
-#endif
        if (!config_load(config_file, &error)) {
                dbg(0, _("Error parsing '%s': %s\n"), config_file, error ? error->message : "");
        } else {