GNOME.org
 

[gedit/gsettings] Use the new api getters and setters.

commit de34f5920a6730ee217848c8db515e09a2a90c3d
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Fri Apr 23 16:50:44 2010 +0200

    Use the new api getters and setters.

 gedit/dialogs/gedit-preferences-dialog.c |   36 +++++++------
 gedit/gedit-document-saver.c             |    4 +-
 gedit/gedit-document.c                   |   18 +++---
 gedit/gedit-io-error-message-area.c      |    4 +-
 gedit/gedit-print-job.c                  |   84 +++++++++++++++---------------
 gedit/gedit-settings.c                   |   64 +++++++++++-----------
 gedit/gedit-tab.c                        |    6 +-
 gedit/gedit-view.c                       |   36 ++++++------
 gedit/gedit-window.c                     |   40 +++++++-------
 9 files changed, 147 insertions(+), 145 deletions(-)
---
diff --git a/gedit/dialogs/gedit-preferences-dialog.c b/gedit/dialogs/gedit-preferences-dialog.c
index 7eed639..b7e201a 100644
--- a/gedit/dialogs/gedit-preferences-dialog.c
+++ b/gedit/dialogs/gedit-preferences-dialog.c
@@ -192,7 +192,7 @@ on_auto_save_changed (GSettings              *settings,
 
 	gedit_debug (DEBUG_PREFS);
 	
-	g_settings_get (settings, key, "b", &value);
+	value = g_settings_get_boolean (settings, key);
 
 	if (value)
 	{
@@ -212,7 +212,7 @@ setup_editor_page (GeditPreferencesDialog *dlg)
 	gedit_debug (DEBUG_PREFS);
 
 	/* Get values */
-	g_settings_get (dlg->priv->editor, GS_AUTO_SAVE, "b", &auto_save);
+	auto_save = g_settings_get_boolean (dlg->priv->editor, GS_AUTO_SAVE);
 
 	/* Set widget sensitivity */
 	gtk_widget_set_sensitive (dlg->priv->auto_save_spinbutton,
@@ -250,7 +250,7 @@ setup_editor_page (GeditPreferencesDialog *dlg)
 			 "value",
 			 G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
 	g_signal_connect (dlg->priv->editor,
-			  "changed::auto_save",
+			  "changed::auto-save",
 			  G_CALLBACK (on_auto_save_changed),
 			  dlg);
 	g_settings_bind (dlg->priv->editor,
@@ -272,7 +272,7 @@ wrap_mode_checkbutton_toggled (GtkToggleButton        *button,
 		
 		wrap_str = gedit_utils_get_wrap_str (GTK_WRAP_NONE);
 	
-		g_settings_set (dlg->priv->editor, GS_WRAP_MODE, "s", wrap_str);
+		g_settings_set_string (dlg->priv->editor, GS_WRAP_MODE, wrap_str);
 		g_free (wrap_str);
 		
 		gtk_widget_set_sensitive (dlg->priv->split_checkbutton, 
@@ -304,7 +304,7 @@ wrap_mode_checkbutton_toggled (GtkToggleButton        *button,
 			wrap_str = gedit_utils_get_wrap_str (GTK_WRAP_CHAR);
 		}
 		
-		g_settings_set (dlg->priv->editor, GS_WRAP_MODE, "s", wrap_str);
+		g_settings_set_string (dlg->priv->editor, GS_WRAP_MODE, wrap_str);
 		g_free (wrap_str);
 	}
 }
@@ -319,7 +319,7 @@ right_margin_checkbutton_toggled (GtkToggleButton        *button,
 
 	active = gtk_toggle_button_get_active (button);
 	
-	g_settings_set (dlg->priv->editor, GS_DISPLAY_RIGHT_MARGIN, "b", active);
+	g_settings_set_boolean (dlg->priv->editor, GS_DISPLAY_RIGHT_MARGIN, active);
 
 	gtk_widget_set_sensitive (dlg->priv->right_margin_position_hbox,
 				  active);
@@ -336,9 +336,10 @@ setup_view_page (GeditPreferencesDialog *dlg)
 	gedit_debug (DEBUG_PREFS);
 	
 	/* Get values */
-	g_settings_get (dlg->priv->editor, GS_WRAP_MODE, "s", &wrap_mode_str);
-	g_settings_get (dlg->priv->editor, GS_DISPLAY_RIGHT_MARGIN,
-			"b", &display_right_margin);
+	wrap_mode_str = g_settings_get_string (dlg->priv->editor,
+					       GS_WRAP_MODE);
+	display_right_margin = g_settings_get_boolean (dlg->priv->editor,
+						       GS_DISPLAY_RIGHT_MARGIN);
 	g_settings_get (dlg->priv->editor, GS_RIGHT_MARGIN_POSITION,
 			"u", &right_margin_position);
 	
@@ -423,7 +424,7 @@ on_use_default_font_changed (GSettings              *settings,
 	
 	gedit_debug (DEBUG_PREFS);
 
-	g_settings_get (settings, key, "b", &value);
+	value = g_settings_get_boolean (settings, key);
 
 	if (value)
 	{
@@ -458,8 +459,8 @@ setup_font_colors_page_font_section (GeditPreferencesDialog *dlg)
 	/* Get values */
 	toplevel = gedit_app_get_settings (gedit_app_get_default (), NULL);
 	system_font = gedit_settings_get_system_font (GEDIT_SETTINGS (toplevel));
-	g_settings_get (dlg->priv->editor, GS_USE_DEFAULT_FONT,
-			"b", &use_default_font);
+	use_default_font = g_settings_get_boolean (dlg->priv->editor,
+						   GS_USE_DEFAULT_FONT);
 	g_object_unref (toplevel);
 
 	label = g_strdup_printf(_("_Use the system fixed width font (%s)"),
@@ -475,7 +476,7 @@ setup_font_colors_page_font_section (GeditPreferencesDialog *dlg)
 
 	/* Connect signals */
 	g_signal_connect (dlg->priv->editor,
-			  "changed::use_default_font",
+			  "changed::use-default-font",
 			  G_CALLBACK (on_use_default_font_changed),
 			  dlg);
 	g_settings_bind (dlg->priv->editor,
@@ -526,7 +527,7 @@ style_scheme_changed (GtkWidget              *treeview,
 	gtk_tree_model_get (GTK_TREE_MODEL (dlg->priv->schemes_treeview_model),
 			    &iter, ID_COLUMN, &id, -1);
 
-	g_settings_set (dlg->priv->editor, GS_SCHEME, "s", id);
+	g_settings_set_string (dlg->priv->editor, GS_SCHEME, id);
 
 	set_buttons_sensisitivity_according_to_scheme (dlg, id);
 
@@ -544,7 +545,7 @@ ensure_color_scheme_id (GeditPreferencesDialog *dlg,
 	{
 		gchar *pref_id;
 
-		g_settings_get (dlg->priv->editor, GS_SCHEME, "s", &pref_id);
+		pref_id = g_settings_get_string (dlg->priv->editor, GS_SCHEME);
 		
 		scheme = gtk_source_style_scheme_manager_get_scheme (manager,
 								     pref_id);
@@ -665,7 +666,7 @@ add_scheme_chooser_response_cb (GtkDialog              *chooser,
 		return;
 	}
 	
-	g_settings_set (dlg->priv->editor, GS_SCHEME, "s", scheme_id);
+	g_settings_set_string (dlg->priv->editor, GS_SCHEME, scheme_id);
 
 	scheme_id = populate_color_scheme_list (dlg, scheme_id);
 
@@ -805,7 +806,8 @@ uninstall_scheme_clicked (GtkButton              *button,
 			
 			if (real_new_id != NULL)
 			{
-				g_settings_set (dlg->priv->editor, GS_SCHEME, "s", real_new_id);
+				g_settings_set_string (dlg->priv->editor,
+						       GS_SCHEME, real_new_id);
 			}
 		}
 
diff --git a/gedit/gedit-document-saver.c b/gedit/gedit-document-saver.c
index b72681c..ba23e77 100644
--- a/gedit/gedit-document-saver.c
+++ b/gedit/gedit-document-saver.c
@@ -322,8 +322,8 @@ gedit_document_saver_save (GeditDocumentSaver     *saver,
 	if ((saver->flags & GEDIT_DOCUMENT_SAVE_PRESERVE_BACKUP) != 0)
 		saver->keep_backup = FALSE;
 	else
-		g_settings_get (saver->editor_settings, GS_CREATE_BACKUP_COPY,
-				"b", &saver->keep_backup);
+		saver->keep_backup = g_settings_get_boolean (saver->editor_settings,
+							     GS_CREATE_BACKUP_COPY);
 
 	GEDIT_DOCUMENT_SAVER_GET_CLASS (saver)->save (saver, old_mtime);
 }
diff --git a/gedit/gedit-document.c b/gedit/gedit-document.c
index 00ee99d..830cf60 100644
--- a/gedit/gedit-document.c
+++ b/gedit/gedit-document.c
@@ -680,8 +680,8 @@ set_language (GeditDocument     *doc,
 	{
 		gboolean syntax_hl;
 		
-		g_settings_get (doc->priv->editor_settings, GS_SYNTAX_HIGHLIGHTING,
-				"b", &syntax_hl);
+		syntax_hl = g_settings_get_boolean (doc->priv->editor_settings,
+						    GS_SYNTAX_HIGHLIGHTING);
 		
 		gtk_source_buffer_set_highlight_syntax (GTK_SOURCE_BUFFER (doc),
 							syntax_hl);
@@ -735,7 +735,7 @@ get_default_style_scheme (GSettings *editor_settings)
 	GtkSourceStyleSchemeManager *manager;
 
 	manager = gedit_get_style_scheme_manager ();
-	g_settings_get (editor_settings, GS_SCHEME, "s", &scheme_id);
+	scheme_id = g_settings_get_string (editor_settings, GS_SCHEME);
 	def_style = gtk_source_style_scheme_manager_get_scheme (manager,
 								scheme_id);
 
@@ -921,10 +921,10 @@ gedit_document_init (GeditDocument *doc)
 
 	g_settings_get (doc->priv->editor_settings, GS_MAX_UNDO_ACTIONS,
 			"u", &undo_actions);
-	g_settings_get (doc->priv->editor_settings, GS_BRACKET_MATCHING,
-			"b", &bracket_matching);
-	g_settings_get (doc->priv->editor_settings, GS_SEARCH_HIGHLIGHTING,
-			"b", &search_hl);
+	bracket_matching = g_settings_get_boolean (doc->priv->editor_settings,
+						   GS_BRACKET_MATCHING);
+	search_hl = g_settings_get_boolean (doc->priv->editor_settings,
+					    GS_SEARCH_HIGHLIGHTING);
 
 	gtk_source_buffer_set_max_undo_levels (GTK_SOURCE_BUFFER (doc), 
 					       undo_actions);
@@ -1292,8 +1292,8 @@ document_loader_loaded (GeditDocumentLoader *loader,
 		gedit_document_set_newline_type (doc,
 		                                 gedit_document_loader_get_newline_type (loader));
 
-		g_settings_get (doc->priv->editor_settings, GS_RESTORE_CURSOR_POSITION,
-				"b", &restore_cursor);
+		restore_cursor = g_settings_get_boolean (doc->priv->editor_settings,
+							 GS_RESTORE_CURSOR_POSITION);
 
 		/* move the cursor at the requested line if any */
 		if (doc->priv->requested_line_pos > 0)
diff --git a/gedit/gedit-io-error-message-area.c b/gedit/gedit-io-error-message-area.c
index 4bee73b..37c4723 100644
--- a/gedit/gedit-io-error-message-area.c
+++ b/gedit/gedit-io-error-message-area.c
@@ -1054,8 +1054,8 @@ gedit_no_backup_saving_error_message_area_new (const gchar  *uri,
 	editor_settings = gedit_app_get_settings (gedit_app_get_default (),
 						  "preferences", "editor", NULL);
 
-	g_settings_get (editor_settings, GS_CREATE_BACKUP_COPY,
-			"b", &create_backup_copy);
+	create_backup_copy = g_settings_get_boolean (editor_settings,
+						     GS_CREATE_BACKUP_COPY);
 	g_object_unref (editor_settings);
 
 	// FIXME: review this messages
diff --git a/gedit/gedit-print-job.c b/gedit/gedit-print-job.c
index fefa941..157d1f5 100644
--- a/gedit/gedit-print-job.c
+++ b/gedit/gedit-print-job.c
@@ -285,12 +285,12 @@ restore_button_clicked (GtkButton     *button,
 {
 	gchar *body, *header, *numbers;
 	
-	g_settings_get (job->priv->print_settings, GS_PRINT_FONT_BODY_PANGO,
-			"s", &body);
-	g_settings_get (job->priv->print_settings, GS_PRINT_FONT_HEADER_PANGO,
-			"s", &header);
-	g_settings_get (job->priv->print_settings, GS_PRINT_FONT_NUMBERS_PANGO,
-			"s", &numbers);
+	body = g_settings_get_string (job->priv->print_settings,
+				      GS_PRINT_FONT_BODY_PANGO);
+	header = g_settings_get_string (job->priv->print_settings,
+					GS_PRINT_FONT_HEADER_PANGO);
+	numbers = g_settings_get_string (job->priv->print_settings,
+					 GS_PRINT_FONT_NUMBERS_PANGO);
 
 	gtk_font_button_set_font_name (
 			GTK_FONT_BUTTON (job->priv->body_fontbutton),
@@ -358,20 +358,20 @@ create_custom_widget_cb (GtkPrintOperation *operation,
 	}
 
 	/* Get all settings values */
-	g_settings_get (job->priv->print_settings, GS_PRINT_SYNTAX_HIGHLIGHTING,
-			"b", &syntax_hl);
-	g_settings_get (job->priv->print_settings, GS_PRINT_HEADER,
-			"b", &print_header);
+	syntax_hl = g_settings_get_boolean (job->priv->print_settings,
+					    GS_PRINT_SYNTAX_HIGHLIGHTING);
+	print_header = g_settings_get_boolean (job->priv->print_settings,
+					       GS_PRINT_HEADER);
 	g_settings_get (job->priv->print_settings, GS_PRINT_LINE_NUMBERS,
 			"u", &line_numbers);
-	g_settings_get (job->priv->print_settings, GS_PRINT_WRAP_MODE,
-			"s", &wrap_str);
-	g_settings_get (job->priv->print_settings, GS_PRINT_FONT_BODY_PANGO,
-			"s", &font_body);
-	g_settings_get (job->priv->print_settings, GS_PRINT_FONT_HEADER_PANGO,
-			"s", &font_header);
-	g_settings_get (job->priv->print_settings, GS_PRINT_FONT_NUMBERS_PANGO,
-			"s", &font_numbers);
+	wrap_str = g_settings_get_string (job->priv->print_settings,
+					  GS_PRINT_WRAP_MODE);
+	font_body = g_settings_get_string (job->priv->print_settings,
+					   GS_PRINT_FONT_BODY_PANGO);
+	font_header = g_settings_get_string (job->priv->print_settings,
+					     GS_PRINT_FONT_HEADER_PANGO);
+	font_numbers = g_settings_get_string (job->priv->print_settings,
+					      GS_PRINT_FONT_NUMBERS_PANGO);
 
 	/* Print syntax */
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (job->priv->syntax_checkbutton),
@@ -466,8 +466,8 @@ set_wrap_setting (GeditPrintJob *job,
 	gchar *wrap_str;
 	
 	wrap_str = gedit_utils_get_wrap_str (mode);
-	g_settings_set (job->priv->print_settings, GS_PRINT_WRAP_MODE,
-			"s", wrap_str);
+	g_settings_set_string (job->priv->print_settings, GS_PRINT_WRAP_MODE,
+			       wrap_str);
 	g_free (wrap_str);
 }
 
@@ -485,16 +485,16 @@ custom_widget_apply_cb (GtkPrintOperation *operation,
 	header = gtk_font_button_get_font_name (GTK_FONT_BUTTON (job->priv->headers_fontbutton));
 	numbers = gtk_font_button_get_font_name (GTK_FONT_BUTTON (job->priv->numbers_fontbutton));
 
-	g_settings_set (job->priv->print_settings, GS_PRINT_SYNTAX_HIGHLIGHTING,
-			"b", syntax);
-	g_settings_set (job->priv->print_settings, GS_PRINT_HEADER,
-			"b", page_header);
-	g_settings_set (job->priv->print_settings, GS_PRINT_FONT_BODY_PANGO,
-			"s", body);
-	g_settings_set (job->priv->print_settings, GS_PRINT_FONT_HEADER_PANGO,
-			"s", header);
-	g_settings_set (job->priv->print_settings, GS_PRINT_FONT_NUMBERS_PANGO,
-			"s", numbers);
+	g_settings_set_boolean (job->priv->print_settings,
+				GS_PRINT_SYNTAX_HIGHLIGHTING, syntax);
+	g_settings_set_boolean (job->priv->print_settings, GS_PRINT_HEADER,
+				page_header);
+	g_settings_set_string (job->priv->print_settings, GS_PRINT_FONT_BODY_PANGO,
+			       body);
+	g_settings_set_string (job->priv->print_settings, GS_PRINT_FONT_HEADER_PANGO,
+			       header);
+	g_settings_set_string (job->priv->print_settings, GS_PRINT_FONT_NUMBERS_PANGO,
+			       numbers);
 
 	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (job->priv->line_numbers_checkbutton)))
 	{
@@ -536,20 +536,20 @@ create_compositor (GeditPrintJob *job)
 	gboolean print_header;
 	
 	/* Create and initialize print compositor */
-	g_settings_get (job->priv->print_settings, GS_PRINT_FONT_BODY_PANGO,
-			"s", &print_font_body);
-	g_settings_get (job->priv->print_settings, GS_PRINT_FONT_HEADER_PANGO,
-			"s", &print_font_header);
-	g_settings_get (job->priv->print_settings, GS_PRINT_FONT_NUMBERS_PANGO,
-			"s", &print_font_numbers);
-	g_settings_get (job->priv->print_settings, GS_PRINT_SYNTAX_HIGHLIGHTING,
-			"b", &syntax_hl);
-	g_settings_get (job->priv->print_settings, GS_PRINT_WRAP_MODE,
-			"s", &wrap_str);
+	print_font_body = g_settings_get_string (job->priv->print_settings,
+						 GS_PRINT_FONT_BODY_PANGO);
+	print_font_header = g_settings_get_string (job->priv->print_settings,
+						   GS_PRINT_FONT_HEADER_PANGO);
+	print_font_numbers = g_settings_get_string (job->priv->print_settings,
+						    GS_PRINT_FONT_NUMBERS_PANGO);
+	syntax_hl = g_settings_get_boolean (job->priv->print_settings,
+					    GS_PRINT_SYNTAX_HIGHLIGHTING);
+	wrap_str = g_settings_get_string (job->priv->print_settings,
+					  GS_PRINT_WRAP_MODE);
 	g_settings_get (job->priv->print_settings, GS_PRINT_LINE_NUMBERS,
 			"u", &print_line_numbers);
-	g_settings_get (job->priv->print_settings, GS_PRINT_HEADER,
-			"b", &print_header);
+	print_header = g_settings_get_boolean (job->priv->print_settings,
+					       GS_PRINT_HEADER);
 	
 	wrap_mode = gedit_utils_get_wrap_mode_from_string (wrap_str);
 	g_free (wrap_str);
diff --git a/gedit/gedit-settings.c b/gedit/gedit-settings.c
index 8f6a6ea..a8d3384 100644
--- a/gedit/gedit-settings.c
+++ b/gedit/gedit-settings.c
@@ -601,7 +601,7 @@ on_lockdown_changed (GSettings   *settings,
 	gboolean locked;
 	GeditApp *app;
 	
-	g_settings_get (settings, key, "b", &locked);
+	locked = g_settings_get_boolean (settings, key);
 	app = gedit_app_get_default ();
 	
 	if (strcmp (key, GS_LOCKDOWN_COMMAND_LINE) == 0)
@@ -653,12 +653,12 @@ on_system_font_changed (GSettings     *settings,
 	gboolean use_default_font;
 	gchar *font;
 	
-	g_settings_get (gs->priv->editor, GS_USE_DEFAULT_FONT,
-			"b", &use_default_font);
+	use_default_font = g_settings_get_boolean (gs->priv->editor,
+						   GS_USE_DEFAULT_FONT);
 	if (!use_default_font)
 		return;
 	
-	g_settings_get (settings, key, "s", &font);
+	font = g_settings_get_string (settings, key);
 	
 	set_font (gs, font);
 	
@@ -673,15 +673,15 @@ on_use_default_font_changed (GSettings     *settings,
 	gboolean def;
 	gchar *font;
 
-	g_settings_get (settings, key, "b", &def);
+	def = g_settings_get_boolean (settings, key);
 	
 	if (def)
 	{
-		g_settings_get (gs->priv->interface, GS_SYSTEM_FONT, "s", &font);
+		font = g_settings_get_string (gs->priv->interface, GS_SYSTEM_FONT);
 	}
 	else
 	{
-		g_settings_get (gs->priv->editor, GS_EDITOR_FONT, "s", &font);
+		font = g_settings_get_string (gs->priv->editor, GS_EDITOR_FONT);
 	}
 	
 	set_font (gs, font);
@@ -697,12 +697,12 @@ on_editor_font_changed (GSettings     *settings,
 	gboolean use_default_font;
 	gchar *font;
 	
-	g_settings_get (gs->priv->editor, GS_USE_DEFAULT_FONT,
-			"b", &use_default_font);
+	use_default_font = g_settings_get_boolean (gs->priv->editor,
+						   GS_USE_DEFAULT_FONT);
 	if (use_default_font)
 		return;
 	
-	g_settings_get (settings, key, "s", &font);
+	font = g_settings_get_string (settings, key);
 	
 	set_font (gs, font);
 	
@@ -719,7 +719,7 @@ on_scheme_changed (GSettings     *settings,
 	GList *docs;
 	GList *l;
 
-	g_settings_get (settings, key, "s", &scheme);
+	scheme = g_settings_get_string (settings, key);
 
 	if (gs->priv->old_scheme != NULL && (strcmp (scheme, gs->priv->old_scheme) == 0))
 		return;
@@ -766,7 +766,7 @@ on_auto_save_changed (GSettings     *settings,
 	GList *docs, *l;
 	gboolean auto_save;
 	
-	g_settings_get (settings, key, "b", &auto_save);
+	auto_save = g_settings_get_boolean (settings, key);
 	
 	docs = gedit_app_get_documents (gedit_app_get_default ());
 	
@@ -834,7 +834,7 @@ on_wrap_mode_changed (GSettings     *settings,
 	GList *views, *l;
 	gchar *wrap_str;
 	
-	g_settings_get (settings, key, "s", &wrap_str);
+	wrap_str = g_settings_get_string (settings, key);
 	
 	wrap_mode = gedit_utils_get_wrap_mode_from_string (wrap_str);
 	g_free (wrap_str);
@@ -883,7 +883,7 @@ on_insert_spaces_changed (GSettings     *settings,
 	GList *views, *l;
 	gboolean spaces;
 	
-	g_settings_get (settings, key, "b", &spaces);
+	spaces = g_settings_get_boolean (settings, key);
 	
 	views = gedit_app_get_views (gedit_app_get_default ());
 	
@@ -905,7 +905,7 @@ on_auto_indent_changed (GSettings     *settings,
 	GList *views, *l;
 	gboolean enable;
 	
-	g_settings_get (settings, key, "b", &enable);
+	enable = g_settings_get_boolean (settings, key);
 	
 	views = gedit_app_get_views (gedit_app_get_default ());
 	
@@ -926,7 +926,7 @@ on_display_line_numbers_changed (GSettings     *settings,
 	GList *views, *l;
 	gboolean line_numbers;
 	
-	g_settings_get (settings, key, "b", &line_numbers);
+	line_numbers = g_settings_get_boolean (settings, key);
 	
 	views = gedit_app_get_views (gedit_app_get_default ());
 	
@@ -947,7 +947,7 @@ on_hl_current_line_changed (GSettings     *settings,
 	GList *views, *l;
 	gboolean hl;
 	
-	g_settings_get (settings, key, "b", &hl);
+	hl = g_settings_get_boolean (settings, key);
 	
 	views = gedit_app_get_views (gedit_app_get_default ());
 	
@@ -968,7 +968,7 @@ on_bracket_matching_changed (GSettings     *settings,
 	GList *docs, *l;
 	gboolean enable;
 	
-	g_settings_get (settings, key, "b", &enable);
+	enable = g_settings_get_boolean (settings, key);
 	
 	docs = gedit_app_get_documents (gedit_app_get_default ());
 	
@@ -989,7 +989,7 @@ on_display_right_margin_changed (GSettings     *settings,
 	GList *views, *l;
 	gboolean display;
 	
-	g_settings_get (settings, key, "b", &display);
+	display = g_settings_get_boolean (settings, key);
 	
 	views = gedit_app_get_views (gedit_app_get_default ());
 	
@@ -1034,7 +1034,7 @@ on_smart_home_end_changed (GSettings     *settings,
 	GList *views, *l;
 	gchar *smart_str;
 	
-	g_settings_get (settings, key, "s", &smart_str);
+	smart_str = g_settings_get_string (settings, key);
 	
 	smart_he = gedit_utils_get_smart_home_end_from_string (smart_str);
 	g_free (smart_str);
@@ -1059,7 +1059,7 @@ on_syntax_highlighting_changed (GSettings     *settings,
 	GList *docs, *l;
 	gboolean enable;
 	
-	g_settings_get (settings, key, "b", &enable);
+	enable = g_settings_get_boolean (settings, key);
 	
 	docs = gedit_app_get_documents (gedit_app_get_default ());
 	
@@ -1097,7 +1097,7 @@ on_search_highlighting_changed (GSettings     *settings,
 	GList *docs, *l;
 	gboolean enable;
 	
-	g_settings_get (settings, key, "b", &enable);
+	enable = g_settings_get_boolean (settings, key);
 	
 	docs = gedit_app_get_documents (gedit_app_get_default ());
 	
@@ -1288,14 +1288,14 @@ gedit_settings_get_lockdown (GeditSettings *gs)
 	guint lockdown = 0;
 	gboolean command_line, printing, print_setup, save_to_disk;
 	
-	g_settings_get (gs->priv->lockdown, GS_LOCKDOWN_COMMAND_LINE,
-			"b", &command_line);
-	g_settings_get (gs->priv->lockdown, GS_LOCKDOWN_PRINTING,
-			"b", &printing);
-	g_settings_get (gs->priv->lockdown, GS_LOCKDOWN_PRINT_SETUP,
-			"b", &print_setup);
-	g_settings_get (gs->priv->lockdown, GS_LOCKDOWN_SAVE_TO_DISK,
-			"b", &save_to_disk);
+	command_line = g_settings_get_boolean (gs->priv->lockdown,
+					       GS_LOCKDOWN_COMMAND_LINE);
+	printing = g_settings_get_boolean (gs->priv->lockdown,
+					   GS_LOCKDOWN_PRINTING);
+	print_setup = g_settings_get_boolean (gs->priv->lockdown,
+					      GS_LOCKDOWN_PRINT_SETUP);
+	save_to_disk = g_settings_get_boolean (gs->priv->lockdown,
+					       GS_LOCKDOWN_SAVE_TO_DISK);
 
 	if (command_line)
 		lockdown |= GEDIT_LOCKDOWN_COMMAND_LINE;
@@ -1319,8 +1319,8 @@ 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",
-			"s", &system_font);
+	system_font = g_settings_get_string (gs->priv->interface,
+					     "monospace-font-name");
 	
 	return system_font;
 }
diff --git a/gedit/gedit-tab.c b/gedit/gedit-tab.c
index ec00ee6..e279dec 100644
--- a/gedit/gedit-tab.c
+++ b/gedit/gedit-tab.c
@@ -381,8 +381,8 @@ set_view_properties_according_to_state (GeditTab      *tab,
 	gboolean val;
 	gboolean hl_current_line;
 	
-	g_settings_get (tab->priv->editor, GS_HIGHLIGHT_CURRENT_LINE,
-			"b", &hl_current_line);
+	hl_current_line = g_settings_get_boolean (tab->priv->editor,
+						  GS_HIGHLIGHT_CURRENT_LINE);
 
 	val = ((state == GEDIT_TAB_STATE_NORMAL) &&
 	       (tab->priv->print_preview == NULL) &&
@@ -1541,7 +1541,7 @@ gedit_tab_init (GeditTab *tab)
 					GTK_POLICY_AUTOMATIC);
 
 	/* Manage auto save data */
-	g_settings_get (tab->priv->editor, GS_AUTO_SAVE, "b", &auto_save);
+	auto_save = g_settings_get_boolean (tab->priv->editor, GS_AUTO_SAVE);
 	g_settings_get (tab->priv->editor, GS_AUTO_SAVE_INTERVAL,
 			"u", &auto_save_interval);
 	
diff --git a/gedit/gedit-view.c b/gedit/gedit-view.c
index 9d8fe93..55f917f 100644
--- a/gedit/gedit-view.c
+++ b/gedit/gedit-view.c
@@ -359,8 +359,8 @@ gedit_view_init (GeditView *view)
 							      NULL);
 
 	/* Get setting values */
-	g_settings_get (view->priv->editor_settings, GS_USE_DEFAULT_FONT,
-			"b", &use_default_font);
+	use_default_font = g_settings_get_boolean (view->priv->editor_settings,
+						   GS_USE_DEFAULT_FONT);
 
 	/*
 	 *  Set tab, fonts, wrap mode, colors, etc. according
@@ -370,8 +370,8 @@ gedit_view_init (GeditView *view)
 	{
 		gchar *editor_font;
 
-		g_settings_get (view->priv->editor_settings, GS_EDITOR_FONT,
-				"s", &editor_font);
+		editor_font = g_settings_get_string (view->priv->editor_settings,
+						     GS_EDITOR_FONT);
 
 		gedit_view_set_font (view, FALSE, editor_font);
 
@@ -382,28 +382,28 @@ gedit_view_init (GeditView *view)
 		gedit_view_set_font (view, TRUE, NULL);
 	}
  
-	g_settings_get (view->priv->editor_settings,GS_DISPLAY_LINE_NUMBERS,
-			"b", &display_line_numbers);
-	g_settings_get (view->priv->editor_settings,GS_AUTO_INDENT,
-			"b", &auto_indent);
+	display_line_numbers = g_settings_get_boolean (view->priv->editor_settings,
+						       GS_DISPLAY_LINE_NUMBERS);
+	auto_indent = g_settings_get_boolean (view->priv->editor_settings,
+					      GS_AUTO_INDENT);
 	g_settings_get (view->priv->editor_settings, GS_TABS_SIZE,
 			"u", &tabs_size);
-	g_settings_get (view->priv->editor_settings, GS_INSERT_SPACES,
-			"b", &insert_spaces);
-	g_settings_get (view->priv->editor_settings, GS_DISPLAY_RIGHT_MARGIN,
-			"b", &display_right_margin);
+	insert_spaces = g_settings_get_boolean (view->priv->editor_settings,
+						GS_INSERT_SPACES);
+	display_right_margin = g_settings_get_boolean (view->priv->editor_settings,
+						       GS_DISPLAY_RIGHT_MARGIN);
 	g_settings_get (view->priv->editor_settings, GS_RIGHT_MARGIN_POSITION,
 			"u", &right_margin_position);
-	g_settings_get (view->priv->editor_settings, GS_HIGHLIGHT_CURRENT_LINE,
-			"b", &hl_current_line);
+	hl_current_line = g_settings_get_boolean (view->priv->editor_settings,
+						  GS_HIGHLIGHT_CURRENT_LINE);
 
-	g_settings_get (view->priv->editor_settings, GS_WRAP_MODE,
-			"s", &wrap_str);
+	wrap_str = g_settings_get_string (view->priv->editor_settings,
+					  GS_WRAP_MODE);
 	wrap_mode = gedit_utils_get_wrap_mode_from_string (wrap_str);
 	g_free (wrap_str);
 	
-	g_settings_get (view->priv->editor_settings, GS_SMART_HOME_END,
-			"s", &smart_home_str);
+	smart_home_str = g_settings_get_string (view->priv->editor_settings,
+						GS_SMART_HOME_END);
 	smart_home_end = gedit_utils_get_smart_home_end_from_string (smart_home_str);
 	g_free (smart_home_str);
 
diff --git a/gedit/gedit-window.c b/gedit/gedit-window.c
index 8a29e46..b29802d 100644
--- a/gedit/gedit-window.c
+++ b/gedit/gedit-window.c
@@ -584,10 +584,10 @@ set_toolbar_style (GeditWindow *window,
 	gboolean toolbar_visible;
 	gchar *toolbar_style_str;
 	
-	g_settings_get (window->priv->ui_settings, GS_TOOLBAR_VISIBLE,
-			"b", &toolbar_visible);
-	g_settings_get (window->priv->ui_settings, GS_TOOLBAR_BUTTONS_STYLE,
-			"s", &toolbar_style_str);
+	toolbar_visible = g_settings_get_boolean (window->priv->ui_settings,
+						  GS_TOOLBAR_VISIBLE);
+	toolbar_style_str = g_settings_get_string (window->priv->ui_settings,
+						   GS_TOOLBAR_BUTTONS_STYLE);
 	
 	if (origin == NULL)
 		visible = toolbar_visible;
@@ -754,8 +754,8 @@ set_sensitivity_according_to_tab (GeditWindow *window,
 
 	gedit_debug (DEBUG_WINDOW);
 	
-	g_settings_get (window->priv->editor_settings, GS_SYNTAX_HIGHLIGHTING,
-			"b", &enable_syntax_highlighting);
+	enable_syntax_highlighting = g_settings_get_boolean (window->priv->editor_settings,
+							     GS_SYNTAX_HIGHLIGHTING);
 
 	lockdown = gedit_app_get_lockdown (gedit_app_get_default ());
 
@@ -1426,7 +1426,7 @@ toolbar_visibility_changed (GtkWidget   *toolbar,
 
 	visible = GTK_WIDGET_VISIBLE (toolbar);
 
-	g_settings_set (window->priv->ui_settings, GS_TOOLBAR_VISIBLE, "b", visible);
+	g_settings_set_boolean (window->priv->ui_settings, GS_TOOLBAR_VISIBLE, visible);
 
 	action = gtk_action_group_get_action (window->priv->always_sensitive_action_group,
 					      "ViewToolbar");
@@ -1840,8 +1840,8 @@ set_statusbar_style (GeditWindow *window,
 	gboolean visible;
 
 	if (origin == NULL)
-		g_settings_get (window->priv->ui_settings, GS_STATUSBAR_VISIBLE,
-				"b", &visible);
+		visible = g_settings_get_boolean (window->priv->ui_settings,
+						  GS_STATUSBAR_VISIBLE);
 	else
 		visible = GTK_WIDGET_VISIBLE (origin->priv->statusbar);
 
@@ -1868,7 +1868,7 @@ statusbar_visibility_changed (GtkWidget   *statusbar,
 
 	visible = GTK_WIDGET_VISIBLE (statusbar);
 
-	g_settings_set (window->priv->ui_settings, GS_STATUSBAR_VISIBLE, "b", visible);
+	g_settings_set_boolean (window->priv->ui_settings, GS_STATUSBAR_VISIBLE, visible);
 
 	action = gtk_action_group_get_action (window->priv->always_sensitive_action_group,
 					      "ViewStatusbar");
@@ -2661,8 +2661,8 @@ _gedit_window_set_lockdown (GeditWindow       *window,
 	gboolean autosave;
 
 	/* start/stop autosave in each existing tab */
-	g_settings_get (window->priv->editor_settings, GS_AUTO_SAVE,
-			"b", &autosave);
+	autosave = g_settings_get_boolean (window->priv->editor_settings,
+					   GS_AUTO_SAVE);
 	gtk_container_foreach (GTK_CONTAINER (window->priv->notebook),
 			       update_tab_autosave,
 			       &autosave);
@@ -3655,8 +3655,8 @@ side_panel_visibility_changed (GtkWidget   *side_panel,
 
 	visible = GTK_WIDGET_VISIBLE (side_panel);
 
-	g_settings_set (window->priv->ui_settings, GS_SIDE_PANE_VISIBLE,
-			"b", visible);
+	g_settings_set_boolean (window->priv->ui_settings, GS_SIDE_PANE_VISIBLE,
+				visible);
 
 	action = gtk_action_group_get_action (window->priv->panes_action_group,
 	                                      "ViewSidePane");
@@ -3709,8 +3709,8 @@ bottom_panel_visibility_changed (GeditPanel  *bottom_panel,
 
 	visible = GTK_WIDGET_VISIBLE (bottom_panel);
 
-	g_settings_set (window->priv->ui_settings, GS_BOTTOM_PANE_VISIBLE,
-			"b", visible);
+	g_settings_set_boolean (window->priv->ui_settings, GS_BOTTOM_PANE_VISIBLE,
+				visible);
 
 	action = gtk_action_group_get_action (window->priv->panes_action_group,
 					      "ViewBottomPane");
@@ -3799,10 +3799,10 @@ init_panels_visibility (GeditWindow *window)
 	_gedit_panel_set_active_item_by_id (GEDIT_PANEL (window->priv->side_panel),
 					    active_page);
 
-	g_settings_get (window->priv->ui_settings, GS_SIDE_PANE_VISIBLE,
-			"b", &side_pane_visible);
-	g_settings_get (window->priv->ui_settings, GS_BOTTOM_PANE_VISIBLE,
-			"b", &bottom_pane_visible);
+	side_pane_visible = g_settings_get_boolean (window->priv->ui_settings,
+						    GS_SIDE_PANE_VISIBLE);
+	bottom_pane_visible = g_settings_get_boolean (window->priv->ui_settings,
+						      GS_BOTTOM_PANE_VISIBLE);
 
 	if (side_pane_visible)
 	{
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]