nagbalae/dunst
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #426 from bebehei/progress

Browse Source 
Use '-1' for undefined progress
This commit is contained in:
Nikos Tsipinakis 2017-11-02 07:29:29 +02:00 committed by GitHub
commit 48fab3f887
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dbus.c
View File

@ -262,7 +262,7 @@ static void on_notify(GDBusConnection *connection,
n->raw_icon = raw_icon; n->raw_icon = raw_icon;
n->timeout = timeout < 0 ? -1 : timeout * 1000; n->timeout = timeout < 0 ? -1 : timeout * 1000;
n->markup = settings.markup; n->markup = settings.markup;
n->progress = (progress < 0 || progress > 100) ? 0 : progress + 1; n->progress = (progress < 0 || progress > 100) ? -1 : progress;
n->urgency = urgency; n->urgency = urgency;
n->category = category; n->category = category;
n->dbus_client = g_strdup(sender); n->dbus_client = g_strdup(sender);

2
src/dunst.c
View File

@ -154,7 +154,7 @@ int dunst_main(int argc, char *argv[])
n->appname = g_strdup("dunst"); n->appname = g_strdup("dunst");
n->summary = g_strdup("startup"); n->summary = g_strdup("startup");
n->body = g_strdup("dunst is up and running"); n->body = g_strdup("dunst is up and running");
n->progress = 0; n->progress = -1;
n->timeout = 10 * G_USEC_PER_SEC; n->timeout = 10 * G_USEC_PER_SEC;
n->markup = MARKUP_NO; n->markup = MARKUP_NO;
n->urgency = LOW; n->urgency = LOW;

12
src/notification.c
View File

@ -359,23 +359,23 @@ void notification_init(notification *n)
MARKUP_NO); MARKUP_NO);
break; break;
case 'p': case 'p':
if (n->progress) if (n->progress != -1)
sprintf(pg, "[%3d%%]", n->progress - 1); sprintf(pg, "[%3d%%]", n->progress);
notification_replace_single_field( notification_replace_single_field(
&n->msg, &n->msg,
&substr, &substr,
n->progress ? pg : "", n->progress != -1 ? pg : "",
MARKUP_NO); MARKUP_NO);
break; break;
case 'n': case 'n':
if (n->progress) if (n->progress != -1)
sprintf(pg, "%d", n->progress - 1); sprintf(pg, "%d", n->progress);
notification_replace_single_field( notification_replace_single_field(
&n->msg, &n->msg,
&substr, &substr,
n->progress ? pg : "", n->progress != -1 ? pg : "",
MARKUP_NO); MARKUP_NO);
break; break;
case '%': case '%':

2
src/notification.h
View File

@ -54,7 +54,7 @@ typedef struct _notification {
bool first_render; bool first_render;
bool transient; bool transient;
int progress; /* percentage + 1, 0 to hide */ int progress; /* percentage (-1: undefined) */
int history_ignore; int history_ignore;
const char *script; const char *script;
char *urls; char *urls;