Author: iratqq
Date: Mon Dec 31 12:35:04 2007
New Revision: 5077
Modified:
trunk/notify/Makefile.am
trunk/notify/uim-knotify.cc
trunk/notify/uim-libnotify.c
trunk/uim/uim-notify.c
trunk/uim/uim-notify.h
Log:
* uim/uim-notify.c
- (uim_notify_load): Rename plugin function name
uim_notify_foo -> uim_notify_plugin_foo and remove va_list.
* uim/uim-notify.h
- (uim_notify_plugin_load, uim_notify_plugin_init, uim_notify_plugin_quit
uim_notify_plugin_info uim_notify_plugin_fatal) : Add plugin functions.
* notify/uim-knotify.cc
- (uim_notify_plugin_info, uim_notify_plugin_fatal): Plugin API Change.
* notify/uim-libnotify.c
- (uim_notify_plugin_info, uim_notify_plugin_fatal): ditto.
* notify/Makefile.am
- (libuimnotify_knotify_la_SOURCES, libuimnotify_libnotify_la_SOURCES):
Remove headers.
Modified: trunk/notify/Makefile.am
==============================================================================
--- trunk/notify/Makefile.am (original)
+++ trunk/notify/Makefile.am Mon Dec 31 12:35:04 2007
@@ -5,7 +5,7 @@
if LIBNOTIFY
uimnotify_plugin_LTLIBRARIES += libuimnotify-libnotify.la
-libuimnotify_libnotify_la_SOURCES = uim-libnotify.c uim-libnotify.h
+libuimnotify_libnotify_la_SOURCES = uim-libnotify.c
libuimnotify_libnotify_la_CFLAGS = @LIBNOTIFY_CFLAGS@
libuimnotify_libnotify_la_LDFLAGS = -avoid-version -module
libuimnotify_libnotify_la_LIBADD = \
@@ -15,7 +15,7 @@
if KNOTIFY
uimnotify_plugin_LTLIBRARIES += libuimnotify-knotify.la
-libuimnotify_knotify_la_SOURCES = uim-knotify.cc uim-knotify.h
+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 = \
Modified: trunk/notify/uim-knotify.cc
==============================================================================
--- trunk/notify/uim-knotify.cc (original)
+++ trunk/notify/uim-knotify.cc Mon Dec 31 12:35:04 2007
@@ -38,16 +38,11 @@
#include <knotifyclient.h>
#include "config.h"
-#include "knotify.h"
-
-int uim_notify_init(void);
-void uim_notify_quit(void);
-int uim_notify_info(const char *, va_list);
-int uim_notify_fatal(const char *, va_list);
+#include "uim-notify.h"
static int inited = 0;
int
-uim_notify_init()
+uim_notify_plugin_init()
{
if (!inited) {
int argc = 1;
@@ -60,21 +55,19 @@
}
void
-uim_notify_quit()
+uim_notify_plugin_quit()
{
return;
}
int
-uim_notify_info(const char *msg_fmt, va_list ap)
+uim_notify_plugin_info(const char *msg)
{
char body[BUFSIZ];
char body_short[256];
char body_fmt[BUFSIZ];
- strlcpy(body_fmt, "uim: ", sizeof(body_fmt));
- strlcat(body_fmt, msg_fmt, sizeof(body_fmt));
- vsnprintf(body, sizeof(body), body_fmt, ap);
+ snprintf(body, sizeof(body), "uim: %s", msg);
strlcpy(body_short, body, sizeof(body_short));
KNotifyClient::userEvent(body_short, KNotifyClient::Messagebox);
@@ -82,15 +75,13 @@
}
int
-uim_notify_fatal(const char *msg_fmt, va_list ap)
+uim_notify_plugin_fatal(const char *msg)
{
char body[BUFSIZ];
char body_short[256];
char body_fmt[BUFSIZ];
- strlcpy(body_fmt, "uim: ", sizeof(body_fmt));
- strlcat(body_fmt, msg_fmt, sizeof(body_fmt));
- vsnprintf(body, sizeof(body), body_fmt, ap);
+ snprintf(body, sizeof(body), "uim: %s", msg);
strlcpy(body_short, body, sizeof(body_short));
KNotifyClient::userEvent(body_short, KNotifyClient::Messagebox,
KNotifyClient::Error);
Modified: trunk/notify/uim-libnotify.c
==============================================================================
--- trunk/notify/uim-libnotify.c (original)
+++ trunk/notify/uim-libnotify.c Mon Dec 31 12:35:04 2007
@@ -38,27 +38,20 @@
#include <libnotify/notify.h>
#include "config.h"
-#include "uim-libnotify.h"
-
-int uim_notify_init(void);
-void uim_notify_quit(void);
-int uim_notify_info(const char *, va_list);
-int uim_notify_fatal(const char *, va_list);
+#include "uim-notify.h"
#define UIM_ICON UIM_PIXMAPSDIR "/uim-icon.png"
static int uim_libnotify_timeout = 3000;
static int
-uim_libnotify_notify(int urgency, const char *body_fmt, va_list ap)
+uim_libnotify_notify(int urgency, const char *body)
{
- char body[BUFSIZ];
char body_short[256];
NotifyNotification *notification;
GError *error = NULL;
gboolean ret;
- vsnprintf(body, sizeof(body), body_fmt, ap);
strlcpy(body_short, body, sizeof(body_short));
fprintf(stderr, "uim: %s\n", body);
@@ -95,26 +88,26 @@
interface
*/
int
-uim_notify_init(void)
+uim_notify_plugin_init(void)
{
return notify_init("uim");
}
void
-uim_notify_quit(void)
+uim_notify_plugin_quit(void)
{
if (notify_is_initted())
notify_uninit();
}
int
-uim_notify_info(const char *msg_fmt, va_list ap)
+uim_notify_plugin_info(const char *msg)
{
- return uim_libnotify_notify(NOTIFY_URGENCY_NORMAL, msg_fmt, ap);
+ return uim_libnotify_notify(NOTIFY_URGENCY_NORMAL, msg);
}
int
-uim_notify_fatal(const char *msg_fmt, va_list ap)
+uim_notify_plugin_fatal(const char *msg)
{
- return uim_libnotify_notify(NOTIFY_URGENCY_CRITICAL, msg_fmt, ap);
+ return uim_libnotify_notify(NOTIFY_URGENCY_CRITICAL, msg);
}
Modified: trunk/uim/uim-notify.c
==============================================================================
--- trunk/uim/uim-notify.c (original)
+++ trunk/uim/uim-notify.c Mon Dec 31 12:35:04 2007
@@ -57,13 +57,13 @@
static int uim_notify_stderr_init(void);
static void uim_notify_stderr_quit(void);
-static int uim_notify_stderr_info(const char *, va_list);
-static int uim_notify_stderr_fatal(const char *, va_list);
+static int uim_notify_stderr_info(const char *);
+static int uim_notify_stderr_fatal(const char *);
static int (*uim_notify_init_func)(void) = uim_notify_stderr_init;
static void (*uim_notify_quit_func)(void) = uim_notify_stderr_quit;
-static int (*uim_notify_info_func)(const char *, va_list) =
uim_notify_stderr_info;
-static int (*uim_notify_fatal_func)(const char *, va_list) =
uim_notify_stderr_fatal;
+static int (*uim_notify_info_func)(const char *) = uim_notify_stderr_info;
+static int (*uim_notify_fatal_func)(const char *) = uim_notify_stderr_fatal;
static void *notify_dlhandle = NULL;
static char notify_agent_name[PATH_MAX];
@@ -108,28 +108,28 @@
uim_notify_load_stderr();
return 0;
}
- uim_notify_init_func = (int (*)(void))(intptr_t)dlfunc(notify_dlhandle,
"uim_notify_init");
+ uim_notify_init_func = (int (*)(void))(intptr_t)dlfunc(notify_dlhandle,
"uim_notify_plugin_init");
if (!uim_notify_init_func) {
fprintf(stderr, "uim-notify: cannot found 'uim_notify_init()'
in %s\n", path);
dlclose(notify_dlhandle);
uim_notify_load_stderr();
return 0;
}
- uim_notify_quit_func = (void (*)(void))(intptr_t)dlfunc(notify_dlhandle,
"uim_notify_quit");
+ uim_notify_quit_func = (void (*)(void))(intptr_t)dlfunc(notify_dlhandle,
"uim_notify_plugin_quit");
if (!uim_notify_quit_func) {
fprintf(stderr, "uim-notify: cannot found 'uim_notify_quit()'
in %s\n", path);
dlclose(notify_dlhandle);
uim_notify_load_stderr();
return 0;
}
- uim_notify_info_func = (int (*)(const char *,
va_list))(intptr_t)dlfunc(notify_dlhandle, "uim_notify_info");
+ uim_notify_info_func = (int (*)(const char *))(intptr_t)dlfunc(notify_dlhandle,
"uim_notify_plugin_info");
if (!uim_notify_info_func) {
fprintf(stderr, "uim-notify: cannot found 'uim_notify_info()'
in %s\n", path);
dlclose(notify_dlhandle);
uim_notify_load_stderr();
return 0;
}
- uim_notify_fatal_func = (int (*)(const char *,
va_list))(intptr_t)dlfunc(notify_dlhandle, "uim_notify_fatal");
+ uim_notify_fatal_func = (int (*)(const char *))(intptr_t)dlfunc(notify_dlhandle,
"uim_notify_plugin_fatal");
if (!uim_notify_fatal_func) {
fprintf(stderr, "uim-notify: cannot found 'uim_notify_fatal()'
in %s\n", path);
dlclose(notify_dlhandle);
@@ -160,27 +160,27 @@
int
uim_notify_info(const char *msg_fmt, ...)
{
- int ret;
va_list ap;
+ char msg[BUFSIZ];
va_start(ap, msg_fmt);
- ret = uim_notify_info_func(msg_fmt, ap);
+ vsnprintf(msg, sizeof(msg), msg_fmt, ap);
va_end(ap);
- return ret;
+ return uim_notify_info_func(msg);
}
int
uim_notify_fatal(const char *msg_fmt, ...)
{
- int ret;
va_list ap;
+ char msg[BUFSIZ];
va_start(ap, msg_fmt);
- ret = uim_notify_fatal_func(msg_fmt, ap);
+ vsnprintf(msg, sizeof(msg), msg_fmt, ap);
va_end(ap);
- return ret;
+ return uim_notify_fatal_func(msg);
}
@@ -201,22 +201,14 @@
}
static int
-uim_notify_stderr_info(const char *fmt, va_list ap)
+uim_notify_stderr_info(const char *msg)
{
- char buf[BUFSIZ];
-
- vsnprintf(buf, sizeof(buf), fmt, ap);
-
- return fprintf(stderr, "uim [Info]: %s", buf);
+ return fprintf(stderr, "uim [Info]: %s", msg);
}
static int
-uim_notify_stderr_fatal(const char *fmt, va_list ap)
+uim_notify_stderr_fatal(const char *msg)
{
- char buf[BUFSIZ];
-
- vsnprintf(buf, sizeof(buf), fmt, ap);
-
- return fprintf(stderr, "uim [Fatal]: %s", buf);
+ return fprintf(stderr, "uim [Fatal]: %s", msg);
}
Modified: trunk/uim/uim-notify.h
==============================================================================
--- trunk/uim/uim-notify.h (original)
+++ trunk/uim/uim-notify.h Mon Dec 31 12:35:04 2007
@@ -27,6 +27,12 @@
int uim_notify_info(const char *, ...);
int uim_notify_fatal(const char *, ...);
+int uim_notify_plugin_load(const char *);
+int uim_notify_plugin_init(void);
+void uim_notify_plugin_quit(void);
+int uim_notify_plugin_info(const char *);
+int uim_notify_plugin_fatal(const char *);
+
#ifdef __cplusplus
}
#endif
