callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

applied patch from Frederic Crozat <fcrozat@mandrakesoft.com>

Browse Source 
svn path=/trunk/; revision=19540
This commit is contained in:
Radek Doulik
2003-01-21 17:23:38 +00:00
parent 52f0cb50fe
commit 16b54010c9
8 changed files with 94 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
addressbook/gui/widgets/e-addressbook-view.c
View File

@ -36,9 +36,9 @@
#include <libgnomeui/gnome-dialog-util.h>
#include <libgnomeprint/gnome-print.h>
#include <libgnomeprint/gnome-print-master.h>
#include <libgnomeprint/gnome-print-job.h>
#include <libgnomeprintui/gnome-print-dialog.h>
#include <libgnomeprintui/gnome-print-master-preview.h>
#include <libgnomeprintui/gnome-print-job-preview.h>
#include "addressbook/printing/e-contact-print.h"
#include "addressbook/printing/e-contact-print-envelope.h"
@ -1515,14 +1515,14 @@ e_contact_print_destroy(gpointer data, GObject *where_object_was)
static void
e_contact_print_button(GtkDialog *dialog, gint button, gpointer data)
{
GnomePrintMaster *master;
GnomePrintJob *master;
GnomePrintContext *pc;
EPrintable *printable = g_object_get_data(G_OBJECT(dialog), "printable");
GtkWidget *preview;
switch( button ) {
case GNOME_PRINT_DIALOG_RESPONSE_PRINT:
master = gnome_print_master_new_from_config (gnome_print_dialog_get_config ( GNOME_PRINT_DIALOG(dialog) ));
pc = gnome_print_master_get_context( master );
master = gnome_print_job_new(gnome_print_dialog_get_config ( GNOME_PRINT_DIALOG(dialog) ));
pc = gnome_print_job_get_context( master );
e_printable_reset(printable);
while (e_printable_data_left(printable)) {
if (gnome_print_gsave(pc) == -1)
@ -1539,14 +1539,14 @@ e_contact_print_button(GtkDialog *dialog, gint button, gpointer data)
if (gnome_print_showpage(pc) == -1)
/* FIXME */;
}
gnome_print_master_close(master);
gnome_print_master_print(master);
gnome_print_job_close(master);
gnome_print_job_print(master);
g_object_unref (master);
gtk_widget_destroy((GtkWidget *)dialog);
break;
case GNOME_PRINT_DIALOG_RESPONSE_PREVIEW:
master = gnome_print_master_new_from_config (gnome_print_dialog_get_config ( GNOME_PRINT_DIALOG(dialog) ));
pc = gnome_print_master_get_context( master );
master = gnome_print_job_new (gnome_print_dialog_get_config ( GNOME_PRINT_DIALOG(dialog) ));
pc = gnome_print_job_get_context( master );
e_printable_reset(printable);
while (e_printable_data_left(printable)) {
if (gnome_print_gsave(pc) == -1)
@ -1563,8 +1563,8 @@ e_contact_print_button(GtkDialog *dialog, gint button, gpointer data)
if (gnome_print_showpage(pc) == -1)
/* FIXME */;
}
gnome_print_master_close(master);
preview = GTK_WIDGET(gnome_print_master_preview_new(master, "Print Preview"));
gnome_print_job_close(master);
preview = GTK_WIDGET(gnome_print_job_preview_new(master, "Print Preview"));
gtk_widget_show_all(preview);
g_object_unref (master);
break;
@ -1644,7 +1644,7 @@ e_addressbook_view_print(EAddressbookView *view)
ETable *etable;
EContactPrintDialogWeakData *weak_data;
dialog = gnome_print_dialog_new("Print cards", GNOME_PRINT_DIALOG_RANGE | GNOME_PRINT_DIALOG_COPIES);
dialog = gnome_print_dialog_new(NULL, "Print cards", GNOME_PRINT_DIALOG_RANGE | GNOME_PRINT_DIALOG_COPIES);
gnome_print_dialog_construct_range_any(GNOME_PRINT_DIALOG(dialog), GNOME_PRINT_RANGE_ALL | GNOME_PRINT_RANGE_SELECTION,
NULL, NULL, NULL);
@ -1692,7 +1692,7 @@ e_addressbook_view_print_preview(EAddressbookView *view)
else if (view->view_type == E_ADDRESSBOOK_VIEW_TABLE) {
EPrintable *printable;
ETable *etable;
GnomePrintMaster *master;
GnomePrintJob *master;
GnomePrintContext *pc;
GnomePrintConfig *config;
GtkWidget *preview;
@ -1700,10 +1700,10 @@ e_addressbook_view_print_preview(EAddressbookView *view)
g_object_get(view->widget, "table", &etable, NULL);
printable = e_table_get_printable(etable);
master = gnome_print_master_new();
config = gnome_print_master_get_config (master);
master = gnome_print_job_new(NULL);
config = gnome_print_job_get_config (master);
gnome_print_config_set_int (config, GNOME_PRINT_KEY_NUM_COPIES, 1);
pc = gnome_print_master_get_context( master );
pc = gnome_print_job_get_context( master );
e_printable_reset(printable);
while (e_printable_data_left(printable)) {
if (gnome_print_gsave(pc) == -1)
@ -1720,8 +1720,8 @@ e_addressbook_view_print_preview(EAddressbookView *view)
if (gnome_print_showpage(pc) == -1)
/* FIXME */;
}
gnome_print_master_close(master);
preview = GTK_WIDGET(gnome_print_master_preview_new(master, "Print Preview"));
gnome_print_job_close(master);
preview = GTK_WIDGET(gnome_print_job_preview_new(master, "Print Preview"));
gtk_widget_show_all(preview);
g_object_unref (master);
g_object_unref (printable);

20
addressbook/printing/e-contact-print-envelope.c
View File

@ -27,7 +27,7 @@
#include <time.h>
#include <libgnomeprintui/gnome-print-dialog.h>
#include <libgnomeprint/gnome-print.h>
#include <libgnomeprint/gnome-print-master.h>
#include <libgnomeprint/gnome-print-job.h>
#include "addressbook/backend/ebook/e-card.h"
#include "addressbook/backend/ebook/e-card-simple.h"
@ -172,7 +172,7 @@ ecpe_print(GnomePrintContext *pc, ECard *ecard, gboolean as_return)
static void
e_contact_print_envelope_button(GnomeDialog *dialog, gint button, gpointer data)
{
GnomePrintMaster *master;
GnomePrintJob *master;
GnomePrintContext *pc;
GnomePrintConfig *config;
ECard *card = NULL;
@ -183,22 +183,22 @@ e_contact_print_envelope_button(GnomeDialog *dialog, gint button, gpointer data)
switch( button ) {
case GNOME_PRINT_DIALOG_RESPONSE_PRINT:
config = gnome_print_dialog_get_config (GNOME_PRINT_DIALOG (dialog));
master = gnome_print_master_new_from_config (config);
pc = gnome_print_master_get_context( master );
master = gnome_print_job_new (config);
pc = gnome_print_job_get_context( master );
ecpe_print(pc, card, FALSE);
gnome_print_master_print(master);
gnome_print_job_print(master);
gnome_dialog_close(dialog);
break;
case GNOME_PRINT_DIALOG_RESPONSE_PREVIEW:
config = gnome_print_dialog_get_config (GNOME_PRINT_DIALOG (dialog));
master = gnome_print_master_new_from_config (config);
pc = gnome_print_master_get_context( master );
master = gnome_print_job_new (config);
pc = gnome_print_job_get_context( master );
ecpe_print(pc, card, FALSE);
preview = GTK_WIDGET(gnome_print_master_preview_new(master, "Print Preview"));
preview = GTK_WIDGET(gnome_print_job_preview_new(master, "Print Preview"));
gtk_widget_show_all(preview);
break;
case GNOME_PRINT_DIALOG_RESPONSE_CANCEL:
@ -213,7 +213,7 @@ e_contact_print_envelope_dialog_new(ECard *card)
{
GtkWidget *dialog;
dialog = gnome_print_dialog_new(_("Print envelope"), GNOME_PRINT_DIALOG_COPIES);
dialog = gnome_print_dialog_new(NULL, _("Print envelope"), GNOME_PRINT_DIALOG_COPIES);
card = e_card_duplicate(card);
g_object_set_data(G_OBJECT(dialog), "card", card);
@ -234,7 +234,7 @@ e_contact_print_envelope_list_dialog_new(GList *list)
if (list == NULL)
return NULL;
dialog = gnome_print_dialog_new(_("Print envelope"), GNOME_PRINT_DIALOG_COPIES);
dialog = gnome_print_dialog_new(NULL, _("Print envelope"), GNOME_PRINT_DIALOG_COPIES);
card = e_card_duplicate(list->data);
g_object_set_data(G_OBJECT(dialog), "card", card);

34
addressbook/printing/e-contact-print.c
View File

@ -34,9 +34,9 @@
#include <libgnomeui/gnome-dialog.h>
#include <libgnomeprint/gnome-print.h>
#include <libgnomeprint/gnome-font.h>
#include <libgnomeprint/gnome-print-master.h>
#include <libgnomeprint/gnome-print-job.h>
#include <libgnomeprintui/gnome-print-dialog.h>
#include <libgnomeprintui/gnome-print-master-preview.h>
#include <libgnomeprintui/gnome-print-job-preview.h>
#include <addressbook/backend/ebook/e-book.h>
#include <addressbook/backend/ebook/e-card.h>
#include <addressbook/backend/ebook/e-card-simple.h>
@ -51,7 +51,7 @@ typedef struct _EContactPrintContext EContactPrintContext;
struct _EContactPrintContext
{
GnomePrintContext *pc;
GnomePrintMaster *master;
GnomePrintJob *master;
gdouble x;
gdouble y;
gint column;
@ -581,10 +581,10 @@ complete_sequence(EBookView *book_view, EBookViewStatus status, EContactPrintCon
g_object_unref(book_view);
if (ctxt->type == GNOME_PRINT_DIALOG_RESPONSE_PREVIEW) {
GtkWidget *preview;
preview = GTK_WIDGET(gnome_print_master_preview_new(ctxt->master, "Print Preview"));
preview = GTK_WIDGET(gnome_print_job_preview_new(ctxt->master, "Print Preview"));
gtk_widget_show_all(preview);
} else {
gnome_print_master_print(ctxt->master);
gnome_print_job_print(ctxt->master);
}
g_object_unref(ctxt->pc);
g_object_unref(ctxt->master);
@ -1006,7 +1006,7 @@ e_contact_print_button(GnomeDialog *dialog, gint button, gpointer data)
{
EContactPrintContext *ctxt = g_new(EContactPrintContext, 1);
EContactPrintStyle *style = g_new(EContactPrintStyle, 1);
GnomePrintMaster *master;
GnomePrintJob *master;
GnomePrintConfig *config;
GnomePrintContext *pc;
gboolean uses_book = (gint) g_object_get_data(G_OBJECT(dialog), "uses_book");
@ -1025,8 +1025,8 @@ e_contact_print_button(GnomeDialog *dialog, gint button, gpointer data)
switch( button ) {
case GNOME_PRINT_DIALOG_RESPONSE_PRINT:
config = gnome_print_dialog_get_config (GNOME_PRINT_DIALOG(dialog));
master = gnome_print_master_new_from_config( config );
pc = gnome_print_master_get_context( master );
master = gnome_print_job_new( config );
pc = gnome_print_job_get_context( master );
e_contact_build_style(style);
ctxt->x = 0;
@ -1061,8 +1061,8 @@ e_contact_print_button(GnomeDialog *dialog, gint button, gpointer data)
break;
case GNOME_PRINT_DIALOG_RESPONSE_PREVIEW:
config = gnome_print_dialog_get_config (GNOME_PRINT_DIALOG(dialog));
master = gnome_print_master_new_from_config( config );
pc = gnome_print_master_get_context( master );
master = gnome_print_job_new( config );
pc = gnome_print_job_get_context( master );
e_contact_build_style(style);
ctxt->x = 0;
@ -1115,7 +1115,7 @@ e_contact_print_dialog_new(EBook *book, char *query)
GtkWidget *dialog;
dialog = gnome_print_dialog_new(_("Print cards"), GNOME_PRINT_DIALOG_RANGE | GNOME_PRINT_DIALOG_COPIES);
dialog = gnome_print_dialog_new(NULL, _("Print cards"), GNOME_PRINT_DIALOG_RANGE | GNOME_PRINT_DIALOG_COPIES);
gnome_print_dialog_construct_range_any(GNOME_PRINT_DIALOG(dialog), GNOME_PRINT_RANGE_ALL | GNOME_PRINT_RANGE_SELECTION,
NULL, NULL, NULL);
@ -1135,15 +1135,15 @@ e_contact_print_preview(EBook *book, char *query)
{
EContactPrintContext *ctxt = g_new(EContactPrintContext, 1);
EContactPrintStyle *style = g_new(EContactPrintStyle, 1);
GnomePrintMaster *master;
GnomePrintJob *master;
GnomePrintContext *pc;
GnomePrintConfig *config;
gdouble font_size;
master = gnome_print_master_new();
config = gnome_print_master_get_config (master);
master = gnome_print_job_new(NULL);
config = gnome_print_job_get_config (master);
gnome_print_config_set_int (config, GNOME_PRINT_KEY_NUM_COPIES, 1);
pc = gnome_print_master_get_context (master);
pc = gnome_print_job_get_context (master);
e_contact_build_style (style);
ctxt->x = 0;
@ -1177,7 +1177,7 @@ e_contact_print_card_dialog_new(ECard *card)
{
GtkWidget *dialog;
dialog = gnome_print_dialog_new(_("Print card"), GNOME_PRINT_DIALOG_COPIES);
dialog = gnome_print_dialog_new(NULL, _("Print card"), GNOME_PRINT_DIALOG_COPIES);
card = e_card_duplicate(card);
g_object_set_data(G_OBJECT(dialog), "card", card);
@ -1199,7 +1199,7 @@ e_contact_print_card_list_dialog_new(GList *list)
if (list == NULL)
return NULL;
dialog = gnome_print_dialog_new(_("Print card"), GNOME_PRINT_DIALOG_COPIES);
dialog = gnome_print_dialog_new(NULL, _("Print card"), GNOME_PRINT_DIALOG_COPIES);
card = e_card_duplicate(list->data);
g_object_set_data(G_OBJECT(dialog), "card", card);

46
calendar/gui/print.c
View File

@ -35,11 +35,11 @@
#include <libgnomeui/gnome-stock-icons.h>
#include <libgnomeprint/gnome-print.h>
#include <libgnomeprint/gnome-print-paper.h>
#include <libgnomeprint/gnome-print-master.h>
#include <libgnomeprintui/gnome-print-master-preview.h>
#include <libgnomeprint/gnome-print-job.h>
#include <libgnomeprintui/gnome-print-job-preview.h>
#include <libgnomeprintui/gnome-print-paper-selector.h>
#include <libgnomeprintui/gnome-print-preview.h>
#include <libgnomeprintui/gnome-printer-dialog.h>
#include <libgnomeprintui/gnome-print-dialog.h>
#include <e-util/e-dialog-widgets.h>
#include <e-util/e-time-utils.h>
#include <gal/widgets/e-unicode.h>
@ -2409,7 +2409,7 @@ print_calendar (GnomeCalendar *gcal, gboolean preview, time_t date,
{
#if 0
GnomePrintConfig *config;
GnomePrintMaster *gpm;
GnomePrintJob *gpm;
GnomePrintContext *pc;
int copies, collate;
double l, r, t, b;
@ -2465,18 +2465,18 @@ print_calendar (GnomeCalendar *gcal, gboolean preview, time_t date,
/* FIXME: allow configuration of paper size */
gpm = gnome_print_master_new ();
gpm = gnome_print_job_new ();
if (paper_info == NULL)
paper_info = gnome_paper_with_name (gnome_paper_name_default ());
gnome_print_master_set_paper (gpm, paper_info);
gnome_print_job_set_paper (gpm, paper_info);
if (printer)
gnome_print_master_set_printer (gpm, printer);
gnome_print_job_set_printer (gpm, printer);
gnome_print_master_set_copies (gpm, copies, collate);
gnome_print_job_set_copies (gpm, copies, collate);
pc = gnome_print_master_get_context (gpm);
pc = gnome_print_job_get_context (gpm);
l = gnome_paper_lmargin (paper_info);
r = gnome_paper_pswidth (paper_info)
@ -2506,19 +2506,19 @@ print_calendar (GnomeCalendar *gcal, gboolean preview, time_t date,
g_assert_not_reached ();
}
gnome_print_master_close (gpm);
gnome_print_job_close (gpm);
if (preview) {
GnomePrintMasterPreview *gpmp;
GnomePrintJobPreview *gpmp;
gboolean landscape = FALSE;
if (default_view == PRINT_VIEW_MONTH)
landscape = TRUE;
gpmp = gnome_print_master_preview_new_with_orientation (gpm, _("Print Preview"), landscape);
gpmp = gnome_print_job_preview_new_with_orientation (gpm, _("Print Preview"), landscape);
gtk_widget_show (GTK_WIDGET (gpmp));
} else {
gnome_print_master_print (gpm);
gnome_print_job_print (gpm);
}
g_object_unref (gpm);
@ -2531,7 +2531,7 @@ print_comp (CalComponent *comp, CalClient *client, gboolean preview)
{
#if 0
GnomePrinter *printer;
GnomePrintMaster *gpm;
GnomePrintJob *gpm;
GnomePrintContext *pc;
int copies, collate;
double l, r, t, b;
@ -2581,18 +2581,18 @@ print_comp (CalComponent *comp, CalClient *client, gboolean preview)
/* FIXME: allow configuration of paper size */
gpm = gnome_print_master_new ();
gpm = gnome_print_job_new ();
if (paper_info == NULL)
paper_info = gnome_paper_with_name (gnome_paper_name_default ());
gnome_print_master_set_paper (gpm, paper_info);
gnome_print_job_set_paper (gpm, paper_info);
if (printer)
gnome_print_master_set_printer (gpm, printer);
gnome_print_job_set_printer (gpm, printer);
gnome_print_master_set_copies (gpm, copies, collate);
gnome_print_job_set_copies (gpm, copies, collate);
pc = gnome_print_master_get_context (gpm);
pc = gnome_print_job_get_context (gpm);
l = gnome_paper_lmargin (paper_info);
r = gnome_paper_pswidth (paper_info)
@ -2603,16 +2603,16 @@ print_comp (CalComponent *comp, CalClient *client, gboolean preview)
print_comp_item (pc, comp, client, l, r, t, b);
gnome_print_master_close (gpm);
gnome_print_job_close (gpm);
if (preview) {
GnomePrintMasterPreview *gpmp;
GnomePrintJobPreview *gpmp;
gpmp = gnome_print_master_preview_new (gpm,
gpmp = gnome_print_job_preview_new (gpm,
_("Print Preview"));
gtk_widget_show (GTK_WIDGET (gpmp));
} else {
gnome_print_master_print (gpm);
gnome_print_job_print (gpm);
}
g_object_unref (gpm);

7
calendar/gui/tasks-control.c
View File

@ -32,12 +32,11 @@
#include <libgnomeui/gnome-stock-icons.h>
#include <libgnomeprint/gnome-print.h>
#include <libgnomeprint/gnome-print-paper.h>
#include <libgnomeprint/gnome-print-master.h>
#include <libgnomeprintui/gnome-print-master-preview.h>
#include <libgnomeprint/gnome-print-job.h>
#include <libgnomeprintui/gnome-print-job-preview.h>
#include <libgnomeprintui/gnome-print-paper-selector.h>
#include <libgnomeprintui/gnome-print-copies.h>
#include <libgnomeprintui/gnome-print-preview.h>
#include <libgnomeprintui/gnome-printer-dialog.h>
#include <libgnomeprintui/gnome-print-dialog.h>
#include <bonobo/bonobo-control.h>
#include <bonobo/bonobo-property-bag.h>
#include <bonobo/bonobo-ui-util.h>

8
configure.in
View File

@ -1073,7 +1073,7 @@ AC_SUBST(SHELL_LIBS)
dnl --- evolution-addressbook flags
EVOLUTION_ADDRESSBOOK_DEPS="gconf-2.0 libbonoboui-2.0 libglade-2.0 gal-2.0 >= $GAL_VERSION libgnomeui-2.0 libgnome-2.0 libgnomecanvas-2.0 gnome-vfs-2.0 libgnomeprintui-2.0"
EVOLUTION_ADDRESSBOOK_DEPS="gconf-2.0 libbonoboui-2.0 libglade-2.0 gal-2.0 >= $GAL_VERSION libgnomeui-2.0 libgnome-2.0 libgnomecanvas-2.0 gnome-vfs-2.0 libgnomeprintui-2.2"
EVO_SET_COMPILE_FLAGS(EVOLUTION_ADDRESSBOOK, $EVOLUTION_ADDRESSBOOK_DEPS)
AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS)
@ -1085,13 +1085,13 @@ dnl AC_SUBST(EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS)
dnl -- evolution-executive-summary flags
EVO_SET_COMPILE_FLAGS(EVOLUTION_EXECUTIVE_SUMMARY, libbonoboui-2.0 libbonoboui-2.0 gal-2.0 >= $GAL_VERSION libgnomeui-2.0 libglade-2.0 libgnomeprint-2.0 libgnomeprintui-2.0 soup-2.0 libgtkhtml-3.0)
EVO_SET_COMPILE_FLAGS(EVOLUTION_EXECUTIVE_SUMMARY, libbonoboui-2.0 libbonoboui-2.0 gal-2.0 >= $GAL_VERSION libgnomeui-2.0 libglade-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 soup-2.0 libgtkhtml-3.0)
AC_SUBST(EVOLUTION_EXECUTIVE_SUMMARY_CFLAGS)
AC_SUBST(EVOLUTION_EXECUTIVE_SUMMARY_LIBS)
dnl --- evolution-calendar flags
EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 gal-2.0 >= $GAL_VERSION libglade-2.0 gnome-vfs-2.0 libgnomeprint-2.0 libgnomeprintui-2.0 libgtkhtml-3.0, ${GTKHTML_CFLAGS}, ${GTKHTML_LIBS})
EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 gal-2.0 >= $GAL_VERSION libglade-2.0 gnome-vfs-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 libgtkhtml-3.0, ${GTKHTML_CFLAGS}, ${GTKHTML_LIBS})
AC_SUBST(EVOLUTION_CALENDAR_CFLAGS)
AC_SUBST(EVOLUTION_CALENDAR_LIBS)
@ -1101,7 +1101,7 @@ dnl AC_SUBST(EVOLUTION_CALENDAR_CONDUIT_LIBS)
dnl --- evolution-mail flags
EVO_SET_COMPILE_FLAGS(EVOLUTION_MAIL, libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 gal-2.0 >= $GAL_VERSION libglade-2.0 soup-2.0 libgnomeprint-2.0 libgtkhtml-3.0 libxml-2.0 bonobo-activation-2.0 gthread-2.0 gconf-2.0)
EVO_SET_COMPILE_FLAGS(EVOLUTION_MAIL, libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 gal-2.0 >= $GAL_VERSION libglade-2.0 soup-2.0 libgnomeprint-2.2 libgtkhtml-3.0 libxml-2.0 bonobo-activation-2.0 gthread-2.0 gconf-2.0)
AC_SUBST(EVOLUTION_MAIL_CFLAGS)
AC_SUBST(EVOLUTION_MAIL_LIBS)

20
mail/mail-callbacks.c
View File

@ -39,9 +39,9 @@
#include <gtk/gtkmessagedialog.h>
#include <libgnomeprint/gnome-print-master.h>
#include <libgnomeprint/gnome-print-job.h>
#include <libgnomeprintui/gnome-print-dialog.h>
#include <libgnomeprintui/gnome-print-master-preview.h>
#include <libgnomeprintui/gnome-print-job-preview.h>
#include <bonobo/bonobo-widget.h>
#include <bonobo/bonobo-socket.h>
@ -2845,14 +2845,14 @@ do_mail_print (FolderBrowser *fb, gboolean preview)
{
GtkHTML *html;
GnomePrintContext *print_context;
GnomePrintMaster *print_master;
GnomePrintJob *print_master;
GnomePrintConfig *config = NULL;
GtkDialog *dialog;
gdouble line = 0.0;
struct footer_info *info;
if (!preview) {
dialog = (GtkDialog *) gnome_print_dialog_new (_("Print Message"), GNOME_PRINT_DIALOG_COPIES);
dialog = (GtkDialog *) gnome_print_dialog_new (NULL, _("Print Message"), GNOME_PRINT_DIALOG_COPIES);
gtk_dialog_set_default_response (dialog, GNOME_PRINT_DIALOG_RESPONSE_PRINT);
gtk_window_set_transient_for ((GtkWindow *) dialog, (GtkWindow *) fb);
@ -2872,14 +2872,14 @@ do_mail_print (FolderBrowser *fb, gboolean preview)
}
if (config) {
print_master = gnome_print_master_new_from_config (config);
print_master = gnome_print_job_new (config);
gnome_print_config_unref (config);
} else
print_master = gnome_print_master_new ();
print_master = gnome_print_job_new (NULL);
/* paper size settings? */
/*gnome_print_master_set_paper (print_master, paper);*/
print_context = gnome_print_master_get_context (print_master);
print_context = gnome_print_job_get_context (print_master);
html = GTK_HTML (gtk_html_new ());
mail_display_initialize_gtkhtml (fb->mail_display, html);
@ -2900,15 +2900,15 @@ do_mail_print (FolderBrowser *fb, gboolean preview)
fb->mail_display->printing = FALSE;
gnome_print_master_close (print_master);
gnome_print_job_close (print_master);
if (preview){
GtkWidget *preview;
preview = gnome_print_master_preview_new (print_master, _("Print Preview"));
preview = gnome_print_job_preview_new (print_master, _("Print Preview"));
gtk_widget_show (preview);
} else {
int result = gnome_print_master_print (print_master);
int result = gnome_print_job_print (print_master);
if (result == -1)
e_notice (FB_WINDOW (fb), GTK_MESSAGE_ERROR, _("Printing of message failed"));

18
my-evolution/e-summary.c
View File

@ -52,9 +52,9 @@
#include <libgnome/gnome-url.h>
#include <libgnomeprint/gnome-print-master.h>
#include <libgnomeprint/gnome-print-job.h>
#include <libgnomeprintui/gnome-print-master-preview.h>
#include <libgnomeprintui/gnome-print-job-preview.h>
#include <libgnomeprintui/gnome-print-dialog.h>
#include <gtk/gtkdialog.h>
@ -584,12 +584,12 @@ do_summary_print (ESummary *summary,
gboolean preview)
{
GnomePrintContext *print_context;
GnomePrintMaster *print_master;
GnomePrintJob *print_master;
GtkWidget *gpd;
GnomePrintConfig *config = NULL;
if (! preview) {
gpd = gnome_print_dialog_new (_("Print Summary"), GNOME_PRINT_DIALOG_COPIES);
gpd = gnome_print_dialog_new (NULL, _("Print Summary"), GNOME_PRINT_DIALOG_COPIES);
switch (gtk_dialog_run (GTK_DIALOG (gpd))) {
case GNOME_PRINT_DIALOG_RESPONSE_PRINT:
@ -607,19 +607,19 @@ do_summary_print (ESummary *summary,
config = gnome_print_dialog_get_config (GNOME_PRINT_DIALOG (gpd));
}
print_master = gnome_print_master_new_from_config (config);
print_master = gnome_print_job_new (config);
print_context = gnome_print_master_get_context (print_master);
print_context = gnome_print_job_get_context (print_master);
gtk_html_print (GTK_HTML (summary->priv->html), print_context);
gnome_print_master_close (print_master);
gnome_print_job_close (print_master);
if (preview) {
GtkWidget *preview;
preview = gnome_print_master_preview_new (print_master, _("Print Preview"));
preview = gnome_print_job_preview_new (print_master, _("Print Preview"));
gtk_widget_show (preview);
} else {
int result = gnome_print_master_print (print_master);
int result = gnome_print_job_print (print_master);
if (result == -1) {
e_notice (NULL, GTK_MESSAGE_ERROR,