diff options
author | Dan Winship <danw@src.gnome.org> | 2003-02-06 07:47:32 +0800 |
---|---|---|
committer | Dan Winship <danw@src.gnome.org> | 2003-02-06 07:47:32 +0800 |
commit | 9ef99937403649cf8ffaea419c5c804def6f1439 (patch) | |
tree | 200cda1d1f78ac6d24dacacd4db361bbb47cf2f3 /addressbook/gui/contact-editor/e-contact-editor-fullname.c | |
parent | 3dd0e5884e06ec8a5376362da694a487b27b8ca6 (diff) | |
download | gsoc2013-evolution-9ef99937403649cf8ffaea419c5c804def6f1439.tar gsoc2013-evolution-9ef99937403649cf8ffaea419c5c804def6f1439.tar.gz gsoc2013-evolution-9ef99937403649cf8ffaea419c5c804def6f1439.tar.bz2 gsoc2013-evolution-9ef99937403649cf8ffaea419c5c804def6f1439.tar.lz gsoc2013-evolution-9ef99937403649cf8ffaea419c5c804def6f1439.tar.xz gsoc2013-evolution-9ef99937403649cf8ffaea419c5c804def6f1439.tar.zst gsoc2013-evolution-9ef99937403649cf8ffaea419c5c804def6f1439.zip |
Remove some cruft. rename ICONSDIR to IMAGESDIR. (images_DATA): Install
* gui/contact-editor/Makefile.am (INCLUDES): Remove some cruft.
rename ICONSDIR to IMAGESDIR.
(images_DATA): Install arrow.png in imagesdir instead of
privdatadir.
* gui/contact-editor/e-contact-quick-add.c: #include <string.h>
* gui/contact-editor/e-contact-editor.c: #include <string.h>
(e_contact_editor_init): s/EVOLUTION_ICONSDIR/EVOLUTION_IMAGESDIR/
(e_contact_editor_new): s/gtk_object_ref/g_object_ref/
(_replace_button): Look in imagesdir, not privdatadir
(_phone_arrow_pressed): Remove call to deprecated
gtk_check_menu_item_set_show_toggle.
(_email_arrow_pressed): Likewise
(_address_arrow_pressed): Likewise
(set_address_field): Remove unused variable
(enable_widget):
s/gtk_entry_set_editable/gtk_editable_set_editable/
* gui/contact-editor/e-contact-editor-address.c
(e_contact_editor_address_init):
s/EVOLUTION_ICONSDIR/EVOLUTION_IMAGESDIR
(e_contact_editor_address_set_property):
s/gtk_entry_set_editable/gtk_editable_set_editable/
* gui/contact-editor/e-contact-editor-fullname.c
(e_contact_editor_fullname_init):
s/EVOLUTION_ICONSDIR/EVOLUTION_IMAGESDIR
(e_contact_editor_fullname_set_property): Likewise.
svn path=/trunk/; revision=19781
Diffstat (limited to 'addressbook/gui/contact-editor/e-contact-editor-fullname.c')
-rw-r--r-- | addressbook/gui/contact-editor/e-contact-editor-fullname.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.c b/addressbook/gui/contact-editor/e-contact-editor-fullname.c index 08186d25b3..02cf3edd44 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-fullname.c +++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.c @@ -126,7 +126,7 @@ e_contact_editor_fullname_init (EContactEditorFullname *e_contact_editor_fullnam gtk_box_pack_start (GTK_BOX (GTK_DIALOG (e_contact_editor_fullname)->vbox), widget, TRUE, TRUE, 0); g_object_unref(widget); - icon_path = g_concat_dir_and_file (EVOLUTION_ICONSDIR, "evolution-contacts-mini.png"); + icon_path = g_concat_dir_and_file (EVOLUTION_IMAGESDIR, "evolution-contacts-mini.png"); gnome_window_icon_set_from_file (GTK_WINDOW (e_contact_editor_fullname), icon_path); g_free (icon_path); } @@ -190,12 +190,12 @@ e_contact_editor_fullname_set_property (GObject *object, guint prop_id, for (i = 0; widget_names[i] != NULL; i ++) { GtkWidget *w = glade_xml_get_widget(e_contact_editor_fullname->gui, widget_names[i]); if (GTK_IS_ENTRY (w)) { - gtk_entry_set_editable (GTK_ENTRY (w), - e_contact_editor_fullname->editable); + gtk_editable_set_editable (GTK_EDITABLE (w), + e_contact_editor_fullname->editable); } else if (GTK_IS_COMBO (w)) { - gtk_entry_set_editable (GTK_ENTRY (GTK_COMBO (w)->entry), - e_contact_editor_fullname->editable); + gtk_editable_set_editable (GTK_EDITABLE (GTK_COMBO (w)->entry), + e_contact_editor_fullname->editable); gtk_widget_set_sensitive (GTK_COMBO (w)->button, e_contact_editor_fullname->editable); } else if (GTK_IS_LABEL (w)) { |