evolution r35947 - branches/kill-bonobo/shell

[mbarnes svn gnome org]

Author: mbarnes
Date: Sat Aug  9 12:05:51 2008
New Revision: 35947
URL: http://svn.gnome.org/viewvc/evolution?rev=35947&view=rev

Log:
Treat the Preferences window as a singleton.
Kill a bunch of Bonobo crud, which breaks compilation again.


Removed:
   branches/kill-bonobo/shell/Evolution-Component.idl
   branches/kill-bonobo/shell/Evolution-ConfigControl.idl
   branches/kill-bonobo/shell/Evolution-Shell.idl
   branches/kill-bonobo/shell/Evolution.idl
   branches/kill-bonobo/shell/e-component-registry.c
   branches/kill-bonobo/shell/e-component-registry.h
   branches/kill-bonobo/shell/evolution-listener.c
   branches/kill-bonobo/shell/evolution-listener.h
Modified:
   branches/kill-bonobo/shell/Makefile.am
   branches/kill-bonobo/shell/e-shell-window-actions.c
   branches/kill-bonobo/shell/e-shell-window.c
   branches/kill-bonobo/shell/e-shell.c
   branches/kill-bonobo/shell/e-shell.h

Modified: branches/kill-bonobo/shell/Makefile.am
==============================================================================
--- branches/kill-bonobo/shell/Makefile.am	(original)
+++ branches/kill-bonobo/shell/Makefile.am	Sat Aug  9 12:05:51 2008
@@ -26,32 +26,6 @@
 
 noinst_PROGRAMS = evolution
 
-# Shell CORBA stuff
-
-IDLS = \
-	Evolution-ConfigControl.idl		\
-	Evolution-Component.idl			\
-	Evolution-Shell.idl			\
-	Evolution.idl
-
-IDL_GENERATED_H = \
-	Evolution.h
-
-IDL_GENERATED_C = 		\
-	Evolution-common.c	\
-	Evolution-skels.c	\
-	Evolution-stubs.c
-
-idl_defines = \
-	-D__evolution_shell_COMPILATION
-
-IDL_GENERATED = $(IDL_GENERATED_H) $(IDL_GENERATED_C)
-
-$(IDL_GENERATED_H): $(IDLS)
-	$(ORBIT_IDL) -I $(srcdir) $(idl_defines) $(IDL_INCLUDES) $(srcdir)/Evolution.idl
-
-$(IDL_GENERATED_C): $(IDL_GENERATED_H)
-
 if NM_SUPPORT_GLIB
 NM_SUPPORT_FILES = e-shell-nm-glib.c
 else
@@ -77,10 +51,6 @@
 $(DATASERVER_IDL_GENERATED_C): $(DATASERVER_IDL_GENERATED_H)
 
 
-# IDL install
-
-idl_DATA = $(IDLS)
-
 # Shell library
 
 privsolib_LTLIBRARIES =	\
@@ -97,7 +67,6 @@
 	e-shell-window-actions.h		\
 	e-user-creatable-items-handler.h	\
 	evolution-config-control.h		\
-	evolution-listener.h			\
 	evolution-shell-component-utils.h	\
 	es-event.h				\
 	es-menu.h
@@ -109,7 +78,6 @@
 	e-shell-view.c				\
 	e-shell-window.c			\
 	e-shell-window-actions.c		\
-	evolution-listener.c			\
 	e-user-creatable-items-handler.c	\
 	evolution-config-control.c		\
 	evolution-shell-component-utils.c	\
@@ -127,8 +95,6 @@
 evolution_SOURCES =				\
 	$(DATASERVER_IDL_GENERATED)		\
 	$(NM_SUPPORT_FILES)			\
-	e-component-registry.c			\
-	e-component-registry.h			\
 	e-config-upgrade.c			\
 	e-config-upgrade.h			\
 	e-shell.c				\
@@ -156,11 +122,6 @@
 
 # Misc stuff
 
-server_in_files = GNOME_Evolution_Shell.server.in.in
-server_DATA = $(server_in_files:.server.in.in=.server)
- EVO_SERVER_RULE@
- INTLTOOL_SERVER_RULE@
-
 error_DATA = shell.error
 errordir = $(privdatadir)/errors
 @EVO_PLUGIN_RULE@
@@ -228,8 +189,6 @@
 # Extra dist stuff
 
 EXTRA_DIST = 					\
-	$(IDLS)					\
-	$(server_in_files)			\
 	shell.error.xml				\
 	$(glade_DATA)				\
 	$(schema_in_files)			\
@@ -251,7 +210,7 @@
 
 endif
 
-BUILT_SOURCES = $(IDL_GENERATED) $(MARSHAL_GENERATED) $(server_DATA) $(DATASERVER_IDL_GENERATED) $(error_DATA)
+BUILT_SOURCES = $(MARSHAL_GENERATED) $(server_DATA) $(DATASERVER_IDL_GENERATED) $(error_DATA)
 CLEANFILES = $(BUILT_SOURCES)
 
 DISTCLEANFILES = $(schema_DATA)

Modified: branches/kill-bonobo/shell/e-shell-window-actions.c
==============================================================================
--- branches/kill-bonobo/shell/e-shell-window-actions.c	(original)
+++ branches/kill-bonobo/shell/e-shell-window-actions.c	Sat Aug  9 12:05:51 2008
@@ -720,7 +720,12 @@
 action_preferences_cb (GtkAction *action,
                        EShellWindow *window)
 {
-	e_shell_show_preferences (GTK_WINDOW (window));
+	GtkWidget *preferences_window;
+
+	preferences_window = e_shell_get_preferences_window ();
+	gtk_window_present (GTK_WINDOW (preferences_window));
+
+	/* FIXME Switch to a page appropriate for the current view. */
 }
 
 static void

Modified: branches/kill-bonobo/shell/e-shell-window.c
==============================================================================
--- branches/kill-bonobo/shell/e-shell-window.c	(original)
+++ branches/kill-bonobo/shell/e-shell-window.c	Sat Aug  9 12:05:51 2008
@@ -29,7 +29,6 @@
 #include "e-util/gconf-bridge.h"
 #include "widgets/misc/e-online-button.h"
 
-#include "e-component-registry.h"
 #include "e-shell-marshal.h"
 #include "e-sidebar.h"
 #include "es-menu.h"

Modified: branches/kill-bonobo/shell/e-shell.c
==============================================================================
--- branches/kill-bonobo/shell/e-shell.c	(original)
+++ branches/kill-bonobo/shell/e-shell.c	Sat Aug  9 12:05:51 2008
@@ -21,15 +21,14 @@
 #include "e-shell.h"
 
 #include <glib/gi18n.h>
+#include <e-preferences-window.h>
 
 #include "e-shell-module.h"
 #include "e-shell-registry.h"
-#include "e-shell-settings-dialog.h"
 
 #define SHUTDOWN_TIMEOUT	500  /* milliseconds */
 
 static GList *active_windows;
-static GtkWidget *preferences;
 
 static gboolean
 shell_window_delete_event_cb (EShellWindow *shell_window)
@@ -160,18 +159,13 @@
 	return e_shell_module_handle_uri (shell_module, uri);
 }
 
-void
-e_shell_show_preferences (GtkWindow *parent)
+GtkWidget *
+e_shell_get_preferences_window (void)
 {
-	if (preferences != NULL) {
-		gtk_window_present (GTK_WINDOW (preferences));
-		return;
-	}
+	static GtkWidget *preferences_window = NULL;
 
-	preferences = e_shell_settings_dialog_new ();
-	/* FIXME e_shell_settings_dialog_show_type (...); */
+	if (G_UNLIKELY (preferences_window == NULL))
+		preferences_window = e_preferences_window_new ();
 
-	gtk_window_set_transient_for (GTK_WINDOW (preferences), parent);
-	gtk_window_set_destroy_with_parent (GTK_WINDOW (preferences), TRUE);
-	gtk_widget_show (preferences);
+	return preferences_window;
 }

Modified: branches/kill-bonobo/shell/e-shell.h
==============================================================================
--- branches/kill-bonobo/shell/e-shell.h	(original)
+++ branches/kill-bonobo/shell/e-shell.h	Sat Aug  9 12:05:51 2008
@@ -45,11 +45,11 @@
 EShellWindow *	e_shell_create_window		(void);
 gboolean	e_shell_handle_uri		(const gchar *uri);
 void		e_shell_send_receive		(GtkWindow *parent);
-void		e_shell_show_preferences	(GtkWindow *parent);
 void		e_shell_go_offline		(void);
 void		e_shell_go_online		(void);
 EShellLineStatus
 		e_shell_get_line_status		(void);
+GtkWidget *	e_shell_get_preferences_window	(void);
 gboolean	e_shell_is_busy			(void);
 gboolean	e_shell_do_quit			(void);
 gboolean	e_shell_quit			(void);