From c0a255eb90769638d57ae4122932f75c46e4e531 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 11 Sep 2008 15:34:29 +0000 Subject: Merge revisions 36016:36303 from trunk. svn path=/branches/kill-bonobo/; revision=36307 --- mail/em-format-html-print.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'mail/em-format-html-print.c') diff --git a/mail/em-format-html-print.c b/mail/em-format-html-print.c index cfff244dd2..c0d3573a3e 100644 --- a/mail/em-format-html-print.c +++ b/mail/em-format-html-print.c @@ -1,26 +1,26 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: Jeffrey Stedfast * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Authors: + * Jeffrey Stedfast + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ - #ifdef HAVE_CONFIG_H #include #endif -- cgit v1.2.3 From fee5916b60c605ff5086d8fdc2a85c5ea21351f6 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 31 Jan 2009 19:03:12 +0000 Subject: Merge revisions 37108:37199 from trunk. svn path=/branches/kill-bonobo/; revision=37200 --- mail/em-format-html-print.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mail/em-format-html-print.c') diff --git a/mail/em-format-html-print.c b/mail/em-format-html-print.c index c0d3573a3e..a903820ca3 100644 --- a/mail/em-format-html-print.c +++ b/mail/em-format-html-print.c @@ -52,7 +52,7 @@ efhp_finalize (GObject *o) static void efhp_class_init (GObjectClass *class) { - parent_class = g_type_class_ref(EM_TYPE_FORMAT_HTML_PRINT); + parent_class = g_type_class_peek_parent (class); class->finalize = efhp_finalize; } -- cgit v1.2.3 From f7e298665b02f72890c6681e6d21ef5601beccbb Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 15 Feb 2009 03:27:31 +0000 Subject: Merge revisions 37200:3266 from trunk. svn path=/branches/kill-bonobo/; revision=37270 --- mail/em-format-html-print.c | 1 + 1 file changed, 1 insertion(+) (limited to 'mail/em-format-html-print.c') diff --git a/mail/em-format-html-print.c b/mail/em-format-html-print.c index a903820ca3..985828d2af 100644 --- a/mail/em-format-html-print.c +++ b/mail/em-format-html-print.c @@ -71,6 +71,7 @@ efhp_init (GObject *o) gtk_container_add (GTK_CONTAINER (efhp->window), html); gtk_widget_realize (html); efhp->parent.show_icon = FALSE; + ((EMFormat *)efhp)->print = TRUE; } GType -- cgit v1.2.3 From fd564be3203400024147469faaa7de0884861566 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 19 Feb 2009 01:36:04 +0000 Subject: Clean up the EMFormat stack. Add some GObject properties to bind to. Add some handy color conversion functions to e-util. svn path=/branches/kill-bonobo/; revision=37290 --- mail/em-format-html-print.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'mail/em-format-html-print.c') diff --git a/mail/em-format-html-print.c b/mail/em-format-html-print.c index 985828d2af..28767d216d 100644 --- a/mail/em-format-html-print.c +++ b/mail/em-format-html-print.c @@ -210,9 +210,7 @@ emfhp_got_message (CamelFolder *folder, const char *uid, return; } - if (efhp->source != NULL) - ((EMFormatHTML *)efhp)->load_http = - efhp->source->load_http_now; + em_format_html_load_images (EM_FORMAT_HTML (efhp)); g_signal_connect ( efhp, "complete", G_CALLBACK (emfhp_complete), efhp); -- cgit v1.2.3 From 4279d2042844fddc4429b8690a550778740222e3 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 14 Apr 2009 18:32:57 +0000 Subject: Commit some code cleanups that I want to keep separate. svn path=/branches/kill-bonobo/; revision=37522 --- mail/em-format-html-print.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'mail/em-format-html-print.c') diff --git a/mail/em-format-html-print.c b/mail/em-format-html-print.c index 28767d216d..137711dbb7 100644 --- a/mail/em-format-html-print.c +++ b/mail/em-format-html-print.c @@ -38,22 +38,27 @@ static gpointer parent_class = NULL; static void -efhp_finalize (GObject *o) +efhp_finalize (GObject *object) { - EMFormatHTMLPrint *efhp = (EMFormatHTMLPrint *)o; + EMFormatHTMLPrint *efhp = (EMFormatHTMLPrint *)object; gtk_widget_destroy (efhp->window); if (efhp->source != NULL) g_object_unref (efhp->source); - ((GObjectClass *) parent_class)->finalize (o); + /* Chain up to parent's finalize() method. */ + G_OBJECT_CLASS (parent_class)->finalize (object); } static void -efhp_class_init (GObjectClass *class) +efhp_class_init (EMFormatHTMLPrintClass *class) { + GObjectClass *object_class; + parent_class = g_type_class_peek_parent (class); - class->finalize = efhp_finalize; + + object_class = G_OBJECT_CLASS (class); + object_class->finalize = efhp_finalize; } static void @@ -93,7 +98,7 @@ em_format_html_print_get_type (void) }; type = g_type_register_static ( - em_format_html_get_type (), "EMFormatHTMLPrint", + EM_TYPE_FORMAT_HTML, "EMFormatHTMLPrint", &type_info, 0); } @@ -101,7 +106,8 @@ em_format_html_print_get_type (void) } EMFormatHTMLPrint * -em_format_html_print_new (EMFormatHTML *source, GtkPrintOperationAction action) +em_format_html_print_new (EMFormatHTML *source, + GtkPrintOperationAction action) { EMFormatHTMLPrint *efhp; -- cgit v1.2.3 From e4afd3f9fb962ea1295a0657ec9f83a427829171 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 26 May 2009 23:21:02 -0400 Subject: Remove trailing whitespace, again. --- mail/em-format-html-print.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mail/em-format-html-print.c') diff --git a/mail/em-format-html-print.c b/mail/em-format-html-print.c index 985828d2af..ef1bbb13c4 100644 --- a/mail/em-format-html-print.c +++ b/mail/em-format-html-print.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: -- cgit v1.2.3 From 948235c3d1076dbe6ed2e57a24c16a083bbd9f01 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 27 May 2009 10:29:19 -0400 Subject: Prefer GLib basic types over C types. --- mail/em-format-html-print.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mail/em-format-html-print.c') diff --git a/mail/em-format-html-print.c b/mail/em-format-html-print.c index 88bcb10dac..773bc04b0d 100644 --- a/mail/em-format-html-print.c +++ b/mail/em-format-html-print.c @@ -206,7 +206,7 @@ emfhp_complete (EMFormatHTMLPrint *efhp) } static void -emfhp_got_message (CamelFolder *folder, const char *uid, +emfhp_got_message (CamelFolder *folder, const gchar *uid, CamelMimeMessage *msg, gpointer data) { EMFormatHTMLPrint *efhp = data; @@ -228,7 +228,7 @@ emfhp_got_message (CamelFolder *folder, const char *uid, void em_format_html_print_message (EMFormatHTMLPrint *efhp, CamelFolder *folder, - const char *uid) + const gchar *uid) { g_object_ref (efhp); -- cgit v1.2.3