augustin64/TaKl
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 8 Wiki Activity

Remove libnotify dependency for main binary

Browse Source
This commit is contained in:
augustin64 2023-10-27 11:19:53 +02:00
parent e03dff6589
commit 3ad74e9428
7 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@ -1,5 +1,6 @@
FLAGS = -g -Wall -Wextra -DLOG_USE_COLOR `pkg-config --cflags --libs libnotify` FLAGS = -g -Wall -Wextra -DLOG_USE_COLOR
LD_FLAGS = -lsqlite3 -lpthread LD_FLAGS = -lsqlite3 -lpthread
NOTIF_FLAGS = `pkg-config --cflags --libs libnotify`
$(shell mkdir -p out) $(shell mkdir -p out)
@ -11,6 +12,9 @@ all: takl takl-daemon
out/%.o: src/%.c out/%.o: src/%.c
$(CC) -c $(FLAGS) $^ -o $@ $(CC) -c $(FLAGS) $^ -o $@
out/notification.o: src/main/notification.c
$(CC) -c $(FLAGS) $(NOTIF_FLAGS) $^ -o $@
out/%.o: src/main/%.c out/%.o: src/main/%.c
$(CC) -c $(FLAGS) $^ -o $@ $(CC) -c $(FLAGS) $^ -o $@
@ -20,8 +24,8 @@ out/%.o: src/log/%.c
takl: out/main.o out/db.o out/tasks.o out/utils.o takl: out/main.o out/db.o out/tasks.o out/utils.o
$(CC) $(FLAGS) $(LD_FLAGS) $^ -o $@ $(CC) $(FLAGS) $(LD_FLAGS) $^ -o $@
takl-daemon: out/daemon.o out/db.o out/tasks.o out/utils.o out/log.o takl-daemon: out/daemon.o out/db.o out/tasks.o out/utils.o out/log.o out/notification.o
$(CC) $(FLAGS) $(LD_FLAGS) $^ -o $@ $(CC) $(FLAGS) $(LD_FLAGS) $(NOTIF_FLAGS) $^ -o $@
install: takl takl-daemon install: takl takl-daemon

1
src/daemon.c
View File

@ -22,6 +22,7 @@
#include "main/include/utils.h" #include "main/include/utils.h"
#include "main/include/colors.h" #include "main/include/colors.h"
#include "main/include/config.h" #include "main/include/config.h"
#include "main/include/notification.h"
#define EVENT_SIZE ( sizeof (struct inotify_event) ) #define EVENT_SIZE ( sizeof (struct inotify_event) )

2
src/main/include/config.h
View File

@ -1,7 +1,7 @@
#ifndef DEF_CONFIG_H #ifndef DEF_CONFIG_H
#define DEF_CONFIG_H #define DEF_CONFIG_H
#define VERSION "1.3.3" #define VERSION "1.3.4"
#define MAX_TASK_ID 10000 // max is set to MAX_TASK_ID-1 #define MAX_TASK_ID 10000 // max is set to MAX_TASK_ID-1
#define NEW_TASK_ID_MAX_RETRIES 10000 // number of retries before giving up #define NEW_TASK_ID_MAX_RETRIES 10000 // number of retries before giving up

10
src/main/include/notification.h Normal file
View File

@ -0,0 +1,10 @@
#ifndef DEF_NOTIFICATION_H
#define DEF_NOTIFICATION_H
#include "tasks.h"
/*
Envoyer une notification avec t
*/
void desktop_notification(task_t t);
#endif

5
src/main/include/tasks.h
View File

@ -29,9 +29,4 @@ Libère la mémoire allouée à une liste de tâches
*/ */
void free_task_list(task_list_t* list); void free_task_list(task_list_t* list);
/*
Envoyer une notification avec t
*/
void desktop_notification(task_t t);
#endif #endif

11
src/main/notification.c Normal file
View File

@ -0,0 +1,11 @@
#include <libnotify/notify.h>
#include "include/notification.h"
void desktop_notification(task_t t) {
notify_init ("TaKl");
NotifyNotification * Notif = notify_notification_new ("TaKl Daemon", t.text, "dialog-information");
notify_notification_show (Notif, NULL);
g_object_unref(G_OBJECT(Notif));
notify_uninit();
}

9
src/main/tasks.c
View File

@ -5,7 +5,6 @@ Fonctions utilitaires concernant les tâches
#include <stdio.h> #include <stdio.h>
#include <time.h> #include <time.h>
#include <string.h> #include <string.h>
#include <libnotify/notify.h>
#include "include/db.h" #include "include/db.h"
#include "include/struct.h" #include "include/struct.h"
@ -131,12 +130,4 @@ void free_task_list(task_list_t* list) {
free(list); free(list);
list = next; list = next;
} }
}
void desktop_notification(task_t t) {
notify_init ("TaKl");
NotifyNotification * Notif = notify_notification_new ("TaKl Daemon", t.text, "dialog-information");
notify_notification_show (Notif, NULL);
g_object_unref(G_OBJECT(Notif));
notify_uninit();
} }