[gnome-builder/wip/slaf/beautifier: 15/15] beautifier plugin: update config files

[Sébastien Lafargue <slafargue src gnome org>]

commit 44ec0ba02dcaa915cd1fafa6ba0fd07de447e9cc
Author: Sebastien Lafargue <slafargue gnome org>
Date:   Mon Dec 5 00:55:24 2016 +0100

    beautifier plugin: update config files

 .beautifier/c/config.ini                           |   20 ++++++++------------
 .../c/{clang-format.cfg => gb-clang-format.cfg}    |    0
 .../c/{gnome-builder.cfg => gb-uncrustify.cfg}     |    0
 .beautifier/global.ini                             |    2 +-
 plugins/beautifier/data/c-sharp/config.ini         |   10 +++++-----
 plugins/beautifier/data/c/config.ini               |   18 ++++++++++--------
 plugins/beautifier/data/d/config.ini               |    8 ++++----
 plugins/beautifier/data/global.ini                 |    2 +-
 plugins/beautifier/data/objc/config.ini            |    8 ++++----
 9 files changed, 33 insertions(+), 35 deletions(-)
---
diff --git a/.beautifier/c/config.ini b/.beautifier/c/config.ini
index 3b79ccf..8c53e2b 100644
--- a/.beautifier/c/config.ini
+++ b/.beautifier/c/config.ini
@@ -1,21 +1,17 @@
 # C language config file
-# Possible commands: uncrustify
 
 [global]
 
-default = gnome-builder.cfg
+default = uncrustify
 
-[gnome-builder.cfg]
+[uncrustify]
 
-command = uncrustify
-name = GNOME Builder project
+command-pattern = uncrustify -c @c@ -f @s@
+config = gb-uncrustify.cfg
+name = GNOME Builder uncrustify
 
-[clang-format.cfg]
+[clang-format]
 
 command = clang-format
-name = GNOME Builder project clang-format
-
-[fake.cfg]
-
-command-pattern = uncrustify -c @c@ -f @s@
-name = GNOME Builder project pattern
+config = gb-clang-format.cfg
+name = GNOME Builder clang-format
diff --git a/.beautifier/c/clang-format.cfg b/.beautifier/c/gb-clang-format.cfg
similarity index 100%
rename from .beautifier/c/clang-format.cfg
rename to .beautifier/c/gb-clang-format.cfg
diff --git a/.beautifier/c/gnome-builder.cfg b/.beautifier/c/gb-uncrustify.cfg
similarity index 100%
rename from .beautifier/c/gnome-builder.cfg
rename to .beautifier/c/gb-uncrustify.cfg
diff --git a/.beautifier/global.ini b/.beautifier/global.ini
index acb0cfb..1b947f6 100644
--- a/.beautifier/global.ini
+++ b/.beautifier/global.ini
@@ -2,5 +2,5 @@
 [chdr]
 
 map = c
-default = gnome-builder.cfg
+default = uncrustify
 
diff --git a/plugins/beautifier/data/c-sharp/config.ini b/plugins/beautifier/data/c-sharp/config.ini
index d931e13..9db426c 100644
--- a/plugins/beautifier/data/c-sharp/config.ini
+++ b/plugins/beautifier/data/c-sharp/config.ini
@@ -1,10 +1,10 @@
 # C-Sharp/mono language config file
-# Possible commands: uncrustify
 [global]
 
-default = mono.cfg
+default = mono
 
-[mono.cfg]
+[mono]
 
-command = uncrustify
-name = C-sharp uncrustify
+command-pattern = uncrustify -c @c@ -f @s@
+config = mono.cfg
+name = Mono and C-sharp uncrustify
diff --git a/plugins/beautifier/data/c/config.ini b/plugins/beautifier/data/c/config.ini
index 4004cdb..6cea913 100644
--- a/plugins/beautifier/data/c/config.ini
+++ b/plugins/beautifier/data/c/config.ini
@@ -1,21 +1,23 @@
 # C language config file
-# Possible commands: uncrustify
 
 [global]
 
-default = gnu-ident.cfg
+default = gnu
 
-[gnu-indent.cfg]
+[gnu]
 
-command = uncrustify
+command-pattern = uncrustify -c @c@ -f @s@
+config = gnu-indent.cfg
 name = Gnu identation
 
-[k&r.cfg]
+[k&r]
 
-command = uncrustify
+command-pattern = uncrustify -c @c@ -f @s@
+config = k&r.cfg
 name = Kernighan and Ritchie
 
-[linux-kernel.cfg]
+[linux-kernel]
 
-command = uncrustify
+command-pattern = uncrustify -c @c@ -f @s@
+config = linux-kernel.cfg
 name = Linux Kernel
diff --git a/plugins/beautifier/data/d/config.ini b/plugins/beautifier/data/d/config.ini
index 12e4f5c..8cb16c4 100644
--- a/plugins/beautifier/data/d/config.ini
+++ b/plugins/beautifier/data/d/config.ini
@@ -1,11 +1,11 @@
 # D language config file
-# Possible commands: uncrustify
 
 [global]
 
-default = d.cfg
+default = d
 
-[d.cfg]
+[d]
 
-command = uncrustify
+command-pattern = uncrustify -c @c@ -f @s@
+config = d.cfg
 name = D uncrustify
diff --git a/plugins/beautifier/data/global.ini b/plugins/beautifier/data/global.ini
index b7e1280..e2e1c72 100644
--- a/plugins/beautifier/data/global.ini
+++ b/plugins/beautifier/data/global.ini
@@ -2,5 +2,5 @@
 [chdr]
 
 map = c
-default = k&r.cfg
+default = k&r
 
diff --git a/plugins/beautifier/data/objc/config.ini b/plugins/beautifier/data/objc/config.ini
index debd875..6cc062a 100644
--- a/plugins/beautifier/data/objc/config.ini
+++ b/plugins/beautifier/data/objc/config.ini
@@ -1,11 +1,11 @@
 # Objective C language config file
-# Possible commands: uncrustify
 
 [global]
 
-default = objc.cfg
+default = objc
 
-[objc.cfg]
+[objc]
 
-command = uncrustify
+command-pattern = uncrustify -c @c@ -f @s@
+config = objc.cfg
 name = Objective C uncrustify