** Fixes bug #437579

2007-10-09  Matthew Barnes  <mbarnes@redhat.com>

	** Fixes bug #437579

	* addressbook/conduit/address-conduit.c:
	* addressbook/gui/component/addressbook-config.c:
	* addressbook/gui/contact-editor/e-contact-editor.c:
	* addressbook/gui/widgets/eab-gui-util.c:
	* calendar/conduits/calendar/calendar-conduit.c:
	* calendar/conduits/memo/memo-conduit.c:
	* calendar/conduits/todo/todo-conduit.c:
	* calendar/gui/dialogs/alarm-dialog.c:
	* calendar/gui/dialogs/event-page.c:
	* calendar/gui/dialogs/memo-page.c:
	* calendar/gui/dialogs/task-page.c:
	* calendar/gui/e-day-view-layout.c:
	* calendar/gui/e-day-view-layout.h:
	* calendar/gui/print.c:
	* e-util/e-pilot-map.c:
	* e-util/e-plugin.c:
	* e-util/e-profile-event.c:
	* e-util/e-signature.c:
	* filter/filter-file.c:
	* mail/e-searching-tokenizer.c:
	* mail/em-folder-browser.c:
	* mail/em-format-html.c:
	* mail/em-format-view.c:
	* mail/em-format.c:
	* mail/em-mailer-prefs.c:
	* mail/em-mailer-prefs.h:
	* mail/mail-session.c:
	* mail/mail-session.h:
	* mail/mail-vfolder.c:
	* mail/message-list.c:
	* plugins/bbdb/bbdb.c:
	* plugins/bbdb/gaimbuddies.c:
	* plugins/calendar-http/calendar-http.c:
	* plugins/exchange-operations/exchange-user-dialog.c:
	* plugins/face/face.c:
	* shell/e-shell-window.c:
	* shell/e-shell.c:
	* smime/lib/e-cert-db.c:
	* tools/killev.c:
	* widgets/misc/e-cursors.c:
	* widgets/misc/e-spinner.c:
	* widgets/misc/e-unicode.c:
	* widgets/table/e-table-field-chooser-item.c:
	* widgets/table/e-table-header-item.c:
	* widgets/table/e-table-header-item.h:
	* widgets/table/e-table-header-utils.c:
	* widgets/table/e-table.c:
	* widgets/text/e-text.c:
	Fix various compiler warnings.  Patch from Milan Crha.


svn path=/trunk/; revision=34368

1 files changed, 14 insertions, 13 deletions

diff --git a/e-util/e-plugin.c b/e-util/e-plugin.c
index 712effb25b..edcdb4d43c 100644
--- a/e-util/e-plugin.c
+++ b/e-util/e-plugin.c
@@ -187,21 +187,20 @@ ep_construct(EPlugin *ep, xmlNodePtr root)
 					ep->hooks = g_slist_append(ep->hooks, hook);
 				}
 			} else {
-				GSList *l;
-				char *oldclass;
+				gpointer l, oldclass;
 
 				if (ep_plugins_pending_hooks == NULL)
 					ep_plugins_pending_hooks = g_hash_table_new(g_str_hash, g_str_equal);
-				if (!g_hash_table_lookup_extended(ep_plugins_pending_hooks, class, (void **)&oldclass, (void **)&l)) {
+				if (!g_hash_table_lookup_extended (ep_plugins_pending_hooks, class, &oldclass, &l)) {
 					oldclass = class;
 					l = NULL;
 				}
 				else {
 					g_free(class);
 				}
-				l = g_slist_prepend(l, ep);
-				g_hash_table_insert(ep_plugins_pending_hooks, oldclass, l);
-				ep->hooks_pending = g_slist_prepend(ep->hooks_pending, node);
+				l = g_slist_prepend (l, ep);
+				g_hash_table_insert (ep_plugins_pending_hooks, oldclass, l);
+				ep->hooks_pending = g_slist_prepend (ep->hooks_pending, node);
 			}
 		} else if (strcmp((char *)node->name, "description") == 0) {
 			ep->description = e_plugin_xml_content_domain(node, ep->domain);
@@ -1110,8 +1109,10 @@ void
 e_plugin_hook_register_type(GType type)
 {
 	EPluginHookClass *klass, *oldklass;
-	GSList *l, *plugins;
-	char *class;
+	GSList *l;
+
+	gpointer plugins; /* GSList */
+	gpointer class;
 
 	if (eph_types == NULL)
 		eph_types = g_hash_table_new(g_str_hash, g_str_equal);
@@ -1133,17 +1134,17 @@ e_plugin_hook_register_type(GType type)
 	/* if we've already loaded a plugin that needed this hook but it didn't exist, re-load it now */
 
 	if (ep_plugins_pending_hooks
-	    && g_hash_table_lookup_extended(ep_plugins_pending_hooks, klass->id, (void **)&class, (void **)&plugins)) {
+	    && g_hash_table_lookup_extended (ep_plugins_pending_hooks, klass->id, &class, &plugins)) {
 		struct _plugin_doc *pdoc, *ndoc;
 
-		g_hash_table_remove(ep_plugins_pending_hooks, class);
-		g_free(class);
+		g_hash_table_remove (ep_plugins_pending_hooks, class);
+		g_free (class);
 		for (l = plugins; l; l = g_slist_next(l)) {
 			EPlugin *ep = l->data;
 
-			ep_load_pending(ep, klass);
+			ep_load_pending (ep, klass);
 		}
-		g_slist_free(plugins);
+		g_slist_free (plugins);
 
 		/* See if we can now garbage collect the xml definition since its been fully loaded */