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

Fixes #315505

Browse source 
2005-10-15  Rodrigo Moya <rodrigo@novell.com>

	Fixes #315505

	* control-center-categories.c (control_center_entry_new): don't show
	xscreensaver capplet icon if gnome-screensaver is installed.
	(populate_category): don't add NULL entries to the list.
This commit is contained in:
Rodrigo Moya 2005-10-15 21:42:13 +00:00 • committed by Rodrigo Moya
parent 006f27081a
commit ec9217a7ae
2 changed files with 42 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
control-center/ChangeLog
View file

@ -1,3 +1,11 @@
2005-10-15 Rodrigo Moya <rodrigo@novell.com>
Fixes #315505
* control-center-categories.c (control_center_entry_new): don't show
xscreensaver capplet icon if gnome-screensaver is installed.
(populate_category): don't add NULL entries to the list.
2005-06-06 Carlos Garnacho Parro <carlosg@gnome.org>
* gnomecc-canvas.c: added a11y support

38
control-center/control-center-categories.c
View file

@ -32,6 +32,7 @@
#include <string.h>
#include <glib/gi18n.h>
#include <gtk/gtk.h>
#include <libgnome/gnome-desktop-item.h>
#define GMENU_I_KNOW_THIS_IS_UNSTABLE
#include <gmenu-tree.h>
@ -90,7 +91,33 @@ control_center_entry_new (ControlCenterCategory *category,
GMenuTreeEntry *menu_entry)
{
ControlCenterEntry *retval;
const char *desktop_entry;
/* only add entries that exist */
desktop_entry = gmenu_tree_entry_get_desktop_file_path (menu_entry);
if (desktop_entry) {
GnomeDesktopItem *item;
const char *exec;
char *path;
item = gnome_desktop_item_new_from_file (desktop_entry,
GNOME_DESKTOP_ITEM_LOAD_ONLY_IF_EXISTS,
NULL);
if (!item)
return NULL;
/* discard xscreensaver if gnome-screensaver is installed */
exec = gnome_desktop_item_get_string (item, GNOME_DESKTOP_ITEM_EXEC);
if ((exec && !strcmp (exec, "xscreensaver-demo")) && (path = g_find_program_in_path ("gnome-screensaver-preferences"))) {
gnome_desktop_item_unref (item);
g_free (path);
return NULL;
}
gnome_desktop_item_unref (item);
}
/* create the new entry */
retval = g_new0 (ControlCenterEntry, 1);
retval->category = category;
@ -137,10 +164,13 @@ populate_category (ControlCenterCategory *category,
for (l = items; l; l = l->next) {
GMenuTreeItem *item = l->data;
if (gmenu_tree_item_get_type (item) == GMENU_TREE_ITEM_ENTRY)
entries = g_slist_append (entries,
control_center_entry_new (category,
GMENU_TREE_ENTRY (item)));
if (gmenu_tree_item_get_type (item) == GMENU_TREE_ITEM_ENTRY) {
ControlCenterEntry *entry;
entry = control_center_entry_new (category, GMENU_TREE_ENTRY (item));
if (entry)
entries = g_slist_append (entries, entry);
}
gmenu_tree_item_unref (item);
}