using ./config/ instead of ./mate2/

4 files changed, 82 insertions, 82 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
index a137334f..da8ec7d9 100755
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -16,7 +16,7 @@ pkgconfig_DATA = pluma-@[email protected]
 pluma-@[email protected]: pluma.pc
 	cp pluma.pc pluma-@[email protected]
 
-bugreportdir = $(libexecdir)/pluma-2
+bugreportdir = $(libexecdir)/pluma
 bugreport_SCRIPTS = pluma-bugreport.sh
 
 if MATECONF_SCHEMAS_INSTALL
diff --git a/data/pluma-bugreport.sh.in b/data/pluma-bugreport.sh.in
index d59d7969..e62a35ec 100755
--- a/data/pluma-bugreport.sh.in
+++ b/data/pluma-bugreport.sh.in
@@ -20,21 +20,21 @@ echo_padded ()
 #if (which mateconftool-2 >/dev/null)
 #then
 #	echo "MateConf configuration dump:"
-#	mateconftool-2 --dump /apps/pluma-2 | grep -Ev "</?(entry|mateconfentryfile|entrylist|value|schema_key)" | cut -c4-
+#	mateconftool-2 --dump /apps/pluma | grep -Ev "</?(entry|mateconfentryfile|entrylist|value|schema_key)" | cut -c4-
 #	echo
 #fi
 
 echo "Active plugins:"
-mateconftool-2 --get /apps/pluma-2/plugins/active-plugins			\
+mateconftool-2 --get /apps/pluma/plugins/active-plugins			\
 	| sed -r -e 's/^\[(.*)\]$/\1/' -e 's/,/\n/g'			\
 	| sed -e 's/^.*$/  - \0/'
 echo
 
 # Manually installed plugins (in $HOME)
-if [ -d $HOME/.mate2/pluma/plugins ]
+if [ -d $HOME/.config/pluma/plugins ]
 then
 	echo "Plugins in \$HOME:"
-	ls $HOME/.mate2/pluma/plugins/*.pluma-plugin			\
+	ls $HOME/.config/pluma/plugins/*.pluma-plugin			\
 		| sed -r -e 's#.*/([^/]*)\.pluma-plugin$#  - \1#'
 else
 	echo "No plugin installed in \$HOME."
diff --git a/data/pluma.desktop.in.in b/data/pluma.desktop.in.in
index 02960688..9ff96685 100755
--- a/data/pluma.desktop.in.in
+++ b/data/pluma.desktop.in.in
@@ -15,4 +15,4 @@ X-MATE-Bugzilla-Bugzilla=MATE
 X-MATE-Bugzilla-Product=pluma
 X-MATE-Bugzilla-Component=general
 X-MATE-Bugzilla-Version=@VERSION@
-X-MATE-Bugzilla-ExtraInfoScript=@FULL_LIBEXECDIR@/pluma-2/pluma-bugreport.sh
+X-MATE-Bugzilla-ExtraInfoScript=@FULL_LIBEXECDIR@/pluma/pluma-bugreport.sh
diff --git a/data/pluma.schemas.in.in b/data/pluma.schemas.in.in
index 5398bbbf..9fe1532b 100755
--- a/data/pluma.schemas.in.in
+++ b/data/pluma.schemas.in.in
@@ -1,8 +1,8 @@
 <mateconfschemafile>
   <schemalist>
     <schema>
-      <key>/schemas/apps/pluma-2/preferences/editor/font/use_default_font</key>
-      <applyto>/apps/pluma-2/preferences/editor/font/use_default_font</applyto>
+      <key>/schemas/apps/pluma/preferences/editor/font/use_default_font</key>
+      <applyto>/apps/pluma/preferences/editor/font/use_default_font</applyto>
       <owner>pluma</owner>
       <type>bool</type>
       <default>TRUE</default>
@@ -16,8 +16,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/pluma-2/preferences/editor/font/editor_font</key>
-      <applyto>/apps/pluma-2/preferences/editor/font/editor_font</applyto>
+      <key>/schemas/apps/pluma/preferences/editor/font/editor_font</key>
+      <applyto>/apps/pluma/preferences/editor/font/editor_font</applyto>
       <owner>pluma</owner>
       <type>string</type>
       <locale name="C">
@@ -31,8 +31,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/pluma-2/preferences/editor/colors/scheme</key>
-      <applyto>/apps/pluma-2/preferences/editor/colors/scheme</applyto>
+      <key>/schemas/apps/pluma/preferences/editor/colors/scheme</key>
+      <applyto>/apps/pluma/preferences/editor/colors/scheme</applyto>
       <owner>pluma</owner>
       <type>string</type>
       <default>classic</default>
@@ -44,8 +44,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/pluma-2/preferences/editor/save/create_backup_copy</key>
-      <applyto>/apps/pluma-2/preferences/editor/save/create_backup_copy</applyto>
+      <key>/schemas/apps/pluma/preferences/editor/save/create_backup_copy</key>
+      <applyto>/apps/pluma/preferences/editor/save/create_backup_copy</applyto>
       <owner>pluma</owner>
       <type>bool</type>
       <default>FALSE</default>
@@ -58,8 +58,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/pluma-2/preferences/editor/save/auto_save</key>
-      <applyto>/apps/pluma-2/preferences/editor/save/auto_save</applyto>
+      <key>/schemas/apps/pluma/preferences/editor/save/auto_save</key>
+      <applyto>/apps/pluma/preferences/editor/save/auto_save</applyto>
       <owner>pluma</owner>
       <type>bool</type>
       <default>FALSE</default>
@@ -72,8 +72,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/pluma-2/preferences/editor/save/auto_save_interval</key>
-      <applyto>/apps/pluma-2/preferences/editor/save/auto_save_interval</applyto>
+      <key>/schemas/apps/pluma/preferences/editor/save/auto_save_interval</key>
+      <applyto>/apps/pluma/preferences/editor/save/auto_save_interval</applyto>
       <owner>pluma</owner>
       <type>int</type>
       <default>10</default>
@@ -86,8 +86,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/pluma-2/preferences/editor/undo/undo_actions_limit</key>
-      <applyto>/apps/pluma-2/preferences/editor/undo/undo_actions_limit</applyto>
+      <key>/schemas/apps/pluma/preferences/editor/undo/undo_actions_limit</key>
+      <applyto>/apps/pluma/preferences/editor/undo/undo_actions_limit</applyto>
       <owner>pluma</owner>
       <type>int</type>
       <default>25</default>
@@ -100,8 +100,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/pluma-2/preferences/editor/undo/max_undo_actions</key>
-      <applyto>/apps/pluma-2/preferences/editor/undo/max_undo_actions</applyto>
+      <key>/schemas/apps/pluma/preferences/editor/undo/max_undo_actions</key>
+      <applyto>/apps/pluma/preferences/editor/undo/max_undo_actions</applyto>
       <owner>pluma</owner>
       <type>int</type>
       <default>2000</default>
@@ -113,8 +113,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/pluma-2/preferences/editor/wrap_mode/wrap_mode</key>
-      <applyto>/apps/pluma-2/preferences/editor/wrap_mode/wrap_mode</applyto>
+      <key>/schemas/apps/pluma/preferences/editor/wrap_mode/wrap_mode</key>
+      <applyto>/apps/pluma/preferences/editor/wrap_mode/wrap_mode</applyto>
       <owner>pluma</owner>
       <type>string</type>
       <default>GTK_WRAP_WORD</default>
@@ -130,8 +130,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/pluma-2/preferences/editor/tabs/tabs_size</key>
-      <applyto>/apps/pluma-2/preferences/editor/tabs/tabs_size</applyto>
+      <key>/schemas/apps/pluma/preferences/editor/tabs/tabs_size</key>
+      <applyto>/apps/pluma/preferences/editor/tabs/tabs_size</applyto>
       <owner>pluma</owner>
       <type>int</type>
       <default>8</default>
@@ -143,8 +143,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/pluma-2/preferences/editor/tabs/insert_spaces</key>
-      <applyto>/apps/pluma-2/preferences/editor/tabs/insert_spaces</applyto>
+      <key>/schemas/apps/pluma/preferences/editor/tabs/insert_spaces</key>
+      <applyto>/apps/pluma/preferences/editor/tabs/insert_spaces</applyto>
       <owner>pluma</owner>
       <type>bool</type>
       <default>FALSE</default>
@@ -155,8 +155,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/pluma-2/preferences/editor/auto_indent/auto_indent</key>
-      <applyto>/apps/pluma-2/preferences/editor/auto_indent/auto_indent</applyto>
+      <key>/schemas/apps/pluma/preferences/editor/auto_indent/auto_indent</key>
+      <applyto>/apps/pluma/preferences/editor/auto_indent/auto_indent</applyto>
       <owner>pluma</owner>
       <type>bool</type>
       <default>FALSE</default>
@@ -167,8 +167,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/pluma-2/preferences/editor/line_numbers/display_line_numbers</key>
-      <applyto>/apps/pluma-2/preferences/editor/line_numbers/display_line_numbers</applyto>
+      <key>/schemas/apps/pluma/preferences/editor/line_numbers/display_line_numbers</key>
+      <applyto>/apps/pluma/preferences/editor/line_numbers/display_line_numbers</applyto>
       <owner>pluma</owner>
       <type>bool</type>
       <default>FALSE</default>
@@ -180,8 +180,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/pluma-2/preferences/editor/current_line/highlight_current_line</key>
-      <applyto>/apps/pluma-2/preferences/editor/current_line/highlight_current_line</applyto>
+      <key>/schemas/apps/pluma/preferences/editor/current_line/highlight_current_line</key>
+      <applyto>/apps/pluma/preferences/editor/current_line/highlight_current_line</applyto>
       <owner>pluma</owner>
       <type>bool</type>
       <default>FALSE</default>
@@ -192,8 +192,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/pluma-2/preferences/editor/bracket_matching/bracket_matching</key>
-      <applyto>/apps/pluma-2/preferences/editor/bracket_matching/bracket_matching</applyto>
+      <key>/schemas/apps/pluma/preferences/editor/bracket_matching/bracket_matching</key>
+      <applyto>/apps/pluma/preferences/editor/bracket_matching/bracket_matching</applyto>
       <owner>pluma</owner>
       <type>bool</type>
       <default>FALSE</default>
@@ -204,8 +204,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/pluma-2/preferences/editor/right_margin/display_right_margin</key>
-      <applyto>/apps/pluma-2/preferences/editor/right_margin/display_right_margin</applyto>
+      <key>/schemas/apps/pluma/preferences/editor/right_margin/display_right_margin</key>
+      <applyto>/apps/pluma/preferences/editor/right_margin/display_right_margin</applyto>
       <owner>pluma</owner>
       <type>bool</type>
       <default>FALSE</default>
@@ -217,8 +217,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/pluma-2/preferences/editor/right_margin/right_margin_position</key>
-      <applyto>/apps/pluma-2/preferences/editor/right_margin/right_margin_position</applyto>
+      <key>/schemas/apps/pluma/preferences/editor/right_margin/right_margin_position</key>
+      <applyto>/apps/pluma/preferences/editor/right_margin/right_margin_position</applyto>
       <owner>pluma</owner>
       <type>int</type>
       <default>80</default>
@@ -229,8 +229,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/pluma-2/preferences/editor/smart_home_end/smart_home_end</key>
-      <applyto>/apps/pluma-2/preferences/editor/smart_home_end/smart_home_end</applyto>
+      <key>/schemas/apps/pluma/preferences/editor/smart_home_end/smart_home_end</key>
+      <applyto>/apps/pluma/preferences/editor/smart_home_end/smart_home_end</applyto>
       <owner>pluma</owner>
       <type>string</type>
       <default>after</default>
@@ -248,8 +248,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/pluma-2/preferences/ui/toolbar/toolbar_visible</key>
-      <applyto>/apps/pluma-2/preferences/ui/toolbar/toolbar_visible</applyto>
+      <key>/schemas/apps/pluma/preferences/ui/toolbar/toolbar_visible</key>
+      <applyto>/apps/pluma/preferences/ui/toolbar/toolbar_visible</applyto>
       <owner>pluma</owner>
       <type>bool</type>
       <default>TRUE</default>
@@ -260,8 +260,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/pluma-2/preferences/ui/toolbar/toolbar_buttons_style</key>
-      <applyto>/apps/pluma-2/preferences/ui/toolbar/toolbar_buttons_style</applyto>
+      <key>/schemas/apps/pluma/preferences/ui/toolbar/toolbar_buttons_style</key>
+      <applyto>/apps/pluma/preferences/ui/toolbar/toolbar_buttons_style</applyto>
       <owner>pluma</owner>
       <type>string</type>
       <default>@TOOLBAR_STYLE@</default>
@@ -278,8 +278,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/pluma-2/preferences/ui/statusbar/statusbar_visible</key>
-      <applyto>/apps/pluma-2/preferences/ui/statusbar/statusbar_visible</applyto>
+      <key>/schemas/apps/pluma/preferences/ui/statusbar/statusbar_visible</key>
+      <applyto>/apps/pluma/preferences/ui/statusbar/statusbar_visible</applyto>
       <owner>pluma</owner>
       <type>bool</type>
       <default>TRUE</default>
@@ -291,8 +291,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/pluma-2/preferences/ui/side_pane/side_pane_visible</key>
-      <applyto>/apps/pluma-2/preferences/ui/side_pane/side_pane_visible</applyto>
+      <key>/schemas/apps/pluma/preferences/ui/side_pane/side_pane_visible</key>
+      <applyto>/apps/pluma/preferences/ui/side_pane/side_pane_visible</applyto>
       <owner>pluma</owner>
       <type>bool</type>
       <default>FALSE</default>
@@ -304,8 +304,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/pluma-2/preferences/ui/bottom_panel/bottom_panel_visible</key>
-      <applyto>/apps/pluma-2/preferences/ui/bottom_panel/bottom_panel_visible</applyto>
+      <key>/schemas/apps/pluma/preferences/ui/bottom_panel/bottom_panel_visible</key>
+      <applyto>/apps/pluma/preferences/ui/bottom_panel/bottom_panel_visible</applyto>
       <owner>pluma</owner>
       <type>bool</type>
       <default>FALSE</default>
@@ -317,8 +317,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/pluma-2/preferences/print/page/print_syntax_highlighting</key>
-      <applyto>/apps/pluma-2/preferences/print/page/print_syntax_highlighting</applyto>
+      <key>/schemas/apps/pluma/preferences/print/page/print_syntax_highlighting</key>
+      <applyto>/apps/pluma/preferences/print/page/print_syntax_highlighting</applyto>
       <owner>pluma</owner>
       <type>bool</type>
       <default>TRUE</default>
@@ -330,8 +330,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/pluma-2/preferences/print/page/print_header</key>
-      <applyto>/apps/pluma-2/preferences/print/page/print_header</applyto>
+      <key>/schemas/apps/pluma/preferences/print/page/print_header</key>
+      <applyto>/apps/pluma/preferences/print/page/print_header</applyto>
       <owner>pluma</owner>
       <type>bool</type>
       <default>TRUE</default>
@@ -343,8 +343,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/pluma-2/preferences/print/page/print_wrap_mode</key>
-      <applyto>/apps/pluma-2/preferences/print/page/print_wrap_mode</applyto>
+      <key>/schemas/apps/pluma/preferences/print/page/print_wrap_mode</key>
+      <applyto>/apps/pluma/preferences/print/page/print_wrap_mode</applyto>
       <owner>pluma</owner>
       <type>string</type>
       <default>GTK_WRAP_WORD</default>
@@ -360,8 +360,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/pluma-2/preferences/print/page/print_line_numbers</key>
-      <applyto>/apps/pluma-2/preferences/print/page/print_line_numbers</applyto>
+      <key>/schemas/apps/pluma/preferences/print/page/print_line_numbers</key>
+      <applyto>/apps/pluma/preferences/print/page/print_line_numbers</applyto>
       <owner>pluma</owner>
       <type>int</type>
       <default>0</default>
@@ -374,8 +374,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/pluma-2/preferences/print/fonts/print_font_body_pango</key>
-      <applyto>/apps/pluma-2/preferences/print/fonts/print_font_body_pango</applyto>
+      <key>/schemas/apps/pluma/preferences/print/fonts/print_font_body_pango</key>
+      <applyto>/apps/pluma/preferences/print/fonts/print_font_body_pango</applyto>
       <owner>pluma</owner>
       <type>string</type>
       <locale name="C">
@@ -388,8 +388,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/pluma-2/preferences/print/fonts/print_font_header_pango</key>
-      <applyto>/apps/pluma-2/preferences/print/fonts/print_font_header_pango</applyto>
+      <key>/schemas/apps/pluma/preferences/print/fonts/print_font_header_pango</key>
+      <applyto>/apps/pluma/preferences/print/fonts/print_font_header_pango</applyto>
       <owner>pluma</owner>
       <type>string</type>
       <locale name="C">
@@ -403,8 +403,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/pluma-2/preferences/print/fonts/print_font_numbers_pango</key>
-      <applyto>/apps/pluma-2/preferences/print/fonts/print_font_numbers_pango</applyto>
+      <key>/schemas/apps/pluma/preferences/print/fonts/print_font_numbers_pango</key>
+      <applyto>/apps/pluma/preferences/print/fonts/print_font_numbers_pango</applyto>
       <owner>pluma</owner>
       <type>string</type>
       <locale name="C">
@@ -418,8 +418,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/pluma-2/preferences/ui/recents/max_recents</key>
-      <applyto>/apps/pluma-2/preferences/ui/recents/max_recents</applyto>
+      <key>/schemas/apps/pluma/preferences/ui/recents/max_recents</key>
+      <applyto>/apps/pluma/preferences/ui/recents/max_recents</applyto>
       <owner>pluma</owner>
       <type>int</type>
       <default>5</default>
@@ -431,8 +431,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/pluma-2/preferences/encodings/auto_detected</key>
-      <applyto>/apps/pluma-2/preferences/encodings/auto_detected</applyto>
+      <key>/schemas/apps/pluma/preferences/encodings/auto_detected</key>
+      <applyto>/apps/pluma/preferences/encodings/auto_detected</applyto>
       <owner>pluma</owner>
       <type>list</type>
       <list_type>string</list_type>
@@ -455,8 +455,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/pluma-2/preferences/encodings/shown_in_menu</key>
-      <applyto>/apps/pluma-2/preferences/encodings/shown_in_menu</applyto>
+      <key>/schemas/apps/pluma/preferences/encodings/shown_in_menu</key>
+      <applyto>/apps/pluma/preferences/encodings/shown_in_menu</applyto>
       <owner>pluma</owner>
       <type>list</type>
       <list_type>string</list_type>
@@ -470,8 +470,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/pluma-2/preferences/syntax_highlighting/enable</key>
-      <applyto>/apps/pluma-2/preferences/syntax_highlighting/enable</applyto>
+      <key>/schemas/apps/pluma/preferences/syntax_highlighting/enable</key>
+      <applyto>/apps/pluma/preferences/syntax_highlighting/enable</applyto>
       <owner>pluma</owner>
       <type>bool</type>
       <default>TRUE</default>
@@ -482,8 +482,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/pluma-2/plugins/active-plugins</key>
-      <applyto>/apps/pluma-2/plugins/active-plugins</applyto>
+      <key>/schemas/apps/pluma/plugins/active-plugins</key>
+      <applyto>/apps/pluma/plugins/active-plugins</applyto>
       <owner>pluma</owner>
       <type>list</type>
       <list_type>string</list_type>
@@ -496,8 +496,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/pluma-2/preferences/editor/save/writable_vfs_schemes</key>
-      <applyto>/apps/pluma-2/preferences/editor/save/writable_vfs_schemes</applyto>
+      <key>/schemas/apps/pluma/preferences/editor/save/writable_vfs_schemes</key>
+      <applyto>/apps/pluma/preferences/editor/save/writable_vfs_schemes</applyto>
       <owner>pluma</owner>
       <type>list</type>
       <list_type>string</list_type>
@@ -510,8 +510,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/pluma-2/preferences/editor/cursor_position/restore_cursor_position</key>
-      <applyto>/apps/pluma-2/preferences/editor/cursor_position/restore_cursor_position</applyto>
+      <key>/schemas/apps/pluma/preferences/editor/cursor_position/restore_cursor_position</key>
+      <applyto>/apps/pluma/preferences/editor/cursor_position/restore_cursor_position</applyto>
       <owner>pluma</owner>
       <type>bool</type>
       <default>TRUE</default>
@@ -522,8 +522,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/pluma-2/preferences/editor/search_highlighting/enable</key>
-      <applyto>/apps/pluma-2/preferences/editor/search_highlighting/enable</applyto>
+      <key>/schemas/apps/pluma/preferences/editor/search_highlighting/enable</key>
+      <applyto>/apps/pluma/preferences/editor/search_highlighting/enable</applyto>
       <owner>pluma</owner>
       <type>bool</type>
       <default>TRUE</default>