1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
|
--- panel/Makefile.in.orig Tue May 23 04:25:47 2000
+++ panel/Makefile.in Fri May 26 15:30:48 2000
@@ -169,7 +169,7 @@
libpanel_appletinclude_HEADERS = applet-widget.h gnome-panel.h
-libpanel_applet_la_LDFLAGS = -version-info 0:1:0 -rpath $(libdir)
+libpanel_applet_la_LDFLAGS = -version-info 4:0:0 -rpath $(libdir)
libpanel_applet_la_LIBADD = $(ORB_LIBS) -lm $(DL_LIB)
libpanel_status_la_SOURCES = status-docklet.c $(CORBA_SRCLIST)
@@ -178,7 +178,7 @@
libpanel_statusinclude_HEADERS = status-docklet.h
-libpanel_status_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir)
+libpanel_status_la_LDFLAGS = -version-info 4:0:0 -rpath $(libdir)
libpanel_status_la_LIBADD = $(ORB_LIBS) -lm $(DL_LIB)
BUILT_SOURCES = $(CORBA_SRCLIST)
@@ -210,7 +210,7 @@
EXTRA_DIST = panelrc.in panel.in appletsConf.sh.in dockletsConf.sh.in panel.gnorba panel.soundlist APPLET_WRITING panel.hints gnome-panel-properties.desktop nothing.cP title-item.gob
-confexecdir = $(libdir)
+confexecdir = $(sysconfdir)
confexec_DATA = appletsConf.sh dockletsConf.sh
panelgnorbadir = $(sysconfdir)/CORBA/servers
--- panel/foobar-widget.c.orig Sat May 6 20:48:27 2000
+++ panel/foobar-widget.c Wed May 31 12:51:56 2000
@@ -557,7 +557,7 @@
append_folder_menu (menu_bar, _("Favorites"), NULL, FALSE, "apps/.");
append_folder_menu (menu_bar, _("Settings"), NULL, TRUE,
- "gnome/apps/Settings/.");
+ "apps/Settings/.");
append_desktop_menu (menu_bar);
gtk_box_pack_start (GTK_BOX (foo->hbox), menu_bar, FALSE, FALSE, 0);
--- panel/menu.c.orig Tue May 23 01:00:43 2000
+++ panel/menu.c Fri May 26 15:10:21 2000
@@ -82,7 +82,7 @@
/*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);
@@ -2709,7 +2709,7 @@
create_system_menu(GtkWidget *menu, gboolean fake_submenus, gboolean fake,
gboolean title)
{
- char *menudir = gnome_datadir_file ("gnome/apps");
+ char *menudir = gnome_datadir_file ("apps");
if (menudir &&
g_file_test (menudir, G_FILE_TEST_ISDIR)) {
@@ -3598,8 +3598,8 @@
gtk_menu_append (GTK_MENU (submenu), submenuitem);
gtk_signal_connect(GTK_OBJECT(submenuitem), "activate",
GTK_SIGNAL_FUNC(add_menu_to_panel),
- "gnome/apps/");
- setup_internal_applet_drag(submenuitem, "MENU:gnome/apps/");
+ "apps/");
+ setup_internal_applet_drag(submenuitem, "MENU:apps/");
submenuitem = gtk_menu_item_new ();
gtk_widget_lock_accelerators (menuitem);
--- panel/menu-properties.c.orig Mon Apr 3 18:03:29 2000
+++ panel/menu-properties.c Wed May 31 12:50:41 2000
@@ -40,7 +40,7 @@
arguments = ".";
if(strcmp(arguments,".")==0)
- this_menu = gnome_unconditional_datadir_file ("gnome/apps");
+ this_menu = gnome_unconditional_datadir_file ("apps");
else if (*arguments == '/')
this_menu = g_strdup (arguments);
else if (*arguments == '~')
--- panel/session.c.orig Fri May 19 00:29:47 2000
+++ panel/session.c Wed May 31 12:49:09 2000
@@ -777,10 +777,10 @@
load_default_applets1(PanelWidget *panel)
{
char *def_launchers[] =
- { "gnome/apps/gnome-help.desktop",
- "gnome/apps/System/gnome-terminal.desktop",
- "gnome/apps/Settings/gnomecc.desktop",
- "gnome/apps/Internet/Netscape.desktop",
+ { "apps/gnome-help.desktop",
+ "apps/System/gnome-terminal.desktop",
+ "apps/Settings/gnomecc.desktop",
+ "apps/Internet/Netscape.desktop",
NULL };
int i;
char *p;
|
