[uim commit] r5112 - trunk/notify

[codesite-noreply]

Author: iratqq
Date: Fri Jan  4 16:02:50 2008
New Revision: 5112
Modified:
  trunk/notify/uim-libnotify.c

Log:
* notify/uim-libnotify.c (uim_libnotify_notify): Add timeout.
 (uim_notify_plugin_info): Set timeout to NOTIFY_EXPIRES_DEFAULT.
 (uim_notify_plugin_fatal): Set timeout to NOTIFY_EXPIRES_NEVER.


Modified: trunk/notify/uim-libnotify.c
==============================================================================
--- trunk/notify/uim-libnotify.c        (original)
+++ trunk/notify/uim-libnotify.c        Fri Jan  4 16:02:50 2008
@@ -42,10 +42,8 @@

#define UIM_ICON UIM_PIXMAPSDIR "/uim-icon.png"

-static int uim_libnotify_timeout = 3000;
-
static int
-uim_libnotify_notify(int urgency, const char *body)
+uim_libnotify_notify(int urgency, int timeout, const char *body)
{
  char body_short[256];
  NotifyNotification *notification;
@@ -68,8 +66,7 @@
    return 0;
  }

-  if (0 < uim_libnotify_timeout)
-    notify_notification_set_timeout(notification, uim_libnotify_timeout);
+  notify_notification_set_timeout(notification, timeout);

  notify_notification_set_urgency(notification, urgency);

@@ -114,11 +111,11 @@
int
uim_notify_plugin_info(const char *msg)
{
-  return uim_libnotify_notify(NOTIFY_URGENCY_NORMAL, msg);
+  return uim_libnotify_notify(NOTIFY_URGENCY_NORMAL, 
NOTIFY_EXPIRES_DEFAULT, msg);
}

int
uim_notify_plugin_fatal(const char *msg)
{
-  return uim_libnotify_notify(NOTIFY_URGENCY_CRITICAL, msg);
+  return uim_libnotify_notify(NOTIFY_URGENCY_CRITICAL, 
NOTIFY_EXPIRES_NEVER, msg);
}