From: Colin Leroy <colin@colino.net>
Date: Tue, 9 Jan 2007 07:13:18 +0000 (+0000)
Subject: 2007-01-09 [colin]	2.7.0cvs3
X-Git-Tag: rel_2_8_0~168
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=7f8501558cd0817de52efa1b3aced55d7841196d

2007-01-09 [colin]	2.7.0cvs3

	* src/gtk/filesel.c
		Use the same type for alloc and free
---

diff --git a/ChangeLog b/ChangeLog
index 519808fc7..1c0565ff3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-09 [colin]	2.7.0cvs3
+
+	* src/gtk/filesel.c
+		Use the same type for alloc and free
+
 2007-01-08 [paul]	2.7.0cvs2
 
 	* po/nl.po
diff --git a/PATCHSETS b/PATCHSETS
index 653261d9b..2861c72c6 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2229,3 +2229,4 @@
 ( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 doc/man/claws-mail.1;  ) > 2.6.1cvs119.patchset
 ( cvs diff -u -r 1.3.2.46 -r 1.3.2.47 src/prefs_themes.c;  cvs diff -u -r 1.36.2.94 -r 1.36.2.95 src/common/utils.c;  ) > 2.7.0cvs1.patchset
 ( cvs diff -u -r 1.28.2.9 -r 1.28.2.10 po/nl.po;  ) > 2.7.0cvs2.patchset
+( cvs diff -u -r 1.2.2.29 -r 1.2.2.30 src/gtk/filesel.c;  ) > 2.7.0cvs3.patchset
diff --git a/configure.ac b/configure.ac
index 199249b57..e32e3305d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=2
+EXTRA_VERSION=3
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/gtk/filesel.c b/src/gtk/filesel.c
index 1062014fd..35cd96635 100644
--- a/src/gtk/filesel.c
+++ b/src/gtk/filesel.c
@@ -121,7 +121,7 @@ static GList *filesel_create(const gchar *title, const gchar *path,
 
 	if (path && strlen(path) > 0) {
 		char *filename = NULL;
-		char *realpath = strdup(path);
+		char *realpath = g_strdup(path);
 		char *tmp = NULL;
 		if (path[strlen(path)-1] == G_DIR_SEPARATOR) {
 			filename = "";
@@ -130,8 +130,8 @@ static GList *filesel_create(const gchar *title, const gchar *path,
 			*(strrchr(realpath, G_DIR_SEPARATOR)+1) = '\0';
 		} else {
 			filename = (char *) path;
-			free(realpath); 
-			realpath = strdup(get_home_dir());
+			g_free(realpath); 
+			realpath = g_strdup(get_home_dir());
 		}
 		if (g_utf8_validate(realpath, -1, NULL))
 			tmp = g_filename_from_utf8(realpath, -1, NULL, NULL, NULL);
@@ -148,7 +148,7 @@ static GList *filesel_create(const gchar *title, const gchar *path,
 			gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(chooser), tmp);
 			g_free(tmp);
 		}
-		free(realpath);
+		g_free(realpath);
 	} else {
 		gchar *tmp = NULL;
 		if (!prefs_common.attach_load_dir)
@@ -170,7 +170,7 @@ static GList *filesel_create(const gchar *title, const gchar *path,
 	slist_orig = slist;
 	
 	if (slist) {
-		gchar *tmp = strdup(slist->data);
+		gchar *tmp = g_strdup(slist->data);
 
 		if (!path && prefs_common.attach_load_dir)
 			g_free(prefs_common.attach_load_dir);
@@ -226,7 +226,7 @@ static gchar *filesel_select_file(const gchar *title, const gchar *path,
 	GList * list = filesel_create(title, path, FALSE, open, folder_mode, filter);
 	gchar * result = NULL;
 	if (list) {
-		result = strdup(list->data);
+		result = g_strdup(list->data);
 	}
 	g_list_free(list);
 	return result;