mirror of https://github.com/GNOME/gimp.git
parent
c731ecb150
commit
e9b670ef7a
|
@ -1,3 +1,7 @@
|
||||||
|
Wed Apr 29 22:29:16 PDT 1998 Manish Singh <yosh@gimp.org>
|
||||||
|
|
||||||
|
* app/app_procs.c: make splash screen honor gtkrc
|
||||||
|
|
||||||
Wed Apr 29 16:49:27 PDT 1998 Manish Singh <yosh@gimp.org>
|
Wed Apr 29 16:49:27 PDT 1998 Manish Singh <yosh@gimp.org>
|
||||||
|
|
||||||
* plug-ins/CEL/CEL.c: reverted gimp-joke-980427-0 changes, they
|
* plug-ins/CEL/CEL.c: reverted gimp-joke-980427-0 changes, they
|
||||||
|
|
|
@ -448,6 +448,17 @@ app_init ()
|
||||||
char *gimp_dir;
|
char *gimp_dir;
|
||||||
char *path;
|
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();
|
make_initialization_status_window();
|
||||||
if (no_interface == FALSE && no_splash == FALSE && win_initstatus) {
|
if (no_interface == FALSE && no_splash == FALSE && win_initstatus) {
|
||||||
splash_text_draw (logo_area);
|
splash_text_draw (logo_area);
|
||||||
|
@ -464,18 +475,6 @@ app_init ()
|
||||||
RESET_BAR();
|
RESET_BAR();
|
||||||
procedural_db_register (&quit_proc);
|
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();
|
RESET_BAR();
|
||||||
parse_gimprc (); /* parse the local GIMP configuration file */
|
parse_gimprc (); /* parse the local GIMP configuration file */
|
||||||
|
|
||||||
|
|
|
@ -66,7 +66,7 @@ gint
|
||||||
gdisplay_canvas_events (GtkWidget *canvas,
|
gdisplay_canvas_events (GtkWidget *canvas,
|
||||||
GdkEvent *event)
|
GdkEvent *event)
|
||||||
{
|
{
|
||||||
GDisplay *gdisp, *tool_gdisp;
|
GDisplay *gdisp;
|
||||||
GdkEventExpose *eevent;
|
GdkEventExpose *eevent;
|
||||||
GdkEventMotion *mevent;
|
GdkEventMotion *mevent;
|
||||||
GdkEventButton *bevent;
|
GdkEventButton *bevent;
|
||||||
|
|
|
@ -66,7 +66,7 @@ gint
|
||||||
gdisplay_canvas_events (GtkWidget *canvas,
|
gdisplay_canvas_events (GtkWidget *canvas,
|
||||||
GdkEvent *event)
|
GdkEvent *event)
|
||||||
{
|
{
|
||||||
GDisplay *gdisp, *tool_gdisp;
|
GDisplay *gdisp;
|
||||||
GdkEventExpose *eevent;
|
GdkEventExpose *eevent;
|
||||||
GdkEventMotion *mevent;
|
GdkEventMotion *mevent;
|
||||||
GdkEventButton *bevent;
|
GdkEventButton *bevent;
|
||||||
|
|
|
@ -66,7 +66,7 @@ gint
|
||||||
gdisplay_canvas_events (GtkWidget *canvas,
|
gdisplay_canvas_events (GtkWidget *canvas,
|
||||||
GdkEvent *event)
|
GdkEvent *event)
|
||||||
{
|
{
|
||||||
GDisplay *gdisp, *tool_gdisp;
|
GDisplay *gdisp;
|
||||||
GdkEventExpose *eevent;
|
GdkEventExpose *eevent;
|
||||||
GdkEventMotion *mevent;
|
GdkEventMotion *mevent;
|
||||||
GdkEventButton *bevent;
|
GdkEventButton *bevent;
|
||||||
|
|
Loading…
Reference in New Issue