diff options
| -rw-r--r-- | addressbook/ChangeLog | 12 | ||||
| -rw-r--r-- | addressbook/gui/contact-editor/e-contact-editor-address.c | 1 | ||||
| -rw-r--r-- | addressbook/gui/contact-editor/e-contact-editor.c | 1 | ||||
| -rw-r--r-- | addressbook/gui/widgets/e-addressbook-view.c | 7 |
4 files changed, 18 insertions, 3 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 56cdd05021..433aca980b 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,15 @@ +2002-12-02 Not Zed <NotZed@Ximian.com> + + * gui/widgets/e-addressbook-view.c (e_contact_print_button): + gnomedialog -> gtkdialog stuff. print dialog is a gtkdialog now. + + * gui/contact-editor/e-contact-editor.c: include gtkstock.h + + +2002-11-27 Not Zed <NotZed@Ximian.com> + + * gui/contact-editor/e-contact-editor-address.c: #include gtkstock.h + 2002-11-29 Chris Toshok <toshok@ximian.com> * gui/widgets/e-minicard-view-widget.c (column_width_changed): the diff --git a/addressbook/gui/contact-editor/e-contact-editor-address.c b/addressbook/gui/contact-editor/e-contact-editor-address.c index 81ee9b9330..954be85928 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-address.c +++ b/addressbook/gui/contact-editor/e-contact-editor-address.c @@ -30,6 +30,7 @@ #include <gal/widgets/e-unicode.h> #include <gal/widgets/e-gui-utils.h> #include <gtk/gtkcombo.h> +#include <gtk/gtkstock.h> #include <string.h> #include <stdlib.h> #include <locale.h> diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index 791058cdf6..23b5dc5dd6 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -29,6 +29,7 @@ #include <gtk/gtkcombo.h> #include <gtk/gtktextview.h> #include <gtk/gtkmessagedialog.h> +#include <gtk/gtkstock.h> #include <libgnomeui/gnome-popup-menu.h> #include <libgnomeui/gnome-window-icon.h> #include <libgnome/gnome-i18n.h> diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index bedb5a685d..5e731d3483 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -1398,7 +1398,7 @@ e_contact_print_destroy(gpointer data, GObject *where_object_was) } static void -e_contact_print_button(GnomeDialog *dialog, gint button, gpointer data) +e_contact_print_button(GtkDialog *dialog, gint button, gpointer data) { GnomePrintMaster *master; GnomePrintContext *pc; @@ -1427,7 +1427,7 @@ e_contact_print_button(GnomeDialog *dialog, gint button, gpointer data) gnome_print_master_close(master); gnome_print_master_print(master); g_object_unref (master); - gnome_dialog_close(dialog); + 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) )); @@ -1454,7 +1454,8 @@ e_contact_print_button(GnomeDialog *dialog, gint button, gpointer data) g_object_unref (master); break; case GNOME_PRINT_DIALOG_RESPONSE_CANCEL: - gnome_dialog_close(dialog); + default: + gtk_widget_destroy((GtkWidget *)dialog); break; } } |