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

Use `evolution:config_item:icon_name' instead of

Browse Source 
* e-shell-settings-dialog.c (load_pages): Use
`evolution:config_item:icon_name' instead of
`evolution:config_item:icon_path'.  If it's not an absolute path,
load from the IMAGESDIR.  Also, no need to specify the language
list for this one, as the icon name shouldn't be translated.

svn path=/trunk/; revision=16140
This commit is contained in:
Ettore Perazzoli
2002-03-13 17:00:35 +00:00
parent abd6567ea0
commit 3aafbac9ee
2 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
shell/ChangeLog
View File

@ -1,3 +1,11 @@
2002-03-13 Ettore Perazzoli <ettore@ximian.com>
* e-shell-settings-dialog.c (load_pages): Use
`evolution:config_item:icon_name' instead of
`evolution:config_item:icon_path'. If it's not an absolute path,
load from the IMAGESDIR. Also, no need to specify the language
list for this one, as the icon name shouldn't be translated.
2002-03-12 Ettore Perazzoli <ettore@ximian.com> 2002-03-12 Ettore Perazzoli <ettore@ximian.com>
* evolution-test-component.c (create_configuration_page): Update * evolution-test-component.c (create_configuration_page): Update

15
shell/e-shell-settings-dialog.c
View File

@ -93,12 +93,21 @@ load_pages (EShellSettingsDialog *dialog)
title = oaf_server_info_prop_lookup (info, "evolution:config_item:title", language_list); title = oaf_server_info_prop_lookup (info, "evolution:config_item:title", language_list);
description = oaf_server_info_prop_lookup (info, "evolution:config_item:description", language_list); description = oaf_server_info_prop_lookup (info, "evolution:config_item:description", language_list);
icon_path = oaf_server_info_prop_lookup (info, "evolution:config_item:icon_path", language_list); icon_path = oaf_server_info_prop_lookup (info, "evolution:config_item:icon_name", NULL);
if (icon_path == NULL) if (icon_path == NULL) {
icon = NULL; icon = NULL;
else } else {
if (g_path_is_absolute (icon_path)) {
icon = gdk_pixbuf_new_from_file (icon_path); icon = gdk_pixbuf_new_from_file (icon_path);
} else {
char *real_icon_path;
real_icon_path = g_concat_dir_and_file (EVOLUTION_IMAGES, icon_path);
icon = gdk_pixbuf_new_from_file (real_icon_path);
g_free (real_icon_path);
}
}
corba_object = oaf_activate_from_id ((char *) info->iid, 0, NULL, &ev); corba_object = oaf_activate_from_id ((char *) info->iid, 0, NULL, &ev);
if (ev._major == CORBA_NO_EXCEPTION) if (ev._major == CORBA_NO_EXCEPTION)