- merged from DEVEL

[packages/control-center.git] / control-center-fsbgpath.patch

diff --git a/control-center-fsbgpath.patch b/control-center-fsbgpath.patch
index f43ba6a13dfc603f938bf53f3eb269fcdea65df0..a2c175f87d03cce40cda6960fb012d9d4db5be04 100644 (file)
--- a/control-center-fsbgpath.patch
+++ b/control-center-fsbgpath.patch
@@ -1,14 +1,15 @@
---- control-center-1.0.4/capplets/background-properties/property-background.c.fsbgdir  Thu Mar 25 11:44:24 1999
-+++ control-center-1.0.4/capplets/background-properties/property-background.c  Thu Mar 25 11:56:53 1999
-@@ -814,7 +814,10 @@
-       else if (origState.wpFileName)
-           gtk_file_selection_set_filename (GTK_FILE_SELECTION (fileSel),
-                                            origState.wpFileName);
+diff -Nru control-center-1.2.1/capplets/background-properties/property-background.c control-center-1.2.1.new/capplets/background-properties/property-background.c
+--- control-center-1.2.1/capplets/background-properties/property-background.c  Mon Aug  7 20:02:14 2000
++++ control-center-1.2.1.new/capplets/background-properties/property-background.c      Mon Aug  7 20:10:23 2000
+@@ -590,7 +590,10 @@
+               else if (origState.wpFileName)
+                       gtk_file_selection_set_filename (GTK_FILE_SELECTION (fileSel),
+                                                        origState.wpFileName);
 -      
-+      else if (g_file_exists("/usr/share/pixmaps/backgrounds"))
-+          gtk_file_selection_set_filename (GTK_FILE_SELECTION (fileSel),
-+                                           "/usr/share/pixmaps/backgrounds/");
++              else if (g_file_exists(GNOME_ICONDIR"/backgrounds"))
++                      gtk_file_selection_set_filename (GTK_FILE_SELECTION (fileSel),
++                                                      GNOME_ICONDIR"/backgrounds");
 +
-       gtk_signal_connect (GTK_OBJECT (fileSel), "delete_event",
-                           (GtkSignalFunc) delete_browse,
-                           &fileSel);
+               gtk_signal_connect (GTK_OBJECT (fileSel), "delete_event",
+                                   (GtkSignalFunc) delete_browse,
+                                   &fileSel);