[telepathy-haze/master] Reinstate hack to disable all fatal criticals.

[Will Thompson]

Seems that the alternative hack to make only libpurple's criticals
non-fatal didn't actually work.

This reverts commit 45746eb8ab80d2dc2bd13412b30e40165523748b ("Add an
env var. to make libpurple's criticals fatal.") and commit
35003c01cedc262de96fbafd0cb998703d81f931 ("Only make libpurple's
criticals non-fatal").
---
 src/main.c |   29 ++++++++---------------------
 1 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/src/main.c b/src/main.c
index c8c7fec..1c3136b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -216,28 +216,15 @@ static TpBaseConnectionManager *
 get_cm (void)
 {
     GLogLevelFlags fatal_mask;
-    gboolean fatal_purple_criticals =
-        (g_getenv ("THIS_PIDGIN_IS_NO_MORE") != NULL);
-
-    /* libpurple has a tendency to throw critical errors from
-     * g_return_val_if_fail(), particularly in MSN code.  We really don't want
-     * haze to die in those cases, so we disable fatal criticals for libpurple.
-     *
-     * This is complicated by libpurple not correctly setting G_LOG_DOMAIN.
-     * This will be fixed in a future libpurple, but in the meantime haze sets
-     * G_LOG_DOMAIN="haze" for itself so that we can assume the NULL domain is
-     * libpurple.
-     */
-    if (!fatal_purple_criticals)
-    {
-        fatal_mask = g_log_set_fatal_mask (NULL, G_LOG_FATAL_MASK);
-        fatal_mask &= ~G_LOG_LEVEL_CRITICAL;
-        g_log_set_fatal_mask (NULL, fatal_mask);
 
-        fatal_mask = g_log_set_fatal_mask ("purple", G_LOG_FATAL_MASK);
-        fatal_mask &= ~G_LOG_LEVEL_CRITICAL;
-        g_log_set_fatal_mask ("purple", fatal_mask);
-    }
+    /* libpurple throws critical errors all over the place because of
+     * g_return_val_if_fail().
+     * Particularly in MSN.
+     * I hate MSN.
+     */
+    fatal_mask = g_log_set_always_fatal (G_LOG_FATAL_MASK);
+    fatal_mask &= ~G_LOG_LEVEL_CRITICAL;
+    g_log_set_always_fatal (fatal_mask);
 
     return (TpBaseConnectionManager *) haze_connection_manager_get ();
 }
-- 
1.5.6.5