Use g_list_delete_link() instead of g_list_remove_link() +

2006-01-30  Kjartan Maraas  <kmaraas@gnome.org>

	* tools/evolution-launch-composer.c: (do_send):
	Use g_list_delete_link() instead of g_list_remove_link()
	+ g_list_free_1().
	* tools/killev.c: mark a couple vars static and remove a
	stray semi-colon.

svn path=/trunk/; revision=31370

3 files changed, 12 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index cf77b55804..3f91693803 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-01-30  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* tools/evolution-launch-composer.c: (do_send):
+	Use g_list_delete_link() instead of g_list_remove_link()
+	+ g_list_free_1().
+	* tools/killev.c: mark a couple vars static and remove a
+	stray semi-colon.
+
 2006-01-21  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
 
 	* configure.in: Add "zh_HK" to ALL_LINGUAS.
diff --git a/tools/evolution-launch-composer.c b/tools/evolution-launch-composer.c
index 65745d95b6..ac152dcc20 100644
--- a/tools/evolution-launch-composer.c
+++ b/tools/evolution-launch-composer.c
@@ -162,7 +162,6 @@ do_send (GNOME_Evolution_Composer composer_server)
 
 	while (attachments) {
 		attachment_t *attachment = attachments->data;
-		GList *temp;
 
 		attach_data = GNOME_Evolution_Composer_AttachmentData__alloc();
 		attach_data->_maximum = attach_data->_length = attachment->size;
@@ -187,9 +186,7 @@ do_send (GNOME_Evolution_Composer composer_server)
 
 		free_attachment (attachment);
 
-		temp = attachments;
-		attachments = g_list_remove_link (attachments, attachments);
-		g_list_free_1 (temp);
+		attachments = g_list_delete_link (attachments, attachments);
 	}
 
 	to_list = GNOME_Evolution_Composer_RecipientList__alloc ();
diff --git a/tools/killev.c b/tools/killev.c
index 0ab1b23a90..419b958587 100644
--- a/tools/killev.c
+++ b/tools/killev.c
@@ -39,8 +39,8 @@ typedef struct {
 	GPtrArray *names;
 } KillevComponent;
 
-GSList *languages;
-GHashTable *components;
+static GSList *languages;
+static GHashTable *components;
 
 static gboolean
 kill_process (const char *proc_name, KillevComponent *comp)
@@ -80,7 +80,7 @@ kill_process (const char *proc_name, KillevComponent *comp)
 	system (command);
 	g_free (command);
 	return TRUE;
-};
+}
 
 static const char *patterns[] = {
 	"%s", "%.16s", "lt-%s", "lt-%.13s"