From d2f0410b09bd00e167b5de81977d96e48d044a2e Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Mon, 3 Feb 2003 19:07:48 +0000 Subject: Just use gnome_vfs_get_mime_type_from_name() so we can forget all the crap 2003-02-03 Jeffrey Stedfast * mail-identify.c (mail_identify_mime_part): Just use gnome_vfs_get_mime_type_from_name() so we can forget all the crap I implemented before. 2003-02-01 Jeffrey Stedfast * mail-display.c (on_link_clicked): Pass in the *address* of the GError to gnome_url_show(), otherwise bad things happen :-) svn path=/trunk/; revision=19711 --- mail/mail-display.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'mail/mail-display.c') diff --git a/mail/mail-display.c b/mail/mail-display.c index bafc0bc019..5a075e5b1a 100644 --- a/mail/mail-display.c +++ b/mail/mail-display.c @@ -303,8 +303,9 @@ on_link_clicked (GtkHTML *html, const char *url, MailDisplay *md) mail_display_jump_to_anchor (md, url); } else { GError *err = NULL; - gnome_url_show (url, err); - + + gnome_url_show (url, &err); + if (err) { g_warning ("gnome_url_show: %s", err->message); g_error_free (err); @@ -319,7 +320,7 @@ save_part (CamelMimePart *part) char *filename, *dir, *base; GConfClient *gconf; - camel_object_ref (CAMEL_OBJECT (part)); + camel_object_ref (part); gconf = gconf_client_get_default (); dir = gconf_client_get_string (gconf, "/apps/evolution/mail/save_dir", NULL); @@ -349,7 +350,7 @@ save_part (CamelMimePart *part) static void save_cb (GtkWidget *widget, gpointer user_data) { - CamelMimePart *part = g_object_get_data((user_data), "CamelMimePart"); + CamelMimePart *part = g_object_get_data ((GObject *) user_data, "CamelMimePart"); save_part (part); } @@ -368,7 +369,7 @@ launch_cb (GtkWidget *widget, gpointer user_data) g_return_if_fail (handler != NULL && handler->applications != NULL); /* Yum. Too bad EPopupMenu doesn't allow per-item closures. */ - children = gtk_container_get_children(GTK_CONTAINER (widget->parent)); + children = gtk_container_get_children (GTK_CONTAINER (widget->parent)); g_return_if_fail (children != NULL && children->next != NULL && children->next->next != NULL); for (c = children->next->next, apps = handler->applications; c && apps; c = c->next, apps = apps->next) { @@ -379,7 +380,7 @@ launch_cb (GtkWidget *widget, gpointer user_data) g_return_if_fail (c != NULL && apps != NULL); app = apps->data; - tmpdir = e_mkdtemp ("evolution.XXXXXX"); + tmpdir = e_mkdtemp ("app-launcher-XXXXXX"); if (!tmpdir) { GtkWidget *dialog; @@ -539,6 +540,7 @@ pixmap_press (GtkWidget *widget, GdkEventButton *event, gpointer user_data) for (i = 1; i < nitems; i++) g_free (menu[i].name); g_free (menu); + return TRUE; } -- cgit v1.2.3