From b882d7ff1ec8ae53bea7cc545e2d0f399f2c3486 Mon Sep 17 00:00:00 2001 From: Chris Toshok Date: Thu, 29 Aug 2002 07:29:30 +0000 Subject: [ fixes #25038 ] need to have EVOLUTION_ICONSDIR defined. 2002-08-29 Chris Toshok [ fixes #25038 ] * gui/contact-editor/Makefile.am (INCLUDES): need to have EVOLUTION_ICONSDIR defined. * gui/contact-list-editor/Makefile.am (INCLUDES): same. * gui/contact-editor/e-contact-editor.c (e_contact_editor_init): set the window icon to the contact mini icon. * gui/contact-list-editor/e-contact-list-editor.c (e_contact_list_editor_init): set the window icon to the new contact list icon. * gui/widgets/e-minicard.c (LIST_ICON_FILENAME): change to (the prettier, imo) "contact-list-16.png" svn path=/trunk/; revision=17915 --- addressbook/gui/contact-editor/Makefile.am | 3 +++ addressbook/gui/contact-editor/e-contact-editor.c | 7 +++++++ 2 files changed, 10 insertions(+) (limited to 'addressbook/gui/contact-editor') diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am index 8f8cb4c4f9..fe7295bfe6 100644 --- a/addressbook/gui/contact-editor/Makefile.am +++ b/addressbook/gui/contact-editor/Makefile.am @@ -9,6 +9,7 @@ INCLUDES = \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ -DDATADIR=\""$(datadir)"\" \ -DEVOLUTION_DATADIR=\""$(datadir)"\" \ + -DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \ -DEVOLUTIONDIR=\""$(evolutiondir)"\" \ -DG_LOG_DOMAIN=\"contact-editor\" \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) @@ -32,6 +33,8 @@ evolutiondir = $(datadir)/evolution evolution_DATA = arrow.png +iconsdir = $(datadir)/images/evolution + gladedir = $(datadir)/evolution/glade glade_DATA = \ diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index 0e606c1c91..f22aaa5487 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include @@ -1287,6 +1288,7 @@ e_contact_editor_init (EContactEditor *e_contact_editor) GtkWidget *bonobo_win; GtkWidget *wants_html; BonoboUIContainer *container; + char *icon_path; e_contact_editor->email_info = NULL; e_contact_editor->phone_info = NULL; @@ -1407,6 +1409,11 @@ e_contact_editor_init (EContactEditor *e_contact_editor) gtk_signal_connect (GTK_OBJECT (e_contact_editor->app), "delete_event", 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"); + gnome_window_icon_set_from_file (GTK_WINDOW (e_contact_editor->app), icon_path); + g_free (icon_path); } void -- cgit v1.2.3