Author: paladine Date: Wed Mar 9 23:32:02 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- merged from DEVEL
---- Files affected:
SOURCES:
gnome-panel-no_launchers_on_panel.patch (1.2 -> 1.3)
---- Diffs:
================================================================
Index: SOURCES/gnome-panel-no_launchers_on_panel.patch
diff -u SOURCES/gnome-panel-no_launchers_on_panel.patch:1.2
SOURCES/gnome-panel-no_launchers_on_panel.patch:1.3
--- SOURCES/gnome-panel-no_launchers_on_panel.patch:1.2 Tue Apr 20 00:39:49 2004
+++ SOURCES/gnome-panel-no_launchers_on_panel.patch Thu Mar 10 00:31:57 2005
@@ -1,6 +1,6 @@
-diff -urN aa/gnome-panel-2.6.1/gnome-panel/panel-compatibility.schemas
gnome-panel-2.6.1/gnome-panel/panel-compatibility.schemas
---- aa/gnome-panel-2.6.1/gnome-panel/panel-compatibility.schemas
2003-09-05 14:35:53.000000000 +0200
-+++ gnome-panel-2.6.1/gnome-panel/panel-compatibility.schemas 2004-04-20
00:03:54.872682832 +0200
+diff -urN gnome-panel-2.9.92.orig/gnome-panel/panel-compatibility.schemas
gnome-panel-2.9.92/gnome-panel/panel-compatibility.schemas
+--- gnome-panel-2.9.92.orig/gnome-panel/panel-compatibility.schemas
2005-03-01 13:12:22.444621344 +0100
++++ gnome-panel-2.9.92/gnome-panel/panel-compatibility.schemas 2005-03-01
13:13:09.123525072 +0100
@@ -182,14 +182,6 @@
</schema>
@@ -31,9 +31,9 @@
<schema>
<key>/schemas/apps/panel/default_profiles/medium/objects/00000002/panel_id</key>
-diff -urN aa/gnome-panel-2.6.1/gnome-panel/panel-default-setup.entries
gnome-panel-2.6.1/gnome-panel/panel-default-setup.entries
---- aa/gnome-panel-2.6.1/gnome-panel/panel-default-setup.entries
2004-04-02 19:05:41.000000000 +0200
-+++ gnome-panel-2.6.1/gnome-panel/panel-default-setup.entries 2004-04-20
00:05:32.229882288 +0200
+diff -urN gnome-panel-2.9.92.orig/gnome-panel/panel-default-setup.entries.in
gnome-panel-2.9.92/gnome-panel/panel-default-setup.entries.in
+--- gnome-panel-2.9.92.orig/gnome-panel/panel-default-setup.entries.in
2005-03-01 13:12:22.445621192 +0100
++++ gnome-panel-2.9.92/gnome-panel/panel-default-setup.entries.in
2005-03-01 13:14:29.082369480 +0100
@@ -29,12 +29,6 @@
<value>
<string>menu_bar</string>
@@ -47,7 +47,7 @@
</list>
</value>
</entry>
-@@ -223,114 +217,6 @@
+@@ -208,114 +202,6 @@
<entry><key>objects/menu_bar/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
<entry><key>objects/menu_bar/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
@@ -92,7 +92,7 @@
- <key>objects/nautilus_launcher/launcher_location</key>
- <schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
- <value>
-- <string>applications:///nautilus.desktop</string>
+- <string>@DATADIR@/applications/nautilus.desktop</string>
- </value>
- </entry>
-
@@ -146,7 +146,7 @@
- <key>objects/terminal_launcher/launcher_location</key>
- <schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
- <value>
-- <string>applications:///System/gnome-terminal.desktop</string>
+- <string>@DATADIR@/applications/gnome-terminal.desktop</string>
- </value>
- </entry>
-
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/gnome-panel-no_launchers_on_panel.patch?r1=1.2&r2=1.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
