callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Define $(iconsdir).

Browse Source 
* gui/component/Makefile.am: Define $(iconsdir).

* gui/component/addressbook-component.c (add_creatable_item): New
helper function.
(create_component): Add the icons for the user creatable items as
well.

svn path=/trunk/; revision=15789
This commit is contained in:
Ettore Perazzoli
2002-02-22 02:22:43 +00:00
parent ea56ff65a2
commit baf32e6a42
3 changed files with 48 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
addressbook/ChangeLog
View File

@ -1,3 +1,12 @@
2002-02-21 Ettore Perazzoli <ettore@ximian.com>
* gui/component/Makefile.am: Define $(iconsdir).
* gui/component/addressbook-component.c (add_creatable_item): New
helper function.
(create_component): Add the icons for the user creatable items as
well.
2002-02-20 Chris Toshok <toshok@ximian.com>
* backend/pas/pas-backend-file.c (pas_backend_file_load_uri):

3
addressbook/gui/component/Makefile.am
View File

@ -21,7 +21,6 @@ INCLUDES = \
-DEVOLUTION_IMAGESDIR=\""$(datadir)"/images/evolution\" \
$(EVOLUTION_ADDRESSBOOK_CFLAGS)
bin_PROGRAMS = \
evolution-addressbook
@ -73,6 +72,8 @@ oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
gladedir = $(datadir)/evolution/glade
glade_DATA = addressbook-config.glade
iconsdir = $(datadir)/images/evolution
EXTRA_DIST = \
$(glade_DATA) \
$(oaf_DATA) \

43
addressbook/gui/component/addressbook-component.c
View File

@ -503,6 +503,37 @@ destination_folder_handle_drop (EvolutionShellComponentDndDestinationFolder *fol
/* The factory function. */
static void
add_creatable_item (EvolutionShellComponent *shell_component,
const char *id,
const char *description,
const char *menu_description,
char menu_shortcut,
const char *icon_name)
{
char *icon_path;
GdkPixbuf *icon;
if (icon_name == NULL) {
icon_path = NULL;
icon = NULL;
} else {
icon_path = g_concat_dir_and_file (EVOLUTION_ICONSDIR, icon_name);
icon = gdk_pixbuf_new_from_file (icon_path);
}
evolution_shell_component_add_user_creatable_item (shell_component,
id,
description,
menu_description,
menu_shortcut,
icon);
if (icon != NULL)
gdk_pixbuf_unref (icon);
g_free (icon_path);
}
static BonoboObject *
create_component (void)
{
@ -523,12 +554,12 @@ create_component (void)
bonobo_object_add_interface (BONOBO_OBJECT (shell_component),
BONOBO_OBJECT (destination_interface));
evolution_shell_component_add_user_creatable_item (shell_component, "contact",
_("New Contact"), _("_Contact"), 'c',
NULL);
evolution_shell_component_add_user_creatable_item (shell_component, "contact_list",
_("New Contact List"), _("Contact _List"), 'l',
NULL);
add_creatable_item (shell_component, "contact",
_("New Contact"), _("_Contact"), 'c',
"evolution-contacts-mini.png");
add_creatable_item (shell_component, "contact_list",
_("New Contact List"), _("Contact _List"), 'l',
"all_contacts.xpm");
gtk_signal_connect (GTK_OBJECT (shell_component), "owner_set",
GTK_SIGNAL_FUNC (owner_set_cb), NULL);