Merge pull request #1429 from bynect/dunstify-category

Add --category to dunstify

Author: bynect

completions/dunstify.fishcomp

@@ -16,7 +16,8 @@ complete -c dunstify -s A -l action -x -d 'Actions the user can invoke'
 complete -c dunstify -s t -l timeout -x -d 'The time in milliseconds until the notification expires'
 complete -c dunstify -s i -l icon -x -d 'An Icon that should be displayed with the notification'
 complete -c dunstify -s I -l raw_icon -r -d 'Path to the icon to be sent as raw image data'
-complete -c dunstify -s c -l capabilities -d 'Print the server capabilities and exit'
+complete -c dunstify -s c -l category -d 'The category of this notification'
+complete -c dunstify -l capabilities -d 'Print the server capabilities and exit'
 complete -c dunstify -s s -l serverinfo -d 'Print server information and exit'
 complete -c dunstify -s p -l printid -d 'Print id, which can be used to update/replace this notification'
 complete -c dunstify -s r -l replace -x -a '(__fish_dunstify_history)' -d 'Set id of this notification.'

docs/dunstify.pod

@@ -47,7 +47,11 @@ Specifies an icon to display with the notification.
 
 Path to the icon to be sent as raw image data.
 
-=item B<-c, --capabilities>
+=item B<-c, --category=TYPE>
+
+The category of this notification.
+
+=item B<--capabilities>
 
 Print the server capabilities and exit.
 

dunstify.c

@@ -11,6 +11,7 @@ static gchar *summary = NULL;
 static gchar *body = NULL;
 static NotifyUrgency urgency = NOTIFY_URGENCY_NORMAL;
 static gchar *urgency_str = NULL;
+static gchar *category = NULL;
 static gchar **hint_strs = NULL;
 static gchar **action_strs = NULL;
 static gint timeout = NOTIFY_EXPIRES_DEFAULT;
@@ -32,7 +33,8 @@ static GOptionEntry entries[] =
     { "timeout",      't', 0, G_OPTION_ARG_INT,          &timeout,        "The time in milliseconds until the notification expires", "TIMEOUT" },
     { "icon",         'i', 0, G_OPTION_ARG_STRING,       &icon,           "An icon that should be displayed with the notification", "ICON" },
     { "raw_icon",     'I', 0, G_OPTION_ARG_STRING,       &raw_icon_path,  "Path to the icon to be sent as raw image data", "RAW_ICON"},
-    { "capabilities", 'c', 0, G_OPTION_ARG_NONE,         &capabilities,   "Print the server capabilities and exit", NULL},
+    { "category",     'c', 0, G_OPTION_ARG_STRING,       &category,       "The category of this notification", "TYPE" },
+    { "capabilities", 0,   0, G_OPTION_ARG_NONE,         &capabilities,   "Print the server capabilities and exit", NULL},
     { "serverinfo",   's', 0, G_OPTION_ARG_NONE,         &serverinfo,     "Print server information and exit", NULL},
     { "printid",      'p', 0, G_OPTION_ARG_NONE,         &printid,        "Print id, which can be used to update/replace this notification", NULL},
     { "replace",      'r', 0, G_OPTION_ARG_INT,          &replace_id,     "Set id of this notification.", "ID"},
@@ -212,7 +214,7 @@ void put_id(NotifyNotification *n, guint32 id)
 {
     knickers *kn = n->priv;
 
-    /* And know I'm putting stuff into
+    /* And now I'm putting stuff into
      * your knickers. I'm sorry.
      * I'm so sorry.
      * */
@@ -302,6 +304,9 @@ int main(int argc, char *argv[])
     notify_notification_set_timeout(n, timeout);
     notify_notification_set_urgency(n, urgency);
 
+    if (category != NULL)
+        notify_notification_set_category(n, category);
+
     GError *err = NULL;
 
     if (raw_icon_path) {