Commit 1af39383 authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

Don't open/close the file, just check for existence with g_file_test().

Thu Mar  4 16:54:30 2004  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkrc.c (gtk_rc_check_pixmap_dir): Don't
        open/close the file, just check for existence
        with g_file_test(). This is considerably cheaper,
        and lack-of-permissions for pixmap dirs is
        pathological.

Wed Mar  3 17:53:21 2004  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtksocket.c (gtk_socket_class_init): Overide
        show_all/hide_all to be gtk_widget_show/gtk_widget_hide,
        since we don't want to propagate to the in-process
        plug, if any. (#122949, Michael Meeks)
parent b1ac4367
Thu Mar 4 16:54:30 2004 Owen Taylor <otaylor@redhat.com>
* gtk/gtkrc.c (gtk_rc_check_pixmap_dir): Don't
open/close the file, just check for existence
with g_file_test(). This is considerably cheaper,
and lack-of-permissions for pixmap dirs is
pathological.
Wed Mar 3 17:53:21 2004 Owen Taylor <otaylor@redhat.com>
* gtk/gtksocket.c (gtk_socket_class_init): Overide
show_all/hide_all to be gtk_widget_show/gtk_widget_hide,
since we don't want to propagate to the in-process
plug, if any. (#122949, Michael Meeks)
Thu Mar 4 15:20:55 2004 Jonathan Blandford <jrb@gnome.org>
* gtk/gtkfilechooserdefault.c (update_appearance): show the 'New
......
Thu Mar 4 16:54:30 2004 Owen Taylor <otaylor@redhat.com>
* gtk/gtkrc.c (gtk_rc_check_pixmap_dir): Don't
open/close the file, just check for existence
with g_file_test(). This is considerably cheaper,
and lack-of-permissions for pixmap dirs is
pathological.
Wed Mar 3 17:53:21 2004 Owen Taylor <otaylor@redhat.com>
* gtk/gtksocket.c (gtk_socket_class_init): Overide
show_all/hide_all to be gtk_widget_show/gtk_widget_hide,
since we don't want to propagate to the in-process
plug, if any. (#122949, Michael Meeks)
Thu Mar 4 15:20:55 2004 Jonathan Blandford <jrb@gnome.org>
* gtk/gtkfilechooserdefault.c (update_appearance): show the 'New
......
Thu Mar 4 16:54:30 2004 Owen Taylor <otaylor@redhat.com>
* gtk/gtkrc.c (gtk_rc_check_pixmap_dir): Don't
open/close the file, just check for existence
with g_file_test(). This is considerably cheaper,
and lack-of-permissions for pixmap dirs is
pathological.
Wed Mar 3 17:53:21 2004 Owen Taylor <otaylor@redhat.com>
* gtk/gtksocket.c (gtk_socket_class_init): Overide
show_all/hide_all to be gtk_widget_show/gtk_widget_hide,
since we don't want to propagate to the in-process
plug, if any. (#122949, Michael Meeks)
Thu Mar 4 15:20:55 2004 Jonathan Blandford <jrb@gnome.org>
* gtk/gtkfilechooserdefault.c (update_appearance): show the 'New
......
Thu Mar 4 16:54:30 2004 Owen Taylor <otaylor@redhat.com>
* gtk/gtkrc.c (gtk_rc_check_pixmap_dir): Don't
open/close the file, just check for existence
with g_file_test(). This is considerably cheaper,
and lack-of-permissions for pixmap dirs is
pathological.
Wed Mar 3 17:53:21 2004 Owen Taylor <otaylor@redhat.com>
* gtk/gtksocket.c (gtk_socket_class_init): Overide
show_all/hide_all to be gtk_widget_show/gtk_widget_hide,
since we don't want to propagate to the in-process
plug, if any. (#122949, Michael Meeks)
Thu Mar 4 15:20:55 2004 Jonathan Blandford <jrb@gnome.org>
* gtk/gtkfilechooserdefault.c (update_appearance): show the 'New
......
Thu Mar 4 16:54:30 2004 Owen Taylor <otaylor@redhat.com>
* gtk/gtkrc.c (gtk_rc_check_pixmap_dir): Don't
open/close the file, just check for existence
with g_file_test(). This is considerably cheaper,
and lack-of-permissions for pixmap dirs is
pathological.
Wed Mar 3 17:53:21 2004 Owen Taylor <otaylor@redhat.com>
* gtk/gtksocket.c (gtk_socket_class_init): Overide
show_all/hide_all to be gtk_widget_show/gtk_widget_hide,
since we don't want to propagate to the in-process
plug, if any. (#122949, Michael Meeks)
Thu Mar 4 15:20:55 2004 Jonathan Blandford <jrb@gnome.org>
* gtk/gtkfilechooserdefault.c (update_appearance): show the 'New
......
......@@ -2973,13 +2973,9 @@ gtk_rc_check_pixmap_dir (const gchar *dir, const gchar *pixmap_file)
gint fd;
buf = g_build_filename (dir, pixmap_file, NULL);
fd = open (buf, O_RDONLY);
if (fd >= 0)
{
close (fd);
return buf;
}
if (g_file_test (buf, G_FILE_TEST_EXISTS))
return buf;
g_free (buf);
......
......@@ -191,6 +191,12 @@ gtk_socket_class_init (GtkSocketClass *class)
widget_class->key_press_event = gtk_socket_key_event;
widget_class->key_release_event = gtk_socket_key_event;
widget_class->focus = gtk_socket_focus;
/* We don't want to show_all/hide_all the in-process
* plug, if any.
*/
widget_class->show_all = gtk_widget_show;
widget_class->hide_all = gtk_widget_hide;
container_class->remove = gtk_socket_remove;
container_class->forall = gtk_socket_forall;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment