Merge branch 'master' into chatstates

2012-10-28 00:37:01 +01:00
parent d4fb72f6c9 8258e7a3ef
commit 44f64bea64
8 changed files with 283 additions and 148 deletions
--- a/src/profanity.c
+++ b/src/profanity.c
@@ -65,7 +65,7 @@ prof_run(const int disable_tls, char *log_level)

            gdouble elapsed = g_timer_elapsed(timer, NULL);

-            gint remind_period = prefs_get_remind();
+            gint remind_period = prefs_get_notify_remind();

            // 0 means to not remind
            if (remind_period > 0 && elapsed >= remind_period) {