aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
diff options
context:
space:
mode:
Diffstat (limited to 'addressbook')
-rw-r--r--addressbook/ChangeLog8
-rw-r--r--addressbook/gui/widgets/e-addressbook-util.c9
-rw-r--r--addressbook/gui/widgets/e-minicard-label.c2
3 files changed, 15 insertions, 4 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index dac59bc1a6..17bbcd1a6a 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,5 +1,13 @@
2002-12-08 Chris Toshok <toshok@ximian.com>
+ * gui/widgets/e-addressbook-util.c (e_addressbook_error_dialog):
+ connect ::response to gtk_widget_destroy so the dialog goes away.
+
+ * gui/widgets/e-minicard-label.c (e_minicard_label_construct):
+ don't use font_gdk anymore on EText. it doesn't exist.
+
+2002-12-08 Chris Toshok <toshok@ximian.com>
+
* gui/widgets/e-addressbook-reflow-adapter.c (text_height): this
uses pango now.
(addressbook_height): same.
diff --git a/addressbook/gui/widgets/e-addressbook-util.c b/addressbook/gui/widgets/e-addressbook-util.c
index 76453d5616..3d5ad8dc37 100644
--- a/addressbook/gui/widgets/e-addressbook-util.c
+++ b/addressbook/gui/widgets/e-addressbook-util.c
@@ -47,11 +47,16 @@ e_addressbook_error_dialog (const gchar *msg, EBookStatus status)
N_("Other error")
};
char *error_msg;
+ GtkWidget *dialog;
error_msg = g_strdup_printf ("%s: %s", msg, _(status_to_string [status]));
- gtk_widget_show (gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
- error_msg));
+ dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
+ error_msg);
+
+ g_signal_connect (dialog, "response", G_CALLBACK (gtk_widget_destroy), NULL);
+
+ gtk_widget_show (dialog);
g_free (error_msg);
}
diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c
index 241293bfe9..33016067fa 100644
--- a/addressbook/gui/widgets/e-minicard-label.c
+++ b/addressbook/gui/widgets/e-minicard-label.c
@@ -296,7 +296,6 @@ e_minicard_label_construct (GnomeCanvasItem *item)
"clip_width", (double) ( e_minicard_label->width / 2 - 4 ),
"clip", TRUE,
"use_ellipsis", TRUE,
- "font_gdk", font,
"fill_color", "black",
"draw_background", FALSE,
NULL );
@@ -309,7 +308,6 @@ e_minicard_label_construct (GnomeCanvasItem *item)
"clip_width", (double) ( ( e_minicard_label->width + 1 ) / 2 - 4 ),
"clip", TRUE,
"use_ellipsis", TRUE,
- "font_gdk", font,
"fill_color", "black",
"editable", e_minicard_label->editable,
"draw_background", FALSE,