diff --git a/ChangeLog b/ChangeLog index e8f8700636..51952c6c74 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Jul 29 17:14:01 2001 Tim Janik + + * gtk/gtkitemfactory.c (gtk_item_factory_parse_rc): use g_file_test() + instead of long deprecated g_scanner_stat_mode(). + 2001-07-29 Hans Breuer * gdk/makefile.msc : build in the backend dir after diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index e8f8700636..51952c6c74 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Sun Jul 29 17:14:01 2001 Tim Janik + + * gtk/gtkitemfactory.c (gtk_item_factory_parse_rc): use g_file_test() + instead of long deprecated g_scanner_stat_mode(). + 2001-07-29 Hans Breuer * gdk/makefile.msc : build in the backend dir after diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index e8f8700636..51952c6c74 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Sun Jul 29 17:14:01 2001 Tim Janik + + * gtk/gtkitemfactory.c (gtk_item_factory_parse_rc): use g_file_test() + instead of long deprecated g_scanner_stat_mode(). + 2001-07-29 Hans Breuer * gdk/makefile.msc : build in the backend dir after diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index e8f8700636..51952c6c74 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Sun Jul 29 17:14:01 2001 Tim Janik + + * gtk/gtkitemfactory.c (gtk_item_factory_parse_rc): use g_file_test() + instead of long deprecated g_scanner_stat_mode(). + 2001-07-29 Hans Breuer * gdk/makefile.msc : build in the backend dir after diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index e8f8700636..51952c6c74 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Sun Jul 29 17:14:01 2001 Tim Janik + + * gtk/gtkitemfactory.c (gtk_item_factory_parse_rc): use g_file_test() + instead of long deprecated g_scanner_stat_mode(). + 2001-07-29 Hans Breuer * gdk/makefile.msc : build in the backend dir after diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index e8f8700636..51952c6c74 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Sun Jul 29 17:14:01 2001 Tim Janik + + * gtk/gtkitemfactory.c (gtk_item_factory_parse_rc): use g_file_test() + instead of long deprecated g_scanner_stat_mode(). + 2001-07-29 Hans Breuer * gdk/makefile.msc : build in the backend dir after diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index e8f8700636..51952c6c74 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Sun Jul 29 17:14:01 2001 Tim Janik + + * gtk/gtkitemfactory.c (gtk_item_factory_parse_rc): use g_file_test() + instead of long deprecated g_scanner_stat_mode(). + 2001-07-29 Hans Breuer * gdk/makefile.msc : build in the backend dir after diff --git a/docs/reference/gtk/tmpl/gtk-unused.sgml b/docs/reference/gtk/tmpl/gtk-unused.sgml index 397609a2b0..8c126874d3 100644 --- a/docs/reference/gtk/tmpl/gtk-unused.sgml +++ b/docs/reference/gtk/tmpl/gtk-unused.sgml @@ -384,6 +384,12 @@ Use to get the value of a GtkArg whose GtkType is GTK_TYPE_C_FOREIGN @a: + + +The widget whose accelerators are to be shown by the #GtkAccelLabel. + + + diff --git a/docs/reference/gtk/tmpl/gtkaccelgroup.sgml b/docs/reference/gtk/tmpl/gtkaccelgroup.sgml index 2649b43277..40c4189c16 100644 --- a/docs/reference/gtk/tmpl/gtkaccelgroup.sgml +++ b/docs/reference/gtk/tmpl/gtkaccelgroup.sgml @@ -19,10 +19,6 @@ Keyboard Accelerators -@ref_count: -@lock_count: -@modifier_mask: -@attach_objects: diff --git a/docs/reference/gtk/tmpl/gtkaccellabel.sgml b/docs/reference/gtk/tmpl/gtkaccellabel.sgml index 07710fe4d9..9c61f558e6 100644 --- a/docs/reference/gtk/tmpl/gtkaccellabel.sgml +++ b/docs/reference/gtk/tmpl/gtkaccellabel.sgml @@ -94,7 +94,7 @@ Creates a new #GtkAccelLabel. @Returns: a new #GtkAccelLabel. - + Sets the widget whose accelerators are to be shown. @@ -125,8 +125,8 @@ accelerators are added or removed from the associated widget. @Returns: always returns FALSE. - + -The widget whose accelerators are to be shown by the #GtkAccelLabel. + diff --git a/docs/reference/gtk/tmpl/gtkmenu.sgml b/docs/reference/gtk/tmpl/gtkmenu.sgml index 8bcfbb4ad2..970ee42ab8 100644 --- a/docs/reference/gtk/tmpl/gtkmenu.sgml +++ b/docs/reference/gtk/tmpl/gtkmenu.sgml @@ -96,9 +96,9 @@ Creates a new #GtkMenu. Adds a new #GtkMenuItem to the end of the menu's item list. + @m: @c: - @menu: a #GtkMenu. @child: The #GtkMenuItem to add. @@ -108,9 +108,9 @@ Adds a new #GtkMenuItem to the end of the menu's item list. Adds a new #GtkMenuItem to the beginning of the menu's item list. + @m: @c: - @menu: a #GtkMenu. @child: The #GtkMenuItem to add. diff --git a/docs/reference/gtk/tmpl/gtkrc.sgml b/docs/reference/gtk/tmpl/gtkrc.sgml index 30ffca8235..cc0b23b6d2 100644 --- a/docs/reference/gtk/tmpl/gtkrc.sgml +++ b/docs/reference/gtk/tmpl/gtkrc.sgml @@ -495,6 +495,7 @@ This can later be composited together with other #GtkRcStyle structures to form a #GtkStyle. +@parent_instance: @name: @bg_pixmap_name: @font_desc: diff --git a/docs/reference/gtk/tmpl/gtkstyle.sgml b/docs/reference/gtk/tmpl/gtkstyle.sgml index 73abe4c49f..69acb5bddd 100644 --- a/docs/reference/gtk/tmpl/gtkstyle.sgml +++ b/docs/reference/gtk/tmpl/gtkstyle.sgml @@ -495,6 +495,8 @@ Styles @state_type: @x: @y: +@expander_style: + @is_open: @@ -866,6 +868,8 @@ Styles @detail: @x: @y: +@expander_style: + @is_open: diff --git a/gtk/gtkitemfactory.c b/gtk/gtkitemfactory.c index d9c8b58ef6..dcaa3a80f2 100644 --- a/gtk/gtkitemfactory.c +++ b/gtk/gtkitemfactory.c @@ -45,7 +45,6 @@ #include "gtk/gtkstock.h" #include "gtk/gtkiconfactory.h" #include -#include #include #ifdef HAVE_UNISTD_H #include @@ -1754,7 +1753,7 @@ gtk_item_factory_parse_rc (const gchar *file_name) g_return_if_fail (file_name != NULL); - if (!S_ISREG (g_scanner_stat_mode (file_name))) + if (!g_file_test (file_name, G_FILE_TEST_IS_REGULAR)) return; fd = open (file_name, O_RDONLY);