First successful build

18 files changed, 299 insertions, 495 deletions

diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.c b/addressbook/gui/widgets/e-addressbook-table-adapter.c
index b579c43dbf..463bdc7a3d 100644
--- a/addressbook/gui/widgets/e-addressbook-table-adapter.c
+++ b/addressbook/gui/widgets/e-addressbook-table-adapter.c
@@ -223,7 +223,6 @@ addressbook_append_row (ETableModel *etm,
 	EAddressbookTableAdapterPrivate *priv = adapter->priv;
 	EBookClient *book_client;
 	EContact *contact;
-	EBookClient *book_client;
 	gint col;
 
 	contact = e_contact_new ();
diff --git a/calendar/gui/alarm-notify/config-data.c b/calendar/gui/alarm-notify/config-data.c
index 4f30a4e4f3..f44a832b4c 100644
--- a/calendar/gui/alarm-notify/config-data.c
+++ b/calendar/gui/alarm-notify/config-data.c
@@ -34,7 +34,7 @@
  * the data from the configuration engine. */
 static gboolean inited = FALSE;
 static GConfClient *conf_client = NULL;
-static GSetting *calendar_settings = NULL;
+static GSettings *calendar_settings = NULL;
 static ESourceList *calendar_source_list = NULL, *tasks_source_list = NULL;
 
 /* Copied from ../calendar-config.c; returns whether the locale has 'am' and
@@ -123,11 +123,11 @@ config_data_get_calendars (const gchar *key)
 		return cal_sources;
 	}
 
-	state = g_settings_get_boolean (calendar_settings, "notify-with-tray", NULL);
+	state = g_settings_get_boolean (calendar_settings, "notify-with-tray");
 	if (!state) /* Should be old client */ {
 		GSList *source;
 
-		g_settings_set_boolean (calendar_settings, "notify-with-tray", TRUE, NULL);
+		g_settings_set_boolean (calendar_settings, "notify-with-tray", TRUE);
 		source = gconf_client_get_list (conf_client,
 						"/apps/evolution/calendar/sources",
 						GCONF_VALUE_STRING,
@@ -226,7 +226,7 @@ config_data_get_24_hour_format (void)
 	ensure_inited ();
 
 	if (locale_supports_12_hour_format ()) {
-		return g_settings_get_boolean (calendar_client, "use-24hour-format");
+		return g_settings_get_boolean (calendar_settings, "use-24hour-format");
 	}
 
 	return TRUE;
@@ -237,7 +237,7 @@ config_data_get_notify_with_tray (void)
 {
 	ensure_inited ();
 
-	return g_settings_get_boolean (calendar_client, "notify-with-tray");
+	return g_settings_get_boolean (calendar_settings, "notify-with-tray");
 }
 
 /**
@@ -286,7 +286,7 @@ config_data_set_last_notification_time (ECalClient *cal,
 	 * than the already stored one */
 	current_t = g_settings_get_int (calendar_settings, "last-notification-time");
 	if (t > current_t || current_t > now)
-		g_settings_set_int (calendar_settings "last-notification-time", t);
+		g_settings_set_int (calendar_settings, "last-notification-time", t);
 }
 
 /**
@@ -313,21 +313,21 @@ config_data_get_last_notification_time (ECalClient *cal)
 
 			if (last_notified && *last_notified &&
 				g_time_val_from_iso8601 (last_notified, &tmval)) {
-				time_t now = time (NULL), val = (time_t) tmval.tv_sec;
+				time_t now = time (NULL), value = (time_t) tmval.tv_sec;
 
-				if (val > now)
-					val = now;
-				return val;
+				if (value > now)
+					value = now;
+				return value;
 			}
 		}
 	}
 
 	value = g_settings_get_int (calendar_settings, "last-notification-time");
 	now = time (NULL);
-	if (val > now)
-		val = now;
+	if (value > now)
+		value = now;
 
-	return val;
+	return value;
 }
 
 /**
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 033b1323f9..73bf421a65 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -40,7 +40,6 @@
 #include <e-util/e-util.h>
 #include <e-util/e-alert-sink.h>
 #include <e-util/e-dialog-utils.h>
-#include <e-util/e-extensible.h>
 #include <e-util/e-util-private.h>
 #include <shell/e-shell.h>
 
@@ -1664,22 +1663,28 @@ comp_editor_bind_settings (CompEditor *editor)
 	g_return_if_fail (editor != NULL);
 
 	action = comp_editor_get_action (editor, "view-categories");
-	g_settings_bind (priv->calendar_settings, "editor-show-categories", G_OBJECT (action), "active", G_SETTINGS_BIND_DEFAULT);
+	g_settings_bind (editor->priv->calendar_settings, "editor-show-categories",
+			 G_OBJECT (action), "active", G_SETTINGS_BIND_DEFAULT);
 
 	action = comp_editor_get_action (editor, "view-role");
-	g_settings_bind (priv->calendar_settings, "editor-show-role", G_OBJECT (action), "active", G_SETTINGS_BIND_DEFAULT);
+	g_settings_bind (editor->priv->calendar_settings, "editor-show-role",
+			 G_OBJECT (action), "active", G_SETTINGS_BIND_DEFAULT);
 
 	action = comp_editor_get_action (editor, "view-rsvp");
-	g_settings_bind (priv->calendar_settings, "editor-show-rsvp", G_OBJECT (action), "active", G_SETTINGS_BIND_DEFAULT);
+	g_settings_bind (editor->priv->calendar_settings, "editor-show-rsvp",
+			 G_OBJECT (action), "active", G_SETTINGS_BIND_DEFAULT);
 
 	action = comp_editor_get_action (editor, "view-status");
-	g_settings_bind (priv->calendar_settings, "editor-show-status", G_OBJECT (action), "active", G_SETTINGS_BIND_DEFAULT);
+	g_settings_bind (editor->priv->calendar_settings, "editor-show-status",
+			 G_OBJECT (action), "active", G_SETTINGS_BIND_DEFAULT);
 
 	action = comp_editor_get_action (editor, "view-time-zone");
-	g_settings_bind (priv->calendar_settings, "editor-show-timezone", G_OBJECT (action), "active", G_SETTINGS_BIND_DEFAULT);
+	g_settings_bind (editor->priv->calendar_settings, "editor-show-timezone",
+			 G_OBJECT (action), "active", G_SETTINGS_BIND_DEFAULT);
 
 	action = comp_editor_get_action (editor, "view-type");
-	g_settings_bind (priv->calendar_settings, "editor-show-type", G_OBJECT (action), "active", G_SETTINGS_BIND_DEFAULT);
+	g_settings_bind (editor->priv->calendar_settings, "editor-show-type",
+			 G_OBJECT (action), "active", G_SETTINGS_BIND_DEFAULT);
 }
 
 static gboolean
diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c
index 4a7b942ba6..96fce86260 100644
--- a/calendar/importers/icalendar-importer.c
+++ b/calendar/importers/icalendar-importer.c
@@ -1382,7 +1382,7 @@ get_users_timezone (void)
 	} else {
 		GSettings *settings = g_settings_new ("org.gnome.evolution.calendar");
 
-		location = g_settings_get_string (settings, "timezone", NULL);
+		location = g_settings_get_string (settings, "timezone");
 
 		g_object_unref (settings);
 	}
diff --git a/data/Makefile.am b/data/Makefile.am
index c7f73e4744..17b32acc1e 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -15,6 +15,7 @@ gsettings_SCHEMAS =							\
 	org.gnome.evolution.addressbook.gschema.xml			\
 	org.gnome.evolution.calendar.gschema.xml			\
 	org.gnome.evolution.mail.gschema.xml				\
+	org.gnome.evolution.shell.gschema.xml.in			\
 	org.gnome.evolution.eplugin.attachment-reminder.gschema.xml	\
 	org.gnome.evolution.eplugin.bogo-junk.gschema.xml		\
 	org.gnome.evolution.eplugin.email-custom-header.gschema.xml	\
diff --git a/data/org.gnome.evolution.calendar.gschema.xml.in b/data/org.gnome.evolution.calendar.gschema.xml.in
index 706c0bf5ac..6915a0c2aa 100644
--- a/data/org.gnome.evolution.calendar.gschema.xml.in
+++ b/data/org.gnome.evolution.calendar.gschema.xml.in
@@ -1,169 +1,169 @@
 <schemalist>
   <schema gettext-domain="evolution" id="org.gnome.evolution.calendar" path="/org/gnome/evolution/calendar/">
+    <key name="audio-dir" type="s">
+      <default>''</default>
+      <_summary>Save directory for reminder audio</_summary>
+      <_description>Directory for saving reminder audio files</_description>
+    </key>
+    <key name="date-navigator-pane-position" type="i">
+      <default>150</default>
+      <_summary>Month view vertical pane position</_summary>
+      <_description>Position of the vertical pane, between the calendar lists and the date navigator calendar</_description>
+    </key>
+    <key name="day-second-zone" type="s">
+      <default>''</default>
+      <_summary>The second timezone for a Day View</_summary>
+      <_description>Shows the second time zone in a Day View, if set. Value is similar to one used in a 'timezone' key</_description>
+    </key>
+    <key name="day-second-zones" type="as">
+      <default>[]</default>
+      <_summary>Recently used second time zones in a Day View</_summary>
+      <_description>List of recently used second time zones in a Day View</_description>
+    </key>
+    <key name="day-second-zones-max" type="i">
+      <default>5</default>
+      <_summary>Maximum number of recently used timezones to remember</_summary>
+      <_description>Maximum number of recently used timezones to remember in a 'day-second-zones' list</_description>
+    </key>
+    <key name="editor-show-categories" type="b">
+      <default>false</default>
+      <_summary>Show categories field in the event/meeting/task editor</_summary>
+      <_description>Whether to show categories field in the event/meeting editor</_description>
+    </key>
+    <key name="editor-show-role" type="b">
+      <default>true</default>
+      <_summary>Show Role field in the event/task/meeting editor</_summary>
+      <_description>Whether to show role field in the event/task/meeting editor</_description>
+    </key>
+    <key name="editor-show-rsvp" type="b">
+      <default>false</default>
+      <_summary>Show RSVP field in the event/task/meeting editor</_summary>
+      <_description>Whether to show RSVP field in the event/task/meeting editor</_description>
+    </key>
+    <key name="editor-show-status" type="b">
+      <default>false</default>
+      <_summary>Show status field in the event/task/meeting editor</_summary>
+      <_description>Whether to show status field in the event/task/meeting editor</_description>
+    </key>
+    <key name="editor-show-timezone" type="b">
+      <default>false</default>
+      <_summary>Show timezone field in the event/meeting editor</_summary>
+      <_description>Whether to show timezone field in the event/meeting editor</_description>
+    </key>
+    <key name="editor-show-type" type="b">
+      <default>false</default>
+      <_summary>Show type field in the event/task/meeting editor</_summary>
+      <_description>Whether to show type field in the event/task/meeting editor</_description>
+    </key>
+    <key name="hide-completed-tasks" type="b">
+      <default>false</default>
+      <_summary>Hide completed tasks</_summary>
+      <_description>Whether to hide completed tasks in the tasks view</_description>
+    </key>
+    <key name="hide-completed-tasks-units" type="s">
+      <default>'days'</default>
+      <_summary>Hide task units</_summary>
+      <_description>Units for determining when to hide tasks, "minutes", "hours" or "days"</_description>
+    </key>
+    <key name="hide-completed-tasks-value" type="i">
+      <default>1</default>
+      <_summary>Hide task value</_summary>
+      <_description>Number of units for determining when to hide tasks</_description>
+    </key>
+    <key name="last-notification-time" type="i">
+      <default>1</default>
+      <_summary>Last reminder time</_summary>
+      <_description>Time the last reminder ran, in time_t</_description>
+    </key>
+    <key name="memo-hpane-position" type="i">
+      <default>200</default>
+      <_summary>Memo preview pane position (horizontal)</_summary>
+      <_description>Position of the task preview pane when oriented horizontally</_description>
+    </key>
+    <key name="memo-layout" type="i">
+      <default>0</default>
+      <_summary>Memo layout style</_summary>
+      <_description>The layout style determines where to place the preview pane in relation to the memo list.  "0" (Classic View) places the preview pane below the memo list.  "1" (Vertical View) places the preview pane next to the memo list</_description>
+    </key>
+    <key name="memo-vpane-position" type="i">
+      <default>400</default>
+      <_summary>Memo preview pane position (vertical)</_summary>
+      <_description>Position of the memo preview pane when oriented vertically</_description>
+    </key>
+    <key name="month-scroll-by-week" type="b">
+      <default>true</default>
+      <_summary>Scroll Month View by a week, not by a month</_summary>
+      <_description>Whether to scroll a Month View by a week, not by a month</_description>
+    </key>
+    <key name="notify-programs" type="as">
+      <default>[]</default>
+      <_summary>Reminder programs</_summary>
+      <_description>Programs that are allowed to be run by reminders</_description>
+    </key>
+    <key name="notify-with-tray" type="b">
+      <default>false</default>
+      <_summary>Show display reminders in notification tray</_summary>
+      <_description>Whether or not to use the notification tray for display reminders</_description>
+    </key>
+    <key name="selected-calendars" type="as">
+      <default>[]</default>
+      <_summary>List of selected calendars</_summary>
+      <_description>List of calendars to load</_description>
+    </key>
+    <key name="selected-memos" type="as">
+      <default>[]</default>
+      <_summary>List of selected memo lists</_summary>
+      <_description>List of memo lists to load</_description>
+    </key>
+    <key name="selected-tasks" type="as">
+      <default>[]</default>
+      <_summary>List of selected task lists</_summary>
+      <_description>List of task lists to load</_description>
+    </key>
+    <key name="show-memo-preview" type="b">
+      <default>true</default>
+      <_summary>Show the memo preview pane</_summary>
+      <_description>If "true", show the memo preview pane in the main window</_description>
+    </key>
+    <key name="show-task-preview" type="b">
+      <default>true</default>
+      <_summary>Show the task preview pane</_summary>
+      <_description>If "true", show the task preview pane in the main window</_description>
+    </key>
+    <key name="task-hpane-position" type="i">
+      <default>200</default>
+      <_summary>Task preview pane position (horizontal)</_summary>
+      <_description>Position of the task preview pane when oriented horizontally</_description>
+    </key>
+    <key name="task-layout" type="i">
+      <default>0</default>
+      <_summary>Task layout style</_summary>
+      <_description>The layout style determines where to place the preview pane in relation to the task list.  "0" (Classic View) places the preview pane below the task list.  "1" (Vertical View) places the preview pane next to the task list</_description>
+    </key>
+    <key name="task-vpane-position" type="i">
+      <default>400</default>
+      <_summary>Task preview pane position (vertical)</_summary>
+      <_description>Position of the task preview pane when oriented vertically</_description>
+    </key>
+    <key name="timezone" type="s">
+      <default>'UTC'</default>
+      <_summary>Timezone</_summary>
+      <_description>The default timezone to use for dates and times in the calendar, as an untranslated Olsen timezone database location like "America/New York"</_description>
+    </key>
+    <key name="use-24hour-format" type="b">
+      <default>false</default>
+      <_summary>Twenty four hour time format</_summary>
+      <_description>Whether to show times in twenty four hour format instead of using am/pm</_description>
+    </key>
+    <key name="use-system-timezone" type="b">
+      <default>true</default>
+      <_summary>Use system timezone</_summary>
+      <_description>Use the system timezone instead of the timezone selected in Evolution</_description>
+    </key>
+    <key name="working-days" type="i">
+      <default>62</default>
+      <_summary>Work days</_summary>
+      <_description>Days on which the start and end of work hours should be indicated</_description>
+    </key>
   </schema>
-  <key name="audio-dir" type="s">
-    <default>''</default>
-    <_summary>Save directory for reminder audio</_summary>
-    <_description>Directory for saving reminder audio files</_description>
-  </key>
-  <key name="date-navigator-pane-position" type="i">
-    <default>150</default>
-    <_summary>Month view vertical pane position</_summary>
-    <_description>Position of the vertical pane, between the calendar lists and the date navigator calendar</_description>
-  </key>
-  <key name="day-second-zone" type="s">
-    <default>''</default>
-    <_summary>The second timezone for a Day View</_summary>
-    <_description>Shows the second time zone in a Day View, if set. Value is similar to one used in a 'timezone' key</_description>
-  </key>
-  <key name="day-second-zones" type="as">
-    <default>[]</default>
-    <_summary>Recently used second time zones in a Day View</_summary>
-    <_description>List of recently used second time zones in a Day View</_description>
-  </key>
-  <key name="day-second-zones-max" type="i">
-    <default>5</default>
-    <_summary>Maximum number of recently used timezones to remember</_summary>
-    <_description>Maximum number of recently used timezones to remember in a 'day-second-zones' list</_description>
-  </key>
-  <key name="editor-show-categories" type="b">
-    <default>false</default>
-    <_summary>Show categories field in the event/meeting/task editor</_summary>
-    <_description>Whether to show categories field in the event/meeting editor</_description>
-  </key>
-  <key name="editor-show-role" type="b">
-    <default>true</default>
-    <_summary>Show Role field in the event/task/meeting editor</_summary>
-    <_description>Whether to show role field in the event/task/meeting editor</_description>
-  </key>
-  <key name="editor-show-rsvp" type="b">
-    <default>false</default>
-    <_summary>Show RSVP field in the event/task/meeting editor</_summary>
-    <_description>Whether to show RSVP field in the event/task/meeting editor</_description>
-  </key>
-  <key name="editor-show-status" type="b">
-    <default>false</default>
-    <_summary>Show status field in the event/task/meeting editor</_summary>
-    <_description>Whether to show status field in the event/task/meeting editor</_description>
-  </key>
-  <key name="editor-show-timezone" type="b">
-    <default>false</default>
-    <_summary>Show timezone field in the event/meeting editor</_summary>
-    <_description>Whether to show timezone field in the event/meeting editor</_description>
-  </key>
-  <key name="editor-show-type" type="b">
-    <default>false</default>
-    <_summary>Show type field in the event/task/meeting editor</_summary>
-    <_description>Whether to show type field in the event/task/meeting editor</_description>
-  </key>
-  <key name="hide-completed-tasks" type="b">
-    <default>false</default>
-    <_summary>Hide completed tasks</_summary>
-    <_description>Whether to hide completed tasks in the tasks view</_description>
-  </key>
-  <key name="hide-completed-tasks-units" type="s">
-    <default>'days'</default>
-    <_summary>Hide task units</_summary>
-    <_description>Units for determining when to hide tasks, "minutes", "hours" or "days"</_description>
-  </key>
-  <key name="hide-completed-tasks-value" type="i">
-    <default>1</default>
-    <_summary>Hide task value</_summary>
-    <_description>Number of units for determining when to hide tasks</_description>
-  </key>
-  <key name="last-notification-time" type="i">
-    <default>1</default>
-    <_summary>Last reminder time</_summary>
-    <_description>Time the last reminder ran, in time_t</_description>
-  </key>
-  <key name="memo-hpane-position" type="i">
-    <default>200</default>
-    <_summary>Memo preview pane position (horizontal)</_summary>
-    <_description>Position of the task preview pane when oriented horizontally</_description>
-  </key>
-  <key name="memo-layout" type="i">
-    <default>0</default>
-    <_summary>Memo layout style</_summary>
-    <_description>The layout style determines where to place the preview pane in relation to the memo list.  "0" (Classic View) places the preview pane below the memo list.  "1" (Vertical View) places the preview pane next to the memo list</_description>
-  </key>
-  <key name="memo-vpane-position" type="i">
-    <default>400</default>
-    <_summary>Memo preview pane position (vertical)</_summary>
-    <_description>Position of the memo preview pane when oriented vertically</_description>
-  </key>
-  <key name="month-scroll-by-week" type="b">
-    <default>true</default>
-    <_summary>Scroll Month View by a week</_summary>
-    <_description>Whether to scroll a Month View by a week, not by a month</_description>
-  </key>
-  <key name="notify-programs" type="as">
-    <default>[]</default>
-    <_summary>Reminder programs</_summary>
-    <_description>Programs that are allowed to be run by reminders</_description>
-  </key>
-  <key name="notify-with-tray" type="b">
-    <default>false</default>
-    <_summary>Show display reminders in notification tray</_summary>
-    <_description>Whether or not to use the notification tray for display reminders</_description>
-  </key>
-  <key name="selected-calendars" type="as">
-    <default>[]</default>
-    <_summary>List of selected calendars</_summary>
-    <_description>List of calendars to load</_description>
-  </key>
-  <key name="selected-memos" type="as">
-    <default>[]</default>
-    <_summary>List of selected memo lists</_summary>
-    <_description>List of memo lists to load</_description>
-  </key>
-  <key name="selected-tasks" type="as">
-    <default>[]</default>
-    <_summary>List of selected task lists</_summary>
-    <_description>List of task lists to load</_description>
-  </key>
-  <key name="show-memo-preview" type="b">
-    <default>true</default>
-    <_summary>Show the memo preview pane</_summary>
-    <_description>If "true", show the memo preview pane in the main window</_description>
-  </key>
-  <key name="show-task-preview" type="b">
-    <default>true</default>
-    <_summary>Show the task preview pane</_summary>
-    <_description>If "true", show the task preview pane in the main window</_description>
-  </key>
-  <key name="task-hpane-position" type="i">
-    <default>200</default>
-    <_summary>Task preview pane position (horizontal)</_summary>
-    <_description>Position of the task preview pane when oriented horizontally</_description>
-  </key>
-  <key name="task-layout" type="i">
-    <default>0</default>
-    <_summary>Task layout style</_summary>
-    <_description>The layout style determines where to place the preview pane in relation to the task list.  "0" (Classic View) places the preview pane below the task list.  "1" (Vertical View) places the preview pane next to the task list</_description>
-  </key>
-  <key name="task-vpane-position" type="i">
-    <default>400</default>
-    <_summary>Task preview pane position (vertical)</_summary>
-    <_description>Position of the task preview pane when oriented vertically</_description>
-  </key>
-  <key name="timezone" type="s">
-    <default>'UTC'</default>
-    <_summary>Timezone</_summary>
-    <_description>The default timezone to use for dates and times in the calendar, as an untranslated Olsen timezone database location like "America/New York"</_description>
-  </key>
-  <key name="use-24hour-format" type="b">
-    <default>false</default>
-    <_summary>Twenty four hour time format</_summary>
-    <_description>Whether to show times in twenty four hour format instead of using am/pm</_description>
-  </key>
-  <key name="use-system-timezone" type="b">
-    <default>true</default>
-    <_summary>Use system timezone</_summary>
-    <_description>Use the system timezone instead of the timezone selected in Evolution</_description>
-  </key>
-  <key name="working-days" type="i">
-    <default>62</default>
-    <_summary>Work days</_summary>
-    <_description>Days on which the start and end of work hours should be indicated</_description>
-  </key>
 </schemalist>
diff --git a/data/org.gnome.evolution.gschema.xml.in b/data/org.gnome.evolution.gschema.xml.in
index ee7905b6b2..6ae4388a5e 100644
--- a/data/org.gnome.evolution.gschema.xml.in
+++ b/data/org.gnome.evolution.gschema.xml.in
@@ -10,98 +10,5 @@
       <_summary>Last upgraded configuration version</_summary>
       <_description>The last upgraded configuration version of Evolution, with major/minor/configuration level (for example "2.6.0").</_description>
     </key>
-    <child name="shell" schema="org.gnome.evolution.shell"/>
-  </schema>
-  <schema gettext-domain="evolution" id="org.gnome.evolution.shell" path="/apps/org/gnome/evolution/shell/">
-    <key name="skip-warning-dialog" type="b">
-      <default>false</default>
-      <_summary>Skip development warning dialog</_summary>
-      <_description>Whether the warning dialog in development versions of Evolution is skipped.</_description>
-    </key>
-    <key name="attachment-view" type="i">
-      <default>0</default>
-      <_summary>Initial attachment view</_summary>
-      <_description>Initial view for attachment bar widgets. "0" is Icon View, "1" is List View.</_description>
-    </key>
-    <key name="file-chooser-folder" type="s">
-      <default>''</default>
-      <_summary>Initial file chooser folder</_summary>
-      <_description>Initial folder for GtkFileChooser dialogs.</_description>
-    </key>
-    <key name="start-offline" type="b">
-      <default>false</default>
-      <_summary>Start in offline mode</_summary>
-      <_description> Whether Evolution will start up in offline mode instead of online mode.</_description>
-    </key>
-    <key name="folder-paths" type="as">
-      <default>[]</default>
-      <_summary>Offline folder paths</_summary>
-      <_description>List of paths for the folders to be synchronized to disk for offline usage.</_description>
-    </key>
-    <key name="express-mode" type="b">
-      <default>false</default>
-      <_summary>Enable express mode</_summary>
-      <_description>Flag that enables a much simplified user interface.</_description>
-    </key>
-    <key name="window-y" type="i">
-      <default></default>
-      <_summary>Default window Y coordinate</_summary>
-      <_description>The default Y coordinate for the main window.</_description>
-    </key>
-    <key name="window-x" type="i">
-      <default></default>
-      <_summary>Default window X coordinate</_summary>
-      <_description>The default X coordinate for the main window.</_description>
-    </key>
-    <key name="window-width" type="i">
-      <default>640</default>
-      <_summary>Default window width</_summary>
-      <_description>The default width for the main window, in pixels.</_description>
-    </key>
-    <key name="window-height" type="i">
-      <default>480</default>
-      <_summary>Default window height</_summary>
-      <_description>The default height for the main window, in pixels.</_description>
-    </key>
-    <key name="window-maximized" type="b">
-      <default>true</default>
-      <_summary>Default window state</_summary>
-      <_description>Whether or not the window should be maximized.</_description>
-    </key>
-    <key name="buttons-visible" type="b">
-      <default>true</default>
-      <_summary>Window buttons are visible</_summary>
-      <_description>Whether the window buttons should be visible.</_description>
-    </key>
-    <key name="buttons-style" type="s">
-      <default>toolbar</default>
-      <_summary>Window button style</_summary>
-      <_description>The style of the window buttons.  Can be "text", "icons", "both", "toolbar".  If "toolbar" is set, the style of the buttons is determined by the GNOME toolbar setting.</_description>
-    </key>
-    <key name="toolbar-visible" type="b">
-      <default>true</default>
-      <_summary>Toolbar is visible</_summary>
-      <_description>Whether the toolbar should be visible.</_description>
-    </key>
-    <key name="sidebar-visible" type="b">
-      <default>true</default>
-      <_summary>Sidebar is visible</_summary>
-      <_description>Whether the sidebar should be visible.</_description>
-    </key>
-    <key name="statusbar-visible" type="b">
-      <default>TRUE</default>
-      <_summary>Statusbar is visible</_summary>
-      <_description>Whether the status bar should be visible.</_description>
-    </key>
-    <key name="default-component-id" type="s">
-      <default>mail</default>
-      <_summary>ID or alias of the component to be shown by default at start-up.</_summary>
-      <_description>ID or alias of the component to be shown by default at start-up.</_description>
-    </key>
-    <key name="folder-bar-width" type="i">
-      <default>200</default>
-      <_summary>Default sidebar width</_summary>
-      <_description>The default width for the sidebar, in pixels.</_description>
-    </key>
   </schema>
 </schemalist>
diff --git a/data/org.gnome.evolution.shell.gschema.xml.in b/data/org.gnome.evolution.shell.gschema.xml.in
new file mode 100644
index 0000000000..d2fd7439cb
--- /dev/null
+++ b/data/org.gnome.evolution.shell.gschema.xml.in
@@ -0,0 +1,94 @@
+<schemalist>
+  <schema gettext-domain="evolution" id="org.gnome.evolution.shell" path="/org/gnome/evolution/shell/">
+    <key name="skip-warning-dialog" type="b">
+      <default>false</default>
+      <_summary>Skip development warning dialog</_summary>
+      <_description>Whether the warning dialog in development versions of Evolution is skipped.</_description>
+    </key>
+    <key name="attachment-view" type="i">
+      <default>0</default>
+      <_summary>Initial attachment view</_summary>
+      <_description>Initial view for attachment bar widgets. "0" is Icon View, "1" is List View.</_description>
+    </key>
+    <key name="file-chooser-folder" type="s">
+      <default>''</default>
+      <_summary>Initial file chooser folder</_summary>
+      <_description>Initial folder for GtkFileChooser dialogs.</_description>
+    </key>
+    <key name="start-offline" type="b">
+      <default>false</default>
+      <_summary>Start in offline mode</_summary>
+      <_description> Whether Evolution will start up in offline mode instead of online mode.</_description>
+    </key>
+    <key name="folder-paths" type="as">
+      <default>[]</default>
+      <_summary>Offline folder paths</_summary>
+      <_description>List of paths for the folders to be synchronized to disk for offline usage.</_description>
+    </key>
+    <key name="express-mode" type="b">
+      <default>false</default>
+      <_summary>Enable express mode</_summary>
+      <_description>Flag that enables a much simplified user interface.</_description>
+    </key>
+    <key name="window-y" type="i">
+      <default></default>
+      <_summary>Default window Y coordinate</_summary>
+      <_description>The default Y coordinate for the main window.</_description>
+    </key>
+    <key name="window-x" type="i">
+      <default></default>
+      <_summary>Default window X coordinate</_summary>
+      <_description>The default X coordinate for the main window.</_description>
+    </key>
+    <key name="window-width" type="i">
+      <default>640</default>
+      <_summary>Default window width</_summary>
+      <_description>The default width for the main window, in pixels.</_description>
+    </key>
+    <key name="window-height" type="i">
+      <default>480</default>
+      <_summary>Default window height</_summary>
+      <_description>The default height for the main window, in pixels.</_description>
+    </key>
+    <key name="window-maximized" type="b">
+      <default>true</default>
+      <_summary>Default window state</_summary>
+      <_description>Whether or not the window should be maximized.</_description>
+    </key>
+    <key name="buttons-visible" type="b">
+      <default>true</default>
+      <_summary>Window buttons are visible</_summary>
+      <_description>Whether the window buttons should be visible.</_description>
+    </key>
+    <key name="buttons-style" type="s">
+      <default>toolbar</default>
+      <_summary>Window button style</_summary>
+      <_description>The style of the window buttons.  Can be "text", "icons", "both", "toolbar".  If "toolbar" is set, the style of the buttons is determined by the GNOME toolbar setting.</_description>
+    </key>
+    <key name="toolbar-visible" type="b">
+      <default>true</default>
+      <_summary>Toolbar is visible</_summary>
+      <_description>Whether the toolbar should be visible.</_description>
+    </key>
+    <key name="sidebar-visible" type="b">
+      <default>true</default>
+      <_summary>Sidebar is visible</_summary>
+      <_description>Whether the sidebar should be visible.</_description>
+    </key>
+    <key name="statusbar-visible" type="b">
+      <default>TRUE</default>
+      <_summary>Statusbar is visible</_summary>
+      <_description>Whether the status bar should be visible.</_description>
+    </key>
+    <key name="default-component-id" type="s">
+      <default>mail</default>
+      <_summary>ID or alias of the component to be shown by default at start-up.</_summary>
+      <_description>ID or alias of the component to be shown by default at start-up.</_description>
+    </key>
+    <key name="folder-bar-width" type="i">
+      <default>200</default>
+      <_summary>Default sidebar width</_summary>
+      <_description>The default width for the sidebar, in pixels.</_description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/mail/e-mail-backend.c b/mail/e-mail-backend.c
index 56f2dc67b3..5768934b1a 100644
--- a/mail/e-mail-backend.c
+++ b/mail/e-mail-backend.c
@@ -272,7 +272,6 @@ mail_backend_prepare_for_quit_cb (EShell *shell,
                                   EMailBackend *backend)
 {
 	EAccountList *account_list;
-	EMailSession *session;
 	gboolean delete_junk;
 	gboolean empty_trash;
 
@@ -281,8 +280,6 @@ mail_backend_prepare_for_quit_cb (EShell *shell,
 		gboolean empty_trash;
 	} sync_data;
 
-	session = e_mail_backend_get_session (backend);
-
 	delete_junk = e_mail_backend_delete_junk_policy_decision (backend);
 	empty_trash = e_mail_backend_empty_trash_policy_decision (backend);
 
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index 76502314ab..920994242a 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -632,10 +632,7 @@ action_mail_forward_quoted_cb (GtkAction *action,
 	CamelFolder *folder;
 	GtkWindow *window;
 	GPtrArray *uids;
-<<<<<<< HEAD
-=======
 	gboolean close_reader;
->>>>>>> master
 
 	folder = e_mail_reader_get_folder (reader);
 	window = e_mail_reader_get_window (reader);
@@ -650,14 +647,8 @@ action_mail_forward_quoted_cb (GtkAction *action,
 	if (em_utils_ask_open_many (window, uids->len))
 		em_utils_forward_messages (
 			reader, folder, uids,
-<<<<<<< HEAD
-			E_MAIL_FORWARD_STYLE_QUOTED);
-
-	g_ptr_array_unref (uids);
-=======
 			E_MAIL_FORWARD_STYLE_QUOTED,
 			close_reader ? GTK_WIDGET (reader) : NULL);
->>>>>>> master
 
 	g_ptr_array_unref (uids);
 }
@@ -750,11 +741,7 @@ action_mail_mark_unread_cb (GtkAction *action,
 
 	/* Notify the tree model that the user has marked messages as
 	 * unread so it doesn't mistake the event as new mail arriving. */
-<<<<<<< HEAD
-	model = em_folder_tree_model_get_default (e_mail_reader_get_backend (reader));
-=======
 	model = em_folder_tree_model_get_default ();
->>>>>>> master
 	folder = e_mail_reader_get_folder (reader);
 	em_folder_tree_model_user_marked_unread (model, folder, n_marked);
 }
@@ -774,17 +761,10 @@ action_mail_message_edit_cb (GtkAction *action,
 	/* XXX Either e_mail_reader_get_selected_uids()
 	 *     or MessageList should do this itself. */
 	g_ptr_array_set_free_func (uids, (GDestroyNotify) g_free);
-<<<<<<< HEAD
-
-	replace = em_utils_folder_is_drafts (folder);
-	em_utils_edit_messages (reader, folder, uids, replace);
-
-=======
 
 	replace = em_utils_folder_is_drafts (folder);
 	em_utils_edit_messages (reader, folder, uids, replace);
 
->>>>>>> master
 	g_ptr_array_unref (uids);
 }
 
@@ -835,11 +815,7 @@ action_mail_move_cb (GtkAction *action,
 	uids = e_mail_reader_get_selected_uids (reader);
 	window = e_mail_reader_get_window (reader);
 
-<<<<<<< HEAD
-	model = em_folder_tree_model_get_default (backend);
-=======
 	model = em_folder_tree_model_get_default ();
->>>>>>> master
 
 	dialog = em_folder_selector_new (
 		window, backend, model,
@@ -1159,19 +1135,11 @@ action_mail_reply_all_check (CamelFolder *folder,
 	gint recip_count = 0;
 	EMailReplyType type = E_MAIL_REPLY_TO_ALL;
 	GError *error = NULL;
-<<<<<<< HEAD
-
-	alert_sink = e_activity_get_alert_sink (closure->activity);
-
-	message = camel_folder_get_message_finish (folder, result, &error);
-
-=======
 
 	alert_sink = e_activity_get_alert_sink (closure->activity);
 
 	message = camel_folder_get_message_finish (folder, result, &error);
 
->>>>>>> master
 	if (e_activity_handle_cancellation (closure->activity, error)) {
 		g_warn_if_fail (message == NULL);
 		mail_reader_closure_free (closure);
@@ -1352,17 +1320,6 @@ action_mail_reply_sender_check (CamelFolder *folder,
 	GError *error = NULL;
 
 	alert_sink = e_activity_get_alert_sink (closure->activity);
-<<<<<<< HEAD
-
-	message = camel_folder_get_message_finish (folder, result, &error);
-
-	if (e_activity_handle_cancellation (closure->activity, error)) {
-		g_warn_if_fail (message == NULL);
-		mail_reader_closure_free (closure);
-		g_error_free (error);
-		return;
-
-=======
 
 	message = camel_folder_get_message_finish (folder, result, &error);
 
@@ -1372,7 +1329,6 @@ action_mail_reply_sender_check (CamelFolder *folder,
 		g_error_free (error);
 		return;
 
->>>>>>> master
 	} else if (error != NULL) {
 		g_warn_if_fail (message == NULL);
 		e_alert_submit (
diff --git a/mail/e-mail-session.c b/mail/e-mail-session.c
index 109e49826d..45c8e0209c 100644
--- a/mail/e-mail-session.c
+++ b/mail/e-mail-session.c
@@ -52,7 +52,6 @@
 #include "e-util/e-util.h"
 #include "e-util/e-account-utils.h"
 #include "e-util/e-alert-dialog.h"
-#include "e-util/e-extensible.h"
 #include "e-util/e-util-private.h"
 #include "e-util/gconf-bridge.h"
 
@@ -633,16 +632,6 @@ mail_session_finalize (GObject *object)
 	g_free (mail_data_dir);
 	g_free (mail_config_dir);
 
-	if (proxy_settings) {
-		g_signal_handlers_disconnect_by_func (proxy_settings, proxy_gsettings_changed_cb, CAMEL_SESSION (object));
-		g_object_unref (proxy_settings);
-	}
-
-	if (proxy_socks_settings) {
-		g_signal_handlers_disconnect_by_func (proxy_socks_settings, proxy_gsettings_changed_cb, CAMEL_SESSION (object));
-		g_object_unref (proxy_socks_settings);
-	}
-
 	/* Chain up to parent's finalize() method. */
 	G_OBJECT_CLASS (e_mail_session_parent_class)->finalize (object);
 }
diff --git a/mail/e-mail-store.c b/mail/e-mail-store.c
index f93856a8f4..e59e7b2abd 100644
--- a/mail/e-mail-store.c
+++ b/mail/e-mail-store.c
@@ -428,7 +428,7 @@ e_mail_store_remove (EMailBackend *backend,
 	folder_cache = e_mail_session_get_folder_cache (session);
 	mail_folder_cache_note_store_remove (folder_cache, store);
 
-	default_model = em_folder_tree_model_get_default (NULL);
+	default_model = em_folder_tree_model_get_default ();
 	em_folder_tree_model_remove_store (default_model, store);
 
 	mail_disconnect_store (store);
diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c
index cc674cd792..1e7840710f 100644
--- a/mail/em-folder-tree-model.c
+++ b/mail/em-folder-tree-model.c
@@ -426,11 +426,6 @@ folder_tree_model_set_property (GObject *object,
 				EM_FOLDER_TREE_MODEL (object),
 				g_value_get_object (value));
 			return;
-		case PROP_BACKEND:
-			em_folder_tree_model_set_backend (
-				EM_FOLDER_TREE_MODEL (object),
-				g_value_get_object (value));
-			return;
 	}
 
 	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@@ -456,74 +451,11 @@ folder_tree_model_get_property (GObject *object,
 				em_folder_tree_model_get_backend (
 				EM_FOLDER_TREE_MODEL (object)));
 			return;
-		case PROP_BACKEND:
-			g_value_set_object (
-				value,
-				em_folder_tree_model_get_backend (
-				EM_FOLDER_TREE_MODEL (object)));
-			return;
 	}
 
 	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 }
 
-
-static void
-folder_tree_model_constructed (GObject *object)
-{
-	EShell *shell;
-	EShellSettings *shell_settings;
-	EMFolderTreeModel *model;
-
-	GType col_types[] = {
-		G_TYPE_STRING,   /* display name */
-		G_TYPE_POINTER,  /* store object */
-		G_TYPE_STRING,   /* full name */
-		G_TYPE_STRING,   /* icon name */
-		G_TYPE_STRING,   /* uri */
-		G_TYPE_UINT,     /* unread count */
-		G_TYPE_UINT,     /* flags */
-		G_TYPE_BOOLEAN,  /* is a store node */
-		G_TYPE_BOOLEAN,  /* is a folder node */
-		G_TYPE_BOOLEAN,  /* has not-yet-loaded subfolders */
-		G_TYPE_UINT,     /* last known unread count */
-		G_TYPE_BOOLEAN,  /* folder is a draft folder */
-		G_TYPE_UINT	 /* user's sortorder */
-	};
-
-	model = EM_FOLDER_TREE_MODEL (object);
-	shell = e_shell_backend_get_shell (E_SHELL_BACKEND (model->priv->backend));
-	shell_settings = e_shell_get_shell_settings (shell);
-
-	gtk_tree_store_set_column_types (
-		GTK_TREE_STORE (model), NUM_COLUMNS, col_types);
-	gtk_tree_sortable_set_default_sort_func (
-		GTK_TREE_SORTABLE (model),
-		folder_tree_model_sort, shell, NULL);
-	gtk_tree_sortable_set_sort_column_id (
-		GTK_TREE_SORTABLE (model),
-		GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID,
-		GTK_SORT_ASCENDING);
-
-	model->priv->accounts = e_get_account_list ();
-	model->priv->account_changed_id = g_signal_connect (
-		model->priv->accounts, "account-changed",
-		G_CALLBACK (account_changed_cb), model);
-	model->priv->account_removed_id = g_signal_connect (
-		model->priv->accounts, "account-removed",
-		G_CALLBACK (account_removed_cb), model);
-	model->priv->account_added_id = g_signal_connect (
-		model->priv->accounts, "account-added",
-		G_CALLBACK (account_added_cb), model);
-
-	g_signal_connect_swapped (model->priv->backend, "account-sort-order-changed", G_CALLBACK (account_sort_order_changed_cb), model);
-	g_signal_connect_swapped (shell_settings, "notify::mail-sort-accounts-alpha", G_CALLBACK (account_sort_order_changed_cb), model);
-	g_signal_connect_swapped (shell_settings, "notify::mail-enable-local-folders", G_CALLBACK (enable_local_folders_changed_cb), model);
-	g_signal_connect_swapped (shell_settings, "notify::mail-enable-search-folders", G_CALLBACK (enable_search_folders_changed_cb), model);
-
-	G_OBJECT_CLASS (parent_class)->constructed (object);
-}
-
 static void
 folder_tree_model_dispose (GObject *object)
 {
@@ -560,24 +492,6 @@ folder_tree_model_dispose (GObject *object)
 		priv->backend = NULL;
 	}
 
-	if (priv->backend) {
-		EShell *shell;
-		EShellSettings *shell_settings;
-		EMFolderTreeModel *model;
-
-		model = EM_FOLDER_TREE_MODEL (object);
-		shell = e_shell_backend_get_shell (E_SHELL_BACKEND (priv->backend));
-		shell_settings = e_shell_get_shell_settings (shell);
-
-		g_signal_handlers_disconnect_by_func (priv->backend, G_CALLBACK (account_sort_order_changed_cb), model);
-		g_signal_handlers_disconnect_by_func (shell_settings, G_CALLBACK (account_sort_order_changed_cb), model);
-		g_signal_handlers_disconnect_by_func (shell_settings, G_CALLBACK (enable_local_folders_changed_cb), model);
-		g_signal_handlers_disconnect_by_func (shell_settings, G_CALLBACK (enable_search_folders_changed_cb), model);
-
-		g_object_unref (priv->backend);
-		priv->backend = NULL;
-	}
-
 	/* Chain up to parent's dispose() method. */
 	G_OBJECT_CLASS (parent_class)->dispose (object);
 }
@@ -662,7 +576,6 @@ em_folder_tree_model_class_init (EMFolderTreeModelClass *class)
 	object_class = G_OBJECT_CLASS (class);
 	object_class->set_property = folder_tree_model_set_property;
 	object_class->get_property = folder_tree_model_get_property;
-	object_class->constructed = folder_tree_model_constructed;
 	object_class->dispose = folder_tree_model_dispose;
 	object_class->finalize = folder_tree_model_finalize;
 	object_class->constructed = folder_tree_model_constructed;
@@ -687,16 +600,6 @@ em_folder_tree_model_class_init (EMFolderTreeModelClass *class)
 			GTK_TYPE_TREE_SELECTION,
 			G_PARAM_READWRITE));
 
-	g_object_class_install_property (
-		object_class,
-		PROP_BACKEND,
-		g_param_spec_object (
-			"backend",
-			NULL,
-			NULL,
-			E_TYPE_MAIL_BACKEND,
-			G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
-
 	signals[LOADING_ROW] = g_signal_new (
 		"loading-row",
 		G_OBJECT_CLASS_TYPE (object_class),
@@ -797,26 +700,18 @@ em_folder_tree_model_init (EMFolderTreeModel *model)
 }
 
 EMFolderTreeModel *
-em_folder_tree_model_new (EMailBackend *mail_backend)
+em_folder_tree_model_new (void)
 {
-	return g_object_new (EM_TYPE_FOLDER_TREE_MODEL, "backend", mail_backend, NULL);
+	return g_object_new (EM_TYPE_FOLDER_TREE_MODEL, NULL);
 }
 
 EMFolderTreeModel *
-em_folder_tree_model_get_default (EMailBackend *mail_backend)
+em_folder_tree_model_get_default (void)
 {
 	static EMFolderTreeModel *default_folder_tree_model;
 
-	if (G_UNLIKELY (default_folder_tree_model == NULL)) {
-		if (!mail_backend) {
-			EShell *shell;
-
-			shell = e_shell_get_default ();
-			mail_backend = E_MAIL_BACKEND (e_shell_get_backend_by_name (shell, "mail"));
-		}
-
-		default_folder_tree_model = em_folder_tree_model_new (mail_backend);
-	}
+	if (G_UNLIKELY (default_folder_tree_model == NULL))
+		default_folder_tree_model = em_folder_tree_model_new ();
 
 	return default_folder_tree_model;
 }
@@ -919,33 +814,6 @@ em_folder_tree_model_set_backend (EMFolderTreeModel *model,
 	g_object_notify (G_OBJECT (model), "backend");
 }
 
-EMailBackend *
-em_folder_tree_model_get_backend (EMFolderTreeModel *model)
-{
-	g_return_val_if_fail (EM_IS_FOLDER_TREE_MODEL (model), NULL);
-
-	return model->priv->backend;
-}
-
-void
-em_folder_tree_model_set_backend (EMFolderTreeModel *model,
-                                  EMailBackend *backend)
-{
-	g_return_if_fail (EM_IS_FOLDER_TREE_MODEL (model));
-
-	if (backend != NULL) {
-		g_return_if_fail (E_IS_MAIL_BACKEND (backend));
-		g_object_ref (backend);
-	}
-
-	if (model->priv->backend != NULL)
-		g_object_unref (model->priv->backend);
-
-	model->priv->backend = backend;
-
-	g_object_notify (G_OBJECT (model), "backend");
-}
-
 void
 em_folder_tree_model_set_folder_info (EMFolderTreeModel *model,
                                       GtkTreeIter *iter,
diff --git a/mail/em-folder-tree-model.h b/mail/em-folder-tree-model.h
index 0188753942..0ed007aa96 100644
--- a/mail/em-folder-tree-model.h
+++ b/mail/em-folder-tree-model.h
@@ -111,9 +111,9 @@ struct _EMFolderTreeModelClass {
 
 GType		em_folder_tree_model_get_type	(void);
 EMFolderTreeModel *
-		em_folder_tree_model_new	(EMailBackend *mail_backend);
+		em_folder_tree_model_new	(void);
 EMFolderTreeModel *
-		em_folder_tree_model_get_default (EMailBackend *mail_backend);
+		em_folder_tree_model_get_default (void);
 GtkTreeSelection *
 		em_folder_tree_model_get_selection
 					(EMFolderTreeModel *model);
diff --git a/mail/message-list.c b/mail/message-list.c
index 603fc71d89..1e903a3f48 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -4191,7 +4191,7 @@ on_click (ETree *tree,
 	if (col == COL_MESSAGE_STATUS && (flags & CAMEL_MESSAGE_SEEN)) {
 		EMFolderTreeModel *model;
 
-		model = em_folder_tree_model_get_default (list->priv->backend);
+		model = em_folder_tree_model_get_default ();
 		em_folder_tree_model_user_marked_unread (
 			model, list->folder, 1);
 	}
diff --git a/modules/calendar/e-task-shell-view-actions.c b/modules/calendar/e-task-shell-view-actions.c
index ad980ea576..c7e91d2955 100644
--- a/modules/calendar/e-task-shell-view-actions.c
+++ b/modules/calendar/e-task-shell-view-actions.c
@@ -1065,7 +1065,6 @@ e_task_shell_view_actions_init (ETaskShellView *task_shell_view)
 	GSettings *settings;
 	GtkAction *action;
 	GObject *object;
-	const gchar *key;
 
 	shell_view = E_SHELL_VIEW (task_shell_view);
 	shell_window = e_shell_view_get_shell_window (shell_view);
@@ -1129,7 +1128,7 @@ e_task_shell_view_actions_init (ETaskShellView *task_shell_view)
 	g_settings_bind (settings, "show-task-preview", object, "active", G_SETTINGS_BIND_DEFAULT);
 
 	object = G_OBJECT (ACTION (TASK_VIEW_VERTICAL));
-	g_settings_bind (settings, "task-layout", "current-value", G_SETTINGS_BIND_DEFAULT);
+	g_settings_bind (settings, "task-layout", object, "current-value", G_SETTINGS_BIND_DEFAULT);
 
 	g_object_unref (G_OBJECT (settings));
 
diff --git a/plugins/mark-all-read/mark-all-read.c b/plugins/mark-all-read/mark-all-read.c
index ab8549495b..4fe19cf71b 100644
--- a/plugins/mark-all-read/mark-all-read.c
+++ b/plugins/mark-all-read/mark-all-read.c
@@ -318,7 +318,7 @@ scan_folder_tree_for_unread_helper (GtkTreeModel *model,
 }
 
 static gint
-scan_folder_tree_for_unread (EMailBackend *backend, const gchar *folder_uri)
+scan_folder_tree_for_unread (const gchar *folder_uri)
 {
 	GtkTreeRowReference *reference;
 	EMFolderTreeModel *model;
@@ -338,7 +338,7 @@ scan_folder_tree_for_unread (EMailBackend *backend, const gchar *folder_uri)
 	if (folder_uri == NULL)
 		return 0;
 
-	model = em_folder_tree_model_get_default (backend);
+	model = em_folder_tree_model_get_default ();
 	reference = em_folder_tree_model_lookup_uri (model, folder_uri);
 
 	if (gtk_tree_row_reference_valid (reference)) {
@@ -602,7 +602,7 @@ update_actions_cb (EShellView *shell_view,
 	g_object_get (shell_sidebar, "folder-tree", &folder_tree, NULL);
 	folder_uri = em_folder_tree_get_selected_uri (folder_tree);
 
-	visible = (scan_folder_tree_for_unread (E_MAIL_BACKEND (e_shell_view_get_shell_backend (shell_view)), folder_uri) > 0);
+	visible = (scan_folder_tree_for_unread (folder_uri) > 0);
 	gtk_action_set_visible (action, visible);
 
 	g_object_unref (folder_tree);
diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c
index d7afd1df5d..d7512a509a 100644
--- a/widgets/text/e-text.c
+++ b/widgets/text/e-text.c
@@ -185,17 +185,6 @@ disconnect_im_context (EText *text)
 	text->im_context_signals_registered = FALSE;
 }
 
-static void
-disconnect_im_context (EText *text)
-{
-	if (!text || !text->im_context)
-		return;
-
-	g_signal_handlers_disconnect_matched (
-		text->im_context, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, text);
-	text->im_context_signals_registered = FALSE;
-}
-
 /* Dispose handler for the text item */
 
 #if 0