Author: ek.kato
Date: Tue Jan 8 19:33:13 2008
New Revision: 5120
Modified:
trunk/notify/Makefile.am
trunk/notify/uim-knotify3.cc
trunk/notify/uim-libnotify.c
Log:
* notify/Makefile.am
- (libuimnotify_libnotify_la_LIBADD)
- (libuimnogify_knotify3_la_LIBADD)
- Add libreplace.la for strlcpy.
* notify/uim-knotify3.cc
* notify/uim-libnotify.c
- Fix #include "config.h" with <config.h> and move to the top.
Modified: trunk/notify/Makefile.am
==============================================================================
--- trunk/notify/Makefile.am (original)
+++ trunk/notify/Makefile.am Tue Jan 8 19:33:13 2008
@@ -8,7 +8,7 @@
libuimnotify_libnotify_la_SOURCES = uim-libnotify.c
libuimnotify_libnotify_la_CFLAGS = @LIBNOTIFY_CFLAGS@
libuimnotify_libnotify_la_LDFLAGS = -avoid-version -module
-libuimnotify_libnotify_la_LIBADD = @LIBNOTIFY_LIBS@
+libuimnotify_libnotify_la_LIBADD = @LIBNOTIFY_LIBS@
$(top_builddir)/replace/libreplace.la
endif
if KNOTIFY3
@@ -16,5 +16,5 @@
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 = -lkdeui -lkdecore
+libuimnotify_knotify3_la_LIBADD = -lkdeui -lkdecore
$(top_builddir)/replace/libreplace.la
endif
Modified: trunk/notify/uim-knotify3.cc
==============================================================================
--- trunk/notify/uim-knotify3.cc (original)
+++ trunk/notify/uim-knotify3.cc Tue Jan 8 19:33:13 2008
@@ -30,6 +30,8 @@
*/
+#include <config.h>
+
#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
@@ -39,7 +41,6 @@
#include <kapplication.h>
#include <knotifyclient.h>
-#include "config.h"
#include "uim-notify.h"
Modified: trunk/notify/uim-libnotify.c
==============================================================================
--- trunk/notify/uim-libnotify.c (original)
+++ trunk/notify/uim-libnotify.c Tue Jan 8 19:33:13 2008
@@ -30,6 +30,8 @@
*/
+#include <config.h>
+
#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
@@ -37,7 +39,6 @@
#include <glib.h>
#include <libnotify/notify.h>
-#include "config.h"
#include "uim-notify.h"
#define UIM_ICON UIM_PIXMAPSDIR "/uim-icon.png"
