Adding convenience method to getting booleans from GSettings.

Perry Werneck
1 parent f94606ed
Showing 5 changed files with 41 additions and 24 deletions Show diff stats
src/include/pw3270/application.h
src/objects/application/application.c
src/objects/window/actions/sessionproperties.c
src/objects/window/keyfile.c
win/pack.sh
@@ -72,6 +72,10 @@ void			  pw3270_application_open_file(GtkApplication *application, GtkWindow **w
 /// @return The internal settings object (Do not unref it).
 GSettings		* pw3270_application_settings_new();
 GSettings		* pw3270_application_get_settings(GApplication *app);
+
+/// @brief Get boolean from gsettings.
+gboolean		  pw3270_application_get_boolean(GApplication *app, const gchar *option_name, gboolean def);
+
 GList			* pw3270_application_get_keypad_models(GApplication *app);
 void			  pw3270_application_set_ui_style(GApplication *app, PW3270_UI_STYLE type);
@@ -427,7 +427,7 @@ void startup(GApplication *application) {
 	G_APPLICATION_CLASS(pw3270Application_parent_class)->startup(application);
-	GSettings *settings = pw3270_application_get_settings(application);
+//	GSettings *settings = pw3270_application_get_settings(application);
 	//
 	// Common actions
@@ -445,14 +445,14 @@ void startup(GApplication *application) {
 	//
 	// Open session actions.
 	//
-	if(g_settings_get_boolean(settings,"allow-open-session-actions")) {
+	if(pw3270_application_get_boolean(application,"allow-open-session-actions",TRUE)) {
 		g_action_map_add_action(G_ACTION_MAP(application),pw3270_open_session_action_new());
 	}
 	//
 	// New tab actions
 	//
-	if(g_settings_get_boolean(settings,"allow-new-tab-actions")) {
+	if(pw3270_application_get_boolean(application,"allow-new-tab-actions",TRUE)) {
 		GAction * new_tab_actions[] = {
 			pw3270_open_tab_action_new(),
@@ -468,7 +468,7 @@ void startup(GApplication *application) {
 	//
 	// New window actions
 	//
-	if(g_settings_get_boolean(settings,"allow-new-window-actions")) {
+	if(pw3270_application_get_boolean(application,"allow-new-window-actions",TRUE)) {
 		GAction * new_window_actions[] = {
 			pw3270_open_window_action_new(),
@@ -557,10 +557,13 @@ PW3270_UI_STYLE pw3270_application_get_ui_style(GApplication *app) {
 }
 GSettings * pw3270_application_get_settings(GApplication *app) {
-
 	g_return_val_if_fail(PW3270_IS_APPLICATION(app),NULL);
 	return PW3270_APPLICATION(app)->settings;
+}
+gboolean pw3270_application_get_boolean(GApplication *app, const gchar *option_name, gboolean def) {
+	g_return_val_if_fail(PW3270_IS_APPLICATION(app),def);
+	return g_settings_get_boolean(PW3270_APPLICATION(app)->settings,option_name);
 }
 GSList * pw3270_application_get_plugins(GApplication *app) {
@@ -43,29 +43,35 @@ GtkWidget * factory(V3270SimpleAction *action, GtkWidget *terminal) {
 	size_t ix;
-	GSettings *settings = pw3270_application_get_settings(g_application_get_default());
+	GApplication *application = g_application_get_default();
+//	GSettings *settings = pw3270_application_get_settings(g_application_get_default());
 	GtkWidget * dialog = v3270_settings_dialog_new();
 	gtk_window_set_title(GTK_WINDOW(dialog), action->label);
-	// Add settings pages.
-	GtkWidget * elements[] = {
-		v3270_color_settings_new(),
-		v3270_font_settings_new(),
-		v3270_accelerator_settings_new(),
-		v3270_clipboard_settings_new()
-	};
-
-	if(g_settings_get_boolean(settings,"allow-host-settings")) {
+	// Host settings is conditional.
+	if(pw3270_application_get_boolean(application,"allow-host-settings",TRUE)) {
 		gtk_container_add(GTK_CONTAINER(dialog), v3270_host_settings_new());
 	}
-	for(ix = 0; ix < G_N_ELEMENTS(elements); ix++) {
-		gtk_container_add(GTK_CONTAINER(dialog), elements[ix]);
+	// Add commom settings.
+	{
+
+		GtkWidget * elements[] = {
+			v3270_color_settings_new(),
+			v3270_font_settings_new(),
+			v3270_accelerator_settings_new(),
+			v3270_clipboard_settings_new()
+		};
+
+		for(ix = 0; ix < G_N_ELEMENTS(elements); ix++) {
+			gtk_container_add(GTK_CONTAINER(dialog), elements[ix]);
+		}
+
 	}
 	pw3270_application_plugin_call(
-	    g_application_get_default(),
+	    application,
 	    "pw3270_plugin_set_session_properties",
 	    dialog
 	);
@@ -216,16 +216,20 @@ V3270KeyFile * v3270_key_file_open(GtkWidget *terminal, const gchar *filename, G
 	if(!*error) {
-		GSettings * settings = pw3270_application_get_settings(g_application_get_default());
+		GApplication *application = g_application_get_default();
-		if(settings && g_settings_get_boolean(settings,"update-default-session-file")) {
+		if(pw3270_application_get_boolean(application,"update-default-session-file",TRUE)) {
-			g_message("Updating default session file to '%s'",filename);
-			g_settings_set_string(settings,"default-session-file",filename);
+			GSettings * settings = pw3270_application_get_settings(application);
+
+			if(settings) {
+				g_message("Updating default session file to '%s'",filename);
+				g_settings_set_string(settings,"default-session-file",filename);
+			}
 		}
-		if(settings && g_settings_get_boolean(settings,"add-session-to-recent-manager")) {
+		if(pw3270_application_get_boolean(application,"add-session-to-recent-manager",TRUE)) {
 			// new_session->key_file
 			g_autofree gchar * display_name = g_key_file_get_string(new_session->key_file,"terminal","session-name",NULL);
@@ -170,7 +170,7 @@ configure()
 		if [ -x ./autogen.sh ]; then
 			NOCONFIGURE=1 ./autogen.sh
 			if [ "$?" != "0" ]; then
-				failed "Erro em autogen.sh"
+				failed "autogen.sh has failed"
 			fi
 		fi
 	done
	@@ -170,7 +170,7 @@ configure()		@@ -170,7 +170,7 @@ configure()
170	if [ -x ./autogen.sh ]; then	170	if [ -x ./autogen.sh ]; then
171	NOCONFIGURE=1 ./autogen.sh	171	NOCONFIGURE=1 ./autogen.sh
172	if [ "$?" != "0" ]; then	172	if [ "$?" != "0" ]; then
173	- failed "Erro em autogen.sh"	173	+ failed "autogen.sh has failed"
174	fi	174	fi
175	fi	175	fi
176	done	176	done