[evolution-patches] cleanups for evolution/e-util

[Kjartan Maraas <kmaraas broadpark no>]

Some more of the same type.

Cheers
Kjartan

? e-system.error
Index: e-account-list.c
===================================================================
RCS file: /cvs/gnome/evolution/e-util/e-account-list.c,v
retrieving revision 1.12
diff -u -p -r1.12 e-account-list.c
--- e-account-list.c	24 Aug 2005 03:05:59 -0000	1.12
+++ e-account-list.c	10 Dec 2005 18:40:28 -0000
@@ -458,7 +458,6 @@ e_account_list_set_default(EAccountList 
 const EAccount *
 e_account_list_find(EAccountList *accounts, e_account_find_t type, const char *key)
 {
-	char *val;
 	EIterator *it;
 	const EAccount *account = NULL;
 
@@ -475,7 +474,6 @@ e_account_list_find(EAccountList *accoun
 
 		account = (const EAccount *)e_iterator_get (it);
 
-		val = NULL;
 		switch(type) {
 		case E_ACCOUNT_FIND_NAME:
 			found = strcmp(account->name, key) == 0;
Index: e-config.c
===================================================================
RCS file: /cvs/gnome/evolution/e-util/e-config.c,v
retrieving revision 1.21
diff -u -p -r1.21 e-config.c
--- e-config.c	11 Jul 2005 14:17:15 -0000	1.21
+++ e-config.c	10 Dec 2005 18:40:28 -0000
@@ -77,7 +77,7 @@ struct _widget_node {
 	struct _GtkWidget *widget; /* widget created by the factory, if any */
 	struct _GtkWidget *frame; /* if created by us */
 
-	int empty:1;		/* set if empty (i.e. hidden) */
+	guint empty:1;		/* set if empty (i.e. hidden) */
 };
 
 struct _check_node {
Index: e-icon-factory.c
===================================================================
RCS file: /cvs/gnome/evolution/e-util/e-icon-factory.c,v
retrieving revision 1.13
diff -u -p -r1.13 e-icon-factory.c
--- e-icon-factory.c	26 Nov 2004 13:57:33 -0000	1.13
+++ e-icon-factory.c	10 Dec 2005 18:40:28 -0000
@@ -100,7 +100,7 @@ load_icon (const char *icon_key, const c
 	if (!filename || !(unscaled = gdk_pixbuf_new_from_file (filename, NULL))) {
 		if (scale) {
 			struct dirent *dent;
-			int width, height;
+			int width;
 			size_t baselen;
 			GString *path;
 			DIR *dir;
@@ -125,7 +125,7 @@ load_icon (const char *icon_key, const c
 				if (((width = strtol (dent->d_name, &x, 10)) < size) || *x != 'x')
 					continue;
 				
-				if (((height = strtol (x + 1, &x, 10)) != width) || *x != '\0')
+				if (((strtol (x + 1, &x, 10)) != width) || *x != '\0')
 					continue;
 				
 				/* if the icon exists in this directory, we can [use/scale] it */
Index: e-iconv.c
===================================================================
RCS file: /cvs/gnome/evolution/e-util/e-iconv.c,v
retrieving revision 1.29
diff -u -p -r1.29 e-iconv.c
--- e-iconv.c	18 Aug 2005 00:40:37 -0000	1.29
+++ e-iconv.c	10 Dec 2005 18:40:29 -0000
@@ -92,7 +92,7 @@ static GHashTable *iconv_charsets = NULL
 static char *locale_charset = NULL;
 static char *locale_lang = NULL;
 
-struct {
+static struct {
 	char *charset;
 	char *iconv_name;
 } known_iconv_charsets[] = {
Index: e-import.c
===================================================================
RCS file: /cvs/gnome/evolution/e-util/e-import.c,v
retrieving revision 1.3
diff -u -p -r1.3 e-import.c
--- e-import.c	14 Jul 2005 02:13:15 -0000	1.3
+++ e-import.c	10 Dec 2005 18:40:29 -0000
@@ -69,18 +69,12 @@ static void
 ep_init(GObject *o)
 {
 	/*EImport *emp = (EImport *)o;*/
-	struct _EImportPrivate *p;
-
-	p = _PRIVATE(o);
 }
 
 static void
 ep_finalise(GObject *o)
 {
 	EImport *emp = (EImport *)o;
-	struct _EImportPrivate *p;
-
-	p = _PRIVATE(emp);
 
 	d(printf("finalising EImport %p\n", o));
 
Index: e-list.c
===================================================================
RCS file: /cvs/gnome/evolution/e-util/e-list.c,v
retrieving revision 1.9
diff -u -p -r1.9 e-list.c
--- e-list.c	16 Jan 2003 19:38:44 -0000	1.9
+++ e-list.c	10 Dec 2005 18:40:29 -0000
@@ -165,8 +165,7 @@ e_list_remove_link (EList *list, GList *
 	}
 	if (list->free)
 		list->free(link->data, list->closure);
-	list->list = g_list_remove_link(list->list, link);
-	g_list_free_1(link);
+	list->list = g_list_delete_link(list->list, link);
 }
 
 void
Index: e-plugin.c
===================================================================
RCS file: /cvs/gnome/evolution/e-util/e-plugin.c,v
retrieving revision 1.18
diff -u -p -r1.18 e-plugin.c
--- e-plugin.c	22 Aug 2005 19:46:44 -0000	1.18
+++ e-plugin.c	10 Dec 2005 18:40:30 -0000
@@ -539,12 +539,12 @@ e_plugin_register_type(GType type)
 
 			for (l=pdoc->plugins;l;l=g_slist_next(l)) {
 				xmlNodePtr root = l->data;
-				char *type;
+				char *prop_type;
 
-				type = xmlGetProp(root, "type");
+				prop_type = xmlGetProp(root, "type");
 				if (!strcmp(type, klass->type))
 					add = g_slist_append(add, l->data);
-				xmlFree(type);
+				xmlFree(prop_type);
 			}
 
 			for (l=add;l;l=g_slist_next(l)) {
Index: e-plugin.h
===================================================================
RCS file: /cvs/gnome/evolution/e-util/e-plugin.h,v
retrieving revision 1.8
diff -u -p -r1.8 e-plugin.h
--- e-plugin.h	25 May 2005 10:51:36 -0000	1.8
+++ e-plugin.h	10 Dec 2005 18:40:30 -0000
@@ -52,7 +52,7 @@ struct _EPlugin {
 	GSList *hooks;
 	GSList *authors;	/* EPluginAuthor structures */
 
-	int enabled:1;
+	guint enabled:1;
 };
 
 /**
Index: e-popup.c
===================================================================
RCS file: /cvs/gnome/evolution/e-util/e-popup.c,v
retrieving revision 1.10
diff -u -p -r1.10 e-popup.c
--- e-popup.c	13 May 2005 11:08:46 -0000	1.10
+++ e-popup.c	10 Dec 2005 18:40:31 -0000
@@ -118,6 +118,7 @@ ep_finalise(GObject *o)
 		/* free item activate callback data */
 		inode = mnode->items;
 		while (inode) {
+			/* This was declared as _menu_node above already */
 			struct _item_node *nnode = inode->link;
 
 			g_free(inode);
Index: e-profile-event.c
===================================================================
RCS file: /cvs/gnome/evolution/e-util/e-profile-event.c,v
retrieving revision 1.3
diff -u -p -r1.3 e-profile-event.c
--- e-profile-event.c	28 Sep 2005 10:20:03 -0000	1.3
+++ e-profile-event.c	10 Dec 2005 18:40:32 -0000
@@ -135,8 +135,6 @@ e_profile_event_emit(const char *id, con
 }
 #else
 #undef e_profile_event_emit
-void e_profile_event_emit(const char *id, const char *uid, guint32 flags);
-
 void
 e_profile_event_emit(const char *id, const char *uid, guint32 flags)
 {
Index: e-text-event-processor-emacs-like.c
===================================================================
RCS file: /cvs/gnome/evolution/e-util/e-text-event-processor-emacs-like.c,v
retrieving revision 1.21
diff -u -p -r1.21 e-text-event-processor-emacs-like.c
--- e-text-event-processor-emacs-like.c	29 Apr 2005 14:18:01 -0000	1.21
+++ e-text-event-processor-emacs-like.c	10 Dec 2005 18:40:32 -0000
@@ -133,6 +133,12 @@ e_text_event_processor_emacs_like_event 
 	ETextEventProcessorCommand command;
 	ETextEventProcessorEmacsLike *tep_el = E_TEXT_EVENT_PROCESSOR_EMACS_LIKE(tep);
 	command.action = E_TEP_NOP;
+	/* Warning from the Intel compiler here:
+	 * e-text-event-processor-emacs-like.c(136): warning #589: transfer of control bypasses initialization of:
+         *   variable "key" (declared at line 194)
+         *  switch (event->type) {
+         *  ^
+	 */
 	switch (event->type) {
 	case GDK_BUTTON_PRESS:
 		if (event->button.button == 1) {