From 6c988be90916e1928b48b8ac7a8feceaed9f5c57 Mon Sep 17 00:00:00 2001
From: Federico Mena Quintero <federico@ximian.com>
Date: Tue, 12 Nov 2002 20:59:08 +0000
Subject: #include <string.h>

2002-11-12  Federico Mena Quintero  <federico@ximian.com>

	* pcs/cal-backend-util.c: #include <string.h>

	* pcs/cal.c: Fixed prototypes of the CORBA method implementations.

	* pcs/cal-backend-file.c (cal_backend_file_dispose): Added a
	dispose method.
	(cal_backend_file_get_free_busy): Converted to use EConfigListener
	rather than BonoboConfigDatabase.

	* gui/alarm-notify/alarm-notify.c: #include <string.h>, fix use of
	g_hash_table_lookup_extended().

	* gui/alarm-notify/alarm-notify-dialog.c: Substitute deprecated
	GTK+ functions for new ones.

	* gui/alarm-notify/alarm-queue.c: Likewise.

	* gui/alarm-notify/notify-main.c: #include <string.h>,
	<gtk/gtkmain.h>.

	* gui/alarm-notify/save.c: #include <string.h>.

svn path=/trunk/; revision=18726
---
 calendar/gui/alarm-notify/alarm-notify.c | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'calendar/gui/alarm-notify/alarm-notify.c')

diff --git a/calendar/gui/alarm-notify/alarm-notify.c b/calendar/gui/alarm-notify/alarm-notify.c
index 8cba059431..290fbd2617 100644
--- a/calendar/gui/alarm-notify/alarm-notify.c
+++ b/calendar/gui/alarm-notify/alarm-notify.c
@@ -22,6 +22,7 @@
 #include "config.h"
 #endif
 
+#include <string.h>
 #include <cal-client/cal-client.h>
 #include "alarm-notify.h"
 #include "alarm-queue.h"
@@ -293,6 +294,7 @@ AlarmNotify_removeCalendar (PortableServer_Servant servant,
 	LoadedClient *lc;
 	EUri *uri;
 	char *orig_str;
+	gpointer lc_ptr, orig_str_ptr;
 	gboolean found;
 
 	an = ALARM_NOTIFY (bonobo_object_from_servant (servant));
@@ -309,8 +311,11 @@ AlarmNotify_removeCalendar (PortableServer_Servant servant,
 	remove_uri_to_load (uri);
 
 	found = g_hash_table_lookup_extended (priv->uri_client_hash, str_uri,
-					      (gpointer *) &orig_str,
-					      (gpointer *) &lc);
+					      &orig_str_ptr,
+					      &lc_ptr);
+	orig_str = orig_str_ptr;
+	lc = lc_ptr;
+
 	e_uri_free (uri);
 
 	if (!lc) {
@@ -413,7 +418,7 @@ alarm_notify_add_calendar (AlarmNotify *an, const char *str_uri, gboolean load_a
 	EUri *uri;
 	CalClient *client;
 	LoadedClient *lc;
-	char *s;
+	gpointer lc_ptr, s_ptr;
 
 	g_return_if_fail (an != NULL);
 	g_return_if_fail (IS_ALARM_NOTIFY (an));
@@ -430,7 +435,12 @@ alarm_notify_add_calendar (AlarmNotify *an, const char *str_uri, gboolean load_a
 		return;
 	}
 
-	if (g_hash_table_lookup_extended (priv->uri_client_hash, str_uri, &s, &lc)) {
+	if (g_hash_table_lookup_extended (priv->uri_client_hash, str_uri, &s_ptr, &lc_ptr)) {
+		char *s;
+
+		lc = lc_ptr;
+		s = s_ptr;
+
 		g_hash_table_remove (priv->uri_client_hash, str_uri);
 
 		g_signal_handlers_disconnect_matched (G_OBJECT (lc->client),
-- 
cgit v1.2.3