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

update to the new libgnome-menu API, patch from Mark McLoughlin

Browse source 
2005-03-27  Sebastien Bacher  <seb128@debian.org>

        * control-center-categories.c: (populate_category),
        (read_categories_from_menu_directory),
        (control_center_get_information): update to the new libgnome-menu API,
        patch from Mark McLoughlin <markmc@redhat.com>.
This commit is contained in:
Sebastien Bacher 2005-03-26 23:34:36 +00:00 • committed by Sebastien Bacher
parent 208728d0c4
commit e1d9efe644
4 changed files with 38 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2005-03-27 Sebastien Bacher <seb128@debian.org>
* configure.in: require libgnome-menu 2.11.1 for the new API.
2005-03-27 Sebastien Bacher <seb128@debian.org>
* configure.in: update version to 2.11.0

2
configure.in
View file

@ -94,7 +94,7 @@ COMMON_MODULES="gtk+-2.0 >= 2.3.0 dnl
libbonoboui-2.0 dnl
gnome-desktop-2.0 >= 2.2.0"
PKG_CHECK_MODULES(CAPPLET, $COMMON_MODULES)
PKG_CHECK_MODULES(GNOMECC, $COMMON_MODULES libgnome-menu >= 2.9.1)
PKG_CHECK_MODULES(GNOMECC, $COMMON_MODULES libgnome-menu >= 2.11.1)
PKG_CHECK_MODULES(GNOME_SETTINGS_DAEMON,
[gtk+-2.0 gconf-2.0 libgnomeui-2.0 esound gnome-desktop-2.0 libglade-2.0])
PKG_CHECK_MODULES(OLD_CAPPLET, libgnomeui-2.0 libglade-2.0)

7
control-center/ChangeLog
View file

@ -1,3 +1,10 @@
2005-03-27 Sebastien Bacher <seb128@debian.org>
* control-center-categories.c: (populate_category),
(read_categories_from_menu_directory),
(control_center_get_information): update to the new libgnome-menu API,
patch from Mark McLoughlin <markmc@redhat.com>.
2005-02-18 Kjartan Maraas <kmaraas@gnome.org>
* control-center.c: (create_control_center): Fix a

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

@ -127,23 +127,25 @@ static void
populate_category (ControlCenterCategory *category,
MenuTreeDirectory *menu_directory)
{
GSList *menu_entries;
GSList *items;
GSList *entries;
GSList *l;
entries = NULL;
menu_entries = menu_tree_directory_get_entries (menu_directory);
for (l = menu_entries; l; l = l->next) {
MenuTreeEntry *menu_entry = l->data;
items = menu_tree_directory_get_contents (menu_directory);
for (l = items; l; l = l->next) {
MenuTreeItem *item = l->data;
entries = g_slist_prepend (entries,
control_center_entry_new (category, menu_entry));
if (menu_tree_item_get_type (item) == MENU_TREE_ITEM_ENTRY)
entries = g_slist_prepend (entries,
control_center_entry_new (category,
MENU_TREE_ENTRY (item)));
menu_tree_entry_unref (menu_entry);
menu_tree_item_unref (item);
}
g_slist_free (menu_entries);
g_slist_free (items);
if (entries != NULL) {
GSList *l;
@ -196,22 +198,28 @@ static GSList *
read_categories_from_menu_directory (MenuTreeDirectory *directory,
GSList *categories)
{
GSList *subdirs;
GSList *items;
GSList *l;
subdirs = menu_tree_directory_get_subdirs (directory);
for (l = subdirs; l; l = l->next) {
MenuTreeDirectory *subdir = l->data;
items = menu_tree_directory_get_contents (directory);
for (l = items; l; l = l->next) {
MenuTreeItem *item = l->data;
categories = g_slist_prepend (categories,
control_center_category_new (subdir, NULL, TRUE));
if (menu_tree_item_get_type (item) == MENU_TREE_ITEM_DIRECTORY) {
MenuTreeDirectory *subdir;
categories = read_categories_from_menu_directory (subdir, categories);
subdir = MENU_TREE_DIRECTORY (item);
menu_tree_directory_unref (subdir);
categories = g_slist_prepend (categories,
control_center_category_new (subdir, NULL, TRUE));
categories = read_categories_from_menu_directory (subdir, categories);
}
menu_tree_item_unref (item);
}
g_slist_free (subdirs);
g_slist_free (items);
return categories;
}
@ -257,7 +265,7 @@ control_center_get_information (void)
}
}
menu_tree_directory_unref (menu_root);
menu_tree_item_unref (menu_root);
if (categories != NULL) {
GSList *l;