Fix a crash with icon themes

[~andy/gtk] / gtk / gtkaboutdialog.h

diff --git a/gtk/gtkaboutdialog.h b/gtk/gtkaboutdialog.h
index 6386e2057701586ebc4c4f39b242e84d4768e5a5..f9337e6095ea110f3660100acd632d6bade46e73 100644 (file)
--- a/gtk/gtkaboutdialog.h
+++ b/gtk/gtkaboutdialog.h
@@ -62,7 +62,7 @@ GType                  gtk_about_dialog_get_type               (void) G_GNUC_CON
 GtkWidget             *gtk_about_dialog_new                    (void);
 void                   gtk_show_about_dialog                   (GtkWindow       *parent,
                                                                const gchar     *first_property_name,
-                                                               ...);
+                                                               ...) G_GNUC_NULL_TERMINATED;
 
 G_CONST_RETURN gchar  *gtk_about_dialog_get_name               (GtkAboutDialog  *about);
 void                   gtk_about_dialog_set_name               (GtkAboutDialog  *about,
@@ -79,33 +79,46 @@ void                   gtk_about_dialog_set_comments           (GtkAboutDialog
 G_CONST_RETURN gchar  *gtk_about_dialog_get_license            (GtkAboutDialog  *about);
 void                   gtk_about_dialog_set_license            (GtkAboutDialog  *about,
                                                                const gchar     *license);
+
+gboolean               gtk_about_dialog_get_wrap_license       (GtkAboutDialog  *about);
+void                   gtk_about_dialog_set_wrap_license       (GtkAboutDialog  *about,
+                                                                gboolean         wrap_license);
+
 G_CONST_RETURN gchar  *gtk_about_dialog_get_website            (GtkAboutDialog  *about);
 void                   gtk_about_dialog_set_website            (GtkAboutDialog  *about,
                                                                const gchar     *website);
 G_CONST_RETURN gchar  *gtk_about_dialog_get_website_label      (GtkAboutDialog  *about);
 void                   gtk_about_dialog_set_website_label      (GtkAboutDialog  *about,
                                                                const gchar     *website_label);
-gchar                **gtk_about_dialog_get_authors            (GtkAboutDialog  *about);
+G_CONST_RETURN gchar* G_CONST_RETURN * gtk_about_dialog_get_authors            (GtkAboutDialog  *about);
 void                   gtk_about_dialog_set_authors            (GtkAboutDialog  *about,
-                                                               gchar          **authors);
-gchar                **gtk_about_dialog_get_documenters        (GtkAboutDialog  *about);
+                                                               const gchar    **authors);
+G_CONST_RETURN gchar* G_CONST_RETURN * gtk_about_dialog_get_documenters        (GtkAboutDialog  *about);
 void                   gtk_about_dialog_set_documenters        (GtkAboutDialog  *about,
-                                                               gchar          **documenters);
-gchar **               gtk_about_dialog_get_artists            (GtkAboutDialog  *about);
+                                                               const gchar    **documenters);
+G_CONST_RETURN gchar* G_CONST_RETURN * gtk_about_dialog_get_artists            (GtkAboutDialog  *about);
 void                   gtk_about_dialog_set_artists            (GtkAboutDialog  *about,
-                                                               gchar          **artists);
+                                                               const gchar    **artists);
 G_CONST_RETURN gchar  *gtk_about_dialog_get_translator_credits (GtkAboutDialog  *about);
 void                   gtk_about_dialog_set_translator_credits (GtkAboutDialog  *about,
                                                                const gchar     *translator_credits);
 GdkPixbuf             *gtk_about_dialog_get_logo               (GtkAboutDialog  *about);
 void                   gtk_about_dialog_set_logo               (GtkAboutDialog  *about,
                                                                GdkPixbuf       *logo);
+G_CONST_RETURN gchar  *gtk_about_dialog_get_logo_icon_name     (GtkAboutDialog  *about);
+void                   gtk_about_dialog_set_logo_icon_name     (GtkAboutDialog  *about,
+                                                               const gchar     *icon_name);
 
 typedef void (* GtkAboutDialogActivateLinkFunc) (GtkAboutDialog *about,
-                                                const gchar    *link);
-
-GtkAboutDialogActivateLinkFunc gtk_about_dialog_set_email_hook (GtkAboutDialogActivateLinkFunc func);
-GtkAboutDialogActivateLinkFunc gtk_about_dialog_set_url_hook   (GtkAboutDialogActivateLinkFunc func);
+                                                const gchar    *link,
+                                                gpointer        data);
+
+GtkAboutDialogActivateLinkFunc gtk_about_dialog_set_email_hook (GtkAboutDialogActivateLinkFunc func,
+                                                               gpointer                       data,
+                                                               GDestroyNotify                 destroy);
+GtkAboutDialogActivateLinkFunc gtk_about_dialog_set_url_hook   (GtkAboutDialogActivateLinkFunc func,
+                                                               gpointer                       data,
+                                                               GDestroyNotify                 destroy);
 
 G_END_DECLS