evolution r37302 - in branches/kill-bonobo/calendar: gui modules

[mbarnes svn gnome org]

Author: mbarnes
Date: Sat Feb 21 04:09:26 2009
New Revision: 37302
URL: http://svn.gnome.org/viewvc/evolution?rev=37302&view=rev

Log:
Kill more Bonobo controls and factories and what not.


Removed:
   branches/kill-bonobo/calendar/gui/comp-editor-factory.c
   branches/kill-bonobo/calendar/gui/comp-editor-factory.h
   branches/kill-bonobo/calendar/gui/itip-bonobo-control.c
   branches/kill-bonobo/calendar/gui/itip-bonobo-control.h
   branches/kill-bonobo/calendar/gui/main.c
Modified:
   branches/kill-bonobo/calendar/gui/Makefile.am
   branches/kill-bonobo/calendar/gui/e-itip-control.c
   branches/kill-bonobo/calendar/modules/e-cal-shell-module.c

Modified: branches/kill-bonobo/calendar/gui/Makefile.am
==============================================================================
--- branches/kill-bonobo/calendar/gui/Makefile.am	(original)
+++ branches/kill-bonobo/calendar/gui/Makefile.am	Sat Feb 21 04:09:26 2009
@@ -48,7 +48,6 @@
 # 	cal-search-bar.h
 # 	gnome-cal.c
 # 	gnome-cal.h
-# 	main.c
 
 libcal_gui_la_SOURCES =		\
  	e-calendar-view.c			\
@@ -160,8 +159,6 @@
 	e-timezone-entry.h			\
 	goto.c					\
 	goto.h					\
-	itip-bonobo-control.c			\
-	itip-bonobo-control.h			\
 	itip-utils.c				\
 	itip-utils.h				\
 	misc.c					\

Modified: branches/kill-bonobo/calendar/gui/e-itip-control.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/e-itip-control.c	(original)
+++ branches/kill-bonobo/calendar/gui/e-itip-control.c	Sat Feb 21 04:09:26 2009
@@ -31,8 +31,6 @@
 #include <unistd.h>
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
-#include <bonobo/bonobo-object.h>
-#include <bonobo/bonobo-exception.h>
 #include <gtkhtml/gtkhtml.h>
 #include <gtkhtml/gtkhtml-embedded.h>
 #include <gtkhtml/gtkhtml-stream.h>

Modified: branches/kill-bonobo/calendar/modules/e-cal-shell-module.c
==============================================================================
--- branches/kill-bonobo/calendar/modules/e-cal-shell-module.c	(original)
+++ branches/kill-bonobo/calendar/modules/e-cal-shell-module.c	Sat Feb 21 04:09:26 2009
@@ -27,6 +27,7 @@
 #include <libedataserver/e-source-list.h>
 #include <libedataserver/e-source-group.h>
 
+#include "e-util/e-import.h"
 #include "shell/e-shell.h"
 #include "shell/e-shell-module.h"
 #include "shell/e-shell-window.h"
@@ -35,9 +36,12 @@
 #include "calendar/common/authentication.h"
 #include "calendar/gui/calendar-config.h"
 #include "calendar/gui/comp-util.h"
+#include "calendar/gui/e-cal-config.h"
+#include "calendar/gui/e-cal-event.h"
 #include "calendar/gui/dialogs/cal-prefs-dialog.h"
 #include "calendar/gui/dialogs/calendar-setup.h"
 #include "calendar/gui/dialogs/event-editor.h"
+#include "calendar/importers/evolution-calendar-importer.h"
 
 #include "e-cal-shell-view.h"
 #include "e-cal-shell-module-migrate.h"
@@ -56,7 +60,7 @@
 void e_shell_module_init (GTypeModule *type_module);
 
 static void
-cal_module_ensure_sources (EShellModule *shell_module)
+cal_shell_module_ensure_sources (EShellModule *shell_module)
 {
 	/* XXX This is basically the same algorithm across all modules.
 	 *     Maybe we could somehow integrate this into EShellModule? */
@@ -312,9 +316,9 @@
 }
 
 static void
-cal_module_cal_opened_cb (ECal *cal,
-                          ECalendarStatus status,
-                          GtkAction *action)
+cal_shell_module_cal_opened_cb (ECal *cal,
+                                ECalendarStatus status,
+                                GtkAction *action)
 {
 	ECalComponent *comp;
 	CompEditor *editor;
@@ -381,7 +385,7 @@
 
 	g_signal_connect (
 		cal, "cal-opened",
-		G_CALLBACK (cal_module_cal_opened_cb), action);
+		G_CALLBACK (cal_shell_module_cal_opened_cb), action);
 
 	e_cal_open_async (cal, FALSE);
 }
@@ -428,7 +432,32 @@
 };
 
 static void
-cal_module_init_preferences (EShell *shell)
+cal_shell_module_init_hooks (void)
+{
+	e_plugin_hook_register_type (e_cal_config_hook_get_type ());
+	e_plugin_hook_register_type (e_cal_event_hook_get_type ());
+}
+
+static void
+cal_shell_module_init_importers (void)
+{
+	EImportClass *import_class;
+	EImportImporter *importer;
+
+	import_class = g_type_class_ref (e_import_get_type ());
+
+	importer = gnome_calendar_importer_peek ();
+	e_import_class_add_importer (import_class, importer, NULL, NULL);
+
+	importer = ical_importer_peek ();
+	e_import_class_add_importer (import_class, importer, NULL, NULL);
+
+	importer = vcal_importer_peek ();
+	e_import_class_add_importer (import_class, importer, NULL, NULL);
+}
+
+static void
+cal_shell_module_init_preferences (EShell *shell)
 {
 	GtkWidget *preferences_window;
 
@@ -444,16 +473,16 @@
 }
 
 static gboolean
-cal_module_handle_uri_cb (EShellModule *shell_module,
-                          const gchar *uri)
+cal_shell_module_handle_uri_cb (EShellModule *shell_module,
+                                const gchar *uri)
 {
 	/* FIXME */
 	return FALSE;
 }
 
 static void
-cal_module_window_created_cb (EShellModule *shell_module,
-                              GtkWindow *window)
+cal_shell_module_window_created_cb (EShellModule *shell_module,
+                                    GtkWindow *window)
 {
 	const gchar *module_name;
 
@@ -496,15 +525,19 @@
 		shell_module, &module_info,
 		e_cal_shell_view_get_type (type_module));
 
-	cal_module_ensure_sources (shell_module);
+	cal_shell_module_ensure_sources (shell_module);
 
 	g_signal_connect_swapped (
 		shell, "handle-uri",
-		G_CALLBACK (cal_module_handle_uri_cb), shell_module);
+		G_CALLBACK (cal_shell_module_handle_uri_cb),
+		shell_module);
 
 	g_signal_connect_swapped (
 		shell, "window-created",
-		G_CALLBACK (cal_module_window_created_cb), shell_module);
+		G_CALLBACK (cal_shell_module_window_created_cb),
+		shell_module);
 
-	cal_module_init_preferences (shell);
+	cal_shell_module_init_hooks ();
+	cal_shell_module_init_importers ();
+	cal_shell_module_init_preferences (shell);
 }