** Fix for bug #526741 (gnome-vfs to gio/gvfs port)
2008-04-17 Milan Crha <mcrha@redhat.com> ** Fix for bug #526741 (gnome-vfs to gio/gvfs port) * configure.in: Drop dependency on gnome-vfs, depend on gio instead. * addressbook/gui/contact-editor/e-contact-editor.c: Do not include gnome-vfs. * calendar/gui/e-meeting-store.c: (start_async_read), (freebusy_async), (async_read): Read data with gio, not with gnome-vfs. * calendar/gui/e-meeting-store.c: (async_close): Function removed. * calendar/gui/migration.c: * calendar/gui/e-memos.c: * calendar/gui/alarm-notify/notify-main.c: * calendar/gui/e-tasks.c: * calendar/gui/main.c: * calendar/gui/e-meeting-list-view.c: Do not include gnome-vfs. * calendar/gui/dialogs/comp-editor.c: (set_attachment_list): * calendar/gui/dialogs/comp-editor.c: (attachment_guess_mime_type): Function removed, use e-util function instead. * calendar/gui/e-cal-popup.c: (temp_save_part): Reflect changes in CamelStreamVFS. * calendar/gui/e-cal-popup.c: (ecalp_apps_open_in), (ecalp_apps_popup_free), (ecalp_standard_menu_factory): Use gio to fill popup and launch app. * calendar/gui/e-cal-component-preview.h: (e_cal_comp_preview_url_requested_cb): * calendar/gui/e-cal-component-preview.c: (e_cal_comp_preview_url_requested_cb): New helper function to manage file:// urls for GtkHTML component. * calendar/gui/e-cal-component-preview.c: (e_cal_component_preview_init): * calendar/gui/e-cal-component-memo-preview.c: (e_cal_comp_preview_url_requested_cb): Use above helper function. * calendar/gui/e-cal-component-memo-preview.c: (url_requested_cb): * calendar/gui/e-cal-component-preview.c: (url_requested_cb): Function removed. * composer/e-msg-composer.h: (e_msg_composer_guess_mime_type): * composer/e-msg-composer.c: (e_msg_composer_guess_mime_type), (handle_uri), (e_msg_composer_add_inline_image_from_file): Use shared e_util_guess_mime_type instead of its own. * e-util/e-gui-utils.c: Do not include gnome-vfs. * e-util/e-util.c: (e_write_file_uri), (e_file_get_save_path): * e-util/e-dialog-utils.c: (e_file_can_save), (e_file_check_local): Use gio instead of gnome-vfs. * e-util/e-util.h: * e-util/e-util.c: (e_util_guess_mime_type), (e_util_filename_to_uri), (e_util_uri_to_filename), (e_util_read_file): New helper functions. * mail/Makefile.am: * mail/em-vfs-stream.h: * mail/em-vfs-stream.c: Removed from project, not used anywhere. * mail/em-menu.c: * mail/em-config.c: Do not include gnome-vfs. * mail/mail-ops.c: (save_messages_exec), (save_part_exec): Changes related to Data Server change of CamelStreamVFS. * mail/em-format.c: (em_format_describe_part): * mail/em-format-html-display.c: (efhd_bonobo_object), (efhd_find_handler), (efhd_use_component), (efhd_bonobo_unknown), (efhd_check_server_prop), (efhd_format_attachment): Drop use of deprecated gnome-vfs functions. * mail/em-utils.c: (em_utils_snoop_type): Use gio to guess the mime_type. * mail/em-popup.c: (emp_apps_open_in), (emp_apps_popup_free), (emp_standard_menu_factory): Use gio to fill popup and launch app. * plugins/import-ics-attachments/icsimporter.c: Do not include gnome-vfs. * plugins/ipod-sync/ical-format.c: (do_save_calendar_ical): * plugins/ipod-sync/ipod-sync.c: (destination_save_addressbook): Write to gio GOutputStream instead of gnome-vfs handle. * plugins/ipod-sync/format-handler.h: (open_for_writing): * plugins/ipod-sync/ipod-sync.c: (open_for_writing): New helper function. * plugins/publish-calendar/publish-format-fb.h: (publish_calendar_as_fb): * plugins/publish-calendar/publish-format-fb.c: (write_calendar), (publish_calendar_as_fb): * plugins/publish-calendar/publish-format-ical.h: (publish_calendar_as_ical): * plugins/publish-calendar/publish-format-ical.c: (write_calendar), (publish_calendar_as_ical): Use gio GOutputStream instead of gnome-vfs handle. * plugins/publish-calendar/url-editor-dialog.c: (create_uri): Use glib function to escape URI. * plugins/publish-calendar/publish-location.c: (migrateURI): Use EUri to parse URI. * plugins/publish-calendar/publish-calendar.c: (publish_online), (unmount_done_cb), (struct mnt_struct), (mount_ready_cb), (ask_password), (ask_question), (mount_first), (publish): Use gio instead of gnome-vfs for opening (remote) files. * plugins/save-calendar/ical-format.c: (do_save_calendar_ical): * plugins/save-calendar/csv-format.c: (do_save_calendar_csv): * plugins/save-calendar/rdf-format.c: (do_save_calendar_rdf): Use gio GOutpuStream instead of gnome-vfs handle. * plugins/save-calendar/format-handler.h: (open_for_writing): * plugins/save-calendar/save-calendar.c: (open_for_writing): New helper function. * shell/e-shell-window-commands.c: (command_quick_reference): Use gio instead of gnome-vfs. * widgets/misc/e-attachment.h: (struct _EAttachment): * widgets/misc/e-attachment.c: (finalise), (init), (attachment_guess_mime_type), (e_attachment_new), (struct DownloadInfo), (download_info_free), (data_ready_cb), (download_to_local_path), (e_attachment_new_remote_file): Use gio instead of gnome-vfs to download remote files. * widgets/misc/e-image-chooser.c: (image_drag_data_received_cb): Use new util function to read file. * widgets/misc/e-attachment-bar.c: (size_to_string): Stolen from gnome-vfs. svn path=/trunk/; revision=35378
This commit is contained in:
Milan Crha
@ -66,7 +66,6 @@
|
||||
|
||||
#include <glade/glade.h>
|
||||
|
||||
#include <libgnomevfs/gnome-vfs-mime-handlers.h>
|
||||
#include <glib/gi18n.h>
|
||||
|
||||
#include <bonobo/bonobo-control-frame.h>
|
||||
@ -210,9 +209,6 @@ static void efhd_format_secure(EMFormat *emf, CamelStream *stream, CamelMimePart
|
||||
static void efhd_complete(EMFormat *);
|
||||
gboolean efhd_mnemonic_show_bar (GtkWidget *widget, gboolean focus, GtkWidget *efhd);
|
||||
|
||||
static gboolean efhd_bonobo_object(EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObject *pobject);
|
||||
static gboolean efhd_use_component(const char *mime_type);
|
||||
|
||||
static void efhd_builtin_init(EMFormatHTMLDisplayClass *efhc);
|
||||
|
||||
enum {
|
||||
@ -1326,37 +1322,9 @@ efhd_builtin_init(EMFormatHTMLDisplayClass *efhc)
|
||||
|
||||
/* ********************************************************************** */
|
||||
|
||||
static void
|
||||
efhd_bonobo_unknown(EMFormat *emf, CamelStream *stream, CamelMimePart *part, const EMFormatHandler *info)
|
||||
{
|
||||
char *classid;
|
||||
|
||||
classid = g_strdup_printf("bonobo-unknown:///em-format-html-display/%s", emf->part_id->str);
|
||||
em_format_html_add_pobject((EMFormatHTML *)emf, sizeof(EMFormatHTMLPObject), classid, part, efhd_bonobo_object);
|
||||
camel_stream_printf(stream, "<object classid=\"%s\" type=\"%s\"></object><br>\n", classid, info->mime_type);
|
||||
g_free(classid);
|
||||
}
|
||||
|
||||
/* ********************************************************************** */
|
||||
|
||||
static const EMFormatHandler *efhd_find_handler(EMFormat *emf, const char *mime_type)
|
||||
{
|
||||
const EMFormatHandler *handle;
|
||||
|
||||
if ( (handle = ((EMFormatClass *)efhd_parent)->find_handler(emf, mime_type)) == NULL
|
||||
&& efhd_use_component(mime_type)
|
||||
&& (handle = g_hash_table_lookup(efhd_bonobo_handlers, mime_type)) == NULL) {
|
||||
EMFormatHandler *h = g_malloc0(sizeof(*h));
|
||||
|
||||
h->mime_type = g_strdup(mime_type);
|
||||
h->handler = efhd_bonobo_unknown;
|
||||
h->flags = EM_FORMAT_HANDLER_INLINE_DISPOSITION;
|
||||
g_hash_table_insert(efhd_bonobo_handlers, h->mime_type, h);
|
||||
|
||||
handle = h;
|
||||
}
|
||||
|
||||
return handle;
|
||||
return ((EMFormatClass *)efhd_parent)->find_handler(emf, mime_type);
|
||||
}
|
||||
|
||||
static void efhd_format_clone(EMFormat *emf, CamelFolder *folder, const char *uid, CamelMimeMessage *msg, EMFormat *src)
|
||||
@ -1980,152 +1948,6 @@ efhd_attachment_frame(EMFormat *emf, CamelStream *stream, EMFormatPURI *puri)
|
||||
}
|
||||
}
|
||||
|
||||
static gboolean
|
||||
efhd_bonobo_object(EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObject *pobject)
|
||||
{
|
||||
CamelDataWrapper *wrapper;
|
||||
Bonobo_ServerInfo *component;
|
||||
GtkWidget *embedded;
|
||||
Bonobo_PersistStream persist;
|
||||
CORBA_Environment ev;
|
||||
CamelStreamMem *cstream;
|
||||
BonoboStream *bstream;
|
||||
BonoboControlFrame *control_frame;
|
||||
Bonobo_PropertyBag prop_bag;
|
||||
|
||||
component = gnome_vfs_mime_get_default_component(eb->type);
|
||||
if (component == NULL)
|
||||
return FALSE;
|
||||
|
||||
embedded = bonobo_widget_new_control(component->iid, NULL);
|
||||
CORBA_free(component);
|
||||
if (embedded == NULL)
|
||||
return FALSE;
|
||||
|
||||
CORBA_exception_init(&ev);
|
||||
|
||||
control_frame = bonobo_widget_get_control_frame((BonoboWidget *)embedded);
|
||||
prop_bag = bonobo_control_frame_get_control_property_bag(control_frame, NULL);
|
||||
if (prop_bag != CORBA_OBJECT_NIL) {
|
||||
/*
|
||||
* Now we can take care of business. Currently, the only control
|
||||
* that needs something passed to it through a property bag is
|
||||
* the iTip control, and it needs only the From email address,
|
||||
* but perhaps in the future we can generalize this section of code
|
||||
* to pass a bunch of useful things to all embedded controls.
|
||||
*/
|
||||
const CamelInternetAddress *from;
|
||||
char *from_address;
|
||||
|
||||
from = camel_mime_message_get_from((CamelMimeMessage *)((EMFormat *)efh)->message);
|
||||
from_address = camel_address_encode((CamelAddress *)from);
|
||||
bonobo_property_bag_client_set_value_string(prop_bag, "from_address", from_address, &ev);
|
||||
g_free(from_address);
|
||||
|
||||
Bonobo_Unknown_unref(prop_bag, &ev);
|
||||
}
|
||||
|
||||
persist = (Bonobo_PersistStream)Bonobo_Unknown_queryInterface(bonobo_widget_get_objref((BonoboWidget *)embedded),
|
||||
"IDL:Bonobo/PersistStream:1.0", &ev);
|
||||
if (persist == CORBA_OBJECT_NIL) {
|
||||
g_object_ref_sink(embedded);
|
||||
CORBA_exception_free(&ev);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
/* Write the data to a CamelStreamMem... */
|
||||
cstream = (CamelStreamMem *)camel_stream_mem_new();
|
||||
wrapper = camel_medium_get_content_object((CamelMedium *)pobject->part);
|
||||
if (FALSE && !g_ascii_strncasecmp (eb->type, "text/", 5)) {
|
||||
/* do charset conversion, etc */
|
||||
d(printf("performing charset conversion for %s component\n", eb->type));
|
||||
em_format_format_text((EMFormat *)efh, (CamelStream *)cstream, wrapper);
|
||||
} else {
|
||||
camel_data_wrapper_decode_to_stream (wrapper, (CamelStream *) cstream);
|
||||
}
|
||||
|
||||
/* ...convert the CamelStreamMem to a BonoboStreamMem... */
|
||||
bstream = bonobo_stream_mem_create((char *)cstream->buffer->data, cstream->buffer->len, TRUE, FALSE);
|
||||
camel_object_unref(cstream);
|
||||
|
||||
/* ...and hydrate the PersistStream from the BonoboStream. */
|
||||
Bonobo_PersistStream_load(persist,
|
||||
bonobo_object_corba_objref(BONOBO_OBJECT (bstream)),
|
||||
eb->type, &ev);
|
||||
bonobo_object_unref(BONOBO_OBJECT (bstream));
|
||||
Bonobo_Unknown_unref(persist, &ev);
|
||||
CORBA_Object_release(persist, &ev);
|
||||
|
||||
if (ev._major != CORBA_NO_EXCEPTION) {
|
||||
g_object_ref_sink(embedded);
|
||||
CORBA_exception_free(&ev);
|
||||
return FALSE;
|
||||
}
|
||||
CORBA_exception_free(&ev);
|
||||
|
||||
gtk_widget_show(embedded);
|
||||
gtk_container_add(GTK_CONTAINER (eb), embedded);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
efhd_check_server_prop(Bonobo_ServerInfo *component, const char *propname, const char *value)
|
||||
{
|
||||
CORBA_sequence_CORBA_string stringv;
|
||||
Bonobo_ActivationProperty *prop;
|
||||
int i;
|
||||
|
||||
prop = bonobo_server_info_prop_find(component, propname);
|
||||
if (!prop || prop->v._d != Bonobo_ACTIVATION_P_STRINGV)
|
||||
return FALSE;
|
||||
|
||||
stringv = prop->v._u.value_stringv;
|
||||
for (i = 0; i < stringv._length; i++) {
|
||||
if (!g_ascii_strcasecmp(value, stringv._buffer[i]))
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
efhd_use_component(const char *mime_type)
|
||||
{
|
||||
GList *components, *iter;
|
||||
Bonobo_ServerInfo *component = NULL;
|
||||
|
||||
/* should this cache it? */
|
||||
|
||||
if (g_ascii_strcasecmp(mime_type, "text/x-vcard") != 0
|
||||
&& g_ascii_strcasecmp(mime_type, "text/calendar") != 0) {
|
||||
const char **mime_types;
|
||||
int i;
|
||||
|
||||
mime_types = mail_config_get_allowable_mime_types();
|
||||
for (i = 0; mime_types[i]; i++) {
|
||||
if (!g_ascii_strcasecmp(mime_types[i], mime_type))
|
||||
goto type_ok;
|
||||
}
|
||||
return FALSE;
|
||||
}
|
||||
type_ok:
|
||||
components = gnome_vfs_mime_get_all_components (mime_type);
|
||||
for (iter = components; iter; iter = iter->next) {
|
||||
Bonobo_ServerInfo *comp = iter->data;
|
||||
|
||||
comp = iter->data;
|
||||
if (efhd_check_server_prop(comp, "repo_ids", "IDL:Bonobo/PersistStream:1.0")
|
||||
&& efhd_check_server_prop(comp, "bonobo:supported_mime_types", mime_type)) {
|
||||
component = comp;
|
||||
break;
|
||||
}
|
||||
}
|
||||
gnome_vfs_mime_component_list_free (components);
|
||||
|
||||
return component != NULL;
|
||||
}
|
||||
|
||||
static void
|
||||
attachment_bar_arrow_clicked(GtkWidget *w, EMFormatHTMLDisplay *efhd)
|
||||
{
|
||||
@ -2472,12 +2294,6 @@ efhd_format_attachment(EMFormat *emf, CamelStream *stream, CamelMimePart *part,
|
||||
if (handle) {
|
||||
if (info->shown)
|
||||
handle->handler(emf, stream, part, handle);
|
||||
} else if (efhd_use_component(mime_type)) {
|
||||
g_free(classid); /* messy */
|
||||
|
||||
classid = g_strdup_printf("bonobo-unknown:///em-format-html-display/%s", emf->part_id->str);
|
||||
em_format_html_add_pobject((EMFormatHTML *)emf, sizeof(EMFormatHTMLPObject), classid, part, efhd_bonobo_object);
|
||||
camel_stream_printf(stream, "<object classid=\"%s\" type=\"%s\"></object><br>>\n", classid, mime_type);
|
||||
}
|
||||
|
||||
g_free(classid);
|
||||
|
||||
Reference in New Issue
Block a user