diff options
| author | Christopher James Lahey <clahey@helixcode.com> | 2000-09-21 07:38:53 +0800 |
|---|---|---|
| committer | Chris Lahey <clahey@src.gnome.org> | 2000-09-21 07:38:53 +0800 |
| commit | ad7e6820081d32774e1a4226899fdbf6c1a8e728 (patch) | |
| tree | eb8d77f379932557954a178e6940076235e135ac /addressbook/gui/widgets | |
| parent | 86b7449d9e76afd9f136e0b0dbce52b6d97fb5b8 (diff) | |
| download | gsoc2013-evolution-ad7e6820081d32774e1a4226899fdbf6c1a8e728.tar.gz gsoc2013-evolution-ad7e6820081d32774e1a4226899fdbf6c1a8e728.tar.zst gsoc2013-evolution-ad7e6820081d32774e1a4226899fdbf6c1a8e728.zip | |
Added a wants_html field to cards. Uses "x-mozilla-html".
2000-09-20 Christopher James Lahey <clahey@helixcode.com>
* backend/ebook/e-card.c, backend/ebook/e-card.h: Added a
wants_html field to cards. Uses "x-mozilla-html".
* contact-editor/Makefile.am: Added definition of
EVOLUTION_DATADIR.
* contact-editor/contact-editor.glade: Make Wants HTML check
button visible.
* contact-editor/e-contact-editor.c,
contact-editor/e-contact-editor.h: Make Wants HTML check button
active. Fix UI stuff to use XML. Set parent window of
confirm_delete dialog.
* gui/widgets/e-addressbook-view.c, gui/widgets/e-minicard.c: Set
the parent window of the confirm_delete dialog.
svn path=/trunk/; revision=5530
Diffstat (limited to 'addressbook/gui/widgets')
| -rw-r--r-- | addressbook/gui/widgets/e-addressbook-view.c | 4 | ||||
| -rw-r--r-- | addressbook/gui/widgets/e-minicard.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index 9bcd4b2827..1700cfdc89 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -401,6 +401,7 @@ table_double_click(ETableScrolled *table, gint row, EAddressbookView *view) typedef struct { EBook *book; ECard *card; + GtkWidget *widget; } CardAndBook; static void @@ -427,7 +428,7 @@ print (GtkWidget *widget, CardAndBook *card_and_book) static void delete (GtkWidget *widget, CardAndBook *card_and_book) { - if (e_contact_editor_confirm_delete()) { + if (e_contact_editor_confirm_delete(GTK_WINDOW(gtk_widget_get_toplevel(card_and_book->widget)))) { /* Add the card in the contact editor to our ebook */ e_book_remove_card (card_and_book->book, card_and_book->card, @@ -453,6 +454,7 @@ table_right_click(ETableScrolled *table, gint row, gint col, GdkEvent *event, EA card_and_book = g_new(CardAndBook, 1); card_and_book->card = e_addressbook_model_get_card(model, row); + card_and_book->widget = GTK_WIDGET(table); gtk_object_get(GTK_OBJECT(model), "book", &(card_and_book->book), NULL); diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c index 792962a5b3..dcf3ff924a 100644 --- a/addressbook/gui/widgets/e-minicard.c +++ b/addressbook/gui/widgets/e-minicard.c @@ -339,7 +339,7 @@ delete (GtkWidget *widget, EMinicard *minicard) { EBook *book; - if (e_contact_editor_confirm_delete()) { + if (e_contact_editor_confirm_delete(GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(GNOME_CANVAS_ITEM(minicard)->canvas))))) { e_card_simple_sync_card(minicard->simple); gtk_object_get(GTK_OBJECT(GNOME_CANVAS_ITEM(minicard)->parent), |