From: Richard Kettlewell Date: Sat, 30 Jul 2011 20:15:16 +0000 (+0100) Subject: Initialize filtering logic properly. X-Git-Tag: branchpoint-5.1~37^2~5 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/commitdiff_plain/722a71bfc6d9067fd72c3ab7e4a93c04b6d6273f Initialize filtering logic properly. --- diff --git a/disobedience/disobedience.c b/disobedience/disobedience.c index 639eb73..7fcfc3c 100644 --- a/disobedience/disobedience.c +++ b/disobedience/disobedience.c @@ -569,6 +569,7 @@ int main(int argc, char **argv) { event_register("log-connected", check_rtp_address, 0); suppress_actions = 0; playlists_init(); + filtering_init(); /* If no password is set yet pop up a login box */ if(!config->password) login_box(); diff --git a/disobedience/disobedience.h b/disobedience/disobedience.h index 81de1f6..ce79bb0 100644 --- a/disobedience/disobedience.h +++ b/disobedience/disobedience.h @@ -240,7 +240,7 @@ void popup_help(const char *what); /* Filtering */ void popup_filtering(void); -void init_filtering(void); +void filtering_init(void); /* RTP */ diff --git a/disobedience/filter.c b/disobedience/filter.c index 12f6cea..b6d26e4 100644 --- a/disobedience/filter.c +++ b/disobedience/filter.c @@ -125,6 +125,6 @@ static void filtering_global_pref_changed(const char *event, } /** @brief Initialize filtering infrastructure */ -void init_filtering() { - event_register("global-pref", NULL, filtering_global_pref_changed); +void filtering_init() { + event_register("global-pref", filtering_global_pref_changed, NULL); }