svnno****@sourc*****
svnno****@sourc*****
Mon Mar 26 17:24:31 JST 2007
Revision: 3029
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=kazehakase&view=rev&rev=3029
Author: kous
Date: 2007-03-26 17:24:31 +0900 (Mon, 26 Mar 2007)
Log Message:
-----------
* module/search/kz-hyper-estraier-search.c
(KZ_MODULE_IMPL_GET_NAME): implemented.
* configure.ac, module/search/Makefile.am (EST_VERSION): added.
* ext/ruby/kz-rb-ext.[ch], ext/ruby/kz-ruby-ext.c
(KZ_MODULE_IMPL_GET_NAME): implemented.
* configure.ac, src/dialogs/Makefile.am, ext/ruby/kz-rb-ext.c,
ext/ruby/Makefile.am (KZ_BACKENDS): removed.
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/configure.ac
kazehakase/trunk/ext/ruby/Makefile.am
kazehakase/trunk/ext/ruby/kz-rb-ext.c
kazehakase/trunk/ext/ruby/kz-rb-ext.h
kazehakase/trunk/ext/ruby/kz-ruby-ext.c
kazehakase/trunk/module/search/Makefile.am
kazehakase/trunk/module/search/kz-hyper-estraier-search.c
kazehakase/trunk/src/dialogs/Makefile.am
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2007-03-26 07:57:35 UTC (rev 3028)
+++ kazehakase/trunk/ChangeLog 2007-03-26 08:24:31 UTC (rev 3029)
@@ -1,5 +1,15 @@
2007-03-26 Kouhei Sutou <kou****@cozmi*****>
+ * module/search/kz-hyper-estraier-search.c
+ (KZ_MODULE_IMPL_GET_NAME): implemented.
+ * configure.ac, module/search/Makefile.am (EST_VERSION): added.
+
+ * ext/ruby/kz-rb-ext.[ch], ext/ruby/kz-ruby-ext.c
+ (KZ_MODULE_IMPL_GET_NAME): implemented.
+
+ * configure.ac, src/dialogs/Makefile.am, ext/ruby/kz-rb-ext.c,
+ ext/ruby/Makefile.am (KZ_BACKENDS): removed.
+
* src/kz-embed.[ch] (kz_embed_get_name): moved to kz_module_get_name().
* src/kz-embed.[ch] (kz_embed_engine_names): added.
Modified: kazehakase/trunk/configure.ac
===================================================================
--- kazehakase/trunk/configure.ac 2007-03-26 07:57:35 UTC (rev 3028)
+++ kazehakase/trunk/configure.ac 2007-03-26 08:24:31 UTC (rev 3029)
@@ -384,9 +384,6 @@
AC_SUBST([UI_XML_RUBY_START])
AC_SUBST([UI_XML_RUBY_END])
-KZ_BACKENDS="\$(GECKO)-\$(MOZILLA_COMPONENT_VERSION)"
-AC_SUBST([KZ_BACKENDS])
-
GECKO_VERSION="\$(GECKO)-\$(MOZILLA_COMPONENT_VERSION)"
AC_SUBST([GECKO_VERSION])
@@ -409,6 +406,14 @@
PKG_CHECK_MODULES(EST, hyperestraier,
[est_exists=yes], [est_exists=no])
fi
+
+pkg_failed=
+_PKG_CONFIG(est_version, modversion, hyperestraier)
+if test -z "$pkg_failed"; then
+ EST_VERSION="$pkg_cv_est_version"
+fi
+echo $pkg_cv_est_version
+AC_SUBST([EST_VERSION])
AM_CONDITIONAL([WITH_EST], [test "$est_exists" = "yes"])
dnl **************************************************************
Modified: kazehakase/trunk/ext/ruby/Makefile.am
===================================================================
--- kazehakase/trunk/ext/ruby/Makefile.am 2007-03-26 07:57:35 UTC (rev 3028)
+++ kazehakase/trunk/ext/ruby/Makefile.am 2007-03-26 08:24:31 UTC (rev 3029)
@@ -9,7 +9,6 @@
-DEXTDIR=\""$(extdir)"\" \
-DKZ_SYSCONFDIR=\""$(sysconfdir)/$(PACKAGE)"\" \
-DKZ_DATADIR=\""$(datadir)/$(PACKAGE)"\" \
- -DKZ_BACKENDS=\""$(KZ_BACKENDS)"\" \
-DKZ_RUBY_EXTDIR=\""$(extrubydir)"\" \
-DGTK_DISABLE_DEPRECATED=1 \
-DGDK_DISABLE_DEPRECATED=1 \
Modified: kazehakase/trunk/ext/ruby/kz-rb-ext.c
===================================================================
--- kazehakase/trunk/ext/ruby/kz-rb-ext.c 2007-03-26 07:57:35 UTC (rev 3028)
+++ kazehakase/trunk/ext/ruby/kz-rb-ext.c 2007-03-26 08:24:31 UTC (rev 3029)
@@ -23,6 +23,8 @@
#include <glib/gi18n.h>
#include "kz-rb-ext.h"
+gchar *_kz_rb_ext_version = NULL;
+
#ifdef POSIX_SIGNAL
#define ruby_signal(sig, handle) posix_signal((sig), (handle))
#else
@@ -48,7 +50,20 @@
static VALUE
rb_kz_get_backends(VALUE self)
{
- return rb_str_split(rb_str_new2(KZ_BACKENDS), ", ");
+ GList *backends, *node;
+ VALUE rb_backends;
+
+ rb_backends = rb_ary_new();
+ backends = kz_embed_engine_names();
+ for (node = backends; node; node = g_list_next(node)) {
+ gchar *name = node->data;
+
+ rb_ary_push(rb_backends, rb_str_new2(name));
+ g_free(name);
+ }
+ g_list_free(backends);
+
+ return rb_backends;
}
static void
@@ -140,6 +155,12 @@
ruby_script("kazehakase");
ruby_set_argv(1, argv);
+ if (!_kz_rb_ext_version) {
+ VALUE version;
+ version = rb_const_get(rb_cObject, rb_intern("VERSION"));
+ _kz_rb_ext_version = g_strdup(StringValueCStr(version));
+ }
+
dirname = g_build_filename(KZ_DATADIR, "ext", "ruby", NULL);
rb_ary_unshift(rb_load_path, rb_str_new2(dirname));
g_free(dirname);
@@ -181,4 +202,7 @@
{
rb_funcall(mKz, rb_intern("exit"), 0);
ruby_cleanup(0);
+
+ g_free(_kz_rb_ext_version);
+ _kz_rb_ext_version = NULL;
}
Modified: kazehakase/trunk/ext/ruby/kz-rb-ext.h
===================================================================
--- kazehakase/trunk/ext/ruby/kz-rb-ext.h 2007-03-26 07:57:35 UTC (rev 3028)
+++ kazehakase/trunk/ext/ruby/kz-rb-ext.h 2007-03-26 08:24:31 UTC (rev 3029)
@@ -46,6 +46,8 @@
#define KZ_RB_GET_APP (_kz_rb_get_app())
+extern gchar *_kz_rb_ext_version;
+
extern KzApp *_kz_rb_get_app(void);
extern void _kz_rb_app_init(VALUE mKz, KzApp *app);
Modified: kazehakase/trunk/ext/ruby/kz-ruby-ext.c
===================================================================
--- kazehakase/trunk/ext/ruby/kz-ruby-ext.c 2007-03-26 07:57:35 UTC (rev 3028)
+++ kazehakase/trunk/ext/ruby/kz-ruby-ext.c 2007-03-26 08:24:31 UTC (rev 3029)
@@ -128,6 +128,23 @@
return G_OBJECT(ext);
}
+G_MODULE_EXPORT const gchar *
+KZ_MODULE_IMPL_GET_NAME (void)
+{
+ static gchar *name = NULL;
+
+ if (name)
+ return name;
+
+ if (_kz_rb_ext_version) {
+ name = g_strdup_printf(_("Ruby extension %s"), _kz_rb_ext_version);
+ return name;
+ }
+
+ return _("Ruby extension");
+}
+
+
static void
kz_ruby_ext_class_init (KzRubyExtClass *klass)
{
Modified: kazehakase/trunk/module/search/Makefile.am
===================================================================
--- kazehakase/trunk/module/search/Makefile.am 2007-03-26 07:57:35 UTC (rev 3028)
+++ kazehakase/trunk/module/search/Makefile.am 2007-03-26 08:24:31 UTC (rev 3029)
@@ -48,7 +48,7 @@
$(search_common_sources) \
kz-hyper-estraier-search.c
hyper_estraier_la_LIBADD = $(EST_LIBS)
-hyper_estraier_la_CPPFLAGS = $(EST_CFLAGS)
+hyper_estraier_la_CPPFLAGS = $(EST_CFLAGS) -DEST_VERSION=\"$(EST_VERSION)\"
endif
Modified: kazehakase/trunk/module/search/kz-hyper-estraier-search.c
===================================================================
--- kazehakase/trunk/module/search/kz-hyper-estraier-search.c 2007-03-26 07:57:35 UTC (rev 3028)
+++ kazehakase/trunk/module/search/kz-hyper-estraier-search.c 2007-03-26 08:24:31 UTC (rev 3029)
@@ -142,7 +142,13 @@
first_property, var_args);
}
+G_MODULE_EXPORT const gchar *
+KZ_MODULE_IMPL_GET_NAME (void)
+{
+ return "Hyper Estraier " EST_VERSION;
+}
+
static void
kz_hyper_estraier_search_class_init (KzHyperEstraierSearchClass *klass)
{
Modified: kazehakase/trunk/src/dialogs/Makefile.am
===================================================================
--- kazehakase/trunk/src/dialogs/Makefile.am 2007-03-26 07:57:35 UTC (rev 3028)
+++ kazehakase/trunk/src/dialogs/Makefile.am 2007-03-26 08:24:31 UTC (rev 3029)
@@ -13,7 +13,6 @@
AM_CPPFLAGS= \
-DKZ_DATADIR=\""$(datadir)/$(PACKAGE)"\" \
- -DKZ_BACKENDS=\""$(KZ_BACKENDS)"\" \
-DGTK_DISABLE_DEPRECATED=1 \
-DGDK_DISABLE_DEPRECATED=1 \
-DG_LOG_DOMAIN=\"Kazehakase-Dialogs\" \