diff -Nru mousepad-0.4.0/debian/changelog mousepad-0.4.0/debian/changelog
--- mousepad-0.4.0/debian/changelog	2015-11-10 12:51:25.000000000 +0000
+++ mousepad-0.4.0/debian/changelog	2016-06-30 13:09:19.000000000 +0000
@@ -1,3 +1,25 @@
+mousepad (0.4.0-4ubuntu1) devel; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - debian/control, debian/rules:
+      + Switch to gtk3.
+    - git-width-mismatch.patch: stop a tab width related crash. LP: #1472690
+  * d/p/git-width-mismatch.patch:
+    - Update to patch the generated .h file rather than upstream glade file.
+
+ -- Unit 193 <unit193@ubuntu.com>  Mon, 13 Jun 2016 05:45:59 +0000
+
+mousepad (0.4.0-4) unstable; urgency=medium
+
+  * debian/patches:
+    - 01_prevent-a-g_settings-cycle and
+      02_do-not-manually-update-the-view-theme added, fix bug leading to huge
+      DBus trafic and large CPU usage.                          closes: #795192
+  * debian/control:
+    - update standards version to 3.9.8.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Sun, 12 Jun 2016 21:59:50 +0200
+
 mousepad (0.4.0-3ubuntu1) xenial; urgency=medium
 
   * Merge from Debian unstable. Remaining changes:
diff -Nru mousepad-0.4.0/debian/control mousepad-0.4.0/debian/control
--- mousepad-0.4.0/debian/control	2015-05-27 20:48:00.000000000 +0000
+++ mousepad-0.4.0/debian/control	2016-06-30 12:57:00.000000000 +0000
@@ -7,7 +7,7 @@
  Yves-Alexis Perez <corsac@debian.org>
 Build-Depends: debhelper (>= 9), pkg-config, libxml-parser-perl, intltool,
  libgtksourceview-3.0-dev, libglib2.0-dev, xfce4-dev-tools, dh-autoreconf
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Vcs-Svn: svn://anonscm.debian.org/pkg-xfce/desktop/trunk/mousepad/
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-xfce/desktop/trunk/mousepad/
 
diff -Nru mousepad-0.4.0/debian/patches/01_prevent-a-g_settings-cycle.patch mousepad-0.4.0/debian/patches/01_prevent-a-g_settings-cycle.patch
--- mousepad-0.4.0/debian/patches/01_prevent-a-g_settings-cycle.patch	1970-01-01 00:00:00.000000000 +0000
+++ mousepad-0.4.0/debian/patches/01_prevent-a-g_settings-cycle.patch	2016-06-12 17:06:05.000000000 +0000
@@ -0,0 +1,53 @@
+From 320deb1ec28ddb5e9647b154f2c08f358ba2c4cb Mon Sep 17 00:00:00 2001
+From: Alistair Buxton <a.j.buxton@gmail.com>
+Date: Mon, 21 Mar 2016 23:34:12 +0000
+Subject: [PATCH 2/3] Prevent a g_settings cycle.
+
+When the selected menu item changes, only update the g_setting.
+When the g_setting changes, only update the selected menu item.
+
+This prevents g_setting changes from bouncing between windows
+endlessly.
+---
+ mousepad/mousepad-action-group.c | 21 ++++++++++-----------
+ 1 file changed, 10 insertions(+), 11 deletions(-)
+
+--- a/mousepad/mousepad-action-group.c
++++ b/mousepad/mousepad-action-group.c
+@@ -302,11 +302,6 @@ mousepad_action_group_set_active_style_s
+   gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), TRUE);
+   self->locked = FALSE;
+ 
+-  /* update the setting when the active action is changed */
+-  self->locked = TRUE;
+-  MOUSEPAD_SETTING_SET_STRING (COLOR_SCHEME, gtk_source_style_scheme_get_id (scheme));
+-  self->locked = FALSE;
+-
+   g_object_notify (G_OBJECT (self), "active-style-scheme");
+ }
+ 
+@@ -473,6 +468,8 @@ static void
+ mousepad_action_group_style_scheme_action_activate (MousepadActionGroup       *self,
+                                                     MousepadStyleSchemeAction *action)
+ {
++  const gchar *scheme_name = NULL;
++
+   /* only update the active action if we're not already in the process of
+    * setting it and the sender action is actually active */
+   if (! self->locked &&
+@@ -481,7 +478,14 @@ mousepad_action_group_style_scheme_actio
+       GtkSourceStyleScheme *scheme;
+ 
+       scheme = mousepad_style_scheme_action_get_style_scheme (action);
+-      mousepad_action_group_set_active_style_scheme (self, scheme);
++
++      /* update the setting when the active action is changed */
++      if (scheme != NULL)
++        scheme_name = gtk_source_style_scheme_get_id(scheme);
++
++      self->locked = TRUE;
++      MOUSEPAD_SETTING_SET_STRING (COLOR_SCHEME, scheme_name);
++      self->locked = FALSE;
+     }
+ }
+ 
diff -Nru mousepad-0.4.0/debian/patches/02_do-not-manually-update-the-view-theme.patch mousepad-0.4.0/debian/patches/02_do-not-manually-update-the-view-theme.patch
--- mousepad-0.4.0/debian/patches/02_do-not-manually-update-the-view-theme.patch	1970-01-01 00:00:00.000000000 +0000
+++ mousepad-0.4.0/debian/patches/02_do-not-manually-update-the-view-theme.patch	2016-06-12 17:06:05.000000000 +0000
@@ -0,0 +1,58 @@
+From 376432b8061956d40e957fb64924e488e0837a1a Mon Sep 17 00:00:00 2001
+From: Alistair Buxton <a.j.buxton@gmail.com>
+Date: Mon, 21 Mar 2016 23:36:05 +0000
+Subject: [PATCH 3/3] Do not manually update the view theme.
+
+The view property is bound directly to the g_setting, so it will
+be updated autoatically whenever that changes. The action group
+updates the g_setting so we don't need to manually propagate the
+setting.
+---
+ mousepad/mousepad-window.c | 34 ----------------------------------
+ 1 file changed, 34 deletions(-)
+
+--- a/mousepad/mousepad-window.c
++++ b/mousepad/mousepad-window.c
+@@ -711,29 +711,6 @@ mousepad_window_create_languages_menu (M
+ 
+ 
+ 
+-static void
+-mousepad_window_action_group_style_scheme_changed (MousepadWindow      *window,
+-                                                   GParamSpec          *pspec,
+-                                                   MousepadActionGroup *group)
+-{
+-  GtkSourceStyleScheme *scheme;
+-  const gchar          *scheme_id;
+-  gint                  npages, i;
+-
+-  /* get the new active language */
+-  scheme = mousepad_action_group_get_active_style_scheme (group);
+-  scheme_id = gtk_source_style_scheme_get_id (scheme);
+-
+-  /* update the color scheme on all the documents */
+-  npages = gtk_notebook_get_n_pages (GTK_NOTEBOOK (window->notebook));
+-  for (i = 0; i < npages; i++)
+-    {
+-      MousepadDocument *document;
+-
+-      document = MOUSEPAD_DOCUMENT (gtk_notebook_get_nth_page (GTK_NOTEBOOK (window->notebook), i));
+-      mousepad_view_set_color_scheme (document->textview, scheme_id);
+-    }
+-}
+ 
+ 
+ 
+@@ -752,12 +729,6 @@ mousepad_window_create_style_schemes_men
+   gtk_widget_show_all (menu);
+   gtk_widget_show (item);
+   
+-  /* watch for activations of the style schemes actions */
+-  g_signal_connect_object (window->action_group,
+-                           "notify::active-style-scheme",
+-                           G_CALLBACK (mousepad_window_action_group_style_scheme_changed),
+-                           window,
+-                           G_CONNECT_SWAPPED);
+ }
+ 
+ 
diff -Nru mousepad-0.4.0/debian/patches/git-width-mismatch.patch mousepad-0.4.0/debian/patches/git-width-mismatch.patch
--- mousepad-0.4.0/debian/patches/git-width-mismatch.patch	2015-11-10 12:51:25.000000000 +0000
+++ mousepad-0.4.0/debian/patches/git-width-mismatch.patch	2016-06-30 13:06:28.000000000 +0000
@@ -1,23 +1,888 @@
-From 15f4e5a47bd85d2cd831f65d6a66e548ad4d5708 Mon Sep 17 00:00:00 2001
-From: Alistair Buxton <a.j.buxton@gmail.com>
-Date: Wed, 8 Jul 2015 17:18:30 +0100
-Subject: Limit prefs dialog tab width to range allowed by schema.
+Description: Limit prefs dialog tab width to range allowed by schema.
+Author: Unit 193 <unit193@ubuntu.com>
 
-Closes bug #12055
+Origin: upstream
+Bug-Ubuntu: https://launchpad.net/bugs/1472690
 
-diff --git a/mousepad/mousepad-prefs-dialog.glade b/mousepad/mousepad-prefs-dialog.glade
-index c886cb1..7bd8064 100644
---- a/mousepad/mousepad-prefs-dialog.glade
-+++ b/mousepad/mousepad-prefs-dialog.glade
-@@ -43,7 +43,8 @@
-     </data>
-   </object>
-   <object class="GtkAdjustment" id="/prefs/editor/tab-width-adjustment">
--    <property name="upper">128</property>
-+    <property name="lower">1</property>
-+    <property name="upper">32</property>
-     <property name="value">8</property>
-     <property name="step_increment">1</property>
-     <property name="page_increment">10</property>
--- 
-cgit v0.10.1
+--- mousepad-0.4.0.orig/mousepad/mousepad-prefs-dialog-ui.h
++++ mousepad-0.4.0/mousepad/mousepad-prefs-dialog-ui.h
+@@ -21,448 +21,449 @@ static const char mousepad_prefs_dialog_
+   "\"0\" translatable=\"yes\">Insert Tabs</col></row><row><col id=\"0\" tr"
+   "anslatable=\"yes\">Insert Spaces</col></row></data></object><object cla"
+   "ss=\"GtkAdjustment\" id=\"/prefs/editor/tab-width-adjustment\"><propert"
+-  "y name=\"upper\">128</property><property name=\"value\">8</property><pr"
+-  "operty name=\"step_increment\">1</property><property name=\"page_increm"
+-  "ent\">10</property></object><object class=\"GtkListStore\" id=\"/prefs/"
+-  "view/color-scheme-model\"><columns><column type=\"gchararray\"/><column"
+-  " type=\"gchararray\"/></columns><data><row><col id=\"0\" translatable=\""
+-  "yes\">none</col><col id=\"1\" translatable=\"yes\">None</col></row></da"
+-  "ta></object><object class=\"GtkAdjustment\" id=\"/prefs/view/right-marg"
+-  "in-adjustment\"><property name=\"upper\">9999</property><property name="
+-  "\"step_increment\">1</property><property name=\"page_increment\">10</pr"
+-  "operty></object><object class=\"GtkListStore\" id=\"/prefs/window/toolb"
+-  "ar/icon-size-model\"><columns><column type=\"GtkIconSize\"/><column typ"
+-  "e=\"gchararray\"/></columns><data><row><col id=\"0\">menu</col><col id="
+-  "\"1\" translatable=\"yes\">Menu</col></row><row><col id=\"0\">small-too"
+-  "lbar</col><col id=\"1\" translatable=\"yes\">Small Toolbar</col></row><"
+-  "row><col id=\"0\">large-toolbar</col><col id=\"1\" translatable=\"yes\""
+-  ">Large Toolbar</col></row><row><col id=\"0\">button</col><col id=\"1\" "
+-  "translatable=\"yes\">Button</col></row><row><col id=\"0\">dnd</col><col"
+-  " id=\"1\" translatable=\"yes\">Drag &amp; Drop</col></row><row><col id="
+-  "\"0\">dialog</col><col id=\"1\" translatable=\"yes\">Dialog</col></row>"
+-  "</data></object><object class=\"GtkListStore\" id=\"/prefs/window/toolb"
+-  "ar/style-model\"><columns><column type=\"GtkToolbarStyle\"/><column typ"
+-  "e=\"gchararray\"/></columns><data><row><col id=\"0\">icons</col><col id"
+-  "=\"1\" translatable=\"yes\">Icons Only</col></row><row><col id=\"0\">te"
+-  "xt</col><col id=\"1\" translatable=\"yes\">Text Only</col></row><row><c"
+-  "ol id=\"0\">both</col><col id=\"1\" translatable=\"yes\">Text Below Ico"
+-  "ns</col></row><row><col id=\"0\">both-horiz</col><col id=\"1\" translat"
+-  "able=\"yes\">Text Beside Icons</col></row></data></object><object class"
+-  "=\"GtkNotebook\" id=\"/prefs/main-notebook\"><property name=\"visible\""
+-  ">True</property><property name=\"can_focus\">True</property><child><obj"
+-  "ect class=\"GtkVBox\" id=\"/prefs/view/content-area\"><property name=\""
+-  "visible\">True</property><property name=\"can_focus\">False</property><"
+-  "property name=\"border_width\">6</property><child><object class=\"GtkFr"
+-  "ame\" id=\"/prefs/view/display/frame\"><property name=\"visible\">True<"
+-  "/property><property name=\"can_focus\">False</property><property name=\""
+-  "label_xalign\">0</property><property name=\"shadow_type\">none</propert"
+-  "y><child><object class=\"GtkAlignment\" id=\"/prefs/view/display/alignm"
+-  "ent\"><property name=\"visible\">True</property><property name=\"can_fo"
+-  "cus\">False</property><property name=\"top_padding\">6</property><prope"
+-  "rty name=\"bottom_padding\">6</property><property name=\"left_padding\""
+-  ">12</property><property name=\"right_padding\">6</property><child><obje"
+-  "ct class=\"GtkVBox\" id=\"/prefs/view/display/content-area\"><property "
+-  "name=\"visible\">True</property><property name=\"can_focus\">False</pro"
+-  "perty><property name=\"spacing\">2</property><child><object class=\"Gtk"
+-  "CheckButton\" id=\"/prefs/view/display/show-line-numbers-check\"><prope"
+-  "rty name=\"label\" translatable=\"yes\">Show line numbers</property><pr"
+-  "operty name=\"visible\">True</property><property name=\"can_focus\">Tru"
+-  "e</property><property name=\"receives_default\">False</property><proper"
+-  "ty name=\"active\">True</property><property name=\"draw_indicator\">Tru"
+-  "e</property><signal name=\"toggled\" handler=\"on_show_line_numbers_tog"
+-  "gled\" object=\"prefs_dialog\" swapped=\"yes\"/></object><packing><prop"
+-  "erty name=\"expand\">True</property><property name=\"fill\">True</prope"
+-  "rty><property name=\"position\">0</property></packing></child><child><o"
+-  "bject class=\"GtkCheckButton\" id=\"/prefs/view/display/display-whitesp"
+-  "ace-check\"><property name=\"label\" translatable=\"yes\">Display white"
+-  "space</property><property name=\"visible\">True</property><property nam"
+-  "e=\"can_focus\">True</property><property name=\"receives_default\">Fals"
+-  "e</property><property name=\"draw_indicator\">True</property></object><"
+-  "packing><property name=\"expand\">True</property><property name=\"fill\""
+-  ">True</property><property name=\"position\">1</property></packing></chi"
+-  "ld><child><object class=\"GtkCheckButton\" id=\"/prefs/view/display/dis"
+-  "play-line-endings-check\"><property name=\"label\" translatable=\"yes\""
+-  ">Display line endings</property><property name=\"visible\">True</proper"
+-  "ty><property name=\"can_focus\">True</property><property name=\"receive"
+-  "s_default\">False</property><property name=\"draw_indicator\">True</pro"
+-  "perty></object><packing><property name=\"expand\">True</property><prope"
+-  "rty name=\"fill\">True</property><property name=\"position\">2</propert"
+-  "y></packing></child><child><object class=\"GtkHBox\" id=\"/prefs/view/d"
+-  "isplay/long-line-margin-box\"><property name=\"visible\">True</property"
+-  "><property name=\"can_focus\">False</property><property name=\"spacing\""
+-  ">6</property><child><object class=\"GtkCheckButton\" id=\"/prefs/view/d"
+-  "isplay/long-line-check\"><property name=\"label\" translatable=\"yes\">"
+-  "Long line margin at column:</property><property name=\"visible\">True</"
+-  "property><property name=\"can_focus\">True</property><property name=\"r"
+-  "eceives_default\">False</property><property name=\"draw_indicator\">Tru"
+-  "e</property></object><packing><property name=\"expand\">False</property"
+-  "><property name=\"fill\">True</property><property name=\"position\">0</"
+-  "property></packing></child><child><object class=\"GtkSpinButton\" id=\""
+-  "/prefs/view/display/long-line-spin\"><property name=\"visible\">True</p"
+-  "roperty><property name=\"sensitive\">False</property><property name=\"c"
+-  "an_focus\">True</property><property name=\"invisible_char\">\342\200\242"
+-  "</property><property name=\"invisible_char_set\">True</property><proper"
+-  "ty name=\"primary_icon_activatable\">False</property><property name=\"s"
+-  "econdary_icon_activatable\">False</property><property name=\"primary_ic"
+-  "on_sensitive\">True</property><property name=\"secondary_icon_sensitive"
+-  "\">True</property><property name=\"adjustment\">/prefs/view/right-margi"
+-  "n-adjustment</property><property name=\"numeric\">True</property></obje"
+-  "ct><packing><property name=\"expand\">False</property><property name=\""
+-  "fill\">True</property><property name=\"position\">1</property></packing"
+-  "></child></object><packing><property name=\"expand\">False</property><p"
+-  "roperty name=\"fill\">True</property><property name=\"position\">3</pro"
+-  "perty></packing></child><child><object class=\"GtkCheckButton\" id=\"/p"
+-  "refs/view/display/highlight-current-line-check\"><property name=\"label"
+-  "\" translatable=\"yes\">Highlight current line</property><property name"
+-  "=\"visible\">True</property><property name=\"can_focus\">True</property"
+-  "><property name=\"receives_default\">False</property><property name=\"a"
+-  "ctive\">True</property><property name=\"draw_indicator\">True</property"
+-  "></object><packing><property name=\"expand\">True</property><property n"
+-  "ame=\"fill\">True</property><property name=\"position\">4</property></p"
+-  "acking></child><child><object class=\"GtkCheckButton\" id=\"/prefs/view"
+-  "/display/match-braces-check\"><property name=\"label\" translatable=\"y"
+-  "es\">Highlight matching brackets</property><property name=\"visible\">T"
+-  "rue</property><property name=\"can_focus\">True</property><property nam"
+-  "e=\"receives_default\">False</property><property name=\"draw_indicator\""
+-  ">True</property></object><packing><property name=\"expand\">True</prope"
+-  "rty><property name=\"fill\">True</property><property name=\"position\">"
+-  "5</property></packing></child><child><object class=\"GtkCheckButton\" i"
+-  "d=\"/prefs/view/display/word-wrap-check\"><property name=\"label\" tran"
+-  "slatable=\"yes\">Wrap long lines</property><property name=\"visible\">T"
+-  "rue</property><property name=\"can_focus\">True</property><property nam"
+-  "e=\"receives_default\">False</property><property name=\"draw_indicator\""
+-  ">True</property></object><packing><property name=\"expand\">True</prope"
+-  "rty><property name=\"fill\">True</property><property name=\"position\">"
+-  "6</property></packing></child></object></child></object></child><child "
+-  "type=\"label\"><object class=\"GtkLabel\" id=\"/prefs/view/display/labe"
+-  "l\"><property name=\"visible\">True</property><property name=\"can_focu"
+-  "s\">False</property><property name=\"label\" translatable=\"yes\">&lt;b"
+-  "&gt;Display&lt;/b&gt;</property><property name=\"use_markup\">True</pro"
+-  "perty></object></child></object><packing><property name=\"expand\">Fals"
+-  "e</property><property name=\"fill\">True</property><property name=\"pos"
+-  "ition\">0</property></packing></child><child><object class=\"GtkFrame\""
+-  " id=\"/prefs/view/font-frame\"><property name=\"visible\">True</propert"
+-  "y><property name=\"can_focus\">False</property><property name=\"label_x"
+-  "align\">0</property><property name=\"shadow_type\">none</property><chil"
+-  "d><object class=\"GtkAlignment\" id=\"/prefs/view/font/alignment\"><pro"
+-  "perty name=\"visible\">True</property><property name=\"can_focus\">Fals"
+-  "e</property><property name=\"top_padding\">6</property><property name=\""
+-  "bottom_padding\">6</property><property name=\"left_padding\">12</proper"
+-  "ty><property name=\"right_padding\">6</property><child><object class=\""
+-  "GtkVBox\" id=\"/prefs/view/font/box\"><property name=\"visible\">True</"
+-  "property><property name=\"can_focus\">False</property><property name=\""
+-  "spacing\">2</property><child><object class=\"GtkCheckButton\" id=\"/pre"
+-  "fs/view/font/default-check\"><property name=\"label\" translatable=\"ye"
+-  "s\">Use system monospace font</property><property name=\"visible\">True"
+-  "</property><property name=\"can_focus\">True</property><property name=\""
+-  "receives_default\">False</property><property name=\"draw_indicator\">Tr"
+-  "ue</property></object><packing><property name=\"expand\">True</property"
+-  "><property name=\"fill\">True</property><property name=\"position\">0</"
+-  "property></packing></child><child><object class=\"GtkFontButton\" id=\""
+-  "/prefs/view/font/chooser-button\"><property name=\"visible\">True</prop"
++  "y name=\"lower\">1</property><property name=\"upper\">32</property><pro"
++  "perty name=\"value\">8</property><property name=\"step_increment\">1</p"
++  "roperty><property name=\"page_increment\">10</property></object><object"
++  " class=\"GtkListStore\" id=\"/prefs/view/color-scheme-model\"><columns>"
++  "<column type=\"gchararray\"/><column type=\"gchararray\"/></columns><da"
++  "ta><row><col id=\"0\" translatable=\"yes\">none</col><col id=\"1\" tran"
++  "slatable=\"yes\">None</col></row></data></object><object class=\"GtkAdj"
++  "ustment\" id=\"/prefs/view/right-margin-adjustment\"><property name=\"u"
++  "pper\">9999</property><property name=\"step_increment\">1</property><pr"
++  "operty name=\"page_increment\">10</property></object><object class=\"Gt"
++  "kListStore\" id=\"/prefs/window/toolbar/icon-size-model\"><columns><col"
++  "umn type=\"GtkIconSize\"/><column type=\"gchararray\"/></columns><data>"
++  "<row><col id=\"0\">menu</col><col id=\"1\" translatable=\"yes\">Menu</c"
++  "ol></row><row><col id=\"0\">small-toolbar</col><col id=\"1\" translatab"
++  "le=\"yes\">Small Toolbar</col></row><row><col id=\"0\">large-toolbar</c"
++  "ol><col id=\"1\" translatable=\"yes\">Large Toolbar</col></row><row><co"
++  "l id=\"0\">button</col><col id=\"1\" translatable=\"yes\">Button</col><"
++  "/row><row><col id=\"0\">dnd</col><col id=\"1\" translatable=\"yes\">Dra"
++  "g &amp; Drop</col></row><row><col id=\"0\">dialog</col><col id=\"1\" tr"
++  "anslatable=\"yes\">Dialog</col></row></data></object><object class=\"Gt"
++  "kListStore\" id=\"/prefs/window/toolbar/style-model\"><columns><column "
++  "type=\"GtkToolbarStyle\"/><column type=\"gchararray\"/></columns><data>"
++  "<row><col id=\"0\">icons</col><col id=\"1\" translatable=\"yes\">Icons "
++  "Only</col></row><row><col id=\"0\">text</col><col id=\"1\" translatable"
++  "=\"yes\">Text Only</col></row><row><col id=\"0\">both</col><col id=\"1\""
++  " translatable=\"yes\">Text Below Icons</col></row><row><col id=\"0\">bo"
++  "th-horiz</col><col id=\"1\" translatable=\"yes\">Text Beside Icons</col"
++  "></row></data></object><object class=\"GtkNotebook\" id=\"/prefs/main-n"
++  "otebook\"><property name=\"visible\">True</property><property name=\"ca"
++  "n_focus\">True</property><child><object class=\"GtkVBox\" id=\"/prefs/v"
++  "iew/content-area\"><property name=\"visible\">True</property><property "
++  "name=\"can_focus\">False</property><property name=\"border_width\">6</p"
++  "roperty><child><object class=\"GtkFrame\" id=\"/prefs/view/display/fram"
++  "e\"><property name=\"visible\">True</property><property name=\"can_focu"
++  "s\">False</property><property name=\"label_xalign\">0</property><proper"
++  "ty name=\"shadow_type\">none</property><child><object class=\"GtkAlignm"
++  "ent\" id=\"/prefs/view/display/alignment\"><property name=\"visible\">T"
++  "rue</property><property name=\"can_focus\">False</property><property na"
++  "me=\"top_padding\">6</property><property name=\"bottom_padding\">6</pro"
++  "perty><property name=\"left_padding\">12</property><property name=\"rig"
++  "ht_padding\">6</property><child><object class=\"GtkVBox\" id=\"/prefs/v"
++  "iew/display/content-area\"><property name=\"visible\">True</property><p"
++  "roperty name=\"can_focus\">False</property><property name=\"spacing\">2"
++  "</property><child><object class=\"GtkCheckButton\" id=\"/prefs/view/dis"
++  "play/show-line-numbers-check\"><property name=\"label\" translatable=\""
++  "yes\">Show line numbers</property><property name=\"visible\">True</prop"
+   "erty><property name=\"can_focus\">True</property><property name=\"recei"
+-  "ves_default\">True</property></object><packing><property name=\"expand\""
+-  ">True</property><property name=\"fill\">True</property><property name=\""
+-  "position\">1</property></packing></child></object></child></object></ch"
+-  "ild><child type=\"label\"><object class=\"GtkLabel\" id=\"/prefs/view/f"
+-  "ont/label\"><property name=\"visible\">True</property><property name=\""
+-  "can_focus\">False</property><property name=\"label\" translatable=\"yes"
+-  "\">&lt;b&gt;Font&lt;/b&gt;</property><property name=\"use_markup\">True"
+-  "</property></object></child></object><packing><property name=\"expand\""
+-  ">False</property><property name=\"fill\">True</property><property name="
+-  "\"position\">1</property></packing></child><child><object class=\"GtkFr"
+-  "ame\" id=\"/prefs/view/color-scheme-frame\"><property name=\"visible\">"
+-  "True</property><property name=\"can_focus\">False</property><property n"
+-  "ame=\"label_xalign\">0</property><property name=\"shadow_type\">none</p"
+-  "roperty><child><object class=\"GtkAlignment\" id=\"/prefs/view/color-sc"
+-  "heme-alignment\"><property name=\"visible\">True</property><property na"
+-  "me=\"can_focus\">False</property><property name=\"top_padding\">6</prop"
+-  "erty><property name=\"bottom_padding\">6</property><property name=\"lef"
+-  "t_padding\">12</property><property name=\"right_padding\">6</property><"
+-  "child><object class=\"GtkVBox\" id=\"/prefs/view/color-scheme-box\"><pr"
++  "ves_default\">False</property><property name=\"active\">True</property>"
++  "<property name=\"draw_indicator\">True</property><signal name=\"toggled"
++  "\" handler=\"on_show_line_numbers_toggled\" object=\"prefs_dialog\" swa"
++  "pped=\"yes\"/></object><packing><property name=\"expand\">True</propert"
++  "y><property name=\"fill\">True</property><property name=\"position\">0<"
++  "/property></packing></child><child><object class=\"GtkCheckButton\" id="
++  "\"/prefs/view/display/display-whitespace-check\"><property name=\"label"
++  "\" translatable=\"yes\">Display whitespace</property><property name=\"v"
++  "isible\">True</property><property name=\"can_focus\">True</property><pr"
++  "operty name=\"receives_default\">False</property><property name=\"draw_"
++  "indicator\">True</property></object><packing><property name=\"expand\">"
++  "True</property><property name=\"fill\">True</property><property name=\""
++  "position\">1</property></packing></child><child><object class=\"GtkChec"
++  "kButton\" id=\"/prefs/view/display/display-line-endings-check\"><proper"
++  "ty name=\"label\" translatable=\"yes\">Display line endings</property><"
++  "property name=\"visible\">True</property><property name=\"can_focus\">T"
++  "rue</property><property name=\"receives_default\">False</property><prop"
++  "erty name=\"draw_indicator\">True</property></object><packing><property"
++  " name=\"expand\">True</property><property name=\"fill\">True</property>"
++  "<property name=\"position\">2</property></packing></child><child><objec"
++  "t class=\"GtkHBox\" id=\"/prefs/view/display/long-line-margin-box\"><pr"
+   "operty name=\"visible\">True</property><property name=\"can_focus\">Fal"
+-  "se</property><property name=\"spacing\">2</property><child><object clas"
+-  "s=\"GtkComboBox\" id=\"/prefs/view/color-scheme-combo\"><property name="
+-  "\"visible\">True</property><property name=\"can_focus\">False</property"
+-  "><property name=\"model\">/prefs/view/color-scheme-model</property><pro"
+-  "perty name=\"active\">0</property><child><object class=\"GtkCellRendere"
+-  "rText\" id=\"/prefs/view/color-scheme-cell-renderer\"/><attributes><att"
+-  "ribute name=\"text\">1</attribute></attributes></child></object><packin"
+-  "g><property name=\"expand\">True</property><property name=\"fill\">True"
+-  "</property><property name=\"position\">0</property></packing></child></"
+-  "object></child></object></child><child type=\"label\"><object class=\"G"
+-  "tkLabel\" id=\"/prefs/view/color-scheme-label\"><property name=\"visibl"
+-  "e\">True</property><property name=\"can_focus\">False</property><proper"
+-  "ty name=\"label\" translatable=\"yes\">&lt;b&gt;Colour scheme&lt;/b&gt;"
+-  "</property><property name=\"use_markup\">True</property></object></chil"
+-  "d></object><packing><property name=\"expand\">False</property><property"
+-  " name=\"fill\">True</property><property name=\"position\">2</property><"
+-  "/packing></child></object></child><child type=\"tab\"><object class=\"G"
+-  "tkLabel\" id=\"/prefs/view/tab-label\"><property name=\"visible\">True<"
+-  "/property><property name=\"can_focus\">False</property><property name=\""
+-  "label\" translatable=\"yes\">View</property></object><packing><property"
+-  " name=\"tab_fill\">False</property></packing></child><child><object cla"
+-  "ss=\"GtkVBox\" id=\"/prefs/editor/content-area\"><property name=\"visib"
+-  "le\">True</property><property name=\"can_focus\">False</property><prope"
+-  "rty name=\"border_width\">6</property><property name=\"spacing\">6</pro"
+-  "perty><child><object class=\"GtkFrame\" id=\"/prefs/editor/indentation/"
+-  "frame\"><property name=\"visible\">True</property><property name=\"can_"
+-  "focus\">False</property><property name=\"label_xalign\">0</property><pr"
+-  "operty name=\"shadow_type\">none</property><child><object class=\"GtkAl"
+-  "ignment\" id=\"/prefs/editor/indentation/alignment\"><property name=\"v"
+-  "isible\">True</property><property name=\"can_focus\">False</property><p"
+-  "roperty name=\"top_padding\">6</property><property name=\"bottom_paddin"
+-  "g\">6</property><property name=\"left_padding\">12</property><property "
+-  "name=\"right_padding\">6</property><child><object class=\"GtkTable\" id"
+-  "=\"/prefs/editor/indentation/table\"><property name=\"visible\">True</p"
+-  "roperty><property name=\"can_focus\">False</property><property name=\"n"
+-  "_rows\">3</property><property name=\"n_columns\">2</property><property "
+-  "name=\"column_spacing\">6</property><property name=\"row_spacing\">6</p"
+-  "roperty><child><object class=\"GtkLabel\" id=\"/prefs/editor/indentatio"
+-  "n/tab-width-label\"><property name=\"visible\">True</property><property"
+-  " name=\"can_focus\">False</property><property name=\"xalign\">0</proper"
+-  "ty><property name=\"label\" translatable=\"yes\">Tab width:</property><"
+-  "/object><packing><property name=\"x_options\">GTK_FILL</property><prope"
+-  "rty name=\"y_options\">GTK_FILL</property></packing></child><child><obj"
+-  "ect class=\"GtkLabel\" id=\"/prefs/editor/indentation/tab-mode-label\">"
+-  "<property name=\"visible\">True</property><property name=\"can_focus\">"
+-  "False</property><property name=\"xalign\">0</property><property name=\""
+-  "label\" translatable=\"yes\">Tab mode:</property></object><packing><pro"
+-  "perty name=\"top_attach\">1</property><property name=\"bottom_attach\">"
+-  "2</property><property name=\"x_options\">GTK_FILL</property><property n"
+-  "ame=\"y_options\">GTK_FILL</property></packing></child><child><object c"
+-  "lass=\"GtkSpinButton\" id=\"/prefs/editor/tab-width-spin\"><property na"
+-  "me=\"visible\">True</property><property name=\"can_focus\">True</proper"
+-  "ty><property name=\"invisible_char\">\342\200\242</property><property n"
+-  "ame=\"invisible_char_set\">True</property><property name=\"primary_icon"
+-  "_activatable\">False</property><property name=\"secondary_icon_activata"
+-  "ble\">False</property><property name=\"primary_icon_sensitive\">True</p"
+-  "roperty><property name=\"secondary_icon_sensitive\">True</property><pro"
+-  "perty name=\"adjustment\">/prefs/editor/tab-width-adjustment</property>"
+-  "</object><packing><property name=\"left_attach\">1</property><property "
+-  "name=\"right_attach\">2</property><property name=\"y_options\">GTK_FILL"
+-  "</property></packing></child><child><object class=\"GtkComboBox\" id=\""
+-  "/prefs/editor/tab-mode-combo\"><property name=\"visible\">True</propert"
+-  "y><property name=\"can_focus\">False</property><property name=\"model\""
+-  ">/prefs/editor/tab-mode-store</property><property name=\"active\">0</pr"
+-  "operty><child><object class=\"GtkCellRendererText\" id=\"editor.tab_mod"
+-  "e.cellrenderer\"/><attributes><attribute name=\"text\">0</attribute></a"
+-  "ttributes></child></object><packing><property name=\"left_attach\">1</p"
+-  "roperty><property name=\"right_attach\">2</property><property name=\"to"
+-  "p_attach\">1</property><property name=\"bottom_attach\">2</property><pr"
+-  "operty name=\"x_options\">GTK_FILL</property><property name=\"y_options"
+-  "\">GTK_FILL</property></packing></child><child><object class=\"GtkCheck"
+-  "Button\" id=\"/prefs/editor/auto-indent-check\"><property name=\"label\""
+-  " translatable=\"yes\">Enable automatic indentation</property><property "
+-  "name=\"visible\">True</property><property name=\"can_focus\">True</prop"
+-  "erty><property name=\"receives_default\">False</property><property name"
+-  "=\"draw_indicator\">True</property></object><packing><property name=\"r"
+-  "ight_attach\">2</property><property name=\"top_attach\">2</property><pr"
+-  "operty name=\"bottom_attach\">3</property><property name=\"x_options\">"
+-  "GTK_FILL</property><property name=\"y_options\">GTK_FILL</property></pa"
+-  "cking></child></object></child></object></child><child type=\"label\"><"
+-  "object class=\"GtkLabel\" id=\"/prefs/editor/indentation/label\"><prope"
+-  "rty name=\"visible\">True</property><property name=\"can_focus\">False<"
+-  "/property><property name=\"label\" translatable=\"yes\">&lt;b&gt;Indent"
+-  "ation&lt;/b&gt;</property><property name=\"use_markup\">True</property>"
+-  "</object></child></object><packing><property name=\"expand\">False</pro"
+-  "perty><property name=\"fill\">True</property><property name=\"position\""
+-  ">0</property></packing></child><child><object class=\"GtkFrame\" id=\"/"
+-  "prefs/editor/home-end/frame\"><property name=\"visible\">True</property"
+-  "><property name=\"can_focus\">False</property><property name=\"label_xa"
+-  "lign\">0</property><property name=\"shadow_type\">none</property><child"
+-  "><object class=\"GtkAlignment\" id=\"/prefs/editor/home-end/alignment\""
+-  "><property name=\"visible\">True</property><property name=\"can_focus\""
+-  ">False</property><property name=\"top_padding\">6</property><property n"
+-  "ame=\"bottom_padding\">6</property><property name=\"left_padding\">12</"
+-  "property><property name=\"right_padding\">6</property><child><object cl"
+-  "ass=\"GtkHBox\" id=\"/prefs/editor/home-end/box\"><property name=\"visi"
+-  "ble\">True</property><property name=\"can_focus\">False</property><prop"
+-  "erty name=\"spacing\">6</property><child><object class=\"GtkLabel\" id="
+-  "\"/prefs/editor/home-end/behaviour-label\"><property name=\"visible\">T"
+-  "rue</property><property name=\"can_focus\">False</property><property na"
+-  "me=\"xalign\">0</property><property name=\"label\" translatable=\"yes\""
+-  ">Behaviour:</property></object><packing><property name=\"expand\">False"
+-  "</property><property name=\"fill\">True</property><property name=\"posi"
+-  "tion\">0</property></packing></child><child><object class=\"GtkComboBox"
+-  "\" id=\"/prefs/editor/smart-home-end-combo\"><property name=\"visible\""
+-  ">True</property><property name=\"can_focus\">False</property><property "
+-  "name=\"model\">/prefs/editor/smart-home-end-model</property><property n"
+-  "ame=\"active\">0</property><child><object class=\"GtkCellRendererText\""
+-  " id=\"/prefs/editor/smart-home-end-cellrenderer\"/><attributes><attribu"
+-  "te name=\"text\">1</attribute></attributes></child></object><packing><p"
+-  "roperty name=\"expand\">True</property><property name=\"fill\">True</pr"
+-  "operty><property name=\"position\">1</property></packing></child></obje"
+-  "ct></child></object></child><child type=\"label\"><object class=\"GtkLa"
+-  "bel\" id=\"/prefs/editor/home-end/label\"><property name=\"visible\">Tr"
+-  "ue</property><property name=\"can_focus\">False</property><property nam"
+-  "e=\"label\" translatable=\"yes\">&lt;b&gt;Home/End Keys&lt;/b&gt;</prop"
+-  "erty><property name=\"use_markup\">True</property></object></child></ob"
+-  "ject><packing><property name=\"expand\">False</property><property name="
+-  "\"fill\">True</property><property name=\"position\">1</property></packi"
+-  "ng></child></object><packing><property name=\"position\">1</property></"
+-  "packing></child><child type=\"tab\"><object class=\"GtkLabel\" id=\"/pr"
+-  "efs/editor/tab-label\"><property name=\"visible\">True</property><prope"
+-  "rty name=\"can_focus\">False</property><property name=\"label\" transla"
+-  "table=\"yes\">Editor</property></object><packing><property name=\"posit"
+-  "ion\">1</property><property name=\"tab_fill\">False</property></packing"
+-  "></child><child><object class=\"GtkVBox\" id=\"/prefs/window/content-ar"
+-  "ea\"><property name=\"visible\">True</property><property name=\"can_foc"
+-  "us\">False</property><property name=\"border_width\">6</property><prope"
+-  "rty name=\"spacing\">6</property><child><object class=\"GtkFrame\" id=\""
+-  "/prefs/window/general/frame\"><property name=\"visible\">True</property"
+-  "><property name=\"can_focus\">False</property><property name=\"label_xa"
+-  "lign\">0</property><property name=\"shadow_type\">none</property><child"
+-  "><object class=\"GtkAlignment\" id=\"/prefs/window/general/alignment\">"
++  "se</property><property name=\"spacing\">6</property><child><object clas"
++  "s=\"GtkCheckButton\" id=\"/prefs/view/display/long-line-check\"><proper"
++  "ty name=\"label\" translatable=\"yes\">Long line margin at column:</pro"
++  "perty><property name=\"visible\">True</property><property name=\"can_fo"
++  "cus\">True</property><property name=\"receives_default\">False</propert"
++  "y><property name=\"draw_indicator\">True</property></object><packing><p"
++  "roperty name=\"expand\">False</property><property name=\"fill\">True</p"
++  "roperty><property name=\"position\">0</property></packing></child><chil"
++  "d><object class=\"GtkSpinButton\" id=\"/prefs/view/display/long-line-sp"
++  "in\"><property name=\"visible\">True</property><property name=\"sensiti"
++  "ve\">False</property><property name=\"can_focus\">True</property><prope"
++  "rty name=\"invisible_char\">\342\200\242</property><property name=\"inv"
++  "isible_char_set\">True</property><property name=\"primary_icon_activata"
++  "ble\">False</property><property name=\"secondary_icon_activatable\">Fal"
++  "se</property><property name=\"primary_icon_sensitive\">True</property><"
++  "property name=\"secondary_icon_sensitive\">True</property><property nam"
++  "e=\"adjustment\">/prefs/view/right-margin-adjustment</property><propert"
++  "y name=\"numeric\">True</property></object><packing><property name=\"ex"
++  "pand\">False</property><property name=\"fill\">True</property><property"
++  " name=\"position\">1</property></packing></child></object><packing><pro"
++  "perty name=\"expand\">False</property><property name=\"fill\">True</pro"
++  "perty><property name=\"position\">3</property></packing></child><child>"
++  "<object class=\"GtkCheckButton\" id=\"/prefs/view/display/highlight-cur"
++  "rent-line-check\"><property name=\"label\" translatable=\"yes\">Highlig"
++  "ht current line</property><property name=\"visible\">True</property><pr"
++  "operty name=\"can_focus\">True</property><property name=\"receives_defa"
++  "ult\">False</property><property name=\"active\">True</property><propert"
++  "y name=\"draw_indicator\">True</property></object><packing><property na"
++  "me=\"expand\">True</property><property name=\"fill\">True</property><pr"
++  "operty name=\"position\">4</property></packing></child><child><object c"
++  "lass=\"GtkCheckButton\" id=\"/prefs/view/display/match-braces-check\"><"
++  "property name=\"label\" translatable=\"yes\">Highlight matching bracket"
++  "s</property><property name=\"visible\">True</property><property name=\""
++  "can_focus\">True</property><property name=\"receives_default\">False</p"
++  "roperty><property name=\"draw_indicator\">True</property></object><pack"
++  "ing><property name=\"expand\">True</property><property name=\"fill\">Tr"
++  "ue</property><property name=\"position\">5</property></packing></child>"
++  "<child><object class=\"GtkCheckButton\" id=\"/prefs/view/display/word-w"
++  "rap-check\"><property name=\"label\" translatable=\"yes\">Wrap long lin"
++  "es</property><property name=\"visible\">True</property><property name=\""
++  "can_focus\">True</property><property name=\"receives_default\">False</p"
++  "roperty><property name=\"draw_indicator\">True</property></object><pack"
++  "ing><property name=\"expand\">True</property><property name=\"fill\">Tr"
++  "ue</property><property name=\"position\">6</property></packing></child>"
++  "</object></child></object></child><child type=\"label\"><object class=\""
++  "GtkLabel\" id=\"/prefs/view/display/label\"><property name=\"visible\">"
++  "True</property><property name=\"can_focus\">False</property><property n"
++  "ame=\"label\" translatable=\"yes\">&lt;b&gt;Display&lt;/b&gt;</property"
++  "><property name=\"use_markup\">True</property></object></child></object"
++  "><packing><property name=\"expand\">False</property><property name=\"fi"
++  "ll\">True</property><property name=\"position\">0</property></packing><"
++  "/child><child><object class=\"GtkFrame\" id=\"/prefs/view/font-frame\">"
+   "<property name=\"visible\">True</property><property name=\"can_focus\">"
+-  "False</property><property name=\"top_padding\">6</property><property na"
+-  "me=\"bottom_padding\">6</property><property name=\"left_padding\">12</p"
+-  "roperty><property name=\"right_padding\">6</property><child><object cla"
+-  "ss=\"GtkVBox\" id=\"/prefs/window/general/box\"><property name=\"visibl"
+-  "e\">True</property><property name=\"can_focus\">False</property><proper"
+-  "ty name=\"spacing\">2</property><child><object class=\"GtkCheckButton\""
+-  " id=\"/prefs/window/general/show-statusbar-check\"><property name=\"lab"
+-  "el\" translatable=\"yes\">Show status bar</property><property name=\"vi"
+-  "sible\">True</property><property name=\"can_focus\">True</property><pro"
+-  "perty name=\"receives_default\">False</property><property name=\"draw_i"
+-  "ndicator\">True</property></object><packing><property name=\"expand\">T"
+-  "rue</property><property name=\"fill\">True</property><property name=\"p"
+-  "osition\">0</property></packing></child><child><object class=\"GtkCheck"
+-  "Button\" id=\"/prefs/window/general/show-path-in-title-check\"><propert"
+-  "y name=\"label\" translatable=\"yes\">Show full filename in title bar</"
++  "False</property><property name=\"label_xalign\">0</property><property n"
++  "ame=\"shadow_type\">none</property><child><object class=\"GtkAlignment\""
++  " id=\"/prefs/view/font/alignment\"><property name=\"visible\">True</pro"
++  "perty><property name=\"can_focus\">False</property><property name=\"top"
++  "_padding\">6</property><property name=\"bottom_padding\">6</property><p"
++  "roperty name=\"left_padding\">12</property><property name=\"right_paddi"
++  "ng\">6</property><child><object class=\"GtkVBox\" id=\"/prefs/view/font"
++  "/box\"><property name=\"visible\">True</property><property name=\"can_f"
++  "ocus\">False</property><property name=\"spacing\">2</property><child><o"
++  "bject class=\"GtkCheckButton\" id=\"/prefs/view/font/default-check\"><p"
++  "roperty name=\"label\" translatable=\"yes\">Use system monospace font</"
+   "property><property name=\"visible\">True</property><property name=\"can"
+   "_focus\">True</property><property name=\"receives_default\">False</prop"
+   "erty><property name=\"draw_indicator\">True</property></object><packing"
+   "><property name=\"expand\">True</property><property name=\"fill\">True<"
+-  "/property><property name=\"position\">1</property></packing></child><ch"
+-  "ild><object class=\"GtkCheckButton\" id=\"/prefs/window/general/remembe"
+-  "r-window-size-check\"><property name=\"label\" translatable=\"yes\">Rem"
+-  "ember window size</property><property name=\"visible\">True</property><"
+-  "property name=\"can_focus\">True</property><property name=\"receives_de"
+-  "fault\">False</property><property name=\"draw_indicator\">True</propert"
+-  "y></object><packing><property name=\"expand\">True</property><property "
+-  "name=\"fill\">True</property><property name=\"position\">2</property></"
+-  "packing></child><child><object class=\"GtkCheckButton\" id=\"/prefs/win"
+-  "dow/general/remember-window-position-check\"><property name=\"label\" t"
+-  "ranslatable=\"yes\">Remember window position</property><property name=\""
+-  "visible\">True</property><property name=\"can_focus\">True</property><p"
+-  "roperty name=\"receives_default\">False</property><property name=\"draw"
+-  "_indicator\">True</property></object><packing><property name=\"expand\""
+-  ">True</property><property name=\"fill\">True</property><property name=\""
+-  "position\">3</property></packing></child><child><object class=\"GtkChec"
+-  "kButton\" id=\"/prefs/window/general/remember-window-state-check\"><pro"
+-  "perty name=\"label\" translatable=\"yes\">Remember window state</proper"
+-  "ty><property name=\"visible\">True</property><property name=\"can_focus"
+-  "\">True</property><property name=\"receives_default\">False</property><"
+-  "property name=\"draw_indicator\">True</property></object><packing><prop"
+-  "erty name=\"expand\">True</property><property name=\"fill\">True</prope"
+-  "rty><property name=\"position\">4</property></packing></child></object>"
+-  "</child></object></child><child type=\"label\"><object class=\"GtkLabel"
+-  "\" id=\"/prefs/window/general/label\"><property name=\"visible\">True</"
+-  "property><property name=\"can_focus\">False</property><property name=\""
+-  "label\" translatable=\"yes\">&lt;b&gt;General&lt;/b&gt;</property><prop"
+-  "erty name=\"use_markup\">True</property></object></child></object><pack"
+-  "ing><property name=\"expand\">False</property><property name=\"fill\">T"
+-  "rue</property><property name=\"position\">0</property></packing></child"
+-  "><child><object class=\"GtkFrame\" id=\"/prefs/window/toolbar/frame\"><"
+-  "property name=\"visible\">True</property><property name=\"can_focus\">F"
+-  "alse</property><property name=\"label_xalign\">0</property><property na"
+-  "me=\"shadow_type\">none</property><child><object class=\"GtkAlignment\""
+-  " id=\"/prefs/window/toolbar/alignment1\"><property name=\"visible\">Tru"
+-  "e</property><property name=\"can_focus\">False</property><property name"
+-  "=\"top_padding\">6</property><property name=\"bottom_padding\">6</prope"
+-  "rty><property name=\"left_padding\">12</property><property name=\"right"
+-  "_padding\">6</property><child><object class=\"GtkTable\" id=\"/prefs/wi"
+-  "ndow/toolbar/table\"><property name=\"visible\">True</property><propert"
+-  "y name=\"can_focus\">False</property><property name=\"n_rows\">3</prope"
+-  "rty><property name=\"n_columns\">2</property><property name=\"column_sp"
+-  "acing\">6</property><property name=\"row_spacing\">6</property><child><"
+-  "object class=\"GtkCheckButton\" id=\"/prefs/window/toolbar/visible-chec"
+-  "k\"><property name=\"label\" translatable=\"yes\">Show toolbar</propert"
+-  "y><property name=\"visible\">True</property><property name=\"can_focus\""
+-  ">True</property><property name=\"receives_default\">False</property><pr"
+-  "operty name=\"draw_indicator\">True</property></object><packing><proper"
+-  "ty name=\"right_attach\">2</property></packing></child><child><object c"
+-  "lass=\"GtkLabel\" id=\"/prefs/window/toolbar/style-label\"><property na"
++  "/property><property name=\"position\">0</property></packing></child><ch"
++  "ild><object class=\"GtkFontButton\" id=\"/prefs/view/font/chooser-butto"
++  "n\"><property name=\"visible\">True</property><property name=\"can_focu"
++  "s\">True</property><property name=\"receives_default\">True</property><"
++  "/object><packing><property name=\"expand\">True</property><property nam"
++  "e=\"fill\">True</property><property name=\"position\">1</property></pac"
++  "king></child></object></child></object></child><child type=\"label\"><o"
++  "bject class=\"GtkLabel\" id=\"/prefs/view/font/label\"><property name=\""
++  "visible\">True</property><property name=\"can_focus\">False</property><"
++  "property name=\"label\" translatable=\"yes\">&lt;b&gt;Font&lt;/b&gt;</p"
++  "roperty><property name=\"use_markup\">True</property></object></child><"
++  "/object><packing><property name=\"expand\">False</property><property na"
++  "me=\"fill\">True</property><property name=\"position\">1</property></pa"
++  "cking></child><child><object class=\"GtkFrame\" id=\"/prefs/view/color-"
++  "scheme-frame\"><property name=\"visible\">True</property><property name"
++  "=\"can_focus\">False</property><property name=\"label_xalign\">0</prope"
++  "rty><property name=\"shadow_type\">none</property><child><object class="
++  "\"GtkAlignment\" id=\"/prefs/view/color-scheme-alignment\"><property na"
+   "me=\"visible\">True</property><property name=\"can_focus\">False</prope"
+-  "rty><property name=\"xalign\">0</property><property name=\"label\" tran"
+-  "slatable=\"yes\">Style:</property></object><packing><property name=\"to"
+-  "p_attach\">1</property><property name=\"bottom_attach\">2</property><pr"
+-  "operty name=\"x_options\">GTK_FILL</property><property name=\"y_options"
+-  "\">GTK_FILL</property></packing></child><child><object class=\"GtkLabel"
+-  "\" id=\"/prefs/window/toolbar/icon-size-label\"><property name=\"visibl"
+-  "e\">True</property><property name=\"can_focus\">False</property><proper"
+-  "ty name=\"xalign\">0</property><property name=\"label\" translatable=\""
+-  "yes\">Icon Size:</property></object><packing><property name=\"top_attac"
+-  "h\">2</property><property name=\"bottom_attach\">3</property><property "
+-  "name=\"x_options\">GTK_FILL</property><property name=\"y_options\">GTK_"
+-  "FILL</property></packing></child><child><object class=\"GtkComboBox\" i"
+-  "d=\"/prefs/window/toolbar/style-combo\"><property name=\"visible\">True"
+-  "</property><property name=\"can_focus\">False</property><property name="
+-  "\"model\">/prefs/window/toolbar/style-model</property><property name=\""
+-  "active\">0</property><child><object class=\"GtkCellRendererText\" id=\""
+-  "/prefs/window/toolbar/style/cellrenderer\"/><attributes><attribute name"
+-  "=\"text\">1</attribute></attributes></child></object><packing><property"
+-  " name=\"left_attach\">1</property><property name=\"right_attach\">2</pr"
+-  "operty><property name=\"top_attach\">1</property><property name=\"botto"
+-  "m_attach\">2</property></packing></child><child><object class=\"GtkComb"
+-  "oBox\" id=\"/prefs/window/toolbar/icon-size-combo\"><property name=\"vi"
+-  "sible\">True</property><property name=\"can_focus\">False</property><pr"
+-  "operty name=\"model\">/prefs/window/toolbar/icon-size-model</property><"
+-  "property name=\"active\">0</property><child><object class=\"GtkCellRend"
+-  "ererText\" id=\"/prefs/window/toolbar/icon-size/cellrenderer1\"/><attri"
+-  "butes><attribute name=\"text\">1</attribute></attributes></child></obje"
+-  "ct><packing><property name=\"left_attach\">1</property><property name=\""
+-  "right_attach\">2</property><property name=\"top_attach\">2</property><p"
+-  "roperty name=\"bottom_attach\">3</property></packing></child></object><"
+-  "/child></object></child><child type=\"label\"><object class=\"GtkLabel\""
+-  " id=\"/prefs/window/toolbar/label1\"><property name=\"visible\">True</p"
+-  "roperty><property name=\"can_focus\">False</property><property name=\"l"
+-  "abel\" translatable=\"yes\">&lt;b&gt;Toolbar&lt;/b&gt;</property><prope"
+-  "rty name=\"use_markup\">True</property></object></child></object><packi"
+-  "ng><property name=\"expand\">False</property><property name=\"fill\">Tr"
+-  "ue</property><property name=\"position\">1</property></packing></child>"
+-  "<child><object class=\"GtkFrame\" id=\"/prefs/window/notebook/frame\"><"
+-  "property name=\"visible\">True</property><property name=\"can_focus\">F"
+-  "alse</property><property name=\"label_xalign\">0</property><property na"
+-  "me=\"shadow_type\">none</property><child><object class=\"GtkAlignment\""
+-  " id=\"/prefs/window/notebook/alignment\"><property name=\"visible\">Tru"
+-  "e</property><property name=\"can_focus\">False</property><property name"
+-  "=\"top_padding\">6</property><property name=\"bottom_padding\">6</prope"
+-  "rty><property name=\"left_padding\">12</property><property name=\"right"
+-  "_padding\">6</property><child><object class=\"GtkVBox\" id=\"/prefs/win"
+-  "dow/notebook/box\"><property name=\"visible\">True</property><property "
+-  "name=\"can_focus\">False</property><property name=\"spacing\">2</proper"
+-  "ty><child><object class=\"GtkCheckButton\" id=\"/prefs/window/notebook/"
+-  "always-show-tabs-check\"><property name=\"label\" translatable=\"yes\">"
+-  "Always show tabs even with one file</property><property name=\"visible\""
+-  ">True</property><property name=\"can_focus\">True</property><property n"
+-  "ame=\"receives_default\">False</property><property name=\"draw_indicato"
+-  "r\">True</property></object><packing><property name=\"expand\">True</pr"
+-  "operty><property name=\"fill\">True</property><property name=\"position"
+-  "\">0</property></packing></child><child><object class=\"GtkCheckButton\""
+-  " id=\"/prefs/window/notebook/cycle-tabs-check\"><property name=\"label\""
+-  " translatable=\"yes\">Cycled notebook tab switching</property><property"
+-  " name=\"visible\">True</property><property name=\"can_focus\">True</pro"
+-  "perty><property name=\"receives_default\">False</property><property nam"
+-  "e=\"yalign\">0.55000001192092896</property><property name=\"draw_indica"
+-  "tor\">True</property></object><packing><property name=\"expand\">True</"
+-  "property><property name=\"fill\">True</property><property name=\"positi"
+-  "on\">1</property></packing></child></object></child></object></child><c"
+-  "hild type=\"label\"><object class=\"GtkLabel\" id=\"/prefs/window/noteb"
+-  "ook/label\"><property name=\"visible\">True</property><property name=\""
++  "rty><property name=\"top_padding\">6</property><property name=\"bottom_"
++  "padding\">6</property><property name=\"left_padding\">12</property><pro"
++  "perty name=\"right_padding\">6</property><child><object class=\"GtkVBox"
++  "\" id=\"/prefs/view/color-scheme-box\"><property name=\"visible\">True<"
++  "/property><property name=\"can_focus\">False</property><property name=\""
++  "spacing\">2</property><child><object class=\"GtkComboBox\" id=\"/prefs/"
++  "view/color-scheme-combo\"><property name=\"visible\">True</property><pr"
++  "operty name=\"can_focus\">False</property><property name=\"model\">/pre"
++  "fs/view/color-scheme-model</property><property name=\"active\">0</prope"
++  "rty><child><object class=\"GtkCellRendererText\" id=\"/prefs/view/color"
++  "-scheme-cell-renderer\"/><attributes><attribute name=\"text\">1</attrib"
++  "ute></attributes></child></object><packing><property name=\"expand\">Tr"
++  "ue</property><property name=\"fill\">True</property><property name=\"po"
++  "sition\">0</property></packing></child></object></child></object></chil"
++  "d><child type=\"label\"><object class=\"GtkLabel\" id=\"/prefs/view/col"
++  "or-scheme-label\"><property name=\"visible\">True</property><property n"
++  "ame=\"can_focus\">False</property><property name=\"label\" translatable"
++  "=\"yes\">&lt;b&gt;Colour scheme&lt;/b&gt;</property><property name=\"us"
++  "e_markup\">True</property></object></child></object><packing><property "
++  "name=\"expand\">False</property><property name=\"fill\">True</property>"
++  "<property name=\"position\">2</property></packing></child></object></ch"
++  "ild><child type=\"tab\"><object class=\"GtkLabel\" id=\"/prefs/view/tab"
++  "-label\"><property name=\"visible\">True</property><property name=\"can"
++  "_focus\">False</property><property name=\"label\" translatable=\"yes\">"
++  "View</property></object><packing><property name=\"tab_fill\">False</pro"
++  "perty></packing></child><child><object class=\"GtkVBox\" id=\"/prefs/ed"
++  "itor/content-area\"><property name=\"visible\">True</property><property"
++  " name=\"can_focus\">False</property><property name=\"border_width\">6</"
++  "property><property name=\"spacing\">6</property><child><object class=\""
++  "GtkFrame\" id=\"/prefs/editor/indentation/frame\"><property name=\"visi"
++  "ble\">True</property><property name=\"can_focus\">False</property><prop"
++  "erty name=\"label_xalign\">0</property><property name=\"shadow_type\">n"
++  "one</property><child><object class=\"GtkAlignment\" id=\"/prefs/editor/"
++  "indentation/alignment\"><property name=\"visible\">True</property><prop"
++  "erty name=\"can_focus\">False</property><property name=\"top_padding\">"
++  "6</property><property name=\"bottom_padding\">6</property><property nam"
++  "e=\"left_padding\">12</property><property name=\"right_padding\">6</pro"
++  "perty><child><object class=\"GtkTable\" id=\"/prefs/editor/indentation/"
++  "table\"><property name=\"visible\">True</property><property name=\"can_"
++  "focus\">False</property><property name=\"n_rows\">3</property><property"
++  " name=\"n_columns\">2</property><property name=\"column_spacing\">6</pr"
++  "operty><property name=\"row_spacing\">6</property><child><object class="
++  "\"GtkLabel\" id=\"/prefs/editor/indentation/tab-width-label\"><property"
++  " name=\"visible\">True</property><property name=\"can_focus\">False</pr"
++  "operty><property name=\"xalign\">0</property><property name=\"label\" t"
++  "ranslatable=\"yes\">Tab width:</property></object><packing><property na"
++  "me=\"x_options\">GTK_FILL</property><property name=\"y_options\">GTK_FI"
++  "LL</property></packing></child><child><object class=\"GtkLabel\" id=\"/"
++  "prefs/editor/indentation/tab-mode-label\"><property name=\"visible\">Tr"
++  "ue</property><property name=\"can_focus\">False</property><property nam"
++  "e=\"xalign\">0</property><property name=\"label\" translatable=\"yes\">"
++  "Tab mode:</property></object><packing><property name=\"top_attach\">1</"
++  "property><property name=\"bottom_attach\">2</property><property name=\""
++  "x_options\">GTK_FILL</property><property name=\"y_options\">GTK_FILL</p"
++  "roperty></packing></child><child><object class=\"GtkSpinButton\" id=\"/"
++  "prefs/editor/tab-width-spin\"><property name=\"visible\">True</property"
++  "><property name=\"can_focus\">True</property><property name=\"invisible"
++  "_char\">\342\200\242</property><property name=\"invisible_char_set\">Tr"
++  "ue</property><property name=\"primary_icon_activatable\">False</propert"
++  "y><property name=\"secondary_icon_activatable\">False</property><proper"
++  "ty name=\"primary_icon_sensitive\">True</property><property name=\"seco"
++  "ndary_icon_sensitive\">True</property><property name=\"adjustment\">/pr"
++  "efs/editor/tab-width-adjustment</property></object><packing><property n"
++  "ame=\"left_attach\">1</property><property name=\"right_attach\">2</prop"
++  "erty><property name=\"y_options\">GTK_FILL</property></packing></child>"
++  "<child><object class=\"GtkComboBox\" id=\"/prefs/editor/tab-mode-combo\""
++  "><property name=\"visible\">True</property><property name=\"can_focus\""
++  ">False</property><property name=\"model\">/prefs/editor/tab-mode-store<"
++  "/property><property name=\"active\">0</property><child><object class=\""
++  "GtkCellRendererText\" id=\"editor.tab_mode.cellrenderer\"/><attributes>"
++  "<attribute name=\"text\">0</attribute></attributes></child></object><pa"
++  "cking><property name=\"left_attach\">1</property><property name=\"right"
++  "_attach\">2</property><property name=\"top_attach\">1</property><proper"
++  "ty name=\"bottom_attach\">2</property><property name=\"x_options\">GTK_"
++  "FILL</property><property name=\"y_options\">GTK_FILL</property></packin"
++  "g></child><child><object class=\"GtkCheckButton\" id=\"/prefs/editor/au"
++  "to-indent-check\"><property name=\"label\" translatable=\"yes\">Enable "
++  "automatic indentation</property><property name=\"visible\">True</proper"
++  "ty><property name=\"can_focus\">True</property><property name=\"receive"
++  "s_default\">False</property><property name=\"draw_indicator\">True</pro"
++  "perty></object><packing><property name=\"right_attach\">2</property><pr"
++  "operty name=\"top_attach\">2</property><property name=\"bottom_attach\""
++  ">3</property><property name=\"x_options\">GTK_FILL</property><property "
++  "name=\"y_options\">GTK_FILL</property></packing></child></object></chil"
++  "d></object></child><child type=\"label\"><object class=\"GtkLabel\" id="
++  "\"/prefs/editor/indentation/label\"><property name=\"visible\">True</pr"
++  "operty><property name=\"can_focus\">False</property><property name=\"la"
++  "bel\" translatable=\"yes\">&lt;b&gt;Indentation&lt;/b&gt;</property><pr"
++  "operty name=\"use_markup\">True</property></object></child></object><pa"
++  "cking><property name=\"expand\">False</property><property name=\"fill\""
++  ">True</property><property name=\"position\">0</property></packing></chi"
++  "ld><child><object class=\"GtkFrame\" id=\"/prefs/editor/home-end/frame\""
++  "><property name=\"visible\">True</property><property name=\"can_focus\""
++  ">False</property><property name=\"label_xalign\">0</property><property "
++  "name=\"shadow_type\">none</property><child><object class=\"GtkAlignment"
++  "\" id=\"/prefs/editor/home-end/alignment\"><property name=\"visible\">T"
++  "rue</property><property name=\"can_focus\">False</property><property na"
++  "me=\"top_padding\">6</property><property name=\"bottom_padding\">6</pro"
++  "perty><property name=\"left_padding\">12</property><property name=\"rig"
++  "ht_padding\">6</property><child><object class=\"GtkHBox\" id=\"/prefs/e"
++  "ditor/home-end/box\"><property name=\"visible\">True</property><propert"
++  "y name=\"can_focus\">False</property><property name=\"spacing\">6</prop"
++  "erty><child><object class=\"GtkLabel\" id=\"/prefs/editor/home-end/beha"
++  "viour-label\"><property name=\"visible\">True</property><property name="
++  "\"can_focus\">False</property><property name=\"xalign\">0</property><pr"
++  "operty name=\"label\" translatable=\"yes\">Behaviour:</property></objec"
++  "t><packing><property name=\"expand\">False</property><property name=\"f"
++  "ill\">True</property><property name=\"position\">0</property></packing>"
++  "</child><child><object class=\"GtkComboBox\" id=\"/prefs/editor/smart-h"
++  "ome-end-combo\"><property name=\"visible\">True</property><property nam"
++  "e=\"can_focus\">False</property><property name=\"model\">/prefs/editor/"
++  "smart-home-end-model</property><property name=\"active\">0</property><c"
++  "hild><object class=\"GtkCellRendererText\" id=\"/prefs/editor/smart-hom"
++  "e-end-cellrenderer\"/><attributes><attribute name=\"text\">1</attribute"
++  "></attributes></child></object><packing><property name=\"expand\">True<"
++  "/property><property name=\"fill\">True</property><property name=\"posit"
++  "ion\">1</property></packing></child></object></child></object></child><"
++  "child type=\"label\"><object class=\"GtkLabel\" id=\"/prefs/editor/home"
++  "-end/label\"><property name=\"visible\">True</property><property name=\""
+   "can_focus\">False</property><property name=\"label\" translatable=\"yes"
+-  "\">&lt;b&gt;Notebook tabs&lt;/b&gt;</property><property name=\"use_mark"
++  "\">&lt;b&gt;Home/End Keys&lt;/b&gt;</property><property name=\"use_mark"
+   "up\">True</property></object></child></object><packing><property name=\""
+   "expand\">False</property><property name=\"fill\">True</property><proper"
+-  "ty name=\"position\">2</property></packing></child></object><packing><p"
+-  "roperty name=\"position\">2</property></packing></child><child type=\"t"
+-  "ab\"><object class=\"GtkLabel\" id=\"/prefs/window/tab-label\"><propert"
++  "ty name=\"position\">1</property></packing></child></object><packing><p"
++  "roperty name=\"position\">1</property></packing></child><child type=\"t"
++  "ab\"><object class=\"GtkLabel\" id=\"/prefs/editor/tab-label\"><propert"
+   "y name=\"visible\">True</property><property name=\"can_focus\">False</p"
+-  "roperty><property name=\"label\" translatable=\"yes\">Window</property>"
+-  "</object><packing><property name=\"position\">2</property><property nam"
+-  "e=\"tab_fill\">False</property></packing></child></object></interface>"
++  "roperty><property name=\"label\" translatable=\"yes\">Editor</property>"
++  "</object><packing><property name=\"position\">1</property><property nam"
++  "e=\"tab_fill\">False</property></packing></child><child><object class=\""
++  "GtkVBox\" id=\"/prefs/window/content-area\"><property name=\"visible\">"
++  "True</property><property name=\"can_focus\">False</property><property n"
++  "ame=\"border_width\">6</property><property name=\"spacing\">6</property"
++  "><child><object class=\"GtkFrame\" id=\"/prefs/window/general/frame\"><"
++  "property name=\"visible\">True</property><property name=\"can_focus\">F"
++  "alse</property><property name=\"label_xalign\">0</property><property na"
++  "me=\"shadow_type\">none</property><child><object class=\"GtkAlignment\""
++  " id=\"/prefs/window/general/alignment\"><property name=\"visible\">True"
++  "</property><property name=\"can_focus\">False</property><property name="
++  "\"top_padding\">6</property><property name=\"bottom_padding\">6</proper"
++  "ty><property name=\"left_padding\">12</property><property name=\"right_"
++  "padding\">6</property><child><object class=\"GtkVBox\" id=\"/prefs/wind"
++  "ow/general/box\"><property name=\"visible\">True</property><property na"
++  "me=\"can_focus\">False</property><property name=\"spacing\">2</property"
++  "><child><object class=\"GtkCheckButton\" id=\"/prefs/window/general/sho"
++  "w-statusbar-check\"><property name=\"label\" translatable=\"yes\">Show "
++  "status bar</property><property name=\"visible\">True</property><propert"
++  "y name=\"can_focus\">True</property><property name=\"receives_default\""
++  ">False</property><property name=\"draw_indicator\">True</property></obj"
++  "ect><packing><property name=\"expand\">True</property><property name=\""
++  "fill\">True</property><property name=\"position\">0</property></packing"
++  "></child><child><object class=\"GtkCheckButton\" id=\"/prefs/window/gen"
++  "eral/show-path-in-title-check\"><property name=\"label\" translatable=\""
++  "yes\">Show full filename in title bar</property><property name=\"visibl"
++  "e\">True</property><property name=\"can_focus\">True</property><propert"
++  "y name=\"receives_default\">False</property><property name=\"draw_indic"
++  "ator\">True</property></object><packing><property name=\"expand\">True<"
++  "/property><property name=\"fill\">True</property><property name=\"posit"
++  "ion\">1</property></packing></child><child><object class=\"GtkCheckButt"
++  "on\" id=\"/prefs/window/general/remember-window-size-check\"><property "
++  "name=\"label\" translatable=\"yes\">Remember window size</property><pro"
++  "perty name=\"visible\">True</property><property name=\"can_focus\">True"
++  "</property><property name=\"receives_default\">False</property><propert"
++  "y name=\"draw_indicator\">True</property></object><packing><property na"
++  "me=\"expand\">True</property><property name=\"fill\">True</property><pr"
++  "operty name=\"position\">2</property></packing></child><child><object c"
++  "lass=\"GtkCheckButton\" id=\"/prefs/window/general/remember-window-posi"
++  "tion-check\"><property name=\"label\" translatable=\"yes\">Remember win"
++  "dow position</property><property name=\"visible\">True</property><prope"
++  "rty name=\"can_focus\">True</property><property name=\"receives_default"
++  "\">False</property><property name=\"draw_indicator\">True</property></o"
++  "bject><packing><property name=\"expand\">True</property><property name="
++  "\"fill\">True</property><property name=\"position\">3</property></packi"
++  "ng></child><child><object class=\"GtkCheckButton\" id=\"/prefs/window/g"
++  "eneral/remember-window-state-check\"><property name=\"label\" translata"
++  "ble=\"yes\">Remember window state</property><property name=\"visible\">"
++  "True</property><property name=\"can_focus\">True</property><property na"
++  "me=\"receives_default\">False</property><property name=\"draw_indicator"
++  "\">True</property></object><packing><property name=\"expand\">True</pro"
++  "perty><property name=\"fill\">True</property><property name=\"position\""
++  ">4</property></packing></child></object></child></object></child><child"
++  " type=\"label\"><object class=\"GtkLabel\" id=\"/prefs/window/general/l"
++  "abel\"><property name=\"visible\">True</property><property name=\"can_f"
++  "ocus\">False</property><property name=\"label\" translatable=\"yes\">&l"
++  "t;b&gt;General&lt;/b&gt;</property><property name=\"use_markup\">True</"
++  "property></object></child></object><packing><property name=\"expand\">F"
++  "alse</property><property name=\"fill\">True</property><property name=\""
++  "position\">0</property></packing></child><child><object class=\"GtkFram"
++  "e\" id=\"/prefs/window/toolbar/frame\"><property name=\"visible\">True<"
++  "/property><property name=\"can_focus\">False</property><property name=\""
++  "label_xalign\">0</property><property name=\"shadow_type\">none</propert"
++  "y><child><object class=\"GtkAlignment\" id=\"/prefs/window/toolbar/alig"
++  "nment1\"><property name=\"visible\">True</property><property name=\"can"
++  "_focus\">False</property><property name=\"top_padding\">6</property><pr"
++  "operty name=\"bottom_padding\">6</property><property name=\"left_paddin"
++  "g\">12</property><property name=\"right_padding\">6</property><child><o"
++  "bject class=\"GtkTable\" id=\"/prefs/window/toolbar/table\"><property n"
++  "ame=\"visible\">True</property><property name=\"can_focus\">False</prop"
++  "erty><property name=\"n_rows\">3</property><property name=\"n_columns\""
++  ">2</property><property name=\"column_spacing\">6</property><property na"
++  "me=\"row_spacing\">6</property><child><object class=\"GtkCheckButton\" "
++  "id=\"/prefs/window/toolbar/visible-check\"><property name=\"label\" tra"
++  "nslatable=\"yes\">Show toolbar</property><property name=\"visible\">Tru"
++  "e</property><property name=\"can_focus\">True</property><property name="
++  "\"receives_default\">False</property><property name=\"draw_indicator\">"
++  "True</property></object><packing><property name=\"right_attach\">2</pro"
++  "perty></packing></child><child><object class=\"GtkLabel\" id=\"/prefs/w"
++  "indow/toolbar/style-label\"><property name=\"visible\">True</property><"
++  "property name=\"can_focus\">False</property><property name=\"xalign\">0"
++  "</property><property name=\"label\" translatable=\"yes\">Style:</proper"
++  "ty></object><packing><property name=\"top_attach\">1</property><propert"
++  "y name=\"bottom_attach\">2</property><property name=\"x_options\">GTK_F"
++  "ILL</property><property name=\"y_options\">GTK_FILL</property></packing"
++  "></child><child><object class=\"GtkLabel\" id=\"/prefs/window/toolbar/i"
++  "con-size-label\"><property name=\"visible\">True</property><property na"
++  "me=\"can_focus\">False</property><property name=\"xalign\">0</property>"
++  "<property name=\"label\" translatable=\"yes\">Icon Size:</property></ob"
++  "ject><packing><property name=\"top_attach\">2</property><property name="
++  "\"bottom_attach\">3</property><property name=\"x_options\">GTK_FILL</pr"
++  "operty><property name=\"y_options\">GTK_FILL</property></packing></chil"
++  "d><child><object class=\"GtkComboBox\" id=\"/prefs/window/toolbar/style"
++  "-combo\"><property name=\"visible\">True</property><property name=\"can"
++  "_focus\">False</property><property name=\"model\">/prefs/window/toolbar"
++  "/style-model</property><property name=\"active\">0</property><child><ob"
++  "ject class=\"GtkCellRendererText\" id=\"/prefs/window/toolbar/style/cel"
++  "lrenderer\"/><attributes><attribute name=\"text\">1</attribute></attrib"
++  "utes></child></object><packing><property name=\"left_attach\">1</proper"
++  "ty><property name=\"right_attach\">2</property><property name=\"top_att"
++  "ach\">1</property><property name=\"bottom_attach\">2</property></packin"
++  "g></child><child><object class=\"GtkComboBox\" id=\"/prefs/window/toolb"
++  "ar/icon-size-combo\"><property name=\"visible\">True</property><propert"
++  "y name=\"can_focus\">False</property><property name=\"model\">/prefs/wi"
++  "ndow/toolbar/icon-size-model</property><property name=\"active\">0</pro"
++  "perty><child><object class=\"GtkCellRendererText\" id=\"/prefs/window/t"
++  "oolbar/icon-size/cellrenderer1\"/><attributes><attribute name=\"text\">"
++  "1</attribute></attributes></child></object><packing><property name=\"le"
++  "ft_attach\">1</property><property name=\"right_attach\">2</property><pr"
++  "operty name=\"top_attach\">2</property><property name=\"bottom_attach\""
++  ">3</property></packing></child></object></child></object></child><child"
++  " type=\"label\"><object class=\"GtkLabel\" id=\"/prefs/window/toolbar/l"
++  "abel1\"><property name=\"visible\">True</property><property name=\"can_"
++  "focus\">False</property><property name=\"label\" translatable=\"yes\">&"
++  "lt;b&gt;Toolbar&lt;/b&gt;</property><property name=\"use_markup\">True<"
++  "/property></object></child></object><packing><property name=\"expand\">"
++  "False</property><property name=\"fill\">True</property><property name=\""
++  "position\">1</property></packing></child><child><object class=\"GtkFram"
++  "e\" id=\"/prefs/window/notebook/frame\"><property name=\"visible\">True"
++  "</property><property name=\"can_focus\">False</property><property name="
++  "\"label_xalign\">0</property><property name=\"shadow_type\">none</prope"
++  "rty><child><object class=\"GtkAlignment\" id=\"/prefs/window/notebook/a"
++  "lignment\"><property name=\"visible\">True</property><property name=\"c"
++  "an_focus\">False</property><property name=\"top_padding\">6</property><"
++  "property name=\"bottom_padding\">6</property><property name=\"left_padd"
++  "ing\">12</property><property name=\"right_padding\">6</property><child>"
++  "<object class=\"GtkVBox\" id=\"/prefs/window/notebook/box\"><property n"
++  "ame=\"visible\">True</property><property name=\"can_focus\">False</prop"
++  "erty><property name=\"spacing\">2</property><child><object class=\"GtkC"
++  "heckButton\" id=\"/prefs/window/notebook/always-show-tabs-check\"><prop"
++  "erty name=\"label\" translatable=\"yes\">Always show tabs even with one"
++  " file</property><property name=\"visible\">True</property><property nam"
++  "e=\"can_focus\">True</property><property name=\"receives_default\">Fals"
++  "e</property><property name=\"draw_indicator\">True</property></object><"
++  "packing><property name=\"expand\">True</property><property name=\"fill\""
++  ">True</property><property name=\"position\">0</property></packing></chi"
++  "ld><child><object class=\"GtkCheckButton\" id=\"/prefs/window/notebook/"
++  "cycle-tabs-check\"><property name=\"label\" translatable=\"yes\">Cycled"
++  " notebook tab switching</property><property name=\"visible\">True</prop"
++  "erty><property name=\"can_focus\">True</property><property name=\"recei"
++  "ves_default\">False</property><property name=\"yalign\">0.5500000119209"
++  "2896</property><property name=\"draw_indicator\">True</property></objec"
++  "t><packing><property name=\"expand\">True</property><property name=\"fi"
++  "ll\">True</property><property name=\"position\">1</property></packing><"
++  "/child></object></child></object></child><child type=\"label\"><object "
++  "class=\"GtkLabel\" id=\"/prefs/window/notebook/label\"><property name=\""
++  "visible\">True</property><property name=\"can_focus\">False</property><"
++  "property name=\"label\" translatable=\"yes\">&lt;b&gt;Notebook tabs&lt;"
++  "/b&gt;</property><property name=\"use_markup\">True</property></object>"
++  "</child></object><packing><property name=\"expand\">False</property><pr"
++  "operty name=\"fill\">True</property><property name=\"position\">2</prop"
++  "erty></packing></child></object><packing><property name=\"position\">2<"
++  "/property></packing></child><child type=\"tab\"><object class=\"GtkLabe"
++  "l\" id=\"/prefs/window/tab-label\"><property name=\"visible\">True</pro"
++  "perty><property name=\"can_focus\">False</property><property name=\"lab"
++  "el\" translatable=\"yes\">Window</property></object><packing><property "
++  "name=\"position\">2</property><property name=\"tab_fill\">False</proper"
++  "ty></packing></child></object></interface>"
+ };
+ 
+-static const unsigned mousepad_prefs_dialog_ui_length = 30768u;
++static const unsigned mousepad_prefs_dialog_ui_length = 30802u;
+ 
diff -Nru mousepad-0.4.0/debian/patches/series mousepad-0.4.0/debian/patches/series
--- mousepad-0.4.0/debian/patches/series	2015-11-10 12:51:25.000000000 +0000
+++ mousepad-0.4.0/debian/patches/series	2016-06-30 13:06:42.000000000 +0000
@@ -1 +1,3 @@
+01_prevent-a-g_settings-cycle.patch
+02_do-not-manually-update-the-view-theme.patch
 git-width-mismatch.patch