Author: yamakenz
Date: Mon Feb 11 04:03:21 2008
New Revision: 5156
Modified:
trunk/notify/uim-knotify3.cc
trunk/notify/uim-libnotify.c
trunk/uim/uim-internal.h
trunk/uim/uim-notify.c
trunk/uim/uim-notify.h
Log:
* uim/uim-notify.h
- (uim_notify_init, uim_notify_load, uim_notify_info,
uim_notify_fatal, uim_notify_plugin_init, uim_notify_plugin_info,
uim_notify_plugin_fatal): Replace return type int with uim_bool to
indicate the semantics
* uim/uim-internal.h
- (uim_notify_fatal_raw): Ditto
* uim/uim-notify.c
- (uim_notify_init, uim_notify_load, uim_notify_info,
uim_notify_fatal, uim_notify_fatal_raw, uim_notify_stderr_init,
uim_notify_stderr_info, uim_notify_stderr_fatal): Ditto
* notify/uim-libnotify.c
- Include uim.h for uim_bool
- (uim_libnotify_notify, uim_notify_plugin_init,
uim_notify_plugin_info, uim_notify_plugin_fatal): Follow the
return type change
* notify/uim-knotify3.cc
- Include uim.h for uim_bool
- (uim_notify_plugin_init, send_knotify, uim_notify_plugin_info,
uim_notify_plugin_fatal): Follow the return type change
Modified: trunk/notify/uim-knotify3.cc
==============================================================================
--- trunk/notify/uim-knotify3.cc (original)
+++ trunk/notify/uim-knotify3.cc Mon Feb 11 04:03:21 2008
@@ -41,6 +41,7 @@
#include <kapplication.h>
#include <knotifyclient.h>
+#include "uim.h" // for uim_bool
#include "uim-notify.h"
@@ -55,10 +56,10 @@
return &uim_notify_knotify3_desc;
}
-int
+uim_bool
uim_notify_plugin_init()
{
- return 1;
+ return UIM_TRUE;
}
void
@@ -67,7 +68,7 @@
return;
}
-static int
+static uim_bool
send_knotify(const char *eventstr, const char *msg, int level)
{
char body[BUFSIZ];
@@ -85,24 +86,24 @@
if (!kapp->dcopClient()->attach()) {
fprintf(stderr, "uim: cannot connect DCOP\n");
- return 0;
+ return UIM_FALSE;
}
arg << event << fromApp << text << sound << file << present << level;
if (!kapp->dcopClient()->send("knotify", "Notify",
"notify(QString,QString,QString,QString,QString,int,int)",
data)) {
fprintf(stderr, "uim: cannot send message via DCOP\n");
- return 0;
+ return UIM_FALSE;
}
- return 1;
+ return UIM_TRUE;
}
-int
+uim_bool
uim_notify_plugin_info(const char *msg)
{
return send_knotify("Info", msg, KNotifyClient::Notification);
}
-int
+uim_bool
uim_notify_plugin_fatal(const char *msg)
{
return send_knotify("Fatal", msg, KNotifyClient::Error);
Modified: trunk/notify/uim-libnotify.c
==============================================================================
--- trunk/notify/uim-libnotify.c (original)
+++ trunk/notify/uim-libnotify.c Mon Feb 11 04:03:21 2008
@@ -39,6 +39,7 @@
#include <glib.h>
#include <libnotify/notify.h>
+#include "uim.h" /* for uim_bool */
#include "uim-notify.h"
#define UIM_ICON UIM_PIXMAPSDIR "/uim-icon.png"
@@ -57,14 +58,14 @@
if (!notify_is_initted()) {
fprintf(stderr, "libnotify: libnotify is not initted\n");
- return 0;
+ return UIM_FALSE;
}
notification = notify_notification_new("uim", body_short, UIM_ICON, NULL);
if (!notification) {
fprintf(stderr, "notify_notification_new: can not create
notification object\n");
- return 0;
+ return UIM_FALSE;
}
notify_notification_set_timeout(notification, timeout);
@@ -74,12 +75,12 @@
ret = notify_notification_show(notification, &error);
if (error) {
fprintf(stderr, "notify_notification_show: %s\n", error->message);
- return 0;
+ return UIM_FALSE;
}
g_object_unref(G_OBJECT(notification));
- return 1;
+ return UIM_TRUE;
}
/*
@@ -96,7 +97,7 @@
return &uim_notify_libnotify_desc;
}
-int
+uim_bool
uim_notify_plugin_init(void)
{
return notify_init("uim");
@@ -109,13 +110,13 @@
notify_uninit();
}
-int
+uim_bool
uim_notify_plugin_info(const char *msg)
{
return uim_libnotify_notify(NOTIFY_URGENCY_NORMAL,
NOTIFY_EXPIRES_DEFAULT, msg);
}
-int
+uim_bool
uim_notify_plugin_fatal(const char *msg)
{
return uim_libnotify_notify(NOTIFY_URGENCY_CRITICAL,
NOTIFY_EXPIRES_NEVER, msg);
Modified: trunk/uim/uim-internal.h
==============================================================================
--- trunk/uim/uim-internal.h (original)
+++ trunk/uim/uim-internal.h Mon Feb 11 04:03:21 2008
@@ -164,7 +164,7 @@
void uim_init_intl_subrs(void);
#if UIM_USE_NOTIFY
-int uim_notify_fatal_raw(const char *msg);
+uim_bool uim_notify_fatal_raw(const char *msg);
#else
/* FIXME: Output to stderr */
#define uim_notify_info printf
Modified: trunk/uim/uim-notify.c
==============================================================================
--- trunk/uim/uim-notify.c (original)
+++ trunk/uim/uim-notify.c Mon Feb 11 04:03:21 2008
@@ -100,7 +100,7 @@
return f;
}
-int
+uim_bool
uim_notify_load(const char *name)
{
if (!agent->quit || !agent->desc) {
@@ -164,7 +164,7 @@
return agent->desc();
}
-int
+uim_bool
uim_notify_init(void)
{
/* Since a cyclic init/quit sequence leaves *agent uncleared,
@@ -182,7 +182,7 @@
agent->quit();
}
-int
+uim_bool
uim_notify_info(const char *msg_fmt, ...)
{
va_list ap;
@@ -195,7 +195,7 @@
return agent->notify_info(msg);
}
-int
+uim_bool
uim_notify_fatal(const char *msg_fmt, ...)
{
va_list ap;
@@ -209,7 +209,7 @@
}
/* Low stack-consumption version of uim_notify_fatal(). */
-int
+uim_bool
uim_notify_fatal_raw(const char *msg)
{
return agent->notify_fatal(msg);
@@ -314,10 +314,10 @@
/*
* builtin 'stderr' notification agent
*/
-static int uim_notify_stderr_init(void);
+static uim_bool uim_notify_stderr_init(void);
static void uim_notify_stderr_quit(void);
-static int uim_notify_stderr_info(const char *);
-static int uim_notify_stderr_fatal(const char *);
+static uim_bool uim_notify_stderr_info(const char *);
+static uim_bool uim_notify_stderr_fatal(const char *);
static const uim_notify_desc uim_notify_stderr_desc = {
"stderr",
@@ -341,10 +341,10 @@
return &uim_notify_stderr_desc;
}
-static int
+static uim_bool
uim_notify_stderr_init(void)
{
- return 1;
+ return UIM_TRUE;
}
static void
@@ -353,7 +353,7 @@
return;
}
-static int
+static uim_bool
uim_notify_stderr_info(const char *msg)
{
fputs("libuim: [info] ", stderr);
@@ -363,7 +363,7 @@
return UIM_TRUE;
}
-static int
+static uim_bool
uim_notify_stderr_fatal(const char *msg)
{
/* To reduce stack consumption on hard situations such as memory
Modified: trunk/uim/uim-notify.h
==============================================================================
--- trunk/uim/uim-notify.h (original)
+++ trunk/uim/uim-notify.h Mon Feb 11 04:03:21 2008
@@ -49,21 +49,21 @@
} uim_notify_desc;
/* API for notification facility users */
-int uim_notify_init(void);
+uim_bool uim_notify_init(void);
void uim_notify_quit(void);
-int uim_notify_load(const char *name);
+uim_bool uim_notify_load(const char *name);
/* API for notification facility users */
const uim_notify_desc *uim_notify_get_desc(void);
-int uim_notify_info(const char *msg_fmt, ...);
-int uim_notify_fatal(const char *msg_fmt, ...);
+uim_bool uim_notify_info(const char *msg_fmt, ...);
+uim_bool uim_notify_fatal(const char *msg_fmt, ...);
/* API for pluggable notification agent implementors */
-int uim_notify_plugin_init(void);
+uim_bool uim_notify_plugin_init(void);
void uim_notify_plugin_quit(void);
const uim_notify_desc *uim_notify_plugin_get_desc(void);
-int uim_notify_plugin_info(const char *msg);
-int uim_notify_plugin_fatal(const char *msg);
+uim_bool uim_notify_plugin_info(const char *msg);
+uim_bool uim_notify_plugin_fatal(const char *msg);
#ifdef __cplusplus
}
