1999-05-09 17:05:03 +00:00
|
|
|
--- gmenu/main.c.orig Thu May 6 11:44:25 1999
|
|
|
|
+++ gmenu/main.c Thu May 6 11:44:43 1999
|
|
|
|
@@ -271,7 +271,7 @@
|
1999-03-09 18:04:17 +00:00
|
|
|
|
|
|
|
gnome_init ("GNOME menu editor", VERSION, argc, argv);
|
|
|
|
|
1999-05-09 17:05:03 +00:00
|
|
|
- system_apps_dir = gnome_unconditional_datadir_file("gnome/apps");
|
|
|
|
+ system_apps_dir = gnome_unconditional_datadir_file("apps");
|
|
|
|
system_pixmap_dir = gnome_unconditional_datadir_file("pixmaps");
|
|
|
|
if (!g_file_exists(system_apps_dir) || !g_file_exists(system_pixmap_dir))
|
1999-03-09 18:04:17 +00:00
|
|
|
{
|
1999-10-14 03:42:41 +00:00
|
|
|
--- panel/menu.c.orig Mon Sep 20 18:49:14 1999
|
|
|
|
+++ panel/menu.c Fri Sep 24 10:55:55 1999
|
|
|
|
@@ -504,7 +504,7 @@
|
1999-03-09 18:04:17 +00:00
|
|
|
/*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*/
|
|
|
|
- char *menu = gnome_datadir_file("gnome/apps");
|
|
|
|
+ char *menu = gnome_datadir_file("apps");
|
|
|
|
if(menu)
|
|
|
|
fr_read_dir(NULL,menu,NULL,2);
|
|
|
|
g_free(menu);
|
1999-10-14 03:42:41 +00:00
|
|
|
@@ -2078,7 +2078,7 @@
|
1999-03-09 18:04:17 +00:00
|
|
|
static GtkWidget *
|
|
|
|
create_system_menu(GtkWidget *menu, int fake_submenus, int fake)
|
|
|
|
{
|
|
|
|
- char *menu_base = gnome_unconditional_datadir_file ("gnome/apps");
|
|
|
|
+ char *menu_base = gnome_unconditional_datadir_file ("apps");
|
1999-10-14 03:42:41 +00:00
|
|
|
char *menudir, *pixmap;
|
1999-03-09 18:04:17 +00:00
|
|
|
|
|
|
|
menudir = g_concat_dir_and_file (menu_base, ".");
|
1999-10-14 03:42:41 +00:00
|
|
|
@@ -3111,7 +3111,7 @@
|
1999-03-09 18:04:17 +00:00
|
|
|
current_panel = PANEL_WIDGET(menu->button->parent);
|
|
|
|
|
|
|
|
if(!menu->menu) {
|
|
|
|
- char *menu_base = gnome_unconditional_datadir_file ("gnome/apps");
|
|
|
|
+ char *menu_base = gnome_unconditional_datadir_file ("apps");
|
|
|
|
char *this_menu = get_real_menu_path(menu->path,menu_base);
|
|
|
|
GSList *list = g_slist_append(NULL,this_menu);
|
|
|
|
|
1999-10-14 03:42:41 +00:00
|
|
|
@@ -3220,7 +3220,7 @@
|
1999-03-09 18:04:17 +00:00
|
|
|
Menu *menu;
|
|
|
|
int main_menu;
|
|
|
|
|
|
|
|
- char *menu_base = gnome_unconditional_datadir_file ("gnome/apps");
|
|
|
|
+ char *menu_base = gnome_unconditional_datadir_file ("apps");
|
|
|
|
char *this_menu = get_real_menu_path(arguments,menu_base);
|
|
|
|
|
|
|
|
if (!this_menu) {
|
1999-10-14 03:42:41 +00:00
|
|
|
@@ -3340,7 +3340,7 @@
|
1999-03-09 18:04:17 +00:00
|
|
|
menu->menu = NULL;
|
|
|
|
|
|
|
|
{
|
|
|
|
- char *menu_base = gnome_unconditional_datadir_file ("gnome/apps");
|
|
|
|
+ char *menu_base = gnome_unconditional_datadir_file ("apps");
|
|
|
|
char *this_menu = get_real_menu_path(menu->path,menu_base);
|
|
|
|
GSList *list = g_slist_append(NULL,this_menu);
|
|
|
|
char *pixmap_name = get_pixmap(this_menu,
|