Author: iratqq
Date: Tue Jan 1 17:32:53 2008
New Revision: 5087
Added:
trunk/notify/uim-knotify3.cc
- copied, changed from r5082, /trunk/notify/uim-knotify.cc
Removed:
trunk/notify/uim-knotify.cc
Modified:
trunk/configure.ac
trunk/notify/Makefile.am
Log:
* configure.ac, notify/Makefike.am notify/uim-knotify3.cc:
Rename knotify to knotify3
Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Tue Jan 1 17:32:53 2008
@@ -1298,12 +1298,12 @@
# *******************************
# *** Tests for NOTIFY ***
# *******************************
-notify_targets='libnotify knotify'
+notify_targets='libnotify knotify3'
AC_ARG_ENABLE(notify,
[ --enable-notify[=mode_list] enable notify module (specify comma
separated mode list), HIGHLY EXPERIMENTAL:
libnotify: libnotify
- knotify: KDE notify],
+ knotify3: KDE3 notify],
[ enable_notify=$enableval
have_notify_opt=yes ],
[ enable_notify=yes
@@ -1330,40 +1330,40 @@
AC_MSG_RESULT(no)
fi
-AC_MSG_CHECKING(enable_notify=knotify)
-if test "x$au_enable_knotify" = xyes; then
- AC_MSG_RESULT([yes, configuring knotify])
+AC_MSG_CHECKING(enable_notify=knotify3)
+if test "x$au_enable_knotify3" = xyes; then
+ AC_MSG_RESULT([yes, configuring knotify3])
if test "x$use_qt" = "xyes"; then
if test "x$KDE_CONFIG" != "xno"; then
- KNOTIFY_PREFIX=`kde-config --prefix`
- KNOTIFY_LIB_DIR=`kde-config --expandvars --install lib`
- KNOTIFY_DATA_DIR=`kde-config --expandvars --install data`
+ KNOTIFY3_PREFIX=`kde-config --prefix`
+ KNOTIFY3_LIB_DIR=`kde-config --expandvars --install lib`
+ KNOTIFY3_DATA_DIR=`kde-config --expandvars --install data`
saved_cppflags="${CPPFLAGS}"
- CPPFLAGS="-I${KNOTIFY_PREFIX}/include/kde ${CPPFLAGS} ${QT_CXXFLAGS}"
+ CPPFLAGS="-I${KNOTIFY3_PREFIX}/include/kde ${CPPFLAGS} ${QT_CXXFLAGS}"
AC_LANG_PUSH(C++)
- AC_CHECK_HEADER([${KNOTIFY_PREFIX}/include/kde/knotifyclient.h],
- [use_knotify="yes"
KNOTIFY_INCLUDE_DIR="${KNOTIFY_PREFIX}/include/kde"], [use_knotify="no"])
- if test "x$use_knotify" = "xno"; then
- CPPFLAGS="-I${KNOTIFY_PREFIX}/include ${saved_cppflags}
${QT_CXXFLAGS}"
- AC_CHECK_HEADER([${KNOTIFY_PREFIX}/include/knotifyclient.h],
- [use_knotify="yes"
KNOTIFY_INCLUDE_DIR="${KNOTIFY_PREFIX}/include"], [use_knotify="no"])
+ AC_CHECK_HEADER([${KNOTIFY3_PREFIX}/include/kde/knotifyclient.h],
+ [use_knotify3="yes"
KNOTIFY3_INCLUDE_DIR="${KNOTIFY3_PREFIX}/include/kde"], [use_knotify3="no"])
+ if test "x$use_knotify3" = "xno"; then
+ CPPFLAGS="-I${KNOTIFY3_PREFIX}/include ${saved_cppflags}
${QT_CXXFLAGS}"
+ AC_CHECK_HEADER([${KNOTIFY3_PREFIX}/include/knotifyclient.h],
+ [use_knotify3="yes"
KNOTIFY3_INCLUDE_DIR="${KNOTIFY3_PREFIX}/include"], [use_knotify3="no"])
fi
CPPFLAGS="${saved_cppflags}"
AC_LANG_POP(C++)
else
- use_knotify="no"
+ use_knotify3="no"
fi
else
- use_knotify="no"
+ use_knotify3="no"
fi
fi
-if test "x$use_knotify" = "xyes"; then
- AC_DEFINE(ENABLE_KNOTIFY, 1, [set notify interface with knotify])
- AC_SUBST(KNOTIFY_PREFIX)
- AC_SUBST(KNOTIFY_LIB_DIR)
- AC_SUBST(KNOTIFY_DATA_DIR)
- AC_SUBST(KNOTIFY_INCLUDE_DIR)
- use_notify="${use_notify}knotify "
+if test "x$use_knotify3" = "xyes"; then
+ AC_DEFINE(ENABLE_KNOTIFY3, 1, [set notify interface with knotify3])
+ AC_SUBST(KNOTIFY3_PREFIX)
+ AC_SUBST(KNOTIFY3_LIB_DIR)
+ AC_SUBST(KNOTIFY3_DATA_DIR)
+ AC_SUBST(KNOTIFY3_INCLUDE_DIR)
+ use_notify="${use_notify}knotify3 "
fi
if test "x$use_notify" = "x"; then
@@ -1371,7 +1371,7 @@
fi
AM_CONDITIONAL(LIBNOTIFY, test x$use_libnotify = xyes)
-AM_CONDITIONAL(KNOTIFY, test x$use_knotify = xyes)
+AM_CONDITIONAL(KNOTIFY3, test x$use_knotify3 = xyes)
AC_DEFINE(UIM_USE_ERROR_GUARD, 1, [Define to 1 if you want to use
longjmp-based error handlings])
Modified: trunk/notify/Makefile.am
==============================================================================
--- trunk/notify/Makefile.am (original)
+++ trunk/notify/Makefile.am Tue Jan 1 17:32:53 2008
@@ -13,12 +13,12 @@
@LIBNOTIFY_LIBS@
endif
-if KNOTIFY
-uimnotify_plugin_LTLIBRARIES += libuimnotify-knotify.la
-libuimnotify_knotify_la_SOURCES = uim-knotify.cc
-libuimnotify_knotify_la_CXXFLAGS = [EMAIL PROTECTED]@ $(QT_CXXFLAGS)
-libuimnotify_knotify_la_LDFLAGS = -avoid-version -module
[EMAIL PROTECTED]@ $(QT_LDFLAGS)
-libuimnotify_knotify_la_LIBADD = \
+if KNOTIFY3
+uimnotify_plugin_LTLIBRARIES += libuimnotify-knotify3.la
+libuimnotify_knotify3_la_SOURCES = uim-knotify3.cc
+libuimnotify_knotify3_la_CXXFLAGS = [EMAIL PROTECTED]@ $(QT_CXXFLAGS)
+libuimnotify_knotify3_la_LDFLAGS = -avoid-version -module
[EMAIL PROTECTED]@ $(QT_LDFLAGS)
+libuimnotify_knotify3_la_LIBADD = \
$(top_builddir)/uim/libuim.la \
-lkdeui -lkdecore
endif
Copied: trunk/notify/uim-knotify3.cc (from r5082, /trunk/notify/uim-knotify.cc)
==============================================================================
--- /trunk/notify/uim-knotify.cc (original)
+++ trunk/notify/uim-knotify3.cc Tue Jan 1 17:32:53 2008
@@ -45,15 +45,15 @@
static int inited = 0;
-static uim_notify_desc uim_notify_knotify_desc = {
- "knotify",
+static uim_notify_desc uim_notify_knotify3_desc = {
+ "knotify3",
"Output via knotify",
};
uim_notify_desc*
uim_notify_plugin_get_desc(void)
{
- return &uim_notify_knotify_desc;
+ return &uim_notify_knotify3_desc;
}
int
