diff options
| author | Chris Toshok <toshok@ximian.com> | 2002-11-27 14:32:23 +0800 |
|---|---|---|
| committer | Chris Toshok <toshok@src.gnome.org> | 2002-11-27 14:32:23 +0800 |
| commit | bbb885a11629ced993c43daca24d5be87934e685 (patch) | |
| tree | e127e7576f8892df770b94f30fea7f8fbb94d796 /addressbook/gui/contact-editor | |
| parent | 7a600dbc41173b9e44536aa60a48a59764f3b595 (diff) | |
| download | gsoc2013-evolution-bbb885a11629ced993c43daca24d5be87934e685.tar gsoc2013-evolution-bbb885a11629ced993c43daca24d5be87934e685.tar.gz gsoc2013-evolution-bbb885a11629ced993c43daca24d5be87934e685.tar.bz2 gsoc2013-evolution-bbb885a11629ced993c43daca24d5be87934e685.tar.lz gsoc2013-evolution-bbb885a11629ced993c43daca24d5be87934e685.tar.xz gsoc2013-evolution-bbb885a11629ced993c43daca24d5be87934e685.tar.zst gsoc2013-evolution-bbb885a11629ced993c43daca24d5be87934e685.zip | |
add include for gtkstock.h.
2002-11-26 Chris Toshok <toshok@ximian.com>
* gui/contact-editor/e-contact-quick-add.c: add include for
gtkstock.h.
* gui/contact-list-editor/e-contact-list-model.c
(e_contact_list_model_add_destination): add pre_change call.
(e_contact_list_model_remove_row): same.
(e_contact_list_model_remove_all): same.
* gui/contact-list-editor/e-contact-list-editor.c
(e_contact_list_editor_new): ref/sink the contact list editor so
we don't get the floating unref warning from gtk.
* gui/contact-editor/e-contact-editor.c (e_contact_editor_new):
ref/sink the contact editor so we don't get the floating unref
warning from gtk.
(e_contact_editor_init): use g_build_filename instead of
g_concat_dir_and_file.
* gui/widgets/e-minicard-label.c
(e_minicard_label_resize_children): use MAX (value, 0) to make
sure we aren't passing negative values for clip-widths.
* gui/widgets/e-minicard.c (e_minicard_realize): use MAX (value,
0) to make sure we aren't passing negative values for widths.
* gui/contact-editor/e-contact-editor.c (e_contact_editor_init):
use g_build_filename.
svn path=/trunk/; revision=18946
Diffstat (limited to 'addressbook/gui/contact-editor')
| -rw-r--r-- | addressbook/gui/contact-editor/e-contact-editor.c | 16 | ||||
| -rw-r--r-- | addressbook/gui/contact-editor/e-contact-quick-add.c | 1 |
2 files changed, 10 insertions, 7 deletions
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index ef45fbe426..791058cdf6 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -230,7 +230,6 @@ e_contact_editor_class_init (EContactEditorClass *klass) NULL, NULL, ece_marshal_NONE__NONE, G_TYPE_NONE, 0); - } static void @@ -1465,7 +1464,7 @@ e_contact_editor_init (EContactEditor *e_contact_editor) GTK_SIGNAL_FUNC (app_delete_event_cb), e_contact_editor); /* set the icon */ - icon_path = g_concat_dir_and_file (EVOLUTION_ICONSDIR, "evolution-contacts-mini.png"); + icon_path = g_build_filename (EVOLUTION_ICONSDIR, "evolution-contacts-mini.png", NULL); gnome_window_icon_set_from_file (GTK_WINDOW (e_contact_editor->app), icon_path); g_free (icon_path); } @@ -1611,12 +1610,15 @@ e_contact_editor_new (EBook *book, all_contact_editors = g_slist_prepend (all_contact_editors, ce); g_object_weak_ref (G_OBJECT (ce), contact_editor_destroy_notify, ce); + gtk_object_ref (GTK_OBJECT (ce)); + gtk_object_sink (GTK_OBJECT (ce)); + g_object_set (ce, - "book", book, - "card", card, - "is_new_card", is_new_card, - "editable", editable, - NULL); + "book", book, + "card", card, + "is_new_card", is_new_card, + "editable", editable, + NULL); if (book) e_book_get_supported_fields (book, (EBookFieldsCallback)supported_fields_cb, ce); diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.c b/addressbook/gui/contact-editor/e-contact-quick-add.c index 715ab2bee1..e06390b2a5 100644 --- a/addressbook/gui/contact-editor/e-contact-quick-add.c +++ b/addressbook/gui/contact-editor/e-contact-quick-add.c @@ -31,6 +31,7 @@ #include <gtk/gtklabel.h> #include <gtk/gtktable.h> #include <gtk/gtkdialog.h> +#include <gtk/gtkstock.h> #include <libgnome/gnome-i18n.h> #include <libgnomeui/gnome-app.h> #include <gal/widgets/e-unicode.h> |