diff options
| author | Alberts Muktupāvels <alberts.muktupavels@gmail.com> | 2021-03-26 15:57:33 +0000 |
|---|---|---|
| committer | Alberts Muktupāvels <alberts.muktupavels@gmail.com> | 2021-03-26 15:57:33 +0000 |
| commit | 39575f7c6f2f053167151b04c1cfabaefc760646 (patch) | |
| tree | 94ab6d68cc4dc0a374a9edd7906837a3c68904d6 | |
| parent | 48e64c39bcbd82db775ef1715c21fbf33e994cf6 (diff) | |
| parent | dfaa76109ebfefc669918e4a6b0d09899ddb332d (diff) | |
| download | libnotify-39575f7c6f2f053167151b04c1cfabaefc760646.tar.gz | |
Merge branch 'master' into 'master'
notify-send: Support commas in icon filenames
See merge request GNOME/libnotify!15
| -rw-r--r-- | docs/notify-send.xml | 2 | ||||
| -rw-r--r-- | tools/notify-send.c | 15 |
2 files changed, 3 insertions, 14 deletions
diff --git a/docs/notify-send.xml b/docs/notify-send.xml index 614b48b..7372507 100644 --- a/docs/notify-send.xml +++ b/docs/notify-send.xml @@ -73,7 +73,7 @@ </listitem> </varlistentry> <varlistentry> - <term><option>-i</option>, <option>--icon</option>=<replaceable>ICON</replaceable>[,<replaceable>ICON</replaceable>…] + <term><option>-i</option>, <option>--icon</option>=<replaceable>ICON</replaceable> </term> <listitem> <para>Specifies an icon filename or stock icon to display.</para> diff --git a/tools/notify-send.c b/tools/notify-send.c index 67e0b03..9b8e438 100644 --- a/tools/notify-send.c +++ b/tools/notify-send.c @@ -128,7 +128,6 @@ main (int argc, char *argv[]) static const char *type = NULL; static char *app_name = NULL; static char *icon_str = NULL; - static char *icons = NULL; static char **n_text = NULL; static char **hints = NULL; static gboolean do_version = FALSE; @@ -150,9 +149,9 @@ main (int argc, char *argv[]) "notification."), N_("TIME")}, {"app-name", 'a', 0, G_OPTION_ARG_STRING, &app_name, N_("Specifies the app name for the icon"), N_("APP_NAME")}, - {"icon", 'i', 0, G_OPTION_ARG_FILENAME, &icons, + {"icon", 'i', 0, G_OPTION_ARG_FILENAME, &icon_str, N_("Specifies an icon filename or stock icon to display."), - N_("ICON[,ICON...]")}, + N_("ICON")}, {"category", 'c', 0, G_OPTION_ARG_FILENAME, &type, N_("Specifies the notification category."), N_("TYPE[,TYPE...]")}, @@ -215,16 +214,6 @@ main (int argc, char *argv[]) } } - if (icons != NULL) { - char *c; - - /* XXX */ - if ((c = strchr (icons, ',')) != NULL) - *c = '\0'; - - icon_str = icons; - } - if (!notify_init ("notify-send")) exit (1); |