diff options
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/Makefile.am | 2 | ||||
| -rw-r--r-- | calendar/gui/Makefile.am | 4 | ||||
| -rw-r--r-- | calendar/gui/alarm-notify/Makefile.am | 31 | ||||
| -rw-r--r-- | calendar/gui/e-cal-component-preview.c | 84 | ||||
| -rw-r--r-- | calendar/gui/e-cal-component-preview.h | 7 | ||||
| -rw-r--r-- | calendar/idl/Makefile.am | 7 | ||||
| -rw-r--r-- | calendar/idl/evolution-calendar.idl | 52 |
7 files changed, 10 insertions, 177 deletions
diff --git a/calendar/Makefile.am b/calendar/Makefile.am index 87057a4d3a..ecdd2d2cc6 100644 --- a/calendar/Makefile.am +++ b/calendar/Makefile.am @@ -4,7 +4,7 @@ else CONDUIT_DIR = endif -SUBDIRS = idl common importers gui $(CONDUIT_DIR) +SUBDIRS = common importers gui $(CONDUIT_DIR) error_DATA = calendar.error errordir = $(privdatadir)/errors diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index ede213e1ff..f05a038624 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -2,7 +2,9 @@ if OS_WIN32 WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libevolution-mail.la endif -SUBDIRS = alarm-notify dialogs +# KILL-BONOBO: Temporarily disabled alarm-notify +#SUBDIRS = alarm-notify dialogs +SUBDIRS = dialogs privsolib_LTLIBRARIES = libevolution-calendar.la diff --git a/calendar/gui/alarm-notify/Makefile.am b/calendar/gui/alarm-notify/Makefile.am index ea1c36e0d9..d8a68387fe 100644 --- a/calendar/gui/alarm-notify/Makefile.am +++ b/calendar/gui/alarm-notify/Makefile.am @@ -1,19 +1,3 @@ -CORBA_GENERATED_H = \ - evolution-calendar.h -CORBA_GENERATED_C = \ - evolution-calendar-common.c \ - evolution-calendar-skels.c \ - evolution-calendar-stubs.c -CORBA_GENERATED = $(CORBA_GENERATED_C) $(CORBA_GENERATED_H) - -idls = $(top_srcdir)/calendar/idl/evolution-calendar.idl -idl_flags = $(IDL_INCLUDES) - -$(CORBA_GENERATED_H): $(idls) - $(ORBIT_IDL) $(idl_flags) $(top_srcdir)/calendar/idl/evolution-calendar.idl -$(CORBA_GENERATED_C): $(CORBA_GENERATED_H) - - privlibexec_PROGRAMS = evolution-alarm-notify @@ -59,19 +43,6 @@ if OS_WIN32 evolution_alarm_notify_LDFLAGS = -mwindows endif -server_in_files = GNOME_Evolution_Calendar_AlarmNotify.server.in.in -server_DATA = $(server_in_files:.server.in.in=.server) -@EVO_SERVER_RULE@ -@INTLTOOL_SERVER_RULE@ - -EXTRA_DIST = \ - $(server_in_files) \ - $(glade_DATA) - -BUILT_SOURCES = $(CORBA_GENERATED) $(server_DATA) -CLEANFILES = $(BUILT_SOURCES) - -dist-hook: - cd $(distdir); rm -f $(BUILT_SOURCES) +EXTRA_DIST = $(glade_DATA) -include $(top_srcdir)/git.mk diff --git a/calendar/gui/e-cal-component-preview.c b/calendar/gui/e-cal-component-preview.c index 633eb5678e..b0ba329286 100644 --- a/calendar/gui/e-cal-component-preview.c +++ b/calendar/gui/e-cal-component-preview.c @@ -271,83 +271,10 @@ cal_component_preview_write_html (GtkHTMLStream *stream, } static void -cal_component_preview_url_requested (GtkHTML *html, - const gchar *url, - GtkHTMLStream *html_stream) -{ - GFile *file; - GFileInputStream *input_stream; - gchar buffer[4096]; - gssize bytes_read; - GError *error = NULL; - - file = g_file_new_for_uri (url); - - /* XXX We only handle native files, which I guess minimizes - * the damage from doing blocking reads here. Annoying - * that GtkHTML does not handle this itself. */ - if (!g_file_is_native (file)) - goto exit; - - input_stream = g_file_read (file, NULL, &error); - - if (error != NULL) - goto fail; - - do { - bytes_read = g_input_stream_read ( - G_INPUT_STREAM (input_stream), - buffer, sizeof (buffer), NULL, &error); - - if (bytes_read > 0) - gtk_html_stream_write ( - html_stream, buffer, bytes_read); - - } while (bytes_read > 0); - - if (error != NULL) - goto fail; - - gtk_html_stream_close (html_stream, GTK_HTML_STREAM_OK); - - goto exit; - -fail: - g_warning ("%s", error->message); - g_error_free (error); - - gtk_html_stream_close (html_stream, GTK_HTML_STREAM_ERROR); - -exit: - if (input_stream != NULL) - g_object_unref (input_stream); - - g_object_unref (file); -} - -static void -cal_component_preview_link_clicked (GtkHTML *html, - const gchar *uri) -{ - gpointer parent; - - parent = gtk_widget_get_toplevel (GTK_WIDGET (html)); - parent = GTK_WIDGET_TOPLEVEL (parent) ? parent : NULL; - - e_show_uri (parent, uri); -} - -static void cal_component_preview_class_init (ECalComponentPreviewClass *class) { - GtkHTMLClass *gtkhtml_class; - parent_class = g_type_class_peek_parent (class); g_type_class_add_private (class, sizeof (ECalComponentPreviewPrivate)); - - gtkhtml_class = GTK_HTML_CLASS (class); - gtkhtml_class->url_requested = cal_component_preview_url_requested; - gtkhtml_class->link_clicked = cal_component_preview_link_clicked; } static void @@ -384,7 +311,8 @@ e_cal_component_preview_get_type (void) }; type = g_type_register_static ( - GTK_TYPE_HTML, "ECalComponentPreview", &type_info, 0); + E_TYPE_WEB_VIEW, "ECalComponentPreview", + &type_info, 0); } return type; @@ -429,11 +357,3 @@ e_cal_component_preview_display (ECalComponentPreview *preview, stream, ecal, comp, preview->priv->zone); gtk_html_stream_close (stream, GTK_HTML_STREAM_OK); } - -void -e_cal_component_preview_clear (ECalComponentPreview *preview) -{ - g_return_if_fail (E_IS_CAL_COMPONENT_PREVIEW (preview)); - - gtk_html_load_empty (GTK_HTML (preview)); -} diff --git a/calendar/gui/e-cal-component-preview.h b/calendar/gui/e-cal-component-preview.h index 8b2b0acd18..78567f06ec 100644 --- a/calendar/gui/e-cal-component-preview.h +++ b/calendar/gui/e-cal-component-preview.h @@ -26,7 +26,7 @@ #include <gtk/gtk.h> #include <libecal/e-cal.h> -#include <gtkhtml/gtkhtml.h> +#include <misc/e-web-view.h> /* Standard GObject macros */ #define E_TYPE_CAL_COMPONENT_PREVIEW \ @@ -54,12 +54,12 @@ typedef struct _ECalComponentPreviewClass ECalComponentPreviewClass; typedef struct _ECalComponentPreviewPrivate ECalComponentPreviewPrivate; struct _ECalComponentPreview { - GtkHTML parent; + EWebView parent; ECalComponentPreviewPrivate *priv; }; struct _ECalComponentPreviewClass { - GtkHTMLClass parent_class; + EWebViewClass parent_class; /* Notification signals */ void (* selection_changed) (ECalComponentPreview *preview, gint n_selected); @@ -75,7 +75,6 @@ void e_cal_component_preview_set_default_timezone void e_cal_component_preview_display (ECalComponentPreview *preview, ECal *ecal, ECalComponent *comp); -void e_cal_component_preview_clear (ECalComponentPreview *preview); G_END_DECLS diff --git a/calendar/idl/Makefile.am b/calendar/idl/Makefile.am deleted file mode 100644 index 1d393a8f9d..0000000000 --- a/calendar/idl/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -idl_DATA = \ - evolution-calendar.idl - -EXTRA_DIST = \ - $(idl_DATA) - --include $(top_srcdir)/git.mk diff --git a/calendar/idl/evolution-calendar.idl b/calendar/idl/evolution-calendar.idl deleted file mode 100644 index 48f7281ab3..0000000000 --- a/calendar/idl/evolution-calendar.idl +++ /dev/null @@ -1,52 +0,0 @@ -/* Evolution calendar interface - * - * Copyright (C) 2000 Eskil Heyn Olsen - * Copyright (C) 2000 Ximian, Inc. - * Copyright (C) 2000 Ximian, Inc. - * - * Authors: Eskil Heyn Olsen <deity@eskil.dk> - * Federico Mena-Quintero <federico@ximian.com> - */ - -#ifndef _EVOLUTION_CALENDAR_IDL_ -#define _EVOLUTION_CALENDAR_IDL_ - -#include <Bonobo.idl> -#include <Evolution-DataServer-Calendar.idl> - -module GNOME { -module Evolution { - -module Calendar { - /* Factory to centralize calendar component editor dialogs */ - interface CompEditorFactory : Bonobo::Unknown { - exception InvalidURI {}; - exception BackendContactError {}; - exception UnsupportedType {}; - - typedef long CompEditorMode; - const CompEditorMode EDITOR_MODE_EVENT = 1 << 0; - const CompEditorMode EDITOR_MODE_ALLDAY_EVENT = 1 << 1; - const CompEditorMode EDITOR_MODE_MEETING = 1 << 2; - const CompEditorMode EDITOR_MODE_TODO = 1 << 3; - - /* Loads a calendar and opens an editor for the specified object */ - /* FIXME Its nasty to use CompEditorMode to pass event/todo source type - but it saves adding yet another corba type - only MODE_EVENT or - MODE_TODO should be passed here */ - void editExisting (in string uri, in CalObjUID uid, in CompEditorMode mode) - raises (InvalidURI, BackendContactError); - - /* Loads a calendar and creates a new component of the specified type */ - void editNew (in string uri, in CompEditorMode mode) - raises (InvalidURI, BackendContactError, UnsupportedType); - }; - - interface AlarmNotify : Bonobo::Unknown { - }; -}; - -}; -}; - -#endif |