[evolution-patches] fix for the bug 73541 [calendar]



Hi,
    Resending it again since i dont find it in the patches list. Have
attached the fix for the bug. Supressed the popup menu when
clicked on the primary source group, since it does not give any
information on source and so causes problems while performing operations
with plugins [save calendar, select only this calendar] as they operate
based on the primary source selection.

thanks, chenthill.

? 73541
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/plugins/save-calendar/ChangeLog,v
retrieving revision 1.17
diff -u -p -r1.17 ChangeLog
--- ChangeLog	2 Mar 2005 18:24:54 -0000	1.17
+++ ChangeLog	11 Mar 2005 12:42:46 -0000
@@ -1,3 +1,12 @@
+2005-03-11  Chenthill Palanisamy  <pchenthill novell com>
+
+	Fixes #73541
+	* csv-format.c: (do_save_calendar_csv):
+	* ical-format.c: (do_save_calendar_ical):
+	* rdf-format.c: (do_save_calendar_rdf): Changed the 
+	cal e_cal_new to auth_new_from_source, so that the 
+	ecal has the auth function in it.
+
 2005-02-24  Björn Torkelsson  <torkel acc umu se>
 
 	* org-gnome-save-calendar.eplug.in: Fixed description and added
Index: csv-format.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/save-calendar/csv-format.c,v
retrieving revision 1.9
diff -u -p -r1.9 csv-format.c
--- csv-format.c	2 Mar 2005 18:24:54 -0000	1.9
+++ csv-format.c	11 Mar 2005 12:42:47 -0000
@@ -36,6 +36,7 @@
 #include <libedataserver/e-source.h>
 #include <libedataserverui/e-source-selector.h>
 #include <libecal/e-cal.h>
+#include "calendar/common/authentication.h"
 #include <calendar/gui/e-cal-popup.h>
 #include <libgnomevfs/gnome-vfs.h>
 #include <string.h>
@@ -330,7 +331,7 @@ do_save_calendar_csv (FormatHandler *han
 	primary_source = e_source_selector_peek_primary_selection (target->selector);
 
 	/* open source client */
-	source_client = e_cal_new (primary_source, type);
+	source_client = auth_new_cal_from_source (primary_source, type);
 	if (!e_cal_open (source_client, TRUE, &error)) {
 		display_error_message (gtk_widget_get_toplevel (GTK_WIDGET (target->selector)), error);
 		g_object_unref (source_client);
Index: ical-format.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/save-calendar/ical-format.c,v
retrieving revision 1.2
diff -u -p -r1.2 ical-format.c
--- ical-format.c	25 Feb 2005 09:55:29 -0000	1.2
+++ ical-format.c	11 Mar 2005 12:42:47 -0000
@@ -70,7 +70,7 @@ do_save_calendar_ical (FormatHandler *ha
 		return;
 
 	/* open source client */
-	source_client = e_cal_new (primary_source, type);
+	source_client = auth_new_cal_from_source (primary_source, type);
 	if (!e_cal_open (source_client, TRUE, &error)) {
 		display_error_message (gtk_widget_get_toplevel (GTK_WIDGET (target->selector)), error->message);
 		g_object_unref (source_client);
Index: rdf-format.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/save-calendar/rdf-format.c,v
retrieving revision 1.7
diff -u -p -r1.7 rdf-format.c
--- rdf-format.c	2 Mar 2005 18:23:20 -0000	1.7
+++ rdf-format.c	11 Mar 2005 12:42:47 -0000
@@ -46,6 +46,7 @@
 #include <string.h>
 
 #include "widgets/misc/e-error.h"
+#include "calendar/common/authentication.c"
 
 #include "format-handler.h"
 
@@ -205,7 +206,7 @@ do_save_calendar_rdf (FormatHandler *han
 	primary_source = e_source_selector_peek_primary_selection (target->selector);
 
 	/* open source client */
-	source_client = e_cal_new (primary_source, type);
+	source_client = auth_new_cal_from_source (primary_source, type);
 	if (!e_cal_open (source_client, TRUE, &error)) {
 		display_error_message (gtk_widget_get_toplevel (GTK_WIDGET (target->selector)), error);
 		g_object_unref (source_client);
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libedataserverui/ChangeLog,v
retrieving revision 1.32
diff -u -p -r1.32 ChangeLog
--- ChangeLog	2 Mar 2005 02:24:51 -0000	1.32
+++ ChangeLog	11 Mar 2005 16:27:26 -0000
@@ -1,3 +1,9 @@
+2005-03-11  Chenthill Palanisamy  <pchenthill novell com>
+
+
+	* e-source-selector.c (selector_button_press_event): Do
+	not emit popup signals when clicked on the source group.
+
 2005-03-01  Harry Lu <harry lu sun com>
 
 	Fix for 73010.
Index: e-source-selector.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libedataserverui/e-source-selector.c,v
retrieving revision 1.27
diff -u -p -r1.27 e-source-selector.c
--- e-source-selector.c	25 Nov 2004 14:49:14 -0000	1.27
+++ e-source-selector.c	11 Mar 2005 16:27:27 -0000
@@ -595,13 +595,13 @@ selector_button_press_event (GtkWidget *
 			gtk_tree_model_get (GTK_TREE_MODEL (priv->tree_store), &iter, 0, &data, -1);
 
 			/* TODO: we could still emit a popup event for this and let the callee decide? */
+			/* Do not emit popup since we will not be able to get the source */
 			if (E_IS_SOURCE_GROUP (data)) {
 				/* do i need to ref it here */
 				ESourceGroup *group;
 				
 				group = E_SOURCE_GROUP (data);g_object_ref (group);
 				priv->primary_source_group = group;
-				g_signal_emit(selector, signals[POPUP_EVENT], 0, NULL, event, &res);
 				/* data shuld be unreffed after creating the
 				 * new source*/	
 				return res;

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.2684
diff -u -p -r1.2684 ChangeLog
--- ChangeLog	11 Mar 2005 01:43:04 -0000	1.2684
+++ ChangeLog	11 Mar 2005 15:17:15 -0000
@@ -1,3 +1,9 @@
+2005-03-11  Chenthill Palanisamy  <pchenthill novell com>
+
+	Fixes 72983
+	* gui/e-cal-list-view.c	(e_cal_list_view_new): Set the 
+	flags to expand recurrences in the view.
+
 2005-03-09  Not Zed  <NotZed Ximian com>
 
 	* gui/e-week-view-event-item.c (e_week_view_event_item_draw_icons):
Index: gui/e-cal-list-view.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-cal-list-view.c,v
retrieving revision 1.14
diff -u -p -r1.14 e-cal-list-view.c
--- gui/e-cal-list-view.c	27 Oct 2004 16:14:21 -0000	1.14
+++ gui/e-cal-list-view.c	11 Mar 2005 15:17:15 -0000
@@ -317,6 +317,7 @@ e_cal_list_view_new (void)
 	
 	model = E_CAL_MODEL (e_cal_model_calendar_new ());
 
+	e_cal_model_set_flags (model, E_CAL_MODEL_FLAGS_EXPAND_RECURRENCES);
 	cal_list_view = g_object_new (e_cal_list_view_get_type (), "model", model, NULL);
 	if (!e_cal_list_view_construct (cal_list_view)) {
 		g_message (G_STRLOC ": Could not construct the calendar list GUI");


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]