[beryl-commits] r2230 - in trunk/beryl-core: libberylsettings settings-backends

[racarr at server.beryl-project.org]

Author: racarr
Date: 2007-01-01 18:12:12 +0000 (Mon, 01 Jan 2007)
New Revision: 2230

Modified:
   trunk/beryl-core/libberylsettings/main.c
   trunk/beryl-core/settings-backends/gconf.c
Log:
Clap your hands and stomp your feet, memory leaks are really neat! *sings*

Modified: trunk/beryl-core/libberylsettings/main.c
===================================================================
--- trunk/beryl-core/libberylsettings/main.c	2007-01-01 17:22:02 UTC (rev 2229)
+++ trunk/beryl-core/libberylsettings/main.c	2007-01-01 18:12:12 UTC (rev 2230)
@@ -971,7 +971,8 @@
 			backend,".so",NULL);
 	gchar * eret;
 	gchar * eret2=NULL;
-	dlerror();
+	eret = dlerror();
+	g_free(eret);
 	backend_dlhand=dlopen(dlname,RTLD_NOW);
 	eret=dlerror();
 	if (eret || !backend_dlhand)
@@ -990,7 +991,13 @@
 		g_free(dlname);
 		return NULL;
 	}
+	if (dlname)
+	{
+		g_free(dlname);
+	}
 	return backend_dlhand;
+	g_free(eret);
+	g_free(eret2);
 }
 
 typedef struct _ImportInfo

Modified: trunk/beryl-core/settings-backends/gconf.c
===================================================================
--- trunk/beryl-core/settings-backends/gconf.c	2007-01-01 17:22:02 UTC (rev 2229)
+++ trunk/beryl-core/settings-backends/gconf.c	2007-01-01 18:12:12 UTC (rev 2230)
@@ -181,7 +181,8 @@
 	*ptr = gconf_client_get_int(client, g_strconcat(PATH, "/alpha", NULL),
 								NULL);
 	set_color_value_from_array(&setting->value, int_ret);
-	free(int_ret);
+	g_free(int_ret);
+	g_free(ptr);
 }
 
 void readBinding(BerylSetting * setting)
@@ -236,6 +237,7 @@
 	gboolean val = setting->value.value.as_bool;
 
 	gconf_client_set_bool(client, PATH, val, NULL);
+
 }
 
 void writeInt(BerylSetting * setting)
@@ -244,6 +246,7 @@
 	int val = setting->value.value.as_int;
 
 	gconf_client_set_int(client, PATH, val, NULL);
+	
 }
 
 void writeFloat(BerylSetting * setting)
@@ -252,7 +255,9 @@
 	float val = setting->value.value.as_float;
 
 	gconf_client_set_float(client, PATH, val, NULL);
+	
 
+
 }
 
 void writeString(BerylSetting * setting)
@@ -261,6 +266,7 @@
 	gchar *val = setting->value.value.as_string;
 
 	gconf_client_set_string(client, PATH, val, NULL);
+
 }
 
 void writeColor(BerylSetting * setting)
@@ -286,7 +292,6 @@
 
 void writeBinding(BerylSetting * setting)
 {
-	gchar *pre;
 
 	GROUPKEY;
 	gboolean bool_val;
@@ -341,6 +346,8 @@
 	gconf_client_set_string(client,
 							g_strconcat("/apps/beryl/", groupname,"/", nkeyname,
 										NULL), pre, NULL);
+	g_free(nkeyname);
+	g_free(pre);
 }
 
 void setButton(BerylSetting * setting)
@@ -406,6 +413,7 @@
 		gconf_client_set_bool(client,g_strconcat("/apps/beryl/", groupname,"/", nkeyname,
 										NULL),bool_val,NULL);
 	}
+	g_free(nkeyname);
 
 }