Fixes

    - Dummy UI plugin
    - GTK2 UI plugin
    - Fixed typo: 'const rcc_string' -> 'rcc_const_string'
    - Fix: Disable BDB recoding in case if recoding switched off

4 files changed, 88 insertions, 10 deletions

diff --git a/ui/Makefile.am b/ui/Makefile.am
index 69395fb..c41cc8c 100644
--- a/ui/Makefile.am
+++ b/ui/Makefile.am
@@ -1,13 +1,35 @@
+lib_LTLIBRARIES = librccui.la
+librccui_la_SOURCES = librccui.c \
+    rccmenu.c rccmenu.h \
+    rccnames.c rccnames.h \
+    internal.h \
+    null.c    
+librccui_la_LIBADD = @XML_LIBS@ ../src/librcc.la
+librccui_la_LDFLAGS = -version-info @LIBRCC_VERSION_INFO@
+
 if HAVE_GTK
-lib_LTLIBRARIES = librccgtk.la
+lib_LTLIBRARIES += librccgtk.la
 librccgtk_la_SOURCES = librccui.c \
     rccmenu.c rccmenu.h \
     rccnames.c rccnames.h \
     internal.h \
     gtk.c    
-librccgtk_la_LIBADD = @GTK_LIBS@ @XML_LIBS@ ../src/librcc.la
+librccgtk_la_LIBADD = @GTK1_LIBS@ @XML_LIBS@ ../src/librcc.la
 librccgtk_la_LDFLAGS = -version-info @LIBRCC_VERSION_INFO@
+librccgtk_la_CPPFLAGS = -I../src @XML_INCLUDES@ @GTK1_INCLUDES@
+endif
+
+if HAVE_GTK2
+lib_LTLIBRARIES += librccgtk2.la
+librccgtk2_la_SOURCES = librccui.c \
+    rccmenu.c rccmenu.h \
+    rccnames.c rccnames.h \
+    internal.h \
+    gtk.c    
+librccgtk2_la_LIBADD = @GTK2_LIBS@ @XML_LIBS@ ../src/librcc.la
+librccgtk2_la_LDFLAGS = -version-info @LIBRCC_VERSION_INFO@
+librccgtk2_la_CPPFLAGS = -I../src @XML_INCLUDES@ @GTK2_CFLAGS@
 endif
 
-INCLUDES = -I../src @GTK_INCLUDES@ @XML_INCLUDES@
+AM_CPPFLAGS = -I../src @XML_INCLUDES@
 include_HEADERS = librccui.h
diff --git a/ui/librccui.h b/ui/librccui.h
index cb17649..2c72678 100644
--- a/ui/librccui.h
+++ b/ui/librccui.h
@@ -62,6 +62,12 @@ typedef struct rcc_ui_page_name_t rcc_ui_page_name;
 
 rcc_ui_page_name *rccUiGetDefaultPageName();
 
+const char *rccUiGetLanguageName(rcc_ui_context ctx, const char *lang);
+const char *rccUiGetCharsetName(rcc_ui_context ctx, const char *charset);
+const char *rccUiGetEngineName(rcc_ui_context ctx, const char *engine);
+const char *rccUiGetClassName(rcc_ui_context ctx, const char *cl);
+const char *rccUiGetOptionName(rcc_ui_context ctx, rcc_option option);
+const char *rccUiGetOptionValueName(rcc_ui_context ctx, rcc_option option, rcc_option_value value);
 
 /*******************************************************************************
 ************************************ API ***************************************
diff --git a/ui/null.c b/ui/null.c
new file mode 100644
index 0000000..36ad032
--- /dev/null
+++ b/ui/null.c
@@ -0,0 +1,57 @@
+#include <stdio.h>
+#include <librcc.h>
+
+#include "internal.h"
+
+rcc_ui_internal rccUiCreateInternal(rcc_ui_context ctx) {
+    return NULL;
+}
+
+void rccUiFreeInternal(rcc_ui_context ctx) {
+}
+
+rcc_ui_widget rccUiMenuCreateWidget(rcc_ui_menu_context ctx) {
+    return NULL;
+}
+
+void rccUiMenuFreeWidget(rcc_ui_menu_context ctx) {
+}
+
+rcc_ui_id rccUiMenuGet(rcc_ui_menu_context ctx) {
+    return 0;
+}
+
+int rccUiMenuSet(rcc_ui_menu_context ctx, rcc_ui_id id) {
+    return 0;
+}
+
+
+int rccUiMenuConfigureWidget(rcc_ui_menu_context ctx) {
+    ctx->widget = NULL;
+    return 0;
+}
+
+
+rcc_ui_box rccUiBoxCreate(rcc_ui_menu_context ctx, const char *title) {
+    return (rcc_ui_box)NULL;
+}
+
+rcc_ui_frame rccUiFrameCreate(rcc_ui_frame_context ctx, const char *title) {
+    return (rcc_ui_frame)NULL;
+}
+
+void rccUiFrameFree(rcc_ui_frame_context ctx) {
+}
+
+
+int rccUiFrameAdd(rcc_ui_frame_context ctx, rcc_ui_box box) {
+    return 0;
+}
+
+rcc_ui_page rccUiPageCreate(rcc_ui_context ctx, const char *title) {
+    return (rcc_ui_page)NULL;
+}
+
+int rccUiPageAdd(rcc_ui_page page, rcc_ui_frame frame) {
+    return 0;
+}
diff --git a/ui/rccnames.h b/ui/rccnames.h
index b026797..bfb022a 100644
--- a/ui/rccnames.h
+++ b/ui/rccnames.h
@@ -11,18 +11,11 @@ extern rcc_name *rcc_default_class_names;
 extern rcc_name *rcc_default_charset_names;
 extern rcc_name *rcc_default_engine_names;
 
-
 rcc_name *rccUiGetLanguageRccName(rcc_ui_context ctx, const char *lang);
-const char *rccUiGetLanguageName(rcc_ui_context ctx, const char *lang);
 rcc_name *rccUiGetCharsetRccName(rcc_ui_context ctx, const char *charset);
-const char *rccUiGetCharsetName(rcc_ui_context ctx, const char *charset);
 rcc_name *rccUiGetEngineRccName(rcc_ui_context ctx, const char *engine);
-const char *rccUiGetEngineName(rcc_ui_context ctx, const char *engine);
 rcc_name *rccUiGetClassRccName(rcc_ui_context ctx, const char *cl);
-const char *rccUiGetClassName(rcc_ui_context ctx, const char *cl);
 
 rcc_option_name *rccUiGetOptionRccName(rcc_ui_context ctx, rcc_option option);
-const char *rccUiGetOptionName(rcc_ui_context ctx, rcc_option option);
-const char *rccUiGetOptionValueName(rcc_ui_context ctx, rcc_option option, rcc_option_value value);
 
 #endif /* _RCC_UI_NAMES_H */