aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/printing
diff options
context:
space:
mode:
authorRadek Doulik <rodo@src.gnome.org>2003-01-22 01:23:38 +0800
committerRadek Doulik <rodo@src.gnome.org>2003-01-22 01:23:38 +0800
commit16b54010c94762d2032c7a61c6b2847f8ba2c3ea (patch)
tree3c0d499305e356946be44e5bdf5a9015a788280a /addressbook/printing
parent52f0cb50fe082682c5c33e81c2e42a6e9a757123 (diff)
downloadgsoc2013-evolution-16b54010c94762d2032c7a61c6b2847f8ba2c3ea.tar.gz
gsoc2013-evolution-16b54010c94762d2032c7a61c6b2847f8ba2c3ea.tar.zst
gsoc2013-evolution-16b54010c94762d2032c7a61c6b2847f8ba2c3ea.zip
applied patch from Frederic Crozat <fcrozat@mandrakesoft.com>
svn path=/trunk/; revision=19540
Diffstat (limited to 'addressbook/printing')
-rw-r--r--addressbook/printing/e-contact-print-envelope.c20
-rw-r--r--addressbook/printing/e-contact-print.c34
2 files changed, 27 insertions, 27 deletions
diff --git a/addressbook/printing/e-contact-print-envelope.c b/addressbook/printing/e-contact-print-envelope.c
index ba57f75ae2..5ed3fb8211 100644
--- a/addressbook/printing/e-contact-print-envelope.c
+++ b/addressbook/printing/e-contact-print-envelope.c
@@ -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);
diff --git a/addressbook/printing/e-contact-print.c b/addressbook/printing/e-contact-print.c
index 9ef1d51bc8..446162f778 100644
--- a/addressbook/printing/e-contact-print.c
+++ b/addressbook/printing/e-contact-print.c
@@ -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);