diff --git a/ChangeLog b/ChangeLog index 9556d15e88..0beb4b6123 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2003-07-19 Matthias Clasen + * gtk/gtkstock.h (GTK_STOCK_DIALOG_AUTHENTICATION): New stock id. + * gtk/gtkiconfactory.c (get_default_icons): Add stock_dialog_authentication_48. (#65765) + * gtk/stock-icons/Makefile.am (VARIABLES2, IMAGES): Here too. + * gtk/stock-icons/stock_dialog_authentication_48.png: New image. + * gtk/gtkbbox.h: * gtk/gtkbbox.c (gtk_button_box_get_child_secondary): New function. (#64562) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 9556d15e88..0beb4b6123 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,10 @@ 2003-07-19 Matthias Clasen + * gtk/gtkstock.h (GTK_STOCK_DIALOG_AUTHENTICATION): New stock id. + * gtk/gtkiconfactory.c (get_default_icons): Add stock_dialog_authentication_48. (#65765) + * gtk/stock-icons/Makefile.am (VARIABLES2, IMAGES): Here too. + * gtk/stock-icons/stock_dialog_authentication_48.png: New image. + * gtk/gtkbbox.h: * gtk/gtkbbox.c (gtk_button_box_get_child_secondary): New function. (#64562) diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 9556d15e88..0beb4b6123 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,5 +1,10 @@ 2003-07-19 Matthias Clasen + * gtk/gtkstock.h (GTK_STOCK_DIALOG_AUTHENTICATION): New stock id. + * gtk/gtkiconfactory.c (get_default_icons): Add stock_dialog_authentication_48. (#65765) + * gtk/stock-icons/Makefile.am (VARIABLES2, IMAGES): Here too. + * gtk/stock-icons/stock_dialog_authentication_48.png: New image. + * gtk/gtkbbox.h: * gtk/gtkbbox.c (gtk_button_box_get_child_secondary): New function. (#64562) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 9556d15e88..0beb4b6123 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,10 @@ 2003-07-19 Matthias Clasen + * gtk/gtkstock.h (GTK_STOCK_DIALOG_AUTHENTICATION): New stock id. + * gtk/gtkiconfactory.c (get_default_icons): Add stock_dialog_authentication_48. (#65765) + * gtk/stock-icons/Makefile.am (VARIABLES2, IMAGES): Here too. + * gtk/stock-icons/stock_dialog_authentication_48.png: New image. + * gtk/gtkbbox.h: * gtk/gtkbbox.c (gtk_button_box_get_child_secondary): New function. (#64562) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 9556d15e88..0beb4b6123 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,10 @@ 2003-07-19 Matthias Clasen + * gtk/gtkstock.h (GTK_STOCK_DIALOG_AUTHENTICATION): New stock id. + * gtk/gtkiconfactory.c (get_default_icons): Add stock_dialog_authentication_48. (#65765) + * gtk/stock-icons/Makefile.am (VARIABLES2, IMAGES): Here too. + * gtk/stock-icons/stock_dialog_authentication_48.png: New image. + * gtk/gtkbbox.h: * gtk/gtkbbox.c (gtk_button_box_get_child_secondary): New function. (#64562) diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index e2ea33b9bf..28dbda6991 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,5 +1,9 @@ 2003-07-19 Matthias Clasen + * gtk/gtk-sections.txt: Add GTK_STOCK_DIALOG_AUTHENTICATION. + + * gtk/tmpl/gtkstock.sgml: Add GTK_STOCK_DIALOG_AUTHENTICATION. + * gtk/gtk-sections.txt: Add gtk_button_box_get_child_secondary(). 2003-07-18 Matthias Clasen diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt index 818fb03169..3981c967f9 100644 --- a/docs/reference/gtk/gtk-sections.txt +++ b/docs/reference/gtk/gtk-sections.txt @@ -4607,6 +4607,7 @@ GTK_STOCK_CONVERT GTK_STOCK_COPY GTK_STOCK_CUT GTK_STOCK_DELETE +GTK_STOCK_DIALOG_AUTHENTICATION GTK_STOCK_DIALOG_ERROR GTK_STOCK_DIALOG_INFO GTK_STOCK_DIALOG_QUESTION diff --git a/docs/reference/gtk/tmpl/gtkstock.sgml b/docs/reference/gtk/tmpl/gtkstock.sgml index d7c9d1e4d4..ff946bbb9b 100644 --- a/docs/reference/gtk/tmpl/gtkstock.sgml +++ b/docs/reference/gtk/tmpl/gtkstock.sgml @@ -193,6 +193,15 @@ The "Delete" item. + + +The "Authentication" item. + + + +@Since: 2.4 + + The "Error" item. diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c index 25d77bf633..61a3303846 100644 --- a/gtk/gtkiconfactory.c +++ b/gtk/gtkiconfactory.c @@ -451,6 +451,7 @@ get_default_icons (GtkIconFactory *factory) /* KEEP IN SYNC with gtkstock.c */ /* Have dialog size */ + add_icon (factory, GTK_STOCK_DIALOG_AUTHENTICATION, 48, stock_dialog_authentication_48); add_icon (factory, GTK_STOCK_DIALOG_ERROR, 48, stock_dialog_error_48); add_icon (factory, GTK_STOCK_DIALOG_INFO, 48, stock_dialog_info_48); add_icon (factory, GTK_STOCK_DIALOG_QUESTION, 48, stock_dialog_question_48); diff --git a/gtk/gtkstock.h b/gtk/gtkstock.h index 97ac69f3fd..3af41b0574 100644 --- a/gtk/gtkstock.h +++ b/gtk/gtkstock.h @@ -62,6 +62,8 @@ void gtk_stock_item_free (GtkStockItem *item); /* Stock IDs (not all are stock items; some are images only) */ +#define GTK_STOCK_DIALOG_AUTHENTICATION \ + "gtk-dialog-authentication" #define GTK_STOCK_DIALOG_INFO "gtk-dialog-info" #define GTK_STOCK_DIALOG_WARNING "gtk-dialog-warning" #define GTK_STOCK_DIALOG_ERROR "gtk-dialog-error" diff --git a/gtk/stock-icons/Makefile.am b/gtk/stock-icons/Makefile.am index 7a8f3285f5..94e0b8e6eb 100644 --- a/gtk/stock-icons/Makefile.am +++ b/gtk/stock-icons/Makefile.am @@ -29,6 +29,7 @@ IMAGES = \ stock_copy_24.png \ stock_cut_16.png \ stock_cut_24.png \ + stock_dialog_authentication_48.png \ stock_dialog_error_48.png \ stock_dialog_info_48.png \ stock_dialog_question_48.png \ @@ -161,6 +162,7 @@ VARIABLES2 = \ stock_copy_24 $(srcdir)/stock_copy_24.png \ stock_cut_16 $(srcdir)/stock_cut_16.png \ stock_cut_24 $(srcdir)/stock_cut_24.png \ + stock_dialog_authentication_48 $(srcdir)/stock_dialog_authentication_48.png \ stock_dialog_error_48 $(srcdir)/stock_dialog_error_48.png \ stock_dialog_info_48 $(srcdir)/stock_dialog_info_48.png \ stock_dialog_question_48 $(srcdir)/stock_dialog_question_48.png \ diff --git a/gtk/stock-icons/stock_dialog_authentication_48.png b/gtk/stock-icons/stock_dialog_authentication_48.png new file mode 100644 index 0000000000..1e86b6caa8 Binary files /dev/null and b/gtk/stock-icons/stock_dialog_authentication_48.png differ