diff options
author | Pierre Grandin <grandinp@altern.org> | 2016-12-01 19:23:13 +0000 |
---|---|---|
committer | Pierre Grandin <grandinp@altern.org> | 2016-12-01 19:23:13 +0000 |
commit | 5030d911084584f9b37aeaa916ab43130044edbf (patch) | |
tree | 0f0e400aa2c575c3fcdfcceaa6012d2f760e525e /navit/gui/gtk | |
parent | 449e5530c4ee68f77691c811f0670cf90e9e58a4 (diff) | |
parent | 59bbe485ba74a6df5ec944275ae28fc1bd98981e (diff) | |
download | navit-5030d911084584f9b37aeaa916ab43130044edbf.tar.gz |
Merge branch 'trunk' into trac/1341trac/1341
Conflicts:
navit/Makefile.am
navit/xpm/Makefile.am
po/Makefile.am
Diffstat (limited to 'navit/gui/gtk')
-rw-r--r-- | navit/gui/gtk/gui_gtk_window.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/navit/gui/gtk/gui_gtk_window.c b/navit/gui/gtk/gui_gtk_window.c index 71bd26315..1741a54a0 100644 --- a/navit/gui/gtk/gui_gtk_window.c +++ b/navit/gui/gtk/gui_gtk_window.c @@ -808,5 +808,5 @@ plugin_init(void) #endif - plugin_register_gui_type("gtk", gui_gtk_new); + plugin_register_category_gui("gtk", gui_gtk_new); } |