summaryrefslogtreecommitdiff
path: root/navit/graphics/sdl/graphics_sdl.c
diff options
context:
space:
mode:
Diffstat (limited to 'navit/graphics/sdl/graphics_sdl.c')
-rw-r--r--navit/graphics/sdl/graphics_sdl.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/navit/graphics/sdl/graphics_sdl.c b/navit/graphics/sdl/graphics_sdl.c
index e5d9f7872..b1a9c17b9 100644
--- a/navit/graphics/sdl/graphics_sdl.c
+++ b/navit/graphics/sdl/graphics_sdl.c
@@ -96,8 +96,6 @@ struct graphics_priv {
/* </main> */
};
-static int dummy;
-
#ifdef USE_WEBOS
# define WEBOS_KEY_SHIFT 0x130
# define WEBOS_KEY_SYM 0x131
@@ -875,7 +873,7 @@ get_data(struct graphics_priv *this, char const *type)
win->disable_suspend=NULL;
return win;
} else {
- return &dummy;
+ return NULL;
}
}
@@ -909,6 +907,8 @@ static struct graphics_methods graphics_methods = {
overlay_disable,
NULL, /* overlay_resize */
NULL, /* set_attr */
+ NULL, /* show_native_keyboard */
+ NULL, /* hide_native_keyboard */
};
static struct graphics_priv *
@@ -986,7 +986,7 @@ overlay_new(struct graphics_priv *gr, struct graphics_methods *meth, struct poin
struct font_priv *(*font_freetype_new) (void *meth);
- font_freetype_new = plugin_get_font_type ("freetype");
+ font_freetype_new = plugin_get_category_font ("freetype");
if (!font_freetype_new)
{
@@ -1407,7 +1407,7 @@ graphics_sdl_new(struct navit *nav, struct graphics_methods *meth, struct attr *
this->cbl = cbl;
/* initialize fonts */
- font_freetype_new = plugin_get_font_type("freetype");
+ font_freetype_new = plugin_get_category_font("freetype");
if (!font_freetype_new) {
g_free(this);
@@ -1852,9 +1852,9 @@ void
plugin_init(void)
{
#ifdef USE_WEBOS
- plugin_register_event_type("sdl", event_sdl_new);
+ plugin_register_category_event("sdl", event_sdl_new);
#endif
- plugin_register_graphics_type("sdl", graphics_sdl_new);
+ plugin_register_category_graphics("sdl", graphics_sdl_new);
}
// vim: sw=4 ts=8