diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | addressbook/ChangeLog | 10 | ||||
| -rw-r--r-- | addressbook/backend/pas/pas-backend-ldap.c | 4 | ||||
| -rw-r--r-- | addressbook/gui/component/addressbook.c | 6 | ||||
| -rw-r--r-- | addressbook/printing/e-contact-print-envelope.c | 24 | ||||
| -rw-r--r-- | configure.in | 6 |
6 files changed, 43 insertions, 11 deletions
@@ -1,3 +1,7 @@ +2000-11-09 Christopher James Lahey <clahey@helixcode.com> + + * configure.in: Require gal 0.2.99.1. + 2000-11-06 Jeffrey Stedfast <fejj@helixcode.com> * configure.in: Require gal 0.2.1.3 diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 1c0dbeca78..cbd0586c60 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,13 @@ +2000-11-09 Christopher James Lahey <clahey@helixcode.com> + + * backend/pas/pas-backend-ldap.c: Fixed a warning. + + * gui/component/addressbook.c: Put in gal view menus for testing + purposes. + + * printing/e-contact-print-envelope.c: Fixed up envelope printing + a bit. Added code for printing return addresses. + 2000-11-09 JP Rosevear <jpr@helixcode.com> * conduit/address-conduit.h: Add changed_hash, change list and complete bool diff --git a/addressbook/backend/pas/pas-backend-ldap.c b/addressbook/backend/pas/pas-backend-ldap.c index f9842d2406..46010dc4a7 100644 --- a/addressbook/backend/pas/pas-backend-ldap.c +++ b/addressbook/backend/pas/pas-backend-ldap.c @@ -1567,6 +1567,10 @@ pas_backend_ldap_process_client_requests (PASBook *book) case GetBookView: pas_backend_ldap_process_get_book_view (backend, book, req); break; + + case GetChanges: + /* FIXME: Code this. */ + break; } g_free (req); diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c index 5ce49871ba..533f13ba90 100644 --- a/addressbook/gui/component/addressbook.c +++ b/addressbook/gui/component/addressbook.c @@ -19,6 +19,7 @@ #include <ebook/e-book.h> #include <gal/util/e-util.h> #include <gal/widgets/e-unicode.h> +#include <gal/menus/gal-view-menus.h> #include "addressbook/gui/search/e-addressbook-search-dialog.h" #include "addressbook/gui/widgets/e-addressbook-view.h" @@ -322,6 +323,7 @@ control_activate (BonoboControl *control, AddressbookView *view) { Bonobo_UIContainer remote_ui_container; + GalViewMenus *views; remote_ui_container = bonobo_control_get_remote_ui_container (control); bonobo_ui_component_set_container (uic, remote_ui_container); @@ -341,6 +343,10 @@ control_activate (BonoboControl *control, "evolution-addressbook"); #endif + views = gal_view_menus_new(); + gal_view_menus_apply(views, uic, NULL); + gtk_object_unref(GTK_OBJECT(views)); + update_view_type (view); bonobo_ui_component_thaw (uic, NULL); diff --git a/addressbook/printing/e-contact-print-envelope.c b/addressbook/printing/e-contact-print-envelope.c index 5a2c695582..d6fbfdc5db 100644 --- a/addressbook/printing/e-contact-print-envelope.c +++ b/addressbook/printing/e-contact-print-envelope.c @@ -31,7 +31,7 @@ #define ENVELOPE_HEIGHT (72.0 * 4.0) -#define ENVELOPE_WIDTH (72.0 * 10.0) +#define ENVELOPE_WIDTH (72.0 * 9.5) typedef struct { int start; @@ -129,7 +129,7 @@ e_contact_print_envelope_close(GnomeDialog *dialog, gpointer data) } static void -ecpe_print(GnomePrintContext *pc, ECard *ecard) +ecpe_print(GnomePrintContext *pc, ECard *ecard, gboolean as_return) { ECardSimple *card = e_card_simple_new(ecard); char *address; @@ -144,10 +144,18 @@ ecpe_print(GnomePrintContext *pc, ECard *ecard) address = e_card_simple_get(card, E_CARD_SIMPLE_FIELD_ADDRESS_BUSINESS); linelist = ecpe_break(address); - font = gnome_font_new("Helvetica", 12); - ecpe_linelist_dimensions(font, address, linelist, &x, &y); - x = (ENVELOPE_WIDTH - x) / 2; - y = (ENVELOPE_HEIGHT - y) / 2; + if (as_return) + font = gnome_font_new("Helvetica", 9); + else + font = gnome_font_new("Helvetica", 12); + ecpe_linelist_dimensions(font, address, linelist, NULL, &y); + if (as_return) { + x = 36; + y = ENVELOPE_HEIGHT - 36; + } else { + x = ENVELOPE_WIDTH / 2; + y = (ENVELOPE_HEIGHT - y) / 2; + } ecpe_linelist_print(pc, font, address, linelist, x, y); gtk_object_unref(GTK_OBJECT(font)); g_free(linelist); @@ -175,7 +183,7 @@ e_contact_print_envelope_button(GnomeDialog *dialog, gint button, gpointer data) master = gnome_print_master_new_from_dialog( GNOME_PRINT_DIALOG(dialog) ); pc = gnome_print_master_get_context( master ); - ecpe_print(pc, card); + ecpe_print(pc, card, FALSE); gnome_print_master_print(master); gnome_dialog_close(dialog); @@ -184,7 +192,7 @@ e_contact_print_envelope_button(GnomeDialog *dialog, gint button, gpointer data) master = gnome_print_master_new_from_dialog( GNOME_PRINT_DIALOG(dialog) ); pc = gnome_print_master_get_context( master ); - ecpe_print(pc, card); + ecpe_print(pc, card, FALSE); preview = GTK_WIDGET(gnome_print_master_preview_new(master, "Print Preview")); gtk_widget_show_all(preview); diff --git a/configure.in b/configure.in index 0c1499b3a3..50db8b0cef 100644 --- a/configure.in +++ b/configure.in @@ -286,14 +286,14 @@ fi dnl ****************************** dnl Gnome App Lib checking dnl ****************************** -AC_MSG_CHECKING(for Gnome App libraries (GAL) >= 0.2.1.3) +AC_MSG_CHECKING(for Gnome App libraries (GAL) >= 0.2.99.1) if gnome-config --libs gal > /dev/null 2>&1; then vers=`gnome-config --modversion gal | sed -e "s/gal-//" -e 's/cvs$//' -e 's/pre$//' | \ awk 'BEGIN { FS = "."; } { print $1 * 1000000 + $2 * 10000 + $3 * 100 + $4;}'` - if test "$vers" -ge 20103; then + if test "$vers" -ge 29901; then AC_MSG_RESULT(found) else - AC_MSG_ERROR(You need at least GNOME Application libs 0.2.1.3 for this version of Evolution) + AC_MSG_ERROR(You need at least GNOME Application libs 0.2.99.1 for this version of Evolution) fi else AC_MSG_ERROR(Did not find GnomeAppLib (GAL) installed) |