diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c
index 279588de..b5764ceb 100644
--- a/src/fe-common/core/fe-common-core.c
+++ b/src/fe-common/core/fe-common-core.c
@@ -436,6 +436,9 @@ void fe_common_core_finish_init(void)
 	signal_add_first("setup changed", (SIGNAL_FUNC) sig_setup_changed);
 
         /* _after_ windows are created.. */
+#ifdef HAVE_GLIB2
+	g_log_set_default_handler((GLogFunc) glog_func, NULL);
+#else
 	g_log_set_handler(G_LOG_DOMAIN,
 			  (GLogLevelFlags) (G_LOG_LEVEL_CRITICAL |
 					    G_LOG_LEVEL_WARNING),
@@ -444,6 +447,7 @@ void fe_common_core_finish_init(void)
 			  (GLogLevelFlags) (G_LOG_LEVEL_CRITICAL |
 					    G_LOG_LEVEL_WARNING),
 			  (GLogFunc) glog_func, NULL); /* send glib errors to the same place */
+#endif
 
 	if (setup_changed)
                 signal_emit("setup changed", 0);