diff options
| author | Matthew Barnes <mbarnes@src.gnome.org> | 2008-12-11 02:30:29 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2008-12-11 02:30:29 +0800 |
| commit | d158af8cdfa6e4bf85c1e74769e8d61bc469494c (patch) | |
| tree | ba55b970ae3a23e5ade4edbddc4eb8dcaf3033bd /addressbook/gui/contact-editor/e-contact-editor.c | |
| parent | dc0d0ee010319425b19d8d8d493f0bc489d5fd07 (diff) | |
| download | gsoc2013-evolution-d158af8cdfa6e4bf85c1e74769e8d61bc469494c.tar gsoc2013-evolution-d158af8cdfa6e4bf85c1e74769e8d61bc469494c.tar.gz gsoc2013-evolution-d158af8cdfa6e4bf85c1e74769e8d61bc469494c.tar.bz2 gsoc2013-evolution-d158af8cdfa6e4bf85c1e74769e8d61bc469494c.tar.lz gsoc2013-evolution-d158af8cdfa6e4bf85c1e74769e8d61bc469494c.tar.xz gsoc2013-evolution-d158af8cdfa6e4bf85c1e74769e8d61bc469494c.tar.zst gsoc2013-evolution-d158af8cdfa6e4bf85c1e74769e8d61bc469494c.zip | |
Merge revisions 36811:36865 from trunk.
svn path=/branches/kill-bonobo/; revision=36867
Diffstat (limited to 'addressbook/gui/contact-editor/e-contact-editor.c')
| -rw-r--r-- | addressbook/gui/contact-editor/e-contact-editor.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index 30d672161a..e5686d3f76 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -36,6 +36,7 @@ #include <misc/e-gui-utils.h> #include <libebook/e-address-western.h> +#include <libedataserverui/e-category-completion.h> #include <libedataserverui/e-source-combo-box.h> #include <camel/camel.h> @@ -176,7 +177,8 @@ im_service [] = { E_CONTACT_IM_GADUGADU, N_ ("Gadu-Gadu") }, { E_CONTACT_IM_MSN, N_ ("MSN") }, { E_CONTACT_IM_ICQ, N_ ("ICQ") }, - { E_CONTACT_IM_GROUPWISE, N_ ("GroupWise") } + { E_CONTACT_IM_GROUPWISE, N_ ("GroupWise") }, + { E_CONTACT_IM_SKYPE, N_ ("Skype") } }; /* Defaults from the table above */ @@ -3102,6 +3104,7 @@ static const EContactField non_string_fields [] = { E_CONTACT_IM_GADUGADU, E_CONTACT_IM_MSN, E_CONTACT_IM_ICQ, + E_CONTACT_IM_SKYPE, E_CONTACT_PHOTO, E_CONTACT_LOGO, E_CONTACT_X509_CERT, @@ -3357,6 +3360,7 @@ e_contact_editor_init (EContactEditor *e_contact_editor) { GladeXML *gui; GtkWidget *widget, *label; + GtkEntryCompletion *completion; char *gladefile; e_contact_editor->name = e_contact_name_new(); @@ -3417,6 +3421,11 @@ e_contact_editor_init (EContactEditor *e_contact_editor) if (widget) gtk_widget_grab_focus (widget); + widget = glade_xml_get_widget (e_contact_editor->gui, "entry-categories"); + completion = e_category_completion_new (); + gtk_entry_set_completion (GTK_ENTRY (widget), completion); + g_object_unref (completion); + /* Connect to the deletion of the dialog */ g_signal_connect (e_contact_editor->app, "delete_event", |