GNOME.org
 

[evolution-patches] shell cleanup

This removes a lot of unused code from shell/



Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/ChangeLog,v
retrieving revision 1.1342
diff -u -r1.1342 ChangeLog
--- ChangeLog	3 Jun 2004 18:02:37 -0000	1.1342
+++ ChangeLog	9 Jun 2004 18:23:00 -0000
@@ -1,3 +1,8 @@
+2004-06-09  Dan Winship  <danw novell com>
+
+	* configure.in (AC_OUTPUT): Remove shell/glade/Makefile, which has
+	been merged into shell/Makefile
+
 2004-06-03  JP Rosevear  <jpr novell com>
 
 	* configure.in: bump version, requirements
Index: configure.in
===================================================================
RCS file: /cvs/gnome/evolution/configure.in,v
retrieving revision 1.694
diff -u -r1.694 configure.in
--- configure.in	3 Jun 2004 18:02:37 -0000	1.694
+++ configure.in	9 Jun 2004 18:23:00 -0000
@@ -1388,7 +1388,6 @@
 help/quickref/C/Makefile
 shell/Makefile
 shell/evolution-nognome
-shell/glade/Makefile
 shell/importer/Makefile
 ui/Makefile
 views/Makefile
Index: shell/.cvsignore
===================================================================
RCS file: /cvs/gnome/evolution/shell/.cvsignore,v
retrieving revision 1.21
diff -u -r1.21 .cvsignore
--- shell/.cvsignore	3 Jun 2004 15:02:29 -0000	1.21
+++ shell/.cvsignore	9 Jun 2004 18:23:00 -0000
@@ -2,10 +2,6 @@
 .deps
 .libs
 .pure
-Evolution-Addressbook-SelectNames-common.c
-Evolution-Addressbook-SelectNames-skels.c
-Evolution-Addressbook-SelectNames-stubs.c
-Evolution-Addressbook-SelectNames.h
 Evolution-common.c
 Evolution-skels.c
 Evolution-stubs.c
@@ -17,8 +13,7 @@
 ID
 Makefile
 Makefile.in
-apps_evolution_shell-1.5.schemas
-apps_evolution_shell-1.5.schemas.in
+apps_evolution_shell-*.schemas
 evolution
 evolution-nognome
 evolution-test-component
Index: shell/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/shell/ChangeLog,v
retrieving revision 1.1452
diff -u -r1.1452 ChangeLog
--- shell/ChangeLog	6 Jun 2004 22:31:34 -0000	1.1452
+++ shell/ChangeLog	9 Jun 2004 18:23:00 -0000
@@ -1,3 +1,40 @@
+2004-06-09  Dan Winship  <danw novell com>
+
+	* check-empty.xpm, check-filled.xpm, check-missing.xpm:
+	* e-shell-config-autocompletion.[ch]:
+	* e-shell-config-default-folders.[ch]:
+	* e-shell-config-folder-settings.[ch]:
+	* e-shell-config-offline.[ch]:
+	* e-shell-config.[ch]:
+	* e-shell-folder-creation-dialog.[ch]:
+	* e-shell-shared-folder-picker-dialog.[ch]:
+	* e-storage-set-store.[ch]:
+	* e-storage-set-view-checkboxes.etstate:
+	* e-storage-set-view-no-checkboxes.etstate:
+	* e-storage-set-view.etspec:
+	* e-uri-schema-registry.[ch]:
+	* evolution-activity-client.c:
+	* evolution-storage-set-view-factory.[ch]:
+	* evolution-storage-set-view.[ch]:
+	* glade/e-folder-list.glade:
+	* glade/e-shell-config-default-folders.glade:
+	* glade/e-shell-folder-creation-dialog.glade:
+	* glade/e-shell-shared-folder-picker-dialog.glade: Remove
+	no-longer-used stuff
+
+	* README: Remove this, since it's more confusing than true now.
+
+	* Evolution-Offline.idl, Evolution-common.idl: Remove
+	GNOME_Evolution_Folder, and references to it.
+
+	* e-active-connection-dialog.glade:
+	* evolution-startup-wizard.glade: Move the last two remaining
+	files from ./glade/ up to here.
+	
+	* glade/*: Gone.
+
+	* Makefile.am, .cvsignore: update for the above
+
 2004-06-06  Jeffrey Stedfast  <fejj ximian com>
 
 	* e-shell-window-commands.c: Added Martyn Russel to the credits.
Index: shell/Evolution-Offline.idl
===================================================================
RCS file: /cvs/gnome/evolution/shell/Evolution-Offline.idl,v
retrieving revision 1.9
diff -u -r1.9 Evolution-Offline.idl
--- shell/Evolution-Offline.idl	30 Nov 2003 20:53:42 -0000	1.9
+++ shell/Evolution-Offline.idl	9 Jun 2004 18:23:00 -0000
@@ -32,21 +32,13 @@
 	/* Whether the component is currently off-line.  */
 	attribute boolean isOffline;
 
-	/* Ask the component to prepare to go into off-line mode.  The
-	   component must return a list of the current active connections.
-	   After this call, the shell is expected to: (in order)
-
-	   	1. Invoke ::syncFolder for each of the component's folders that
-	   	   need to be synchronized to disk for offline usage.
-
-		2. Either invoke ::goOffline (actually complete the operation
-		   and go off-line) or ::goOnline (operation cancelled).
-	*/
+	/* Ask the component to prepare to go into off-line mode. The
+	 * component must return a list of the current active
+	 * connections. After this call, the shell is expected to
+	 * either invoke ::goOffline (actually complete the operation
+	 * and go off-line) or ::goOnline (operation cancelled).
+	 */
 	void prepareForOffline (out ConnectionList active_connection_list);
-
-	/* Request the component to stop syncing the specified folder.  This
-	   has to happen after ::syncFolder.  */
-	oneway void cancelSyncFolder (in Folder folder);
 
 	/* Ask the component to go into off-line mode.  This always comes after
 	   a ::prepareForOffline. */
Index: shell/Evolution-common.idl
===================================================================
RCS file: /cvs/gnome/evolution/shell/Evolution-common.idl,v
retrieving revision 1.7
diff -u -r1.7 Evolution-common.idl
--- shell/Evolution-common.idl	10 Jul 2002 15:26:25 -0000	1.7
+++ shell/Evolution-common.idl	9 Jun 2004 18:23:00 -0000
@@ -10,19 +10,6 @@
 
 module GNOME {
 module Evolution {
-	struct Folder {
-		string type;
-		string description;
-		string displayName;
-		string physicalUri;
-		string evolutionUri;
-		string customIconName;
-		long unreadCount;
-		boolean canSyncOffline;
-		short sortingPriority;
-	};
-	typedef sequence <Folder> FolderList;
-
 	struct Icon {
 		short width, height;
 		boolean hasAlpha;
Index: shell/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/shell/Makefile.am,v
retrieving revision 1.198
diff -u -r1.198 Makefile.am
--- shell/Makefile.am	28 May 2004 16:14:07 -0000	1.198
+++ shell/Makefile.am	9 Jun 2004 18:23:00 -0000
@@ -1,4 +1,4 @@
-SUBDIRS = glade importer
+SUBDIRS = importer
 
 INCLUDES =							\
 	-I$(top_srcdir)/widgets					\
@@ -8,7 +8,6 @@
 	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"		\
 	-DEVOLUTION_DATADIR=\""$(datadir)"\"			\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"			\
-	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"		\
 	-DEVOLUTION_HELPDIR=\""$(evolutionhelpdir)"\"		\
 	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\"		\
 	-DEVOLUTION_TOOLSDIR=\""$(privlibexecdir)"\"		\
@@ -50,27 +49,6 @@
 $(IDL_GENERATED_C): $(IDL_GENERATED_H)
 
 
-# SelectNames CORBA stuff
-
-SELECT_NAMES_IDL = \
-	$(top_srcdir)/addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl
-
-SELECT_NAMES_IDL_GENERATED_H =			\
-	Evolution-Addressbook-SelectNames.h
-
-SELECT_NAMES_IDL_GENERATED_C = 			   \
-	Evolution-Addressbook-SelectNames-common.c \
-	Evolution-Addressbook-SelectNames-skels.c  \
-	Evolution-Addressbook-SelectNames-stubs.c
-
-SELECT_NAMES_IDL_GENERATED = $(SELECT_NAMES_IDL_GENERATED_C) $(SELECT_NAMES_IDL_GENERATED_H)
-
-$(SELECT_NAMES_IDL_GENERATED_H): $(SELECT_NAMES_IDL)
-	$(ORBIT_IDL) -I $(srcdir) $(IDL_INCLUDES) $(SELECT_NAMES_IDL)
-
-$(SELECT_NAMES_IDL_GENERATED_C): $(SELECT_NAMES_IDL_GENERATED_H)
-
-
 # Data Server CORBA stuff
 DATASERVER_IDL_GENERATED_H =			\
 	Evolution-DataServer.h
@@ -126,7 +104,6 @@
 # Evolution executable
 
 evolution_SOURCES =				\
-	$(SELECT_NAMES_IDL_GENERATED)		\
 	$(DATASERVER_IDL_GENERATED)		\
 	e-component-registry.c			\
 	e-component-registry.h			\
@@ -139,10 +116,10 @@
 	e-shell-constants.h			\
 	e-shell-folder-title-bar.c		\
 	e-shell-folder-title-bar.h		\
-	e-shell-offline-handler.c		\
-	e-shell-offline-handler.h		\
 	e-shell-importer.c			\
 	e-shell-importer.h			\
+	e-shell-offline-handler.c		\
+	e-shell-offline-handler.h		\
 	e-shell-settings-dialog.c		\
 	e-shell-settings-dialog.h		\
 	e-shell-startup-wizard.c		\
@@ -202,12 +179,9 @@
 %.xml.h: %.xml
 	$(top_builddir)/e-util/e-error-tool $^
 
-etspec_DATA = e-storage-set-view.etspec
-
-icons = 			\
-	check-empty.xpm		\
-	check-filled.xpm	\
-	check-missing.xpm
+glade_DATA =						\
+	e-active-connection-dialog.glade		\
+	evolution-startup-wizard.glade
 
 # GConf schemas
 
@@ -258,9 +232,8 @@
 	GNOME_Evolution_Test.server.in.in	\
 	$(error_DATA)				\
 	$(error_i18n)				\
-	$(etspec_DATA)				\
+	$(glade_DATA)				\
 	$(schema_DATA)				\
-	$(icons)				\
 	ChangeLog.pre-1-4			\
 	e-shell-marshal.list			\
 	evolution-nognome.in
@@ -279,7 +252,7 @@
 
 endif
 
-BUILT_SOURCES = $(IDL_GENERATED) $(SELECT_NAMES_IDL_GENERATED) $(MARSHAL_GENERATED) $(server_DATA) $(testserver_DATA) $(DATASERVER_IDL_GENERATED) $(error_i18n)
+BUILT_SOURCES = $(IDL_GENERATED) $(MARSHAL_GENERATED) $(server_DATA) $(testserver_DATA) $(DATASERVER_IDL_GENERATED) $(error_i18n)
 CLEANFILES = $(BUILT_SOURCES)
 
 dist-hook:
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]