GNOME.org
 

Re: [evolution-patches] Cleanups for evolution/calendar

tor, 17,.08.2006 kl. 15.13 +0530, skrev Srinivasa Ragavan:
> On Thu, 2006-08-17 at 10:49 +0200, Kjartan Maraas wrote:
> > tor, 17,.08.2006 kl. 11.52 +0530, skrev Srinivasa Ragavan:
> > > Hi Kjartan,
> > > 
> > > On Wed, 2006-08-16 at 20:35 +0200, Kjartan Maraas wrote:
> > > > ons, 16,.08.2006 kl. 13.01 -0400, skrev Joe Shaw:
> > > > > Hi,
> > > > > 
> > > > > On Wed, 2006-08-16 at 18:22 +0200, Kjartan Maraas wrote:
> > > > > > > > > On Wed, 2006-08-16 at 16:53 +0200, Kjartan Maraas wrote:
> > > > > > > > > > -               d (printf("%s:%d (list_changed_cb) - Removing Calendar %s\n", __FILE__, __LINE__, l->data));            
> > > > > > > > > > +               d (printf("%p:%d (list_changed_cb) - Removing Calendar %s\n", __FILE__, __LINE__, l->data));            
> > > > > >
> > > > > > I'm a bit baffled by the use of %d for all these structs and pointers.
> > > > > > If the debug output is supposed to show strings to the user they should
> > > > > > all be %s and casted to char * I guess?
> > > > > 
> > > > > %d is only used for the second value, __LINE__, which is a special
> > > > > preprocessor macro set by the compiler.  My understanding is that
> > > > > __LINE__ is just an integer value.  Hence the use of %d.
> > > > > 
> > > > > Likewise, __FILE__ is set in the same way, but it is a string constant.
> > > > > Thus, %s.
> > > > > 
> > > > > The warning is actually for "%s" but references the 4th argument (the
> > > > > format string first, __FILE__ second, __LINE__ third, l->data fourth).
> > > > > The issue is that l->data is defined as a gpointer, but %s implies char
> > > > > *.
> > > > > 
> > > > > l is an element in a GList or GSList and it was designed to be as
> > > > > generic as possible.  That's why the data value is defines as a
> > > > > gpointer: you can store a pointer to a string, pointer to a structure,
> > > > > even an integer casted to a pointer in there.  But the compiler doesn't
> > > > > know exactly what it is and can't automatically cast from a gpointer to
> > > > > the appropriate type.
> > > > 
> > > > Yeah, I follow that.
> > > > 
> > > > > Therefore, it's important for the developer to know what type l->data
> > > > > really is.  I presume it's a string since the %s was already in the
> > > > > format specifier, so just casting l->data to char * is probably the
> > > > > right thing.  Otherwise someone probably would have noticed garbage
> > > > > being printed on the console by now.
> > > > > 
> > > > Looking through the rest of the file almost all debug printouts use %d
> > > > and try to print out pointers to structs, strings and so on. I'm not
> > > > sure what info is really wanted there so maybe the people who added the
> > > > debug statements in the alarm code could chime in and reveal what was
> > > > intended here? :-)
> > > > 
> > > It is a string and casting to (char *) should just solve the problem.
> > > You are right, the %d has to be converted to %p. It was added to debug
> > > the multiple corruptions happening in alarm code. 
> > > 
> > Still a bit confused here. Do you want the relevant %d changed to %s and
> > the argument casted to char * or should I just change the format
> > specifier to %p?
> > 
> a (char *) needs to be appended for %s types and %d's have to be
> converted to %p.
> 
> > Cheers
> > Kjartan
> > 

Here's an updated patch. There could be places where %p should be
swapped with char * + %s in here so just say the word and I'll change
those.

Cheers
Kjartan


? calendar.error
? gui/apps_evolution_calendar-2.8.schemas
Index: gui/alarm-notify/alarm-notify-dialog.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/alarm-notify/alarm-notify-dialog.c,v
retrieving revision 1.45
diff -u -p -r1.45 alarm-notify-dialog.c
--- gui/alarm-notify/alarm-notify-dialog.c	23 May 2006 08:24:52 -0000	1.45
+++ gui/alarm-notify/alarm-notify-dialog.c	22 Aug 2006 10:29:21 -0000
@@ -148,7 +148,6 @@ dialog_response_cb (GtkDialog *dialog, g
 
 	if (!funcinfo) {
 		 GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (an->treeview));
-		 gboolean valid = gtk_tree_model_get_iter_first (model, &iter);
 		 gtk_tree_model_get (model, &iter, ALARM_FUNCINFO_COLUMN, &funcinfo, -1);
 	}
 	g_return_if_fail (funcinfo);
Index: gui/alarm-notify/alarm-notify.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/alarm-notify/alarm-notify.c,v
retrieving revision 1.55
diff -u -p -r1.55 alarm-notify.c
--- gui/alarm-notify/alarm-notify.c	21 Apr 2006 19:38:16 -0000	1.55
+++ gui/alarm-notify/alarm-notify.c	22 Aug 2006 10:29:21 -0000
@@ -26,6 +26,7 @@
 #include <string.h>
 #include <bonobo/bonobo-main.h>
 #include <libedataserver/e-url.h>
+#include <libedataserver/e-data-server-util.h>
 #include <libedataserverui/e-passwords.h>
 #include <libecal/e-cal.h>
 #include "alarm-notify.h"
@@ -170,7 +171,7 @@ list_changed_cb (ESourceList *source_lis
 	g_hash_table_foreach (priv->uri_client_hash[source_type], (GHFunc) process_removal_in_hash, &prd);
 
 	for (l = prd.removals; l; l = l->next) {
-		d (printf("%s:%d (list_changed_cb) - Removing Calendar %s\n", __FILE__, __LINE__, l->data));		
+		d (printf("%s:%d (list_changed_cb) - Removing Calendar %p\n", __FILE__, __LINE__, l->data));		
 		alarm_notify_remove_calendar (an, source_type, l->data);
 	}
 	g_list_free (prd.removals);
@@ -253,7 +254,7 @@ dequeue_client (gpointer key, gpointer v
 {
 	ECal *client = value;
 
-	d (printf("%s:%d (dequeue_client) - Removing client %d\n ", __FILE__, __LINE__, client));
+	d (printf("%s:%d (dequeue_client) - Removing client %p\n ", __FILE__, __LINE__, client));
 	alarm_queue_remove_client (client);
 }
 
@@ -328,9 +329,9 @@ static gboolean
 alarm_msgport_replied(GIOChannel *source, GIOCondition cond, void *d)
 {
 	EMsgPort *port = (EMsgPort *)d;
-	AlarmMsg *m;
+	EMsg *m;
 
-	while (( m = (AlarmMsg *)e_msgport_get(port))) {
+	while (( m = e_msgport_get(port))) {
 		d (printf("%s:%d (alarm_msgport_replied) - %p: Replied to GUI thread\n", __FILE__, __LINE__, m));
 		alarm_msg_destroy(NULL, m, NULL);
 	}
@@ -450,7 +451,7 @@ alarm_notify_add_calendar (AlarmNotify *
 	client = auth_new_cal_from_source (source, source_type);
 
 	if (client) {
-		d (printf("%s:%d (alarm_notify_add_calendar) - Calendar Open Async... %d\n", __FILE__, __LINE__, client));	
+		d (printf("%s:%d (alarm_notify_add_calendar) - Calendar Open Async... %p\n", __FILE__, __LINE__, client));	
 		g_hash_table_insert (priv->uri_client_hash[source_type], g_strdup (str_uri), client);
 		g_signal_connect (G_OBJECT (client), "cal_opened", G_CALLBACK (cal_opened_cb), an);
 		e_cal_open_async (client, FALSE);
@@ -470,7 +471,7 @@ alarm_notify_remove_calendar (AlarmNotif
 
 	client = g_hash_table_lookup (priv->uri_client_hash[source_type], str_uri);
 	if (client) {
-		d (printf("%s:%d (alarm_notify_remove_calendar) - Removing Client %d\n", __FILE__, __LINE__, client));
+		d (printf("%s:%d (alarm_notify_remove_calendar) - Removing Client %p\n", __FILE__, __LINE__, client));
 		alarm_queue_remove_client (client);
 		g_hash_table_remove (priv->uri_client_hash[source_type], str_uri);
 	}
Index: gui/alarm-notify/alarm-queue.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/alarm-notify/alarm-queue.c,v
retrieving revision 1.103
diff -u -p -r1.103 alarm-queue.c
--- gui/alarm-notify/alarm-queue.c	14 Aug 2006 08:18:49 -0000	1.103
+++ gui/alarm-notify/alarm-queue.c	22 Aug 2006 10:29:21 -0000
@@ -219,7 +219,7 @@ queue_midnight_refresh (void)
 	
 	midnight_refresh_id = alarm_add (midnight, midnight_refresh_cb, NULL, NULL);
 	if (!midnight_refresh_id) {
-		 d(printf("%s:%d (queue_midnight_refresh)) - Could not setup the midnight refresh alarm\n",__FILE__, __LINE__));
+		 d(printf("%s:%d (queue_midnight_refresh) - Could not setup the midnight refresh alarm\n",__FILE__, __LINE__));
 		/* FIXME: what to do? */
 	}
 }
@@ -228,9 +228,9 @@ queue_midnight_refresh (void)
 static void
 add_client_alarms_cb (gpointer key, gpointer value, gpointer data)
 {
-	ClientAlarms *ca;
+	ClientAlarms *ca = (ClientAlarms *)data;
 	
-	d(printf("%s:%d (add_client_alarms_cb) - Adding %d\n",__FILE__, __LINE__, ca));
+	d(printf("%s:%d (add_client_alarms_cb) - Adding %p\n",__FILE__, __LINE__, ca));
 	
 	ca = value;
 	load_alarms_for_today (ca);
@@ -253,7 +253,7 @@ midnight_refresh_async (EThread *e, Alar
 
 	/* Re-schedule the midnight update */
 	if (list->remove && midnight_refresh_id != NULL) {
-		d(printf("%s:%d (midnight_refresh_async)) - Reschedule the midnight update \n",__FILE__, __LINE__)); 
+		d(printf("%s:%d (midnight_refresh_async) - Reschedule the midnight update \n",__FILE__, __LINE__)); 
 		alarm_remove (midnight_refresh_id);
 		midnight_refresh_id = NULL;
 	}
@@ -345,7 +345,7 @@ remove_queued_alarm (CompQueuedAlarms *c
 	if (cqa->queued_alarms != NULL)
 		return FALSE;
 
-	d(printf("%s:%d (remove_queued_alarm)) - Last Component. Removing CQA- Free=%d\n",__FILE__, __LINE__, free_object));
+	d(printf("%s:%d (remove_queued_alarm) - Last Component. Removing CQA- Free=%d\n",__FILE__, __LINE__, free_object));
 	if (free_object) {
 		cqa->id = NULL;
 		cqa->parent_client = NULL;
@@ -444,7 +444,7 @@ add_component_alarms (ClientAlarms *ca, 
 	cqa->expecting_update = FALSE;
 
 	cqa->queued_alarms = NULL;
-	d(printf("%s:%d (add_component_alarms)) - Creating CQA %d\n",__FILE__, __LINE__, cqa));
+	d(printf("%s:%d (add_component_alarms) - Creating CQA %p\n",__FILE__, __LINE__, cqa));
 	
 	for (l = alarms->alarms; l; l = l->next) {
 		ECalComponentAlarmInstance *instance;
@@ -456,7 +456,7 @@ add_component_alarms (ClientAlarms *ca, 
 
 		alarm_id = alarm_add (instance->trigger, alarm_trigger_cb, cqa, NULL);
 		if (!alarm_id) {
-			d(printf("%s:%d (add_component_alarms)) - Could not schedule a trigger for %s. Discarding \n",__FILE__, __LINE__, ctime(&(instance->trigger))));
+			d(printf("%s:%d (add_component_alarms) - Could not schedule a trigger for %s. Discarding \n",__FILE__, __LINE__, ctime(&(instance->trigger))));
 			continue;
 		}
 
@@ -467,7 +467,7 @@ add_component_alarms (ClientAlarms *ca, 
 		qa->snooze = FALSE;
 
 		cqa->queued_alarms = g_slist_prepend (cqa->queued_alarms, qa);
-		d(printf("%s:%d (add_component_alarms)) - Adding alarm %d(%d)at %s (%s)\n",__FILE__, __LINE__, qa, alarm_id, ctime (&(instance->trigger)), ctime(&tnow)));		
+		d(printf("%s:%d (add_component_alarms) - Adding alarm %s %s at %s %s\n",__FILE__, __LINE__, (char *)qa, (char *)alarm_id, ctime (&(instance->trigger)), ctime(&tnow)));		
 	}
 
 	id = e_cal_component_get_id (alarms->comp);
@@ -476,7 +476,7 @@ add_component_alarms (ClientAlarms *ca, 
 	if (cqa->queued_alarms == NULL) {
 		e_cal_component_alarms_free (cqa->alarms);
 		cqa->alarms = NULL;
-		d(printf("%s:%d (add_component_alarms)) - Failed to add all : %d\n",__FILE__, __LINE__, cqa));
+		d(printf("%s:%d (add_component_alarms) - Failed to add all : %p\n",__FILE__, __LINE__, cqa));
 		g_message ("Failed to add all\n");
 		g_free (cqa);
 		return;
@@ -484,7 +484,7 @@ add_component_alarms (ClientAlarms *ca, 
 
 	cqa->queued_alarms = g_slist_reverse (cqa->queued_alarms);
 	cqa->id = id;
-	d(printf("%s:%d (add_component_alarms)) - Alarm added for %s\n",__FILE__, __LINE__, id->uid));
+	d(printf("%s:%d (add_component_alarms) - Alarm added for %s\n",__FILE__, __LINE__, id->uid));
 	g_hash_table_insert (ca->uid_alarms_hash, cqa->id, cqa);
 }
 
@@ -569,7 +569,7 @@ cal_opened_cb (ECal *client, ECalendarSt
 
 	ca = data;
 
-	d(printf("%s:%d (cal_opened_cb)) - Opened Calendar %d (Status %d)\n",__FILE__, __LINE__, client, status==E_CALENDAR_STATUS_OK));
+	d(printf("%s:%d (cal_opened_cb) - Opened Calendar %s (Status %d)\n",__FILE__, __LINE__, (char *)client, status==E_CALENDAR_STATUS_OK));
 	if (status != E_CALENDAR_STATUS_OK)
 		return;
 
@@ -588,7 +588,7 @@ remove_alarms (CompQueuedAlarms *cqa, gb
 {
 	GSList *l;
 
-	d(printf("%s:%d (remove_alarms) - Removing for %d\n",__FILE__, __LINE__, cqa));
+	d(printf("%s:%d (remove_alarms) - Removing for %s\n",__FILE__, __LINE__, (char *)cqa));
 	for (l = cqa->queued_alarms; l;) {
 		QueuedAlarm *qa;
 
@@ -628,7 +628,7 @@ remove_comp (ClientAlarms *ca, ECalCompo
 	 */
 	g_assert (cqa->queued_alarms != NULL);
 	
-	d(printf("%s:%d (remove_comp) - Removing CQA %d\n",__FILE__, __LINE__, cqa));
+	d(printf("%s:%d (remove_comp) - Removing CQA %s\n",__FILE__, __LINE__, (char *)cqa));
 	remove_alarms (cqa, TRUE);
 }
 
@@ -709,7 +709,7 @@ query_objects_changed_async (EThread *e,
 		found = e_cal_get_alarms_for_object (ca->client, id, from, day_end, &alarms);
 
 		if (!found) {
-			d(printf("%s:%d (query_objects_changed_async) - No Alarm found for client %d\n",__FILE__, __LINE__, ca->client));
+			d(printf("%s:%d (query_objects_changed_async) - No Alarm found for client %s\n",__FILE__, __LINE__, (char *)ca->client));
 			tray_list_remove_cqa (lookup_comp_queued_alarms (ca, id));
 			remove_comp (ca, id);
 			g_hash_table_remove (ca->uid_alarms_hash, id);
@@ -765,7 +765,7 @@ query_objects_changed_async (EThread *e,
 			qa->snooze = FALSE;
 			qa->orig_trigger = instance->trigger;	
 			cqa->queued_alarms = g_slist_prepend (cqa->queued_alarms, qa);
-			d(printf("%s:%d (query_objects_changed_async) - Adding %d to queue \n",__FILE__, __LINE__, qa));
+			d(printf("%s:%d (query_objects_changed_async) - Adding %p to queue \n",__FILE__, __LINE__, qa));
 		}
 		
 		cqa->queued_alarms = g_slist_reverse (cqa->queued_alarms);
@@ -888,7 +888,7 @@ edit_component (ECal *client, ECalCompon
 	GNOME_Evolution_Calendar_CompEditorFactory factory;
 	GNOME_Evolution_Calendar_CompEditorFactory_CompEditorMode corba_type;
 
-	d(printf("%s:%d (edit_component) - Client %d\n",__FILE__, __LINE__, client));
+	d(printf("%s:%d (edit_component) - Client %p\n",__FILE__, __LINE__, client));
 	
 	e_cal_component_get_uid (comp, &uid);
 
@@ -1053,12 +1053,11 @@ tray_list_remove_cqa_async(EThread *e, A
 	CompQueuedAlarms *cqa = tmsg->cqa;
 	GList *list = tray_icons_list;
 
-	d(printf("%s:%d (tray_list_remove_cqa_async) - Removing CQA %d from tray list\n",__FILE__, __LINE__, cqa));
+	d(printf("%s:%d (tray_list_remove_cqa_async) - Removing CQA %p from tray list\n",__FILE__, __LINE__, cqa));
 	
 	while (list) {
 		TrayIconData *tray_data = list->data;
 		GList *tmp = list;
-		GtkTreeIter iter;
 		GtkTreeModel *model;
 		
 		list = list->next;
@@ -1082,8 +1081,6 @@ tray_list_remove_cqa_async(EThread *e, A
 			alarm_notifications_dialog = NULL;
 		} else {
 			GtkTreeIter iter;
-			GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (alarm_notifications_dialog->treeview));
-			gboolean valid = gtk_tree_model_get_iter_first (model, &iter);		
 			GtkTreeSelection *sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (alarm_notifications_dialog->treeview));
 			gtk_tree_selection_select_iter (sel, &iter);
 		}
@@ -1166,7 +1163,7 @@ tray_list_remove_data_async(EThread *e, 
 	struct _tray_msg *tmsg = msg->data;
 	TrayIconData *tray_data = tmsg->data;
 
-	d(printf("%s:%d (tray_list_remove_data_async) - Removing %d from tray list\n",__FILE__, __LINE__, tray_data));
+	d(printf("%s:%d (tray_list_remove_data_async) - Removing %p from tray list\n",__FILE__, __LINE__, tray_data));
 	
 	tray_icons_list = g_list_remove_all (tray_icons_list, tray_data);
 	free_tray_icon_data (tray_data);
@@ -1239,7 +1236,6 @@ notify_dialog_cb (AlarmNotifyResult resu
 	case ALARM_NOTIFY_CLOSE:
 		d(printf("%s:%d (notify_dialog_cb) - Dialog close\n",__FILE__, __LINE__));
 		if (alarm_notifications_dialog) {
-			GList *list;
 			GtkTreeIter iter;
 			GtkTreeModel *model = 
 				gtk_tree_view_get_model (
@@ -1282,7 +1278,7 @@ open_alarm_dialog (TrayIconData *tray_da
 			g_source_remove (tray_blink_id);
 		tray_blink_id = -1;
 		
-		gtk_widget_destroy (tray_icon);
+		gtk_widget_destroy (GTK_WIDGET (tray_icon));
 		tray_icon = NULL;
 #ifndef USE_GTK_STATUS_ICON
 		tray_image = NULL;
@@ -1320,8 +1316,6 @@ open_alarm_dialog (TrayIconData *tray_da
 static gint
 tray_icon_clicked_cb (GtkWidget *widget, GdkEventButton *event, gpointer user_data)
 {
-	TrayIconData *tray_data = user_data;
-
 	if (event->type == GDK_BUTTON_PRESS) {
 			d(printf("%s:%d (tray_icon_clicked_cb) - left click and %d alarms\n",__FILE__, __LINE__, g_list_length (tray_icons_list))); 		 
 		if (event->button == 1 && g_list_length (tray_icons_list) > 0) {
@@ -1337,7 +1331,7 @@ tray_icon_clicked_cb (GtkWidget *widget,
 				g_source_remove (tray_blink_id);
 			tray_blink_id = -1;
 			
-			gtk_widget_destroy (tray_icon);
+			gtk_widget_destroy (GTK_WIDGET (tray_icon));
 			tray_icon = NULL;
 #ifndef USE_GTK_STATUS_ICON
 			tray_image = NULL;
@@ -1394,7 +1388,7 @@ static void
 tray_list_add_async (EThread *e, AlarmMsg *msg, void *data)
 {
 	struct _tray_msg *list = msg->data;
-	d(printf("%s:%d (tray_list_add_async) - Add %d\n",__FILE__, __LINE__, list->data));	
+	d(printf("%s:%d (tray_list_add_async) - Add %p\n",__FILE__, __LINE__, list->data));	
 	tray_icons_list = g_list_prepend (tray_icons_list, list->data);
 }
 
@@ -1892,7 +1886,7 @@ free_client_alarms_cb (gpointer key, gpo
 {
 	ClientAlarms *ca = value;
 
-	d(printf("%s:%d (free_client_alarms_cb) - %d \n",__FILE__, __LINE__, ca));
+	d(printf("%s:%d (free_client_alarms_cb) - %s\n",__FILE__, __LINE__, (char *)ca));
 	
 	if (ca) {
 		remove_client_alarms (ca);
@@ -1998,7 +1992,7 @@ static void alarm_queue_add_async (EThre
 		return;
 	}
 
-	d(printf("%s:%d (alarm_queue_add_async) - %d\n",__FILE__, __LINE__, client));
+	d(printf("%s:%d (alarm_queue_add_async) - %s\n",__FILE__, __LINE__, (char *)client));
 	
 	ca = g_new (ClientAlarms, 1);
 
@@ -2061,7 +2055,7 @@ remove_cqa (ClientAlarms *ca, ECalCompon
 	 */
 	g_assert (cqa->queued_alarms != NULL);
 
-	d(printf("%s:%d (remove_cqa) - removing %d alarms\n",__FILE__, __LINE__, g_list_length(cqa->queued_alarms)));
+	d(printf("%s:%d (remove_cqa) - removing %d alarms\n",__FILE__, __LINE__, g_slist_length(cqa->queued_alarms)));
 	remove_alarms (cqa, TRUE);
 }
 
@@ -2087,7 +2081,7 @@ remove_client_alarms (ClientAlarms *ca)
 {
 	d(printf("%s:%d (remove_client_alarms) - size %d \n",__FILE__, __LINE__, g_hash_table_size (ca->uid_alarms_hash))); 
 
-	g_hash_table_foreach_remove  (ca->uid_alarms_hash, (GHFunc)remove_comp_by_id, ca);
+	g_hash_table_foreach_remove  (ca->uid_alarms_hash, (GHRFunc)remove_comp_by_id, ca);
 	
 	/* The hash table should be empty now */
 	g_assert (g_hash_table_size (ca->uid_alarms_hash) == 0);
Index: gui/dialogs/alarm-dialog.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/alarm-dialog.c,v
retrieving revision 1.17
diff -u -p -r1.17 alarm-dialog.c
--- gui/dialogs/alarm-dialog.c	7 Jul 2006 04:45:27 -0000	1.17
+++ gui/dialogs/alarm-dialog.c	22 Aug 2006 10:29:21 -0000
@@ -29,6 +29,7 @@
 #endif
 
 #include <string.h>
+#include <glib/gi18n.h>
 #include <gtk/gtklabel.h>
 #include <gtk/gtkcellrenderertext.h>
 #include <gtk/gtkdialog.h>
@@ -40,7 +41,7 @@
 #include <gtk/gtktextbuffer.h>
 #include <gtk/gtktextview.h>
 #include <gtk/gtktogglebutton.h>
-#include <libgnome/gnome-i18n.h>
+#include <libgnomeui/gnome-file-entry.h>
 #include <bonobo/bonobo-control.h>
 #include <bonobo/bonobo-exception.h>
 #include <bonobo/bonobo-widget.h>
@@ -365,7 +366,7 @@ alarm_to_dalarm_widgets (Dialog *dialog,
 
 	if (description.value) {
 		e_dialog_toggle_set (dialog->dalarm_message, TRUE);
-		text_buffer = gtk_text_view_get_buffer (dialog->dalarm_description);
+		text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (dialog->dalarm_description));
 		gtk_text_buffer_set_text (text_buffer, description.value, -1);
 	}
 }
@@ -654,7 +655,7 @@ populate_widgets_from_alarm (Dialog *dia
 
 	/* Alarm options */
 	e_dialog_option_menu_set (dialog->action, *action, action_map);
-	action_selection_done_cb (dialog->action, dialog);
+	action_selection_done_cb (GTK_MENU_SHELL (dialog->action), dialog);
 
 	switch (*action) {
 	case E_CAL_COMPONENT_ALARM_AUDIO:
@@ -1078,7 +1079,7 @@ action_selection_done_cb (GtkMenuShell *
 	case E_CAL_COMPONENT_ALARM_AUDIO:
 		dir = calendar_config_get_dir_path ();
 		if ( dir && *dir )
-			gnome_file_entry_set_default_path (dialog->aalarm_file_entry, dir);
+			gnome_file_entry_set_default_path (GNOME_FILE_ENTRY (dialog->aalarm_file_entry), dir);
 		check_custom_sound (dialog);
 		break;
 
Index: gui/dialogs/alarm-list-dialog.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/alarm-list-dialog.c,v
retrieving revision 1.10
diff -u -p -r1.10 alarm-list-dialog.c
--- gui/dialogs/alarm-list-dialog.c	3 Mar 2006 12:58:48 -0000	1.10
+++ gui/dialogs/alarm-list-dialog.c	22 Aug 2006 10:29:21 -0000
@@ -308,8 +308,6 @@ GtkWidget *
 alarm_list_dialog_peek (ECal *ecal, EAlarmList *list_store)
 {
 	Dialog *dialog;
-	int response_id;
-	GList *icon_list;
 	char *gladefile;
 	
 	dialog = (Dialog *)g_new (Dialog, 1);
@@ -339,8 +337,8 @@ alarm_list_dialog_peek (ECal *ecal, EAla
 	g_object_unref (dialog->xml);
 
 	/* Free the other stuff when the parent really gets destroyed. */
-	g_object_set_data_full (dialog->box, "toplevel", dialog->toplevel, gtk_widget_destroy);
-	g_object_set_data_full (dialog->box, "dialog", dialog, g_free);
+	g_object_set_data_full (G_OBJECT (dialog->box), "toplevel", dialog->toplevel, (GDestroyNotify) gtk_widget_destroy);
+	g_object_set_data_full (G_OBJECT (dialog->box), "dialog", dialog, g_free);
 
 	return dialog->box;
 }
Index: gui/dialogs/cal-prefs-dialog.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/cal-prefs-dialog.c,v
retrieving revision 1.56
diff -u -p -r1.56 cal-prefs-dialog.c
--- gui/dialogs/cal-prefs-dialog.c	10 Jul 2006 10:42:58 -0000	1.56
+++ gui/dialogs/cal-prefs-dialog.c	22 Aug 2006 10:29:21 -0000
@@ -486,7 +486,7 @@ show_alarms_config (CalendarPrefsDialog 
 	atk_object_set_name (gtk_widget_get_accessible (prefs->alarm_list_widget), _("Selected Calendars for Alarms"));
 	gtk_container_add (GTK_CONTAINER (prefs->scrolled_window), prefs->alarm_list_widget);
 	gtk_widget_show (prefs->alarm_list_widget);
-	initialize_selection (prefs->alarm_list_widget, prefs->alarms_list);
+	initialize_selection (E_SOURCE_SELECTOR (prefs->alarm_list_widget), prefs->alarms_list);
 }
 
 /* Shows the current config settings in the dialog. */
Index: gui/dialogs/memo-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/memo-editor.c,v
retrieving revision 1.6
diff -u -p -r1.6 memo-editor.c
--- gui/dialogs/memo-editor.c	10 Aug 2006 07:53:02 -0000	1.6
+++ gui/dialogs/memo-editor.c	22 Aug 2006 10:29:21 -0000
@@ -266,7 +266,6 @@ memo_editor_finalize (GObject *object)
 {
 	MemoEditor *me;
 	MemoEditorPrivate *priv;
-	ECalComponent *comp;
 
 	g_return_if_fail (object != NULL);
 	g_return_if_fail (IS_MEMO_EDITOR (object));
Index: gui/dialogs/memo-page.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/memo-page.c,v
retrieving revision 1.9
diff -u -p -r1.9 memo-page.c
--- gui/dialogs/memo-page.c	10 Aug 2006 07:53:02 -0000	1.9
+++ gui/dialogs/memo-page.c	22 Aug 2006 10:29:21 -0000
@@ -283,7 +283,7 @@ memo_page_set_classification (MemoPage *
 static void
 sensitize_widgets (MemoPage *mpage)
 {
-	gboolean read_only, sens, sensitize;
+	gboolean read_only, sens = FALSE, sensitize;
 	MemoPagePrivate *priv;
 	
 	priv = mpage->priv;
Index: gui/dialogs/task-page.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/task-page.c,v
retrieving revision 1.88
diff -u -p -r1.88 task-page.c
--- gui/dialogs/task-page.c	31 Jul 2006 09:54:41 -0000	1.88
+++ gui/dialogs/task-page.c	22 Aug 2006 10:29:22 -0000
@@ -979,7 +979,7 @@ add_clicked_cb (GtkButton *btn, TaskPage
 	e_meeting_list_view_edit (page->priv->list_view, attendee);
 }
 
-void edit_clicked_cb (GtkButton *btn, TaskPage *tpage)
+static void edit_clicked_cb (GtkButton *btn, TaskPage *tpage)
 {
 	TaskPagePrivate *priv;
 	GtkTreePath *path = NULL;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]