a bit more OO names for a couple of functions

5 files changed, 57 insertions, 38 deletions

diff --git a/libxklavier/xklavier_config.c b/libxklavier/xklavier_config.c
index 1198851..72473f3 100644
--- a/libxklavier/xklavier_config.c
+++ b/libxklavier/xklavier_config.c
@@ -295,8 +295,8 @@ xkl_engine_get_ruleset_name(XklEngine * engine,
 	if (!rules_set_name[0]) {
 		/* first call */
 		gchar *rf = NULL;
-		if (!xkl_engine_get_names_prop
-		    (engine, engine->priv->base_config_atom, &rf, NULL)
+		if (!xkl_config_rec_get_from_root_window_property
+		    (NULL, engine->priv->base_config_atom, &rf, engine)
 		    || (rf == NULL)) {
 			g_strlcpy(rules_set_name, default_ruleset,
 				  sizeof rules_set_name);
diff --git a/libxklavier/xklavier_config.h b/libxklavier/xklavier_config.h
index ef3730f..34c9521 100644
--- a/libxklavier/xklavier_config.h
+++ b/libxklavier/xklavier_config.h
@@ -426,11 +426,15 @@ extern "C" {
  *   all records are allocated using standard malloc 
  * @return TRUE on success
  */
-	extern gboolean xkl_engine_get_names_prop(XklEngine * engine,
-						  Atom rules_atom_name,
-						  gchar ** rules_file_out,
-						  XklConfigRec *
-						  config_out);
+	extern gboolean
+	    xkl_config_rec_get_from_root_window_property(XklConfigRec *
+							 config_out,
+							 Atom
+							 rules_atom_name,
+							 gchar **
+							 rules_file_out,
+							 XklEngine *
+							 engine);
 
 /**
  * Saves the XKB configuration into any root window property
@@ -439,11 +443,17 @@ extern "C" {
  * @param config is a configuration to save 
  * @return TRUE on success
  */
-	extern gboolean xkl_engine_set_names_prop(XklEngine * engine,
-						  Atom rules_atom_name,
-						  gchar * rules_file,
-						  const XklConfigRec *
-						  config);
+	extern gboolean xkl_config_rec_set_to_root_window_property(const
+								   XklConfigRec
+								   *
+								   config,
+								   Atom
+								   rules_atom_name,
+								   gchar *
+								   rules_file,
+								   XklEngine
+								   *
+								   engine);
 
 /**
  * Backups current XKB configuration into some property - 
diff --git a/libxklavier/xklavier_config_xkb.c b/libxklavier/xklavier_config_xkb.c
index c166a9b..f1d1873 100644
--- a/libxklavier/xklavier_config_xkb.c
+++ b/libxklavier/xklavier_config_xkb.c
@@ -462,11 +462,11 @@ xkl_xkb_activate_config(XklEngine * engine, const XklConfigRec * data)
 		    xkl_config_get_keyboard(engine, &component_names,
 					    TRUE);
 		if (xkb != NULL) {
-			if (xkl_engine_set_names_prop
-			    (engine, engine->priv->base_config_atom,
+			if (xkl_config_rec_set_to_root_window_property
+			    (data, engine->priv->base_config_atom,
 			     xkl_engine_get_ruleset_name(engine,
 							 XKB_DEFAULT_RULESET),
-			     data))
+			     engine))
 				/* We do not need to check the result of _XklGetRulesSetName - 
 				   because PrepareBeforeKbd did it for us */
 				rv = TRUE;
diff --git a/libxklavier/xklavier_config_xmm.c b/libxklavier/xklavier_config_xmm.c
index ff7e38a..350791c 100644
--- a/libxklavier/xklavier_config_xmm.c
+++ b/libxklavier/xklavier_config_xmm.c
@@ -50,9 +50,11 @@ gboolean
 xkl_xmm_activate_config(XklEngine * engine, const XklConfigRec * data)
 {
 	gboolean rv;
-	rv = xkl_engine_set_names_prop(engine,
-				       engine->priv->base_config_atom,
-				       current_xmm_rules, data);
+	rv = xkl_config_rec_set_to_root_window_property(data,
+							engine->priv->
+							base_config_atom,
+							current_xmm_rules,
+							engine);
 	if (rv)
 		xkl_xmm_lock_group(engine, 0);
 	return rv;
diff --git a/libxklavier/xklavier_props.c b/libxklavier/xklavier_props.c
index f76d649..e6e7671 100644
--- a/libxklavier/xklavier_props.c
+++ b/libxklavier/xklavier_props.c
@@ -113,10 +113,12 @@ xkl_config_rec_get_full_from_server(char **rules_file_out,
 				    XklConfigRec * data,
 				    XklEngine * engine)
 {
-	gboolean rv =
-	    xkl_engine_get_names_prop(engine,
-				      engine->priv->base_config_atom,
-				      rules_file_out, data);
+	gboolean rv = xkl_config_rec_get_from_root_window_property(data,
+								   engine->
+								   priv->
+								   base_config_atom,
+								   rules_file_out,
+								   engine);
 
 	if (!rv)
 		rv = xkl_engine_get_default_names_prop(engine,
@@ -176,9 +178,10 @@ xkl_config_rec_get_from_server(XklConfigRec * data, XklEngine * engine)
 gboolean
 xkl_config_rec_get_from_backup(XklConfigRec * data, XklEngine * engine)
 {
-	return xkl_engine_get_names_prop(engine,
-					 engine->priv->backup_config_atom,
-					 NULL, data);
+	return xkl_config_rec_get_from_root_window_property(data,
+							    engine->priv->
+							    backup_config_atom,
+							    NULL, engine);
 }
 
 gboolean
@@ -190,8 +193,8 @@ xkl_backup_names_prop(XklEngine * engine)
 	gboolean cgp = FALSE;
 
 	xkl_config_rec_init(&data);
-	if (xkl_engine_get_names_prop
-	    (engine, engine->priv->backup_config_atom, NULL, &data)) {
+	if (xkl_config_rec_get_from_root_window_property
+	    (&data, engine->priv->backup_config_atom, NULL, engine)) {
 		xkl_config_rec_destroy(&data);
 		return TRUE;
 	}
@@ -200,9 +203,9 @@ xkl_backup_names_prop(XklEngine * engine)
 	cgp = xkl_config_rec_get_full_from_server(&rf, &data, engine);
 
 	if (cgp) {
-		if (!xkl_engine_set_names_prop
-		    (engine, engine->priv->backup_config_atom, rf,
-		     &data)) {
+		if (!xkl_config_rec_set_to_root_window_property
+		    (&data, engine->priv->backup_config_atom, rf,
+		     engine)) {
 			xkl_debug(150,
 				  "Could not backup the configuration");
 			rv = FALSE;
@@ -226,14 +229,14 @@ xkl_restore_names_prop(XklEngine * engine)
 	XklConfigRec data;
 
 	xkl_config_rec_init(&data);
-	if (!xkl_engine_get_names_prop
-	    (engine, engine->priv->backup_config_atom, NULL, &data)) {
+	if (!xkl_config_rec_get_from_root_window_property
+	    (&data, engine->priv->backup_config_atom, NULL, engine)) {
 		xkl_config_rec_destroy(&data);
 		return FALSE;
 	}
 
-	if (!xkl_engine_set_names_prop
-	    (engine, engine->priv->base_config_atom, rf, &data)) {
+	if (!xkl_config_rec_set_to_root_window_property
+	    (&data, engine->priv->base_config_atom, rf, engine)) {
 		xkl_debug(150, "Could not backup the configuration");
 		rv = FALSE;
 	}
@@ -242,8 +245,10 @@ xkl_restore_names_prop(XklEngine * engine)
 }
 
 gboolean
-xkl_engine_get_names_prop(XklEngine * engine, Atom rules_atom,
-			  gchar ** rules_file_out, XklConfigRec * data)
+xkl_config_rec_get_from_root_window_property(XklConfigRec * data,
+					     Atom rules_atom,
+					     gchar ** rules_file_out,
+					     XklEngine * engine)
 {
 	Atom real_prop_type;
 	int fmt;
@@ -373,8 +378,10 @@ xkl_engine_get_names_prop(XklEngine * engine, Atom rules_atom,
 
 /* taken from XFree86 maprules.c */
 gboolean
-xkl_engine_set_names_prop(XklEngine * engine, Atom rules_atom,
-			  gchar * rules_file, const XklConfigRec * data)
+xkl_config_rec_set_to_root_window_property(const XklConfigRec * data,
+					   Atom rules_atom,
+					   gchar * rules_file,
+					   XklEngine * engine)
 {
 	gint len, rv;
 	gchar *pval;