Fixes from merging master

author Philip Withnall <philip.withnall@collabora.co.uk>

Wed, 23 Jun 2010 15:46:26 +0000 (16:46 +0100)

committer Travis Reitter <treitter@gmail.com>

Tue, 20 Jul 2010 23:12:35 +0000 (16:12 -0700)
author Philip Withnall <philip.withnall@collabora.co.uk>
Wed, 23 Jun 2010 15:46:26 +0000 (16:46 +0100)
committer Travis Reitter <treitter@gmail.com>
Tue, 20 Jul 2010 23:12:35 +0000 (16:12 -0700)
diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c

index 0e596fe0a5a0dfc0c960ec9fe44157c4b75f891b..0af2413fc3eb7cdb5f874c6cdf001ee97fdd5627 100644 (file)
--- a/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@ -42,6 +42,7 @@
  #include <libempathy/empathy-contact-manager.h>
  #include <libempathy/empathy-gsettings.h>
  #include <libempathy/empathy-individual-manager.h>
+#include <libempathy/empathy-gsettings.h>
  #include <libempathy/empathy-status-presets.h>
  #include <libempathy/empathy-tp-contact-factory.h>
author	Philip Withnall <philip.withnall@collabora.co.uk>
	Wed, 23 Jun 2010 15:46:26 +0000 (16:46 +0100)
committer	Travis Reitter <treitter@gmail.com>
	Tue, 20 Jul 2010 23:12:35 +0000 (16:12 -0700)