From 0d925661198174c72dc3ca9a337c91e82ba9f4a5 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 2 Apr 2003 23:06:16 +0000 Subject: [PATCH] Only use files from the current directory if it looks like the srcdir. 2003-04-03 Matthias Clasen * demos/gtk-demo/main.c (demo_find_file): Only use files from the current directory if it looks like the srcdir. (#109357) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ demos/gtk-demo/main.c | 3 ++- 6 files changed, 27 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 52f6ebb51b..bec3efdb2b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-04-03 Matthias Clasen + + * 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 * gtk/gtkbutton.[ch] (gtk_button_class_init): add property diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 52f6ebb51b..bec3efdb2b 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2003-04-03 Matthias Clasen + + * 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 * gtk/gtkbutton.[ch] (gtk_button_class_init): add property diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 52f6ebb51b..bec3efdb2b 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2003-04-03 Matthias Clasen + + * 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 * gtk/gtkbutton.[ch] (gtk_button_class_init): add property diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 52f6ebb51b..bec3efdb2b 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2003-04-03 Matthias Clasen + + * 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 * gtk/gtkbutton.[ch] (gtk_button_class_init): add property diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 52f6ebb51b..bec3efdb2b 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2003-04-03 Matthias Clasen + + * 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 * gtk/gtkbutton.[ch] (gtk_button_class_init): add property diff --git a/demos/gtk-demo/main.c b/demos/gtk-demo/main.c index 545c713e7d..4b50287597 100644 --- 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 {