Only use files from the current directory if it looks like the srcdir.

2003-04-03  Matthias Clasen  <maclas@gmx.de>

	* demos/gtk-demo/main.c (demo_find_file): Only use files from the
	current directory if it looks like the srcdir.  (#109357)

diff --git a/ChangeLog b/ChangeLog
index 52f6ebb51b6594da350123a6778a030cc9c9b939..bec3efdb2b5f71f0034264c87965ec1aea4f3b68 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-03  Matthias Clasen  <maclas@gmx.de>
+
+       * demos/gtk-demo/main.c (demo_find_file): Only use files from the
+       current directory if it looks like the srcdir.  (#109357)
+
 Wed Apr  2 23:02:26 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtkbutton.[ch] (gtk_button_class_init): add property

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 52f6ebb51b6594da350123a6778a030cc9c9b939..bec3efdb2b5f71f0034264c87965ec1aea4f3b68 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2003-04-03  Matthias Clasen  <maclas@gmx.de>
+
+       * demos/gtk-demo/main.c (demo_find_file): Only use files from the
+       current directory if it looks like the srcdir.  (#109357)
+
 Wed Apr  2 23:02:26 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtkbutton.[ch] (gtk_button_class_init): add property

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 52f6ebb51b6594da350123a6778a030cc9c9b939..bec3efdb2b5f71f0034264c87965ec1aea4f3b68 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2003-04-03  Matthias Clasen  <maclas@gmx.de>
+
+       * demos/gtk-demo/main.c (demo_find_file): Only use files from the
+       current directory if it looks like the srcdir.  (#109357)
+
 Wed Apr  2 23:02:26 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtkbutton.[ch] (gtk_button_class_init): add property

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 52f6ebb51b6594da350123a6778a030cc9c9b939..bec3efdb2b5f71f0034264c87965ec1aea4f3b68 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2003-04-03  Matthias Clasen  <maclas@gmx.de>
+
+       * demos/gtk-demo/main.c (demo_find_file): Only use files from the
+       current directory if it looks like the srcdir.  (#109357)
+
 Wed Apr  2 23:02:26 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtkbutton.[ch] (gtk_button_class_init): add property

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 52f6ebb51b6594da350123a6778a030cc9c9b939..bec3efdb2b5f71f0034264c87965ec1aea4f3b68 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2003-04-03  Matthias Clasen  <maclas@gmx.de>
+
+       * demos/gtk-demo/main.c (demo_find_file): Only use files from the
+       current directory if it looks like the srcdir.  (#109357)
+
 Wed Apr  2 23:02:26 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtkbutton.[ch] (gtk_button_class_init): add property

diff --git a/demos/gtk-demo/main.c b/demos/gtk-demo/main.c
index 545c713e7de8cbb35a6bf6895722034968f91874..4b50287597c44efb7ee15bc282245201d9e77979 100644 (file)
--- a/demos/gtk-demo/main.c
+++ b/demos/gtk-demo/main.c
@@ -45,7 +45,8 @@ demo_find_file (const char *base,
 {
   g_return_val_if_fail (err == NULL || *err == NULL, NULL);
   
-  if (g_file_test (base, G_FILE_TEST_EXISTS))
+  if (g_file_test ("gtk-logo-rgb.gif", G_FILE_TEST_EXISTS) &&
+      g_file_test (base, G_FILE_TEST_EXISTS))
     return g_strdup (base);
   else
     {