diff --git a/src/config/preferences.c b/src/config/preferences.c index 36f3df38..d0506e06 100644 --- a/src/config/preferences.c +++ b/src/config/preferences.c @@ -192,7 +192,7 @@ prefs_reset_room_trigger_ac(void) } gboolean -prefs_do_chat_notify(gboolean current_win, const char *const message) +prefs_do_chat_notify(gboolean current_win) { gboolean notify_current = prefs_get_boolean(PREF_NOTIFY_CHAT_CURRENT); gboolean notify_window = FALSE; diff --git a/src/config/preferences.h b/src/config/preferences.h index 5bb219b1..baf43953 100644 --- a/src/config/preferences.h +++ b/src/config/preferences.h @@ -231,7 +231,7 @@ char* prefs_get_string(preference_t pref); void prefs_free_string(char *pref); void prefs_set_string(preference_t pref, char *value); -gboolean prefs_do_chat_notify(gboolean current_win, const char *const message); +gboolean prefs_do_chat_notify(gboolean current_win); gboolean prefs_do_room_notify(gboolean current_win, const char *const roomjid, const char *const nick, const char *const message, gboolean mention, gboolean trigger_found); GList* prefs_message_get_triggers(const char *const message); diff --git a/src/ui/chatwin.c b/src/ui/chatwin.c index 05751f6c..718c6809 100644 --- a/src/ui/chatwin.c +++ b/src/ui/chatwin.c @@ -240,7 +240,7 @@ chatwin_incoming_msg(ProfChatWin *chatwin, const char *const resource, const cha char *display_name = roster_get_msg_display_name(chatwin->barejid, resource); gboolean is_current = wins_is_current(window); - gboolean notify = prefs_do_chat_notify(is_current, message); + gboolean notify = prefs_do_chat_notify(is_current); // currently viewing chat window with sender if (wins_is_current(window)) { diff --git a/src/ui/notifier.c b/src/ui/notifier.c index 9a185e38..30497fe3 100644 --- a/src/ui/notifier.c +++ b/src/ui/notifier.c @@ -140,7 +140,7 @@ notify_remind(void) gdouble elapsed = g_timer_elapsed(remind_timer, NULL); gint remind_period = prefs_get_notify_remind(); if (remind_period > 0 && elapsed >= remind_period) { - gboolean notify = wins_get_notify(); + gboolean notify = wins_do_notify_remind(); gint unread = wins_get_total_unread(); gint open = muc_invites_count(); gint subs = presence_sub_request_count(); diff --git a/src/ui/privwin.c b/src/ui/privwin.c index 00c50bb6..36cc29c7 100644 --- a/src/ui/privwin.c +++ b/src/ui/privwin.c @@ -57,7 +57,7 @@ privwin_incoming_msg(ProfPrivateWin *privatewin, const char *const message, GDat } gboolean is_current = wins_is_current(window); - gboolean notify = prefs_do_chat_notify(is_current, message); + gboolean notify = prefs_do_chat_notify(is_current); // currently viewing chat window with sender if (wins_is_current(window)) { diff --git a/src/window_list.c b/src/window_list.c index 62576b84..bfd1f422 100644 --- a/src/window_list.c +++ b/src/window_list.c @@ -589,7 +589,7 @@ wins_new_private(const char *const fulljid) } gboolean -wins_get_notify(void) +wins_do_notify_remind(void) { GList *values = g_hash_table_get_values(windows); GList *curr = values; diff --git a/src/window_list.h b/src/window_list.h index 7037e80e..46bac234 100644 --- a/src/window_list.h +++ b/src/window_list.h @@ -72,7 +72,7 @@ int wins_get_current_num(void); void wins_close_current(void); void wins_close_by_num(int i); gboolean wins_is_current(ProfWin *window); -gboolean wins_get_notify(void); +gboolean wins_do_notify_remind(void); int wins_get_total_unread(void); void wins_resize_all(void); GSList* wins_get_chat_recipients(void);