From 3b0e8d298663724c5cac44cb2ccd9a1bc6d84482 Mon Sep 17 00:00:00 2001 From: Christian Hammond Date: Thu, 19 Jan 2006 09:35:17 +0000 Subject: [PATCH] Make notify-send work again when a body isn't specified. --- ChangeLog | 5 +++++ tools/notify-send.c | 17 ++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 941f567..ba79887 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Jan 19 01:34:57 PST 2006 Christian Hammond + + * tools/notify-send.c: + - Make notify-send work again when a body isn't specified. + Wed Jan 18 22:24:10 PST 2006 Christian Hammond * libnotify/notifynotification.h: diff --git a/tools/notify-send.c b/tools/notify-send.c index 2a459ae..6e4b217 100644 --- a/tools/notify-send.c +++ b/tools/notify-send.c @@ -32,7 +32,7 @@ int main(int argc, const char **argv) { const gchar *summary = NULL; - const gchar *body = NULL; + const gchar *body = ""; const gchar *type = NULL; char *urgency_str = NULL; gchar *icon_str = NULL; @@ -42,7 +42,7 @@ main(int argc, const char **argv) char ch; poptContext opt_ctx; const char **args; - NotifyNotification *notify; + NotifyNotification *notify; struct poptOption options[] = { @@ -64,7 +64,7 @@ main(int argc, const char **argv) POPT_TABLEEND }; - g_type_init (); + g_type_init (); opt_ctx = poptGetContext("notify-send", argc, argv, options, 0); poptSetOtherOptionHelp(opt_ctx, "[OPTIONS]* [body]"); @@ -128,13 +128,12 @@ main(int argc, const char **argv) if (!notify_init("notify-send")) exit(1); + notify = notify_notification_new(summary, body, icon_str, NULL); + notify_notification_set_category(notify, type); + notify_notification_set_urgency(notify, urgency); + notify_notification_set_timeout(notify, expire_timeout); - notify = notify_notification_new (summary, body, icon_str, NULL); - notify_notification_set_category (notify, type); - notify_notification_set_urgency (notify, urgency); - notify_notification_set_timeout (notify, expire_timeout); - - notify_notification_show_and_forget (notify, NULL); + notify_notification_show_and_forget(notify, NULL); poptFreeContext(opt_ctx); notify_uninit();