Commit 7eb77cf0 authored by Seth Nickell's avatar Seth Nickell Committed by Seth Nickell

Change to using "applications:/" rather than "programs:/"

2001-12-14  Seth Nickell  <snickell@stanford.edu>

	* applet.c: (applet_callback_callback):
	* menu-properties.c: (get_real_menu_path):
	* menu.c: (init_menus), (add_menu_to_panel), (create_system_menu),
	(make_add_submenu), (make_panel_submenu):
	* session.c: (session_init_user_applets),
	(session_init_user_panels):

	Change to using "applications:/" rather than "programs:/"
parent b9db5272
2001-12-14 Seth Nickell <snickell@stanford.edu>
* applet.c: (applet_callback_callback):
* menu-properties.c: (get_real_menu_path):
* menu.c: (init_menus), (add_menu_to_panel), (create_system_menu),
(make_add_submenu), (make_panel_submenu):
* session.c: (session_init_user_applets),
(session_init_user_panels):
Change to using "applications:/" rather than "programs:/"
2001-12-14 Stephen Browne <stephen.browne@sun.com>
* gnome-panel-properties.c, gnome-panel-properties.glade,
......
......@@ -160,7 +160,7 @@ applet_callback_callback(GtkWidget *widget, gpointer data)
else if(strcmp(menu->name,"edit_menus")==0) {
char *tmp[3] = { NULL, NULL, NULL };
if((tmp[0] = g_find_program_in_path ("nautilus")) != NULL) {
tmp[1] = "programs:/";
tmp[1] = "applications:/";
gnome_execute_async (g_get_home_dir (), 2, tmp);
g_free (tmp[0]);
}
......
......@@ -64,7 +64,7 @@ char *
get_real_menu_path (const char *arguments, gboolean main_menu)
{
if (main_menu)
return g_strdup ("programs:");
return g_strdup ("applications:");
else if (*arguments == '~')
/* FIXME: this needs to be a URI */
......
......@@ -247,7 +247,7 @@ init_menus (void)
/*just load the menus from disk, don't make the widgets
this just reads the .desktops of the top most directory
and a level down*/
fr_read_dir (NULL, "programs:/", 0, 2);
fr_read_dir (NULL, "applications:/", 0, 2);
menu = gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_DATADIR,
"applets", TRUE, NULL);
......@@ -1013,7 +1013,7 @@ add_menu_to_panel (GtkWidget *widget, gpointer data)
if (menudir == NULL) {
main_menu = TRUE;
menudir = "programs:/";
menudir = "applications:/";
} else {
main_menu = FALSE;
}
......@@ -3217,17 +3217,17 @@ create_system_menu (GtkWidget *menu, gboolean fake_submenus,
{
if ( ! fake ||
menu != NULL) {
menu = create_menu_at (menu, "programs:/",
menu = create_menu_at (menu, "applications:/",
FALSE /* applets */,
launcher_add,
_("Programs"),
_("Applications"),
"gnome-logo-icon-transparent.png",
fake_submenus, FALSE);
} else {
menu = create_fake_menu_at ("programs:/",
menu = create_fake_menu_at ("applications:/",
FALSE /* applets */,
launcher_add,
_("Programs"),
_("Applications"),
"gnome-logo-icon-transparent.png");
}
......@@ -3690,8 +3690,8 @@ make_add_submenu (GtkWidget *menu, gboolean fake_submenus)
gtk_menu_shell_append (GTK_MENU_SHELL (submenu), submenuitem);
g_signal_connect (G_OBJECT(submenuitem), "activate",
G_CALLBACK(add_menu_to_panel),
"programs:/");
setup_internal_applet_drag(submenuitem, "MENU:programs:/");
"applications:/");
setup_internal_applet_drag(submenuitem, "MENU:applications:/");
menuitem = gtk_image_menu_item_new ();
setup_menuitem_try_pixmap (menuitem,
......@@ -3934,7 +3934,7 @@ make_panel_submenu (GtkWidget *menu, gboolean fake_submenus, gboolean is_basep)
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
g_signal_connect (G_OBJECT (menuitem), "activate",
G_CALLBACK (panel_launch_nautilus),
"programs:/");
"applications:/");
if ( ! global_config.menu_check) {
menuitem = gtk_image_menu_item_new ();
......
......@@ -913,7 +913,7 @@ session_init_user_applets (void)
} else if (strcmp (applet_name, MENU_ID) == 0) {
char *path = conditional_get_string ("path",
"programs:/", NULL);
"applications:/", NULL);
gboolean main_menu =
conditional_get_bool ("main_menu", TRUE, NULL);
gboolean global_main =
......@@ -1009,7 +1009,7 @@ session_init_user_panels(void)
gtk_widget_show(panel);
/* load up the foot menu */
load_menu_applet ("programs:/",
load_menu_applet ("applications:/",
TRUE /* main_menu */,
get_default_menu_flags (),
TRUE, FALSE, NULL,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment