From 5f439e5e625a81145d3ec372cdb5caa654c269cc Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Tue, 18 Oct 2011 12:26:00 -0400
Subject: Trivial little cleanups.

To synchronize with the "wip/gsettings" branch.

Mostly just removing unneeded "gconf-bridge.h" includes.
---
 calendar/gui/e-calendar-view.c                 | 2 +-
 capplet/anjal-settings-main.c                  | 1 -
 capplet/settings/mail-capplet-shell.c          | 1 -
 composer/e-msg-composer.c                      | 2 +-
 plugins/mail-to-task/mail-to-task.c            | 1 -
 plugins/publish-calendar/publish-format-fb.c   | 1 -
 plugins/publish-calendar/publish-format-ical.c | 1 -
 7 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index e2ecfc10ae..ebaede4257 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -1571,7 +1571,7 @@ e_calendar_view_new_appointment_full (ECalendarView *cal_view,
 		gint time_div = e_calendar_view_get_time_divisions (cal_view);
 		gint hours, mins;
 
-		if (!time_div) /* Possible if your gconf values aren't so nice */
+		if (!time_div) /* Possible if your settings values aren't so nice */
 			time_div = 30;
 
 		if (time_day_begin (now) == time_day_begin (dtstart)) {
diff --git a/capplet/anjal-settings-main.c b/capplet/anjal-settings-main.c
index 2bc3268b58..99e0b4a282 100644
--- a/capplet/anjal-settings-main.c
+++ b/capplet/anjal-settings-main.c
@@ -38,7 +38,6 @@
 #include <libedataserverui/e-passwords.h>
 #include <mail/mail-mt.h>
 #include "settings/mail-capplet-shell.h"
-#include <gconf/gconf-client.h>
 #include <libedataserver/e-categories.h>
 
 #ifdef G_OS_WIN32
diff --git a/capplet/settings/mail-capplet-shell.c b/capplet/settings/mail-capplet-shell.c
index 91a82b6757..6567da02ac 100644
--- a/capplet/settings/mail-capplet-shell.c
+++ b/capplet/settings/mail-capplet-shell.c
@@ -30,7 +30,6 @@
 #include <gtk/gtkx.h>
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
-#include <gconf/gconf-client.h>
 #include "mail-capplet-shell.h"
 #include "mail-view.h"
 #include <gdk/gdkkeysyms.h>
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 82bca68514..5ed9fad575 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -5060,7 +5060,7 @@ e_load_spell_languages (void)
 
 	spell_languages = g_list_reverse (spell_languages);
 
-	/* Pick a default spell language if GConf came back empty. */
+	/* Pick a default spell language if it came back empty. */
 	if (spell_languages == NULL) {
 		const GtkhtmlSpellLanguage *language;
 
diff --git a/plugins/mail-to-task/mail-to-task.c b/plugins/mail-to-task/mail-to-task.c
index 810a2b593c..f028528575 100644
--- a/plugins/mail-to-task/mail-to-task.c
+++ b/plugins/mail-to-task/mail-to-task.c
@@ -33,7 +33,6 @@
 #include <stdio.h>
 
 #include <gtkhtml/gtkhtml.h>
-#include <gconf/gconf-client.h>
 #include <libecal/e-cal-client.h>
 #include <libecal/e-cal-component.h>
 #include <libedataserver/e-account.h>
diff --git a/plugins/publish-calendar/publish-format-fb.c b/plugins/publish-calendar/publish-format-fb.c
index 1059e1d5be..b818a58d08 100644
--- a/plugins/publish-calendar/publish-format-fb.c
+++ b/plugins/publish-calendar/publish-format-fb.c
@@ -27,7 +27,6 @@
 #include <string.h>
 #include <time.h>
 #include <glib/gi18n.h>
-#include <gconf/gconf-client.h>
 #include <libedataserver/e-source.h>
 #include <libedataserver/e-source-list.h>
 #include <libedataserverui/e-client-utils.h>
diff --git a/plugins/publish-calendar/publish-format-ical.c b/plugins/publish-calendar/publish-format-ical.c
index b28a57aceb..82b38983a6 100644
--- a/plugins/publish-calendar/publish-format-ical.c
+++ b/plugins/publish-calendar/publish-format-ical.c
@@ -26,7 +26,6 @@
 
 #include <string.h>
 #include <glib/gi18n.h>
-#include <gconf/gconf-client.h>
 #include <libedataserver/e-source.h>
 #include <libedataserver/e-source-list.h>
 #include <libedataserverui/e-client-utils.h>
-- 
cgit v1.2.3