gtk+ r21809 - in trunk: . tests

[cdywan svn gnome org]

Author: cdywan
Date: Wed Nov 26 08:36:10 2008
New Revision: 21809
URL: http://svn.gnome.org/viewvc/gtk+?rev=21809&view=rev

Log:
2008-11-26  Christian Dywan  <christian imendio com>

	Bug 561504 â testgtk should load rc file from sub folder

	* tests/testgtk.c (main):
        Make testgtk look in subfolder and warn if not found

Modified:
   trunk/ChangeLog
   trunk/tests/testgtk.c

Modified: trunk/tests/testgtk.c
==============================================================================
--- trunk/tests/testgtk.c	(original)
+++ trunk/tests/testgtk.c	Wed Nov 26 08:36:10 2008
@@ -13895,6 +13895,10 @@
    */
   if (file_exists ("testgtkrc"))
     gtk_rc_add_default_file ("testgtkrc");
+  else if (file_exists ("tests/testgtkrc"))
+    gtk_rc_add_default_file ("tests/testgtkrc");
+  else
+    g_warning ("Couldn't find file \"testgtkrc\".");
 
   g_set_application_name ("GTK+ Test Program");