[evolution-patches] Exchange Connector: Fix for 62440 for gnome-2-8 branch.



This patch is for removing the move/copy options, to avoid "FIXME"
pop-ups.

Thanks,
Sushma.
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-exchange/ChangeLog,v
retrieving revision 1.139.2.4
diff -u -r1.139.2.4 ChangeLog
--- ChangeLog	4 Sep 2004 15:38:56 -0000	1.139.2.4
+++ ChangeLog	7 Sep 2004 08:17:42 -0000
@@ -1,3 +1,8 @@
+2004-09-07  Sushma Rai  <rsushma novell com>
+
+	* storage/xc-commands.c: Disabled menu options for
+	move and copy folders.  See #62440
+
 2004-09-04  Telsa Gwynne  <hobbit aloss ukuu org uk>
 
 	* configure.in: Added "cy" (Welsh) to ALL_LINGUAS.
Index: storage/xc-commands.c
===================================================================
RCS file: /cvs/gnome/evolution-exchange/storage/xc-commands.c,v
retrieving revision 1.7
diff -u -r1.7 xc-commands.c
--- storage/xc-commands.c	15 Jul 2004 16:42:59 -0000	1.7
+++ storage/xc-commands.c	7 Sep 2004 08:18:55 -0000
@@ -206,6 +206,7 @@
 	return exchange_component_get_account_for_uri (global_exchange_component, e_folder_exchange_get_internal_uri (fcd->folder));
 }
 
+#if 0
 static void
 do_move_folder (GtkWidget *item, XCFolderCommandData *fcd)
 {
@@ -219,6 +220,7 @@
 	e_notice (item, GTK_MESSAGE_ERROR, "FIXME (do_copy_folder)");
 	xc_folder_command_data_free (fcd);
 }
+#endif
 
 
 static void
@@ -350,12 +352,15 @@
 #define E_POPUP_SEPARATOR_WITH_MASK(mask) { "", NULL, (NULL), NULL, mask }
 
 static EPopupMenu popup_menu [] = {
+	/*
+	FIXME: See 62440
 	E_POPUP_ITEM (N_("_Move Folder..."),
 		      G_CALLBACK (do_move_folder),
 		      XC_FOLDER_COMMAND_MASK_MOVECOPY),
 	E_POPUP_ITEM (N_("_Copy Folder..."),
 		      G_CALLBACK (do_copy_folder),
 		      XC_FOLDER_COMMAND_MASK_MOVECOPY),
+	*/
 	E_POPUP_ITEM (N_("_Rename Folder..."),
 		      G_CALLBACK (do_rename_folder),
 		      XC_FOLDER_COMMAND_MASK_CHANGE),


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