GNOME.org
 

[gedit/gsettings: 6/13] Convert the schema key names to the new format. _ is not allowed anymore.

commit 329fb09a4cf8e9591520130c929fc1607eb180bf
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Thu Apr 22 16:22:08 2010 +0200

    Convert the schema key names to the new format. _ is not allowed anymore.

 data/Makefile.am                   |    4 +-
 data/org.gnome.gedit.gschema.in.in |   88 ++++++++++++++++++------------------
 gedit/gedit-settings.c             |   12 +++---
 gedit/gedit-settings.h             |   74 +++++++++++++++---------------
 4 files changed, 89 insertions(+), 89 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 313fdf2..bb6f90e 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -4,8 +4,8 @@ desktop_DATA 	 = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
 gsettingsschema_in_files = org.gnome.gedit.gschema.in
-gsettingsschema_DATA = $(gsettingsschema_in_files:.gschema.in=.gschema)
-org.gnome.gedit.gschema: org.gnome.gedit.gschema.in
+gsettingsschema_DATA = $(gsettingsschema_in_files:.gschema.in=.gschema.xml)
+org.gnome.gedit.gschema.xml: org.gnome.gedit.gschema.in
 	gsettings-schema-convert -f $< -o $@
 
 man_MANS = gedit.1
diff --git a/data/org.gnome.gedit.gschema.in.in b/data/org.gnome.gedit.gschema.in.in
index ea214c1..9144d06 100644
--- a/data/org.gnome.gedit.gschema.in.in
+++ b/data/org.gnome.gedit.gschema.in.in
@@ -3,66 +3,66 @@ schema org.gnome.gedit:
   
   child preferences:
     child editor:
-      key use_default_font = @b true
-      key editor_font = @s 'Monospace 12'
+      key use-default-font = @b true
+      key editor-font = @s 'Monospace 12'
       key scheme = @s 'classic'
-      key create_backup_copy = @b true
-      key auto_save = @b false
-      key auto_save_interval = @u 10
-      key undo_actions_limit = @u 25
-      key max_undo_actions = @u 2000
-      key wrap_mode = @s 'GTK_WRAP_WORD'
-      key tabs_size = @u 8
-      key insert_spaces = @b false
-      key auto_indent = @b false
-      key display_line_numbers = @b false
-      key highlight_current_line = @b false
-      key bracket_matching = @b false
-      key display_right_margin = @b false
-      key right_margin_position = @u 80
-      key smart_home_end = @s 'after'
-      key writable_vfs_schemes = @as ['dav', 'davs', 'ftp', 'sftp', 'smb', 'ssh']
-      key restore_cursor_position = @b true
-      key syntax_highlighting = @b true
-      key search_highlighting = @b true
+      key create-backup-copy = @b true
+      key auto-save = @b false
+      key auto-save-interval = @u 10
+      key undo-actions-limit = @u 25
+      key max-undo-actions = @u 2000
+      key wrap-mode = @s 'GTK_WRAP_WORD'
+      key tabs-size = @u 8
+      key insert-spaces = @b false
+      key auto-indent = @b false
+      key display-line-numbers = @b false
+      key highlight-current-line = @b false
+      key bracket-matching = @b false
+      key display-right-margin = @b false
+      key right-margin-position = @u 80
+      key smart-home-end = @s 'after'
+      key writable-vfs-schemes = @as ['dav', 'davs', 'ftp', 'sftp', 'smb', 'ssh']
+      key restore-cursor-position = @b true
+      key syntax-highlighting = @b true
+      key search-highlighting = @b true
 
     child ui:
-      key toolbar_visible = @b true
-      key toolbar_buttons_style = @s @TOOLBAR_STYLE@
-      key statusbar_visible = @b true
-      key side_pane_visible = @b false
-      key bottom_pane_visible = @b false
-      key max_recents = @u 5
+      key toolbar-visible = @b true
+      key toolbar-buttons-style = @s '@TOOLBAR_STYLE@'
+      key statusbar-visible = @b true
+      key side-pane-visible = @b false
+      key bottom-pane-visible = @b false
+      key max-recents = @u 5
 
     child print:
-      key print_syntax_highlighting = @b true
-      key print_header = @b true
-      key print_wrap_mode = @s 'GTK_WRAP_WORD'
-      key print_line_numbers = @u 0
-      key print_font_body_pango = @s 'Monospace 9'
-      key print_font_header_pango = @s 'Sans 11'
-      key print_font_numbers_pango = @s 'Sans 8'
+      key print-syntax-highlighting = @b true
+      key print-header = @b true
+      key print-wrap-mode = @s 'GTK_WRAP_WORD'
+      key print-line-numbers = @u 0
+      key print-font-body-pango = @s 'Monospace 9'
+      key print-font-header-pango = @s 'Sans 11'
+      key print-font-numbers-pango = @s 'Sans 8'
 
     child encodings:
-      key auto_detected = @as ['UTF-8', 'CURRENT', 'ISO-8859-15', 'UTF-16']
-      key shown_in_menu = @as ['ISO-8859-15']
+      key auto-detected = @as ['UTF-8', 'CURRENT', 'ISO-8859-15', 'UTF-16']
+      key shown-in-menu = @as ['ISO-8859-15']
 
   child plugins:
-    key active_plugins = @as [ ACTIVE_PLUGINS@]
+    key active-plugins = @as [ ACTIVE_PLUGINS@]
 
   child history:
-    key gedit2_search_for_entry = @as ['']
-    key gedit2_replace_with_entry = @as ['']
+    key gedit2-search-for-entry = @as ['']
+    key gedit2-replace-with-entry = @as ['']
 
 schema org.gnome.Desktop.Lockdown:
   path /desktop/gnome/lockdown/
   
-  key disable_command_line = @b false
-  key disable_printing = @b false
-  key disable_print_setup = @b false
-  key disable_save_to_disk = @b false
+  key disable-command-line = @b false
+  key disable-printing = @b false
+  key disable-print-setup = @b false
+  key disable-save-to-disk = @b false
 
 schema org.gnome.Desktop.Interface:
   path /desktop/gnome/interface/
   
-  key monospace_font_name = @s 'Monospace 10'
+  key monospace-font-name = @s 'Monospace 10'
diff --git a/gedit/gedit-settings.c b/gedit/gedit-settings.c
index 339b1e4..6161e46 100644
--- a/gedit/gedit-settings.c
+++ b/gedit/gedit-settings.c
@@ -34,12 +34,12 @@
 #include "gedit-utils.h"
 #include "gedit-window-private.h"
 
-#define GS_LOCKDOWN_COMMAND_LINE "disable_command_line"
-#define GS_LOCKDOWN_PRINTING "disable_printing"
-#define GS_LOCKDOWN_PRINT_SETUP "disable_print_setup"
-#define GS_LOCKDOWN_SAVE_TO_DISK "disable_save_to_disk"
+#define GS_LOCKDOWN_COMMAND_LINE "disable-command-line"
+#define GS_LOCKDOWN_PRINTING "disable-printing"
+#define GS_LOCKDOWN_PRINT_SETUP "disable-print-setup"
+#define GS_LOCKDOWN_SAVE_TO_DISK "disable-save-to-disk"
 
-#define GS_SYSTEM_FONT "monospace_font_name"
+#define GS_SYSTEM_FONT "monospace-font-name"
 
 #define GEDIT_STATE_DEFAULT_WINDOW_STATE	0
 #define GEDIT_STATE_DEFAULT_WINDOW_WIDTH	650
@@ -1319,7 +1319,7 @@ gedit_settings_get_system_font (GeditSettings *gs)
 
 	g_return_val_if_fail (GEDIT_IS_SETTINGS (gs), NULL);
 	
-	g_settings_get (gs->priv->interface, "monospace_font_name",
+	g_settings_get (gs->priv->interface, "monospace-font-name",
 			"s", &system_font);
 	
 	return system_font;
diff --git a/gedit/gedit-settings.h b/gedit/gedit-settings.h
index 867ebcc..b032d15 100644
--- a/gedit/gedit-settings.h
+++ b/gedit/gedit-settings.h
@@ -110,43 +110,43 @@ gboolean		 gedit_settings_active_file_filter_can_set	(void);
 G_END_DECLS
 
 /* key constants */
-#define GS_USE_DEFAULT_FONT		"use_default_font"
-#define GS_EDITOR_FONT			"editor_font"
+#define GS_USE_DEFAULT_FONT		"use-default-font"
+#define GS_EDITOR_FONT			"editor-font"
 #define GS_SCHEME			"scheme"
-#define GS_CREATE_BACKUP_COPY		"create_backup_copy"
-#define GS_AUTO_SAVE			"auto_save"
-#define GS_AUTO_SAVE_INTERVAL		"auto_save_interval"
-#define GS_UNDO_ACTIONS_LIMIT		"undo_actions_limit"
-#define GS_MAX_UNDO_ACTIONS		"max_undo_actions"
-#define GS_WRAP_MODE			"wrap_mode"
-#define GS_TABS_SIZE			"tabs_size"
-#define GS_INSERT_SPACES		"insert_spaces"
-#define GS_AUTO_INDENT			"auto_indent"
-#define GS_DISPLAY_LINE_NUMBERS		"display_line_numbers"
-#define GS_HIGHLIGHT_CURRENT_LINE	"highlight_current_line"
-#define GS_BRACKET_MATCHING		"bracket_matching"
-#define GS_DISPLAY_RIGHT_MARGIN		"display_right_margin"
-#define GS_RIGHT_MARGIN_POSITION	"right_margin_position"
-#define GS_SMART_HOME_END		"smart_home_end"
-#define GS_WRITABLE_VFS_SCHEMES		"writable_vfs_schemes"
-#define GS_RESTORE_CURSOR_POSITION	"restore_cursor_position"
-#define GS_SYNTAX_HIGHLIGHTING		"syntax_highlighting"
-#define GS_SEARCH_HIGHLIGHTING		"search_highlighting"
-#define GS_TOOLBAR_VISIBLE		"toolbar_visible"
-#define GS_TOOLBAR_BUTTONS_STYLE	"toolbar_buttons_style"
-#define GS_STATUSBAR_VISIBLE		"statusbar_visible"
-#define GS_SIDE_PANE_VISIBLE		"side_pane_visible"
-#define GS_BOTTOM_PANE_VISIBLE		"bottom_pane_visible"
-#define GS_MAX_RECENTS			"max_recents"
-#define GS_PRINT_SYNTAX_HIGHLIGHTING	"print_syntax_highlighting"
-#define GS_PRINT_HEADER			"print_header"
-#define GS_PRINT_WRAP_MODE		"print_wrap_mode"
-#define GS_PRINT_LINE_NUMBERS		"print_line_numbers"
-#define GS_PRINT_FONT_BODY_PANGO	"print_font_body_pango"
-#define GS_PRINT_FONT_HEADER_PANGO	"print_font_header_pango"
-#define GS_PRINT_FONT_NUMBERS_PANGO	"print_font_numbers_pango"
-#define GS_ENCODING_AUTO_DETECTED	"auto_detected"
-#define GS_ENCODING_SHOW_IN_MENU	"show_in_menu"
-#define GS_ACTIVE_PLUGINS		"active_plugins"
+#define GS_CREATE_BACKUP_COPY		"create-backup-copy"
+#define GS_AUTO_SAVE			"auto-save"
+#define GS_AUTO_SAVE_INTERVAL		"auto-save-interval"
+#define GS_UNDO_ACTIONS_LIMIT		"undo-actions-limit"
+#define GS_MAX_UNDO_ACTIONS		"max-undo-actions"
+#define GS_WRAP_MODE			"wrap-mode"
+#define GS_TABS_SIZE			"tabs-size"
+#define GS_INSERT_SPACES		"insert-spaces"
+#define GS_AUTO_INDENT			"auto-indent"
+#define GS_DISPLAY_LINE_NUMBERS		"display-line-numbers"
+#define GS_HIGHLIGHT_CURRENT_LINE	"highlight-current-line"
+#define GS_BRACKET_MATCHING		"bracket-matching"
+#define GS_DISPLAY_RIGHT_MARGIN		"display-right-margin"
+#define GS_RIGHT_MARGIN_POSITION	"right-margin-position"
+#define GS_SMART_HOME_END		"smart-home-end"
+#define GS_WRITABLE_VFS_SCHEMES		"writable-vfs-schemes"
+#define GS_RESTORE_CURSOR_POSITION	"restore-cursor-position"
+#define GS_SYNTAX_HIGHLIGHTING		"syntax-highlighting"
+#define GS_SEARCH_HIGHLIGHTING		"search-highlighting"
+#define GS_TOOLBAR_VISIBLE		"toolbar-visible"
+#define GS_TOOLBAR_BUTTONS_STYLE	"toolbar-buttons-style"
+#define GS_STATUSBAR_VISIBLE		"statusbar-visible"
+#define GS_SIDE_PANE_VISIBLE		"side-pane-visible"
+#define GS_BOTTOM_PANE_VISIBLE		"bottom-pane-visible"
+#define GS_MAX_RECENTS			"max-recents"
+#define GS_PRINT_SYNTAX_HIGHLIGHTING	"print-syntax-highlighting"
+#define GS_PRINT_HEADER			"print-header"
+#define GS_PRINT_WRAP_MODE		"print-wrap-mode"
+#define GS_PRINT_LINE_NUMBERS		"print-line-numbers"
+#define GS_PRINT_FONT_BODY_PANGO	"print-font-body-pango"
+#define GS_PRINT_FONT_HEADER_PANGO	"print-font-header-pango"
+#define GS_PRINT_FONT_NUMBERS_PANGO	"print-font-numbers-pango"
+#define GS_ENCODING_AUTO_DETECTED	"auto-detected"
+#define GS_ENCODING_SHOW_IN_MENU	"show-in-menu"
+#define GS_ACTIVE_PLUGINS		"active-plugins"
 
 #endif /* __GEDIT_SETTINGS_H__ */
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]