jcarr
/
libnotify
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make notify-send work again when a body isn't specified.

This commit is contained in:
Christian Hammond 2006-01-19 09:35:17 +00:00
parent 28e0463e75
commit 3b0e8d2986
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Thu Jan 19 01:34:57 PST 2006 Christian Hammond <chipx86@chipx86.com>
* 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 <chipx86@chipx86.com> Wed Jan 18 22:24:10 PST 2006 Christian Hammond <chipx86@chipx86.com>
* libnotify/notifynotification.h: * libnotify/notifynotification.h:

17
tools/notify-send.c
View File

@ -32,7 +32,7 @@ int
main(int argc, const char **argv) main(int argc, const char **argv)
{ {
const gchar *summary = NULL; const gchar *summary = NULL;
const gchar *body = NULL; const gchar *body = "";
const gchar *type = NULL; const gchar *type = NULL;
char *urgency_str = NULL; char *urgency_str = NULL;
gchar *icon_str = NULL; gchar *icon_str = NULL;
@ -42,7 +42,7 @@ main(int argc, const char **argv)
char ch; char ch;
poptContext opt_ctx; poptContext opt_ctx;
const char **args; const char **args;
NotifyNotification *notify; NotifyNotification *notify;
struct poptOption options[] = struct poptOption options[] =
{ {
@ -64,7 +64,7 @@ main(int argc, const char **argv)
POPT_TABLEEND POPT_TABLEEND
}; };
g_type_init (); g_type_init ();
opt_ctx = poptGetContext("notify-send", argc, argv, options, 0); opt_ctx = poptGetContext("notify-send", argc, argv, options, 0);
poptSetOtherOptionHelp(opt_ctx, "[OPTIONS]* <summary> [body]"); poptSetOtherOptionHelp(opt_ctx, "[OPTIONS]* <summary> [body]");
@ -128,13 +128,12 @@ main(int argc, const char **argv)
if (!notify_init("notify-send")) if (!notify_init("notify-send"))
exit(1); 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_show_and_forget(notify, 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);
poptFreeContext(opt_ctx); poptFreeContext(opt_ctx);
notify_uninit(); notify_uninit();