Merge pull request #547 from knopwob/random_stuff

Random fixes
This commit is contained in:
Nikos Tsipinakis 2018-09-14 15:55:44 +03:00 committed by GitHub
commit f76af36743
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 5 deletions

View File

@ -17,7 +17,6 @@ enum reason {
int initdbus(void); int initdbus(void);
void dbus_tear_down(int id); void dbus_tear_down(int id);
/* void dbus_poll(int timeout); */
void signal_notification_closed(notification *n, enum reason reason); void signal_notification_closed(notification *n, enum reason reason);
void signal_action_invoked(notification *n, const char *identifier); void signal_action_invoked(notification *n, const char *identifier);

View File

@ -23,7 +23,6 @@ int dunst_main(int argc, char *argv[]);
void usage(int exit_status); void usage(int exit_status);
void print_version(void); void print_version(void);
char *extract_urls(const char *str);
void context_menu(void); void context_menu(void);
void pause_signal_handler(int sig); void pause_signal_handler(int sig);

View File

@ -17,14 +17,19 @@
#define DIE(...) do { LOG_C(__VA_ARGS__); exit(EXIT_FAILURE); } while (0) #define DIE(...) do { LOG_C(__VA_ARGS__); exit(EXIT_FAILURE); } while (0)
/** /**
* @return the string representation of the given `level` * Set the current loglevel to `level`
*
* @param level The desired log level
*
* If `level` is `NULL`, nothing will be done.
* If `level` is an invalid value, nothing will be done.
*/ */
void log_set_level(GLogLevelFlags level); void log_set_level(GLogLevelFlags level);
/** /**
* Set the current loglevel to `level` * Set the current loglevel to `level`
* *
* @param level The desired log level * @param level The desired log level as a string
* *
* If `level` is `NULL`, nothing will be done. * If `level` is `NULL`, nothing will be done.
* If `level` is an invalid value, nothing will be done. * If `level` is an invalid value, nothing will be done.

View File

@ -136,7 +136,7 @@ void markup_strip_a(char **str, char **urls)
*/ */
void markup_strip_img(char **str, char **urls) void markup_strip_img(char **str, char **urls)
{ {
const char *start = *str; const char *start;
if (urls) if (urls)
*urls = NULL; *urls = NULL;