aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@src.gnome.org>2008-08-13 20:00:21 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2008-08-13 20:00:21 +0800
commit5f6a18500c3119731663ac4c059426c62a3b37f6 (patch)
treecea0b67ae6e62e2535e118eab8e4b23be906aee6 /addressbook
parentebec065334b5cf943591527254d628c13d06c369 (diff)
downloadgsoc2013-evolution-5f6a18500c3119731663ac4c059426c62a3b37f6.tar
gsoc2013-evolution-5f6a18500c3119731663ac4c059426c62a3b37f6.tar.gz
gsoc2013-evolution-5f6a18500c3119731663ac4c059426c62a3b37f6.tar.bz2
gsoc2013-evolution-5f6a18500c3119731663ac4c059426c62a3b37f6.tar.lz
gsoc2013-evolution-5f6a18500c3119731663ac4c059426c62a3b37f6.tar.xz
gsoc2013-evolution-5f6a18500c3119731663ac4c059426c62a3b37f6.tar.zst
gsoc2013-evolution-5f6a18500c3119731663ac4c059426c62a3b37f6.zip
Merge revisions 35931:35950 from trunk.
svn path=/branches/kill-bonobo/; revision=35978
Diffstat (limited to 'addressbook')
-rw-r--r--addressbook/gui/component/addressbook-view.c4
-rw-r--r--addressbook/gui/contact-editor/e-contact-editor.c4
2 files changed, 3 insertions, 5 deletions
diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c
index 3db5bbdf36..7fa76e7fdc 100644
--- a/addressbook/gui/component/addressbook-view.c
+++ b/addressbook/gui/component/addressbook-view.c
@@ -947,14 +947,14 @@ primary_source_selection_changed_callback (ESourceSelector *selector,
}
static EPopupItem abv_source_popups[] = {
- { E_POPUP_ITEM, "10.new", N_("_New Address Book"), new_addressbook_cb, NULL, "contact-new", 0, 0 },
+ { E_POPUP_ITEM, "10.new", N_("_New Address Book"), new_addressbook_cb, NULL, "address-book-new", 0, 0 },
{ E_POPUP_ITEM, "20.saveasvcard", N_("Save As vCard..."), save_addressbook_cb, NULL,"document-save-as", 0, EAB_POPUP_SOURCE_PRIMARY },
{ E_POPUP_BAR, "30.bar" },
{ E_POPUP_ITEM, "30.delete", N_("_Delete"), delete_addressbook_cb, NULL, "edit-delete", 0, EAB_POPUP_SOURCE_USER|EAB_POPUP_SOURCE_PRIMARY },
{ E_POPUP_BAR, "99.bar" },
- { E_POPUP_ITEM, "99.properties", N_("_Properties..."), edit_addressbook_cb, NULL,"document-properties", 0, EAB_POPUP_SOURCE_PRIMARY },
+ { E_POPUP_ITEM, "99.properties", N_("_Properties"), edit_addressbook_cb, NULL,"document-properties", 0, EAB_POPUP_SOURCE_PRIMARY },
};
static void
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index 9b328de2c2..c0616d9916 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -3381,9 +3381,7 @@ e_contact_editor_init (EContactEditor *e_contact_editor)
G_CALLBACK (app_delete_event_cb), e_contact_editor);
/* set the icon */
- icon_path = g_build_filename (EVOLUTION_IMAGESDIR, "evolution-contacts-mini.png", NULL);
- gtk_window_set_icon_from_file (GTK_WINDOW (e_contact_editor->app), icon_path, NULL);
- g_free (icon_path);
+ gtk_window_set_icon_name (GTK_WINDOW (e_contact_editor->app), "contact-editor");
/* show window */
gtk_widget_show (e_contact_editor->app);