applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Check for entry->icon[0] != 0 if (Icon =) in the desktop file. if

Browse source 
2002-01-09  Jean Schurger <jschurger@schurger.org>

        * capplet-dir.c (capplet_new): Check for entry->icon[0] != 0
                if (Icon =) in the desktop file.
                if entry->icon is a DIR
                If entry->icon[0] still NULL.
This commit is contained in:
Jean Schurger 2002-01-10 19:46:45 +00:00 • committed by Bradford Hovinen (Gdict maintainer)
parent 3e7140488f
commit 44aca2c8c3
2 changed files with 39 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
control-center/ChangeLog
View file

@ -1,3 +1,10 @@
2002-01-09 Jean Schurger <jschurger@schurger.org>
* capplet-dir.c (capplet_new): Check for entry->icon[0] != 0
if (Icon =) in the desktop file.
if entry->icon is a DIR
If entry->icon[0] still NULL.
2002-01-03 Richard Hestilow <hestilow@ximian.com>
* capplet-dir.c (capplet_new): Check for ditem::icon != NULL

54
control-center/capplet-dir.c
View file

@ -99,34 +99,44 @@ capplet_new (CappletDir *dir, gchar *desktop_path)
entry->label = g_strdup (gnome_desktop_item_get_string (dentry,
GNOME_DESKTOP_ITEM_NAME));
entry->icon = g_strdup (gnome_desktop_item_get_string (dentry, GNOME_DESKTOP_ITEM_ICON));
if (entry->icon && entry->icon[0] != '/')
{
gchar *old = entry->icon;
entry->icon = g_concat_dir_and_file (PIXMAPS_DIR, old);
g_free (old);
if (entry->icon[0] == 0) {
g_free(entry->icon);
entry->icon = NULL;
}
if (!g_file_exists (entry->icon))
{
const gchar *icon;
g_free (entry->icon);
icon = gnome_desktop_item_get_string (dentry, GNOME_DESKTOP_ITEM_ICON);
if (icon)
entry->icon = gnome_pixmap_file (icon);
if (!entry->icon)
entry->icon = gnome_pixmap_file ("gnome-unknown.png");
}
entry->path = g_strdup (gnome_desktop_item_get_location (dentry));
entry->exec = vec;
entry->dir = dir;
if (entry->icon == NULL)
if (entry->icon) {
if (entry->icon[0] != '/')
{
gchar *old = entry->icon;
entry->icon = g_concat_dir_and_file (PIXMAPS_DIR, old);
g_free (old);
}
if (!g_file_exists (entry->icon) || g_file_test(entry->icon, G_FILE_TEST_IS_DIR))
{
const gchar *icon;
g_free (entry->icon);
icon = gnome_desktop_item_get_string (dentry, GNOME_DESKTOP_ITEM_ICON);
if (icon)
entry->icon = gnome_pixmap_file (icon);
if (!entry->icon)
entry->icon = gnome_pixmap_file ("gnome-unknown.png");
}
} else {
entry->icon = gnome_program_locate_file
(gnome_program_get (), GNOME_FILE_DOMAIN_APP_PIXMAP,
"control-center.png", TRUE, NULL);
}
if (!entry->icon) { /* if entry->icon still NULL */
entry->icon = gnome_pixmap_file ("gnome-unknown.png");
}
entry->pb = gdk_pixbuf_new_from_file (entry->icon, NULL);
entry->path = g_strdup (gnome_desktop_item_get_location (dentry));
entry->exec = vec;
entry->dir = dir;
g_hash_table_insert (capplet_hash, g_strdup (desktop_path), entry);