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

Applied the shell part of the patch from bug 382730 (fix build with C89

Browse source 
2007-01-11  Thomas Wood  <thos@gnome.org>

	* control-center.c: (get_actions_list), (main): Applied the shell part
	of the patch from bug 382730 (fix build with C89 compilers)

svn path=/trunk/; revision=7070
This commit is contained in:
Thomas Wood 2007-01-06 23:04:53 +00:00 • committed by Thomas Wood
parent d88f83a12c
commit 20b8dd4a61
2 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
shell/ChangeLog
View file

@ -1,3 +1,8 @@
2007-01-11 Thomas Wood <thos@gnome.org>
* control-center.c: (get_actions_list), (main): Applied the shell part
of the patch from bug 382730 (fix build with C89 compilers)
2006-11-13 Rodrigo Moya <rodrigo@novell.com> 2006-11-13 Rodrigo Moya <rodrigo@novell.com>
* gnomecc.desktop.in.in: added missing file. * gnomecc.desktop.in.in: added missing file.

9
shell/control-center.c
View file

@ -65,9 +65,10 @@ get_actions_list ()
for (; key_list; key_list = key_list->next) for (; key_list; key_list = key_list->next)
{ {
gchar *entry = (gchar *) key_list->data; gchar *entry = (gchar *) key_list->data;
gchar **temp;
action = g_new (AppAction, 1); action = g_new (AppAction, 1);
gchar **temp = g_strsplit (entry, CONTROL_CENTER_ACTIONS_SEPARATOR, 2); temp = g_strsplit (entry, CONTROL_CENTER_ACTIONS_SEPARATOR, 2);
action->name = g_strdup (temp[0]); action->name = g_strdup (temp[0]);
if ((action->item = load_desktop_item_from_unknown (temp[1])) == NULL) if ((action->item = load_desktop_item_from_unknown (temp[1])) == NULL)
{ {
@ -107,6 +108,8 @@ main (int argc, char *argv[])
BonoboApplication *bonobo_app = NULL; BonoboApplication *bonobo_app = NULL;
gboolean hidden = FALSE; gboolean hidden = FALSE;
gchar * startup_id; gchar * startup_id;
AppShellData *app_data;
GSList *actions;
#ifdef ENABLE_NLS #ifdef ENABLE_NLS
bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR); bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
@ -138,11 +141,11 @@ main (int argc, char *argv[])
exit (1); exit (1);
} }
AppShellData *app_data = appshelldata_new ( app_data = appshelldata_new (
"preferences.menu", NULL, CONTROL_CENTER_PREFIX, GTK_ICON_SIZE_DIALOG); "preferences.menu", NULL, CONTROL_CENTER_PREFIX, GTK_ICON_SIZE_DIALOG);
generate_categories (app_data); generate_categories (app_data);
GSList *actions = get_actions_list (); actions = get_actions_list ();
layout_shell (app_data, _("Filter"), _("Groups"), _("Common Tasks"), actions, layout_shell (app_data, _("Filter"), _("Groups"), _("Common Tasks"), actions,
handle_static_action_clicked); handle_static_action_clicked);