]>
Commit | Line | Data |
---|---|---|
949a454a | 1 | diff -urN balsa-2.0.3.orig/configure.in balsa-2.0.3/configure.in |
2 | --- balsa-2.0.3.orig/configure.in Wed Dec 18 21:01:37 2002 | |
3 | +++ balsa-2.0.3/configure.in Wed Dec 18 22:10:00 2002 | |
4 | @@ -64,8 +64,8 @@ | |
5 | gtk+-2.0 | |
6 | gnome-vfs-2.0 | |
7 | gnome-vfs-module-2.0 | |
8 | -libgnomeprint-2.0 >= 1.106.0 | |
9 | -libgnomeprintui-2.0 >= 1.106.0 | |
10 | +libgnomeprint-2.2 >= 2.1.5 | |
11 | +libgnomeprintui-2.2 >= 2.1.5 | |
12 | $gnome_extras | |
13 | ]) | |
14 | AC_SUBST(BALSA_CFLAGS) | |
15 | diff -urN balsa-2.0.3.orig/src/print.c balsa-2.0.3/src/print.c | |
16 | --- balsa-2.0.3.orig/src/print.c Wed Dec 18 21:01:37 2002 | |
17 | +++ balsa-2.0.3/src/print.c Wed Dec 18 22:20:13 2002 | |
18 | @@ -30,10 +30,10 @@ | |
19 | #include <ctype.h> | |
20 | #include <libgnomeprint/gnome-print.h> | |
21 | #include <libgnomeprint/gnome-font.h> | |
22 | -#include <libgnomeprint/gnome-print-master.h> | |
23 | +#include <libgnomeprint/gnome-print-job.h> | |
24 | #include <libgnomeprint/gnome-print-paper.h> | |
25 | #include <libgnomeprintui/gnome-print-dialog.h> | |
26 | -#include <libgnomeprintui/gnome-print-master-preview.h> | |
27 | +#include <libgnomeprintui/gnome-print-job-preview.h> | |
28 | #include <libbalsa.h> | |
29 | #ifdef HAVE_PCRE | |
30 | # include <pcreposix.h> | |
31 | @@ -990,18 +990,18 @@ | |
32 | } | |
33 | ||
34 | static PrintInfo * | |
35 | -print_info_new(LibBalsaMessage * msg, GnomePrintMaster * master, | |
36 | +print_info_new(LibBalsaMessage * msg, GnomePrintJob * master, | |
37 | CommonInfo * ci) | |
38 | { | |
39 | GnomePrintConfig* config; | |
40 | PrintInfo *pi = g_new0(PrintInfo, 1); | |
41 | ||
42 | - config = gnome_print_master_get_config(master); | |
43 | - gnome_print_master_get_page_size_from_config(config, &pi->page_width, | |
44 | + config = gnome_print_job_get_config(master); | |
45 | + gnome_print_job_get_page_size_from_config(config, &pi->page_width, | |
46 | &pi->page_height); | |
47 | gnome_print_config_unref(config); | |
48 | ||
49 | - pi->pc = gnome_print_master_get_context(master); | |
50 | + pi->pc = gnome_print_job_get_context(master); | |
51 | pi->margin_top = 0.75 * 72; | |
52 | pi->margin_bottom = 0.75 * 72; | |
53 | pi->margin_left = 0.75 * 72; | |
54 | @@ -1162,7 +1162,7 @@ | |
55 | * creates the print dialog, and adds a page for fonts | |
56 | */ | |
57 | static GtkWidget * | |
58 | -print_dialog(GnomePrintMaster * master, CommonInfo * ci) | |
59 | +print_dialog(GnomePrintJob * master, CommonInfo * ci) | |
60 | { | |
61 | GtkWidget *dialog; | |
62 | GtkWidget *frame; | |
63 | @@ -1173,8 +1173,8 @@ | |
64 | GtkWidget *chkbut; | |
65 | GList *childList; | |
66 | ||
67 | - dialog = gnome_print_dialog_new_from_master(master, _("Print message"), | |
68 | - GNOME_PRINT_DIALOG_COPIES); | |
69 | + dialog = gnome_print_dialog_new(master, _("Print message"), | |
70 | + GNOME_PRINT_DIALOG_COPIES); | |
71 | gtk_window_set_wmclass(GTK_WINDOW(dialog), "print", "Balsa"); | |
72 | dlgVbox = GTK_DIALOG(dialog)->vbox; | |
73 | childList = gtk_container_get_children(GTK_CONTAINER(dlgVbox)); | |
74 | @@ -1290,7 +1290,7 @@ | |
75 | message_print(LibBalsaMessage * msg) | |
76 | { | |
77 | CommonInfo ci; | |
78 | - GnomePrintMaster *master; | |
79 | + GnomePrintJob *master; | |
80 | GnomePrintConfig* config; | |
81 | PrintInfo *pi; | |
82 | gboolean preview; | |
83 | @@ -1299,14 +1299,14 @@ | |
84 | ||
85 | common_info_setup(&ci); | |
86 | ||
87 | - master = gnome_print_master_new(); | |
88 | + master = gnome_print_job_new(NULL); | |
89 | ||
90 | /* FIXME: this sets the paper size in the GnomePrintConfig. We can | |
91 | * change it in the Paper page of the GnomePrintDialog, and retrieve | |
92 | * it from the GnomePrintConfig. However, it doesn't get set as the | |
93 | * initial value in the Paper page. Is there some Gnome-2-wide | |
94 | * repository for data like this? */ | |
95 | - config = gnome_print_master_get_config(master); | |
96 | + config = gnome_print_job_get_config(master); | |
97 | gnome_print_config_set(config, GNOME_PRINT_KEY_PAPER_SIZE, | |
98 | balsa_app.paper_size); | |
99 | ||
100 | @@ -1334,16 +1334,16 @@ | |
101 | ||
102 | /* do the Real Job */ | |
103 | print_message(pi); | |
104 | - gnome_print_master_close(master); | |
105 | + gnome_print_job_close(master); | |
106 | if (preview) { | |
107 | GtkWidget *preview_widget = | |
108 | - gnome_print_master_preview_new(master, | |
109 | + gnome_print_job_preview_new(master, | |
110 | _("Balsa: message print preview")); | |
111 | gtk_window_set_wmclass(GTK_WINDOW(preview_widget), "print-preview", | |
112 | "Balsa"); | |
113 | gtk_widget_show(preview_widget); | |
114 | } else | |
115 | - gnome_print_master_print(master); | |
116 | + gnome_print_job_print(master); | |
117 | ||
118 | print_info_destroy(pi); | |
119 | common_info_cleanup(&ci); |