diff --git a/ChangeLog b/ChangeLog index 4b0e56fca9..174069251b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Wed Apr 29 22:29:16 PDT 1998 Manish Singh + + * app/app_procs.c: make splash screen honor gtkrc + Wed Apr 29 16:49:27 PDT 1998 Manish Singh * plug-ins/CEL/CEL.c: reverted gimp-joke-980427-0 changes, they diff --git a/app/app_procs.c b/app/app_procs.c index 8422f37b54..314d6fe7e3 100644 --- a/app/app_procs.c +++ b/app/app_procs.c @@ -448,6 +448,17 @@ app_init () char *gimp_dir; char *path; + gimp_dir = gimp_directory (); + if (gimp_dir[0] != '\000') + { + sprintf (filename, "%s/gtkrc", gimp_dir); + + if ((be_verbose == TRUE) || (no_splash == TRUE)) + g_print ("parsing \"%s\"\n", filename); + + gtk_rc_parse (filename); + } + make_initialization_status_window(); if (no_interface == FALSE && no_splash == FALSE && win_initstatus) { splash_text_draw (logo_area); @@ -464,18 +475,6 @@ app_init () RESET_BAR(); procedural_db_register (&quit_proc); - gimp_dir = gimp_directory (); - if (gimp_dir[0] != '\000') - { - sprintf (filename, "%s/gtkrc", gimp_dir); - - if ((be_verbose == TRUE) || (no_splash == TRUE)) - g_print ("parsing \"%s\"\n", filename); - app_init_update_status("Resource configuration", filename, -1); - - gtk_rc_parse (filename); - } - RESET_BAR(); parse_gimprc (); /* parse the local GIMP configuration file */ diff --git a/app/disp_callbacks.c b/app/disp_callbacks.c index e42e7732ea..685d3ae146 100644 --- a/app/disp_callbacks.c +++ b/app/disp_callbacks.c @@ -66,7 +66,7 @@ gint gdisplay_canvas_events (GtkWidget *canvas, GdkEvent *event) { - GDisplay *gdisp, *tool_gdisp; + GDisplay *gdisp; GdkEventExpose *eevent; GdkEventMotion *mevent; GdkEventButton *bevent; diff --git a/app/display/gimpdisplay-callbacks.c b/app/display/gimpdisplay-callbacks.c index e42e7732ea..685d3ae146 100644 --- a/app/display/gimpdisplay-callbacks.c +++ b/app/display/gimpdisplay-callbacks.c @@ -66,7 +66,7 @@ gint gdisplay_canvas_events (GtkWidget *canvas, GdkEvent *event) { - GDisplay *gdisp, *tool_gdisp; + GDisplay *gdisp; GdkEventExpose *eevent; GdkEventMotion *mevent; GdkEventButton *bevent; diff --git a/app/display/gimpdisplayshell-callbacks.c b/app/display/gimpdisplayshell-callbacks.c index e42e7732ea..685d3ae146 100644 --- a/app/display/gimpdisplayshell-callbacks.c +++ b/app/display/gimpdisplayshell-callbacks.c @@ -66,7 +66,7 @@ gint gdisplay_canvas_events (GtkWidget *canvas, GdkEvent *event) { - GDisplay *gdisp, *tool_gdisp; + GDisplay *gdisp; GdkEventExpose *eevent; GdkEventMotion *mevent; GdkEventButton *bevent;