]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtkaboutdialog.c
stylecontext: Do invalidation on first resize container
[~andy/gtk] / gtk / gtkaboutdialog.c
index b073c982287ab2151a651ce19f82a68d5a54d1d0..f50fed0af12473491817512203f8b8d36d113402 100644 (file)
@@ -4,8 +4,8 @@
  * Copyright (C) 2003, 2004 Matthias Clasen <mclasen@redhat.com>
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public 
- * License as published by the Free Software Foundation; either 
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the 
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
  * Modified by the GTK+ Team and others 1997-2004.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
 #include "config.h"
 
 #include <string.h>
 
-#include <gdk/gdkkeysyms.h>
-
 #include "gtkaboutdialog.h"
 #include "gtkbutton.h"
 #include "gtkbbox.h"
 #include "gtkdialog.h"
-#include "gtkhbox.h"
+#include "gtkgrid.h"
+#include "gtkbox.h"
 #include "gtkimage.h"
 #include "gtklabel.h"
 #include "gtklinkbutton.h"
 #include "gtkmarshalers.h"
 #include "gtknotebook.h"
+#include "gtkorientable.h"
 #include "gtkscrolledwindow.h"
 #include "gtkstock.h"
 #include "gtktextview.h"
-#include "gtkvbox.h"
 #include "gtkiconfactory.h"
 #include "gtkshow.h"
 #include "gtkmain.h"
 #include "gtkmessagedialog.h"
+#include "gtktogglebutton.h"
+#include "gtktypebuiltins.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
 
-#include "gtkalias.h"
+
+/**
+ * SECTION:gtkaboutdialog
+ * @Short_description: Display information about an application
+ * @Title: GtkAboutDialog
+ * @See_also: #GTK_STOCK_ABOUT
+ *
+ * The GtkAboutDialog offers a simple way to display information about
+ * a program like its logo, name, copyright, website and license. It is
+ * also possible to give credits to the authors, documenters, translators
+ * and artists who have worked on the program. An about dialog is typically
+ * opened when the user selects the <literal>About</literal> option from
+ * the <literal>Help</literal> menu. All parts of the dialog are optional.
+ *
+ * About dialog often contain links and email addresses. GtkAboutDialog
+ * displays these as clickable links. By default, it calls gtk_show_uri()
+ * when a user clicks one. The behaviour can be overridden with the
+ * #GtkAboutDialog::activate-link signal.
+ *
+ * To make constructing a GtkAboutDialog as convenient as possible, you can
+ * use the function gtk_show_about_dialog() which constructs and shows a dialog
+ * and keeps it around so that it can be shown again.
+ *
+ * Note that GTK+ sets a default title of <literal>_("About &percnt;s")</literal>
+ * on the dialog window (where &percnt;s is replaced by the name of the
+ * application, but in order to ensure proper translation of the title,
+ * applications should set the title property explicitly when constructing
+ * a GtkAboutDialog, as shown in the following example:
+ * <informalexample><programlisting>
+ * gtk_show_about_dialog (NULL,
+ *                        "program-name", "ExampleCode",
+ *                        "logo", example_logo,
+ *                        "title" _("About ExampleCode"),
+ *                        NULL);
+ * </programlisting></informalexample>
+ *
+ * It is also possible to show a #GtkAboutDialog like any other #GtkDialog,
+ * e.g. using gtk_dialog_run(). In this case, you might need to know that
+ * the 'Close' button returns the #GTK_RESPONSE_CANCEL response id.
+ */
 
 static GdkColor default_link_color = { 0, 0, 0, 0xeeee };
 static GdkColor default_visited_link_color = { 0, 0x5555, 0x1a1a, 0x8b8b };
 
-typedef struct _GtkAboutDialogPrivate GtkAboutDialogPrivate;
+/* Translators: this is the license preamble; the string at the end
+ * contains the URL of the license.
+ */
+static const gchar *gtk_license_preamble = N_("This program comes with ABSOLUTELY NO WARRANTY;\nfor details, visit <a href=\"%s\">%s</a>");
+
+/* URLs for each GtkLicense type; keep in the same order as the enumeration */
+static const gchar *gtk_license_urls[] = {
+  NULL,
+  NULL,
+
+  "http://www.gnu.org/licenses/old-licenses/gpl-2.0.html",
+  "http://www.gnu.org/licenses/gpl.html",
+
+  "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html",
+  "http://www.gnu.org/licenses/lgpl.html",
+
+  "http://opensource.org/licenses/bsd-license.php",
+  "http://opensource.org/licenses/mit-license.php",
+
+  "http://opensource.org/licenses/artistic-license-2.0.php"
+};
+
+typedef struct
+{
+  gchar *heading;
+  gchar **people;
+} CreditSection;
+
 struct _GtkAboutDialogPrivate 
 {
   gchar *name;
@@ -71,36 +136,46 @@ struct _GtkAboutDialogPrivate
   gchar *website_text;
   gchar *translator_credits;
   gchar *license;
-  
+
   gchar **authors;
   gchar **documenters;
   gchar **artists;
-  
+
+
+  GSList *credit_sections;
+
+  gint credits_page;
+  gint license_page;
+
+  GtkWidget *notebook;
   GtkWidget *logo_image;
   GtkWidget *name_label;
+  GtkWidget *version_label;
   GtkWidget *comments_label;
   GtkWidget *copyright_label;
-  GtkWidget *website_button;
+  GtkWidget *license_label;
   GtkWidget *website_label;
 
   GtkWidget *credits_button;
-  GtkWidget *credits_dialog;
   GtkWidget *license_button;
-  GtkWidget *license_dialog;
-  
+
   GdkCursor *hand_cursor;
   GdkCursor *regular_cursor;
-  
+
   GSList *visited_links;
 
+  GtkLicense license_type;
+
   guint hovering_over_link : 1;
   guint wrap_license : 1;
 };
 
+
+
 #define GTK_ABOUT_DIALOG_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_ABOUT_DIALOG, GtkAboutDialogPrivate))
 
 
-enum 
+enum
 {
   PROP_0,
   PROP_NAME,
@@ -116,108 +191,57 @@ enum
   PROP_ARTISTS,
   PROP_LOGO,
   PROP_LOGO_ICON_NAME,
-  PROP_WRAP_LICENSE
+  PROP_WRAP_LICENSE,
+  PROP_LICENSE_TYPE
 };
 
 static void                 gtk_about_dialog_finalize       (GObject            *object);
 static void                 gtk_about_dialog_get_property   (GObject            *object,
-                                                            guint               prop_id,
-                                                            GValue             *value,
-                                                            GParamSpec         *pspec);
+                                                             guint               prop_id,
+                                                             GValue             *value,
+                                                             GParamSpec         *pspec);
 static void                 gtk_about_dialog_set_property   (GObject            *object,
-                                                            guint               prop_id,
-                                                            const GValue       *value,
-                                                            GParamSpec         *pspec);
+                                                             guint               prop_id,
+                                                             const GValue       *value,
+                                                             GParamSpec         *pspec);
 static void                 gtk_about_dialog_show           (GtkWidget          *widge);
 static void                 update_name_version             (GtkAboutDialog     *about);
 static GtkIconSet *         icon_set_new_from_pixbufs       (GList              *pixbufs);
-static void                 activate_url                    (GtkWidget          *widget,
-                                                            gpointer            data);
 static void                 follow_if_link                  (GtkAboutDialog     *about,
-                                                            GtkTextView        *text_view,
-                                                            GtkTextIter        *iter);
+                                                             GtkTextView        *text_view,
+                                                             GtkTextIter        *iter);
 static void                 set_cursor_if_appropriate       (GtkAboutDialog     *about,
-                                                            GtkTextView        *text_view,
-                                                            gint                x,
-                                                            gint                y);
-static void                 display_credits_dialog          (GtkWidget          *button,
-                                                            gpointer            data);
-static void                 display_license_dialog          (GtkWidget          *button,
-                                                            gpointer            data);
+                                                             GtkTextView        *text_view,
+                                                             GdkDevice          *device,
+                                                             gint                x,
+                                                             gint                y);
+static void                 display_credits_page            (GtkWidget          *button,
+                                                             gpointer            data);
+static void                 display_license_page            (GtkWidget          *button,
+                                                             gpointer            data);
 static void                 close_cb                        (GtkAboutDialog     *about);
-static void                 default_url_hook                (GtkAboutDialog     *about,
-                                                             const gchar        *uri,
-                                                             gpointer            user_data);
-static void                 default_email_hook              (GtkAboutDialog     *about,
-                                                             const gchar        *email_address,
-                                                             gpointer            user_data);
-
-static gboolean activate_email_hook_set = FALSE;
-static GtkAboutDialogActivateLinkFunc activate_email_hook = NULL;
-static gpointer activate_email_hook_data = NULL;
-static GDestroyNotify activate_email_hook_destroy = NULL;
-
-static gboolean activate_url_hook_set = FALSE;
-static GtkAboutDialogActivateLinkFunc activate_url_hook = NULL;
-static gpointer activate_url_hook_data = NULL;
-static GDestroyNotify activate_url_hook_destroy = NULL;
-
-static void
-default_url_hook (GtkAboutDialog *about,
-                  const gchar *uri,
-                  gpointer user_data G_GNUC_UNUSED)
-{
-  GdkScreen *screen;
-  GError *error = NULL;
-
-  screen = gtk_widget_get_screen (GTK_WIDGET (about));
-
-  if (!gtk_show_uri (screen, uri, gtk_get_current_event_time (), &error)) {
-    GtkWidget *dialog;
-
-    dialog = gtk_message_dialog_new (GTK_WINDOW (about),
-                                     GTK_DIALOG_DESTROY_WITH_PARENT |
-                                     GTK_DIALOG_MODAL,
-                                     GTK_MESSAGE_ERROR,
-                                     GTK_BUTTONS_CLOSE,
-                                     "%s", _("Could not show link"));
-    gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-                                              "%s", error->message);
-    g_error_free (error);
-
-    g_signal_connect (dialog, "response",
-                      G_CALLBACK (gtk_widget_destroy), NULL);
-
-    gtk_window_present (GTK_WINDOW (dialog));
-  }
-}
-
-static void
-default_email_hook (GtkAboutDialog *about,
-                    const gchar *email_address,
-                    gpointer user_data)
-{
-  char *escaped, *uri;
+static gboolean             gtk_about_dialog_activate_link  (GtkAboutDialog     *about,
+                                                             const gchar        *uri);
 
-  escaped = g_uri_escape_string (email_address, NULL, FALSE);
-  uri = g_strdup_printf ("mailto:%s", escaped);
-  g_free (escaped);
+enum {
+  ACTIVATE_LINK,
+  LAST_SIGNAL
+};
 
-  default_url_hook (about, uri, user_data);
-  g_free (uri);
-}
+static guint signals[LAST_SIGNAL] = { 0 };
 
 G_DEFINE_TYPE (GtkAboutDialog, gtk_about_dialog, GTK_TYPE_DIALOG)
 
+
 static void
 gtk_about_dialog_class_init (GtkAboutDialogClass *klass)
 {
   GObjectClass *object_class;
   GtkWidgetClass *widget_class;
-       
+
   object_class = (GObjectClass *)klass;
   widget_class = (GtkWidgetClass *)klass;
-       
+
   object_class->set_property = gtk_about_dialog_set_property;
   object_class->get_property = gtk_about_dialog_get_property;
 
@@ -225,121 +249,176 @@ gtk_about_dialog_class_init (GtkAboutDialogClass *klass)
 
   widget_class->show = gtk_about_dialog_show;
 
+  klass->activate_link = gtk_about_dialog_activate_link;
+
+  /**
+   * GtkAboutDialog::activate-link:
+   * @label: The object on which the signal was emitted
+   * @uri: the URI that is activated
+   *
+   * The signal which gets emitted to activate a URI.
+   * Applications may connect to it to override the default behaviour,
+   * which is to call gtk_show_uri().
+   *
+   * Returns: %TRUE if the link has been activated
+   *
+   * Since: 2.24
+   */
+  signals[ACTIVATE_LINK] =
+    g_signal_new ("activate-link",
+                  G_TYPE_FROM_CLASS (object_class),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GtkAboutDialogClass, activate_link),
+                  _gtk_boolean_handled_accumulator, NULL,
+                  _gtk_marshal_BOOLEAN__STRING,
+                  G_TYPE_BOOLEAN, 1, G_TYPE_STRING);
+
   /**
    * GtkAboutDialog:program-name:
    *
-   * The name of the program. 
+   * The name of the program.
    * If this is not set, it defaults to g_get_application_name().
    *
    * Since: 2.12
-   */  
+   */
   g_object_class_install_property (object_class,
-                                  PROP_NAME,
-                                  g_param_spec_string ("program-name",
-                                                       P_("Program name"),
-                                                       P_("The name of the program. If this is not set, it defaults to g_get_application_name()"),
-                                                       NULL,
-                                                       GTK_PARAM_READWRITE));
+                                   PROP_NAME,
+                                   g_param_spec_string ("program-name",
+                                                        P_("Program name"),
+                                                        P_("The name of the program. If this is not set, it defaults to g_get_application_name()"),
+                                                        NULL,
+                                                        GTK_PARAM_READWRITE));
 
   /**
    * GtkAboutDialog:version:
    *
-   * The version of the program. 
+   * The version of the program.
    *
    * Since: 2.6
-   */  
+   */
   g_object_class_install_property (object_class,
-                                  PROP_VERSION,
-                                  g_param_spec_string ("version",
-                                                       P_("Program version"),
-                                                       P_("The version of the program"),
-                                                       NULL,
-                                                       GTK_PARAM_READWRITE));
+                                   PROP_VERSION,
+                                   g_param_spec_string ("version",
+                                                        P_("Program version"),
+                                                        P_("The version of the program"),
+                                                        NULL,
+                                                        GTK_PARAM_READWRITE));
 
   /**
    * GtkAboutDialog:copyright:
    *
-   * Copyright information for the program. 
+   * Copyright information for the program.
    *
    * Since: 2.6
-   */  
+   */
   g_object_class_install_property (object_class,
-                                  PROP_COPYRIGHT,
-                                  g_param_spec_string ("copyright",
-                                                       P_("Copyright string"),
-                                                       P_("Copyright information for the program"),
-                                                       NULL,
-                                                       GTK_PARAM_READWRITE));
-       
+                                   PROP_COPYRIGHT,
+                                   g_param_spec_string ("copyright",
+                                                        P_("Copyright string"),
+                                                        P_("Copyright information for the program"),
+                                                        NULL,
+                                                        GTK_PARAM_READWRITE));
+        
 
   /**
    * GtkAboutDialog:comments:
    *
-   * Comments about the program. This string is displayed in a label 
+   * Comments about the program. This string is displayed in a label
    * in the main dialog, thus it should be a short explanation of
    * the main purpose of the program, not a detailed list of features.
    *
    * Since: 2.6
-   */  
+   */
   g_object_class_install_property (object_class,
-                                  PROP_COMMENTS,
-                                  g_param_spec_string ("comments",
-                                                       P_("Comments string"),
-                                                       P_("Comments about the program"),
-                                                       NULL,
-                                                       GTK_PARAM_READWRITE));
+                                   PROP_COMMENTS,
+                                   g_param_spec_string ("comments",
+                                                        P_("Comments string"),
+                                                        P_("Comments about the program"),
+                                                        NULL,
+                                                        GTK_PARAM_READWRITE));
 
   /**
    * GtkAboutDialog:license:
    *
-   * The license of the program. This string is displayed in a 
+   * The license of the program. This string is displayed in a
    * text view in a secondary dialog, therefore it is fine to use
    * a long multi-paragraph text. Note that the text is only wrapped
    * in the text view if the "wrap-license" property is set to %TRUE;
    * otherwise the text itself must contain the intended linebreaks.
+   * When setting this property to a non-%NULL value, the
+   * #GtkAboutDialog:license-type property is set to %GTK_LICENSE_CUSTOM
+   * as a side effect.
    *
    * Since: 2.6
-   */  
+   */
+  g_object_class_install_property (object_class,
+                                   PROP_LICENSE,
+                                   g_param_spec_string ("license",
+                                                        _("License"),
+                                                        _("The license of the program"),
+                                                        NULL,
+                                                        GTK_PARAM_READWRITE));
+
+  /**
+   * GtkAboutDialog:license-type:
+   *
+   * The license of the program, as a value of the %GtkLicense enumeration.
+   *
+   * The #GtkAboutDialog will automatically fill out a standard disclaimer
+   * and link the user to the appropriate online resource for the license
+   * text.
+   *
+   * If %GTK_LICENSE_UNKNOWN is used, the link used will be the same
+   * specified in the #GtkAboutDialog:website property.
+   *
+   * If %GTK_LICENSE_CUSTOM is used, the current contents of the
+   * #GtkAboutDialog:license property are used.
+   *
+   * For any other #GtkLicense value, the contents of the
+   * #GtkAboutDialog:license property are also set by this property as
+   * a side effect.
+   *
+   * Since: 3.0
+   */
   g_object_class_install_property (object_class,
-                                  PROP_LICENSE,
-                                  g_param_spec_string ("license",
-                                                       _("License"),
-                                                       _("The license of the program"),
-                                                       NULL,
-                                                       GTK_PARAM_READWRITE));
+                                   PROP_LICENSE_TYPE,
+                                   g_param_spec_enum ("license-type",
+                                                      P_("License Type"),
+                                                      P_("The license type of the program"),
+                                                      GTK_TYPE_LICENSE,
+                                                      GTK_LICENSE_UNKNOWN,
+                                                      GTK_PARAM_READWRITE));
 
   /**
    * GtkAboutDialog:website:
    *
-   * The URL for the link to the website of the program. 
+   * The URL for the link to the website of the program.
    * This should be a string starting with "http://.
    *
    * Since: 2.6
-   */  
+   */
   g_object_class_install_property (object_class,
-                                  PROP_WEBSITE,
-                                  g_param_spec_string ("website",
-                                                       P_("Website URL"),
-                                                       P_("The URL for the link to the website of the program"),
-                                                       NULL,
-                                                       GTK_PARAM_READWRITE));
+                                   PROP_WEBSITE,
+                                   g_param_spec_string ("website",
+                                                        P_("Website URL"),
+                                                        P_("The URL for the link to the website of the program"),
+                                                        NULL,
+                                                        GTK_PARAM_READWRITE));
 
   /**
    * GtkAboutDialog:website-label:
    *
-   * The label for the link to the website of the program. If this is not set, 
-   * it defaults to the URL specified in the 
-   * <link linkend="GtkAboutDialog--website">website</link> property.
+   * The label for the link to the website of the program.
    *
    * Since: 2.6
-   */  
+   */
   g_object_class_install_property (object_class,
-                                  PROP_WEBSITE_LABEL,
-                                  g_param_spec_string ("website-label",
-                                                       P_("Website label"),
-                                                       P_("The label for the link to the website of the program. If this is not set, it defaults to the URL"),
-                                                       NULL,
-                                                       GTK_PARAM_READWRITE));
+                                   PROP_WEBSITE_LABEL,
+                                   g_param_spec_string ("website-label",
+                                                        P_("Website label"),
+                                                        P_("The label for the link to the website of the program"),
+                                                        NULL,
+                                                        GTK_PARAM_READWRITE));
 
   /**
    * GtkAboutDialog:authors:
@@ -349,14 +428,14 @@ gtk_about_dialog_class_init (GtkAboutDialogClass *klass)
    * as links, see the introduction for more details.
    *
    * Since: 2.6
-   */  
+   */
   g_object_class_install_property (object_class,
-                                  PROP_AUTHORS,
-                                  g_param_spec_boxed ("authors",
-                                                      P_("Authors"),
-                                                      P_("List of authors of the program"),
-                                                      G_TYPE_STRV,
-                                                      GTK_PARAM_READWRITE));
+                                   PROP_AUTHORS,
+                                   g_param_spec_boxed ("authors",
+                                                       P_("Authors"),
+                                                       P_("List of authors of the program"),
+                                                       G_TYPE_STRV,
+                                                       GTK_PARAM_READWRITE));
 
   /**
    * GtkAboutDialog:documenters:
@@ -366,31 +445,31 @@ gtk_about_dialog_class_init (GtkAboutDialogClass *klass)
    * as links, see the introduction for more details.
    *
    * Since: 2.6
-   */  
+   */
   g_object_class_install_property (object_class,
-                                  PROP_DOCUMENTERS,
-                                  g_param_spec_boxed ("documenters",
-                                                      P_("Documenters"),
-                                                      P_("List of people documenting the program"),
-                                                      G_TYPE_STRV,
-                                                      GTK_PARAM_READWRITE));
+                                   PROP_DOCUMENTERS,
+                                   g_param_spec_boxed ("documenters",
+                                                       P_("Documenters"),
+                                                       P_("List of people documenting the program"),
+                                                       G_TYPE_STRV,
+                                                       GTK_PARAM_READWRITE));
 
   /**
    * GtkAboutDialog:artists:
    *
-   * The people who contributed artwork to the program, as a %NULL-terminated array of strings.
-   * Each string may contain email addresses and URLs, which will be displayed
-   * as links, see the introduction for more details.
+   * The people who contributed artwork to the program, as a %NULL-terminated
+   * array of strings. Each string may contain email addresses and URLs, which
+   * will be displayed as links, see the introduction for more details.
    *
    * Since: 2.6
-   */  
+   */
   g_object_class_install_property (object_class,
-                                  PROP_ARTISTS,
-                                  g_param_spec_boxed ("artists",
-                                                      P_("Artists"),
-                                                      P_("List of people who have contributed artwork to the program"),
-                                                      G_TYPE_STRV,
-                                                      GTK_PARAM_READWRITE));
+                                   PROP_ARTISTS,
+                                   g_param_spec_boxed ("artists",
+                                                       P_("Artists"),
+                                                       P_("List of people who have contributed artwork to the program"),
+                                                       G_TYPE_STRV,
+                                                       GTK_PARAM_READWRITE));
 
 
   /**
@@ -401,75 +480,176 @@ gtk_about_dialog_class_init (GtkAboutDialogClass *klass)
    * as links, see the introduction for more details.
    *
    * Since: 2.6
-   */  
+   */
   g_object_class_install_property (object_class,
-                                  PROP_TRANSLATOR_CREDITS,
-                                  g_param_spec_string ("translator-credits",
-                                                       P_("Translator credits"),
-                                                       P_("Credits to the translators. This string should be marked as translatable"),
-                                                       NULL,
-                                                       GTK_PARAM_READWRITE));
-       
+                                   PROP_TRANSLATOR_CREDITS,
+                                   g_param_spec_string ("translator-credits",
+                                                        P_("Translator credits"),
+                                                        P_("Credits to the translators. This string should be marked as translatable"),
+                                                        NULL,
+                                                        GTK_PARAM_READWRITE));
+        
   /**
    * GtkAboutDialog:logo:
    *
-   * A logo for the about box. If this is not set, it defaults to 
+   * A logo for the about box. If this is not set, it defaults to
    * gtk_window_get_default_icon_list().
    *
    * Since: 2.6
-   */  
+   */
   g_object_class_install_property (object_class,
-                                  PROP_LOGO,
-                                  g_param_spec_object ("logo",
-                                                       P_("Logo"),
-                                                       P_("A logo for the about box. If this is not set, it defaults to gtk_window_get_default_icon_list()"),
-                                                       GDK_TYPE_PIXBUF,
-                                                       GTK_PARAM_READWRITE));
+                                   PROP_LOGO,
+                                   g_param_spec_object ("logo",
+                                                        P_("Logo"),
+                                                        P_("A logo for the about box. If this is not set, it defaults to gtk_window_get_default_icon_list()"),
+                                                        GDK_TYPE_PIXBUF,
+                                                        GTK_PARAM_READWRITE));
 
   /**
    * GtkAboutDialog:logo-icon-name:
    *
    * A named icon to use as the logo for the about box. This property
-   * overrides the <link linkend="GtkAboutDialog--logo">logo</link> property.
+   * overrides the #GtkAboutDialog:logo property.
    *
    * Since: 2.6
-   */  
+   */
   g_object_class_install_property (object_class,
-                                  PROP_LOGO_ICON_NAME,
-                                  g_param_spec_string ("logo-icon-name",
-                                                       P_("Logo Icon Name"),
-                                                       P_("A named icon to use as the logo for the about box."),
-                                                       NULL,
-                                                       GTK_PARAM_READWRITE));
+                                   PROP_LOGO_ICON_NAME,
+                                   g_param_spec_string ("logo-icon-name",
+                                                        P_("Logo Icon Name"),
+                                                        P_("A named icon to use as the logo for the about box."),
+                                                        NULL,
+                                                        GTK_PARAM_READWRITE));
   /**
    * GtkAboutDialog:wrap-license:
    *
    * Whether to wrap the text in the license dialog.
    *
    * Since: 2.8
-   */  
+   */
   g_object_class_install_property (object_class,
-                                  PROP_WRAP_LICENSE,
-                                  g_param_spec_boolean ("wrap-license",
-                                                        P_("Wrap license"),
-                                                        P_("Whether to wrap the license text."),
-                                                        FALSE,
-                                                        GTK_PARAM_READWRITE));
+                                   PROP_WRAP_LICENSE,
+                                   g_param_spec_boolean ("wrap-license",
+                                                         P_("Wrap license"),
+                                                         P_("Whether to wrap the license text."),
+                                                         FALSE,
+                                                         GTK_PARAM_READWRITE));
 
 
   g_type_class_add_private (object_class, sizeof (GtkAboutDialogPrivate));
 }
 
+static gboolean
+emit_activate_link (GtkAboutDialog *about,
+                    const gchar    *uri)
+{
+  gboolean handled = FALSE;
+
+  g_signal_emit (about, signals[ACTIVATE_LINK], 0, uri, &handled);
+
+  return TRUE;
+}
+
+static void
+update_license_button_visibility (GtkAboutDialog *about)
+{
+  GtkAboutDialogPrivate *priv = about->priv;
+
+  if (priv->license_type == GTK_LICENSE_CUSTOM && priv->license != NULL)
+    gtk_widget_show (priv->license_button);
+  else
+    gtk_widget_hide (priv->license_button);
+}
+
+static void
+update_credits_button_visibility (GtkAboutDialog *about)
+{
+  GtkAboutDialogPrivate *priv = about->priv;
+  gboolean show;
+
+  show = (priv->authors != NULL ||
+          priv->documenters != NULL ||
+          priv->artists != NULL ||
+          priv->credit_sections != NULL ||
+         (priv->translator_credits != NULL &&
+          strcmp (priv->translator_credits, "translator_credits") &&
+          strcmp (priv->translator_credits, "translator-credits")));
+  if (show)
+    gtk_widget_show (priv->credits_button);
+  else
+    gtk_widget_hide (priv->credits_button);
+}
+
+static void
+switch_page (GtkAboutDialog *about,
+             gint            page)
+{
+  GtkAboutDialogPrivate *priv = about->priv;
+
+  gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook), page);
+}
+
+static void
+display_main_page (GtkButton *button,
+                   gpointer   data)
+{
+  GtkAboutDialog *about = (GtkAboutDialog *)data;
+
+  switch_page (about, 0);
+}
+
+static void
+credits_button_clicked (GtkButton *button,
+                        gpointer   data)
+{
+  GtkAboutDialog *about = (GtkAboutDialog *)data;
+  GtkAboutDialogPrivate *priv = about->priv;
+  gboolean active;
+
+  active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button));
+
+  if (active)
+    {
+      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->license_button), FALSE);
+      display_credits_page (NULL, data);
+    }
+  else
+    {
+      display_main_page (NULL, data);
+    }
+}
+
+static void
+license_button_clicked (GtkButton *button,
+                        gpointer   data)
+{
+  GtkAboutDialog *about = (GtkAboutDialog *)data;
+  GtkAboutDialogPrivate *priv = about->priv;
+  gboolean active;
+
+  active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button));
+
+  if (active)
+    {
+      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->credits_button), FALSE);
+      display_license_page (NULL, data);
+    }
+  else
+    {
+      display_main_page (NULL, data);
+    }
+}
 static void
 gtk_about_dialog_init (GtkAboutDialog *about)
 {
   GtkDialog *dialog = GTK_DIALOG (about);
   GtkAboutDialogPrivate *priv;
-  GtkWidget *vbox, *hbox, *button, *close_button, *image;
+  GtkWidget *vbox, *page_vbox, *hbox, *button, *close_button, *image;
+  GtkWidget *content_area, *action_area;
 
   /* Data */
   priv = GTK_ABOUT_DIALOG_GET_PRIVATE (about);
-  about->private_data = priv;
+  about->priv = priv;
 
   priv->name = NULL;
   priv->version = NULL;
@@ -488,17 +668,21 @@ gtk_about_dialog_init (GtkAboutDialog *about)
   priv->hovering_over_link = FALSE;
   priv->wrap_license = FALSE;
 
-  gtk_dialog_set_has_separator (dialog, FALSE);
+  priv->license_type = GTK_LICENSE_UNKNOWN;
+
+  content_area = gtk_dialog_get_content_area (dialog);
+  action_area = gtk_dialog_get_action_area (dialog);
+
   gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
-  gtk_box_set_spacing (GTK_BOX (dialog->vbox), 2); /* 2 * 5 + 2 = 12 */
-  gtk_container_set_border_width (GTK_CONTAINER (dialog->action_area), 5);
+  gtk_box_set_spacing (GTK_BOX (content_area), 2); /* 2 * 5 + 2 = 12 */
+  gtk_container_set_border_width (GTK_CONTAINER (action_area), 5);
 
   /* Widgets */
   gtk_widget_push_composite_child ();
 
-  vbox = gtk_vbox_new (FALSE, 8);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
-  gtk_box_pack_start (GTK_BOX (dialog->vbox), vbox, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
 
   priv->logo_image = gtk_image_new ();
   gtk_box_pack_start (GTK_BOX (vbox), priv->logo_image, FALSE, FALSE, 0);
@@ -508,64 +692,86 @@ gtk_about_dialog_init (GtkAboutDialog *about)
   gtk_label_set_justify (GTK_LABEL (priv->name_label), GTK_JUSTIFY_CENTER);
   gtk_box_pack_start (GTK_BOX (vbox), priv->name_label, FALSE, FALSE, 0);
 
+  priv->notebook = gtk_notebook_new ();
+  gtk_box_pack_start (GTK_BOX (vbox), priv->notebook, TRUE, TRUE, 0);
+  gtk_widget_set_size_request (priv->notebook, 400, 100);
+
+  page_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
+  gtk_widget_show (page_vbox);
+  gtk_notebook_set_show_tabs (GTK_NOTEBOOK (priv->notebook), FALSE);
+  gtk_notebook_set_show_border (GTK_NOTEBOOK (priv->notebook), FALSE);
+  gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook), page_vbox, NULL);
+
+  priv->version_label = gtk_label_new (NULL);
+  gtk_label_set_selectable (GTK_LABEL (priv->version_label), TRUE);
+  gtk_label_set_justify (GTK_LABEL (priv->version_label), GTK_JUSTIFY_CENTER);
+  gtk_box_pack_start (GTK_BOX (page_vbox), priv->version_label, FALSE, FALSE, 0);
+
   priv->comments_label = gtk_label_new (NULL);
   gtk_label_set_selectable (GTK_LABEL (priv->comments_label), TRUE);
   gtk_label_set_justify (GTK_LABEL (priv->comments_label), GTK_JUSTIFY_CENTER);
   gtk_label_set_line_wrap (GTK_LABEL (priv->comments_label), TRUE);
-  gtk_box_pack_start (GTK_BOX (vbox), priv->comments_label, FALSE, FALSE, 0);
-
-  priv->copyright_label = gtk_label_new (NULL);
-  gtk_label_set_selectable (GTK_LABEL (priv->copyright_label), TRUE);  
-  gtk_label_set_justify (GTK_LABEL (priv->copyright_label), GTK_JUSTIFY_CENTER);
-  gtk_box_pack_start (GTK_BOX (vbox), priv->copyright_label, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (page_vbox), priv->comments_label, FALSE, FALSE, 0);
 
-  hbox = gtk_hbox_new (TRUE, 0);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, FALSE, 0); 
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+  gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE);
+  gtk_box_pack_start (GTK_BOX (page_vbox), hbox, FALSE, FALSE, 0);
 
-  priv->website_button = button = gtk_link_button_new (""); 
-  gtk_widget_set_no_show_all (button, TRUE);
-  gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
-  
   priv->website_label = button = gtk_label_new ("");
   gtk_widget_set_no_show_all (button, TRUE);
   gtk_label_set_selectable (GTK_LABEL (button), TRUE);
   gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
-  
+  g_signal_connect_swapped (button, "activate-link",
+                            G_CALLBACK (emit_activate_link), about);
+
+  priv->license_label = gtk_label_new (NULL);
+  gtk_label_set_use_markup (GTK_LABEL (priv->license_label), TRUE);
+  gtk_label_set_selectable (GTK_LABEL (priv->license_label), TRUE);
+  gtk_label_set_justify (GTK_LABEL (priv->license_label), GTK_JUSTIFY_CENTER);
+  gtk_box_pack_end (GTK_BOX (page_vbox), priv->license_label, FALSE, FALSE, 0);
+  gtk_label_set_line_wrap (GTK_LABEL (priv->license_label), TRUE);
+
+  priv->copyright_label = gtk_label_new (NULL);
+  gtk_label_set_selectable (GTK_LABEL (priv->copyright_label), TRUE);
+  gtk_label_set_justify (GTK_LABEL (priv->copyright_label), GTK_JUSTIFY_CENTER);
+  gtk_box_pack_end (GTK_BOX (page_vbox), priv->copyright_label, FALSE, FALSE, 0);
+
   gtk_widget_show (vbox);
+  gtk_widget_show (priv->notebook);
   gtk_widget_show (priv->logo_image);
   gtk_widget_show (priv->name_label);
   gtk_widget_show (hbox);
 
-  /* Add the OK button */
-  close_button = gtk_dialog_add_button (GTK_DIALOG (about), GTK_STOCK_CLOSE,
-                                       GTK_RESPONSE_CANCEL);
+  /* Add the close button */
+  close_button = gtk_dialog_add_button (GTK_DIALOG (about),
+                                        GTK_STOCK_CLOSE, GTK_RESPONSE_CANCEL);
   gtk_dialog_set_default_response (GTK_DIALOG (about), GTK_RESPONSE_CANCEL);
 
   /* Add the credits button */
-  button = gtk_button_new_with_mnemonic (_("C_redits"));
-  GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
+  button = gtk_toggle_button_new_with_mnemonic (_("C_redits"));
+  gtk_widget_set_can_default (button, TRUE);
   image = gtk_image_new_from_stock (GTK_STOCK_ABOUT, GTK_ICON_SIZE_BUTTON);
   gtk_button_set_image (GTK_BUTTON (button), image);
   gtk_widget_set_no_show_all (button, TRUE);
-  gtk_box_pack_end (GTK_BOX (GTK_DIALOG (about)->action_area), 
-                   button, FALSE, TRUE, 0); 
-  gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (GTK_DIALOG (about)->action_area), button, TRUE);
+  gtk_box_pack_end (GTK_BOX (action_area), button, FALSE, TRUE, 0);
+  gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (action_area), button, TRUE);
   g_signal_connect (button, "clicked",
-                    G_CALLBACK (display_credits_dialog), about);
+                    G_CALLBACK (credits_button_clicked), about);
   priv->credits_button = button;
-  priv->credits_dialog = NULL;
+  priv->credits_page = 0;
 
   /* Add the license button */
-  button = gtk_button_new_from_stock (_("_License"));
-  GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
+  button = gtk_toggle_button_new_with_mnemonic (_("_License"));
+  gtk_widget_set_can_default (button, TRUE);
   gtk_widget_set_no_show_all (button, TRUE);
-  gtk_box_pack_end (GTK_BOX (GTK_DIALOG (about)->action_area), 
-                   button, FALSE, TRUE, 0); 
-  gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (GTK_DIALOG (about)->action_area), button, TRUE);
+  gtk_box_pack_end (GTK_BOX (action_area), button, FALSE, TRUE, 0);
+  gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (action_area), button, TRUE);
   g_signal_connect (button, "clicked",
-                    G_CALLBACK (display_license_dialog), about);
+                    G_CALLBACK (license_button_clicked), about);
   priv->license_button = button;
-  priv->license_dialog = NULL;
+  priv->license_page = 0;
+
+  switch_page (about, 0);
 
   gtk_window_set_resizable (GTK_WINDOW (about), FALSE);
 
@@ -579,11 +785,20 @@ gtk_about_dialog_init (GtkAboutDialog *about)
   gtk_about_dialog_set_logo (about, NULL);
 }
 
+static void
+destroy_credit_section (gpointer data)
+{
+  CreditSection *cs = data;
+  g_free (cs->heading);
+  g_strfreev (cs->people);
+  g_slice_free (CreditSection, data);
+}
+
 static void
 gtk_about_dialog_finalize (GObject *object)
 {
   GtkAboutDialog *about = GTK_ABOUT_DIALOG (object);
-  GtkAboutDialogPrivate *priv = (GtkAboutDialogPrivate *)about->private_data;
+  GtkAboutDialogPrivate *priv = about->priv;
 
   g_free (priv->name);
   g_free (priv->version);
@@ -598,25 +813,27 @@ gtk_about_dialog_finalize (GObject *object)
   g_strfreev (priv->documenters);
   g_strfreev (priv->artists);
 
+  g_slist_free_full (priv->credit_sections, destroy_credit_section);
+
   g_slist_foreach (priv->visited_links, (GFunc)g_free, NULL);
   g_slist_free (priv->visited_links);
 
-  gdk_cursor_unref (priv->hand_cursor);
-  gdk_cursor_unref (priv->regular_cursor);  
+  g_object_unref (priv->hand_cursor);
+  g_object_unref (priv->regular_cursor);
 
   G_OBJECT_CLASS (gtk_about_dialog_parent_class)->finalize (object);
 }
 
 static void
-gtk_about_dialog_set_property (GObject      *object, 
-                              guint         prop_id, 
-                              const GValue *value, 
-                              GParamSpec   *pspec)
+gtk_about_dialog_set_property (GObject      *object,
+                               guint         prop_id,
+                               const GValue *value,
+                               GParamSpec   *pspec)
 {
   GtkAboutDialog *about = GTK_ABOUT_DIALOG (object);
-  GtkAboutDialogPrivate *priv = (GtkAboutDialogPrivate *)about->private_data;
+  GtkAboutDialogPrivate *priv = about->priv;
 
-  switch (prop_id) 
+  switch (prop_id)
     {
     case PROP_NAME:
       gtk_about_dialog_set_program_name (about, g_value_get_string (value));
@@ -636,21 +853,24 @@ gtk_about_dialog_set_property (GObject      *object,
     case PROP_LICENSE:
       gtk_about_dialog_set_license (about, g_value_get_string (value));
       break;
+    case PROP_LICENSE_TYPE:
+      gtk_about_dialog_set_license_type (about, g_value_get_enum (value));
+      break;
     case PROP_COPYRIGHT:
       gtk_about_dialog_set_copyright (about, g_value_get_string (value));
       break;
     case PROP_LOGO:
       gtk_about_dialog_set_logo (about, g_value_get_object (value));
-      break; 
+      break;
     case PROP_AUTHORS:
       gtk_about_dialog_set_authors (about, (const gchar**)g_value_get_boxed (value));
       break;
     case PROP_DOCUMENTERS:
       gtk_about_dialog_set_documenters (about, (const gchar**)g_value_get_boxed (value));
-      break;   
+      break;
     case PROP_ARTISTS:
       gtk_about_dialog_set_artists (about, (const gchar**)g_value_get_boxed (value));
-      break;   
+      break;
     case PROP_TRANSLATOR_CREDITS:
       gtk_about_dialog_set_translator_credits (about, g_value_get_string (value));
       break;
@@ -667,14 +887,14 @@ gtk_about_dialog_set_property (GObject      *object,
 }
 
 static void
-gtk_about_dialog_get_property (GObject    *object, 
-                              guint       prop_id, 
-                              GValue     *value, 
-                              GParamSpec *pspec)
+gtk_about_dialog_get_property (GObject    *object,
+                               guint       prop_id,
+                               GValue     *value,
+                               GParamSpec *pspec)
 {
   GtkAboutDialog *about = GTK_ABOUT_DIALOG (object);
-  GtkAboutDialogPrivate *priv = (GtkAboutDialogPrivate *)about->private_data;
-       
+  GtkAboutDialogPrivate *priv = about->priv;
+        
   switch (prop_id) 
     {
     case PROP_NAME:
@@ -698,6 +918,9 @@ gtk_about_dialog_get_property (GObject    *object,
     case PROP_LICENSE:
       g_value_set_string (value, priv->license);
       break;
+    case PROP_LICENSE_TYPE:
+      g_value_set_enum (value, priv->license_type);
+      break;
     case PROP_TRANSLATOR_CREDITS:
       g_value_set_string (value, priv->translator_credits);
       break;
@@ -712,20 +935,20 @@ gtk_about_dialog_get_property (GObject    *object,
       break;
     case PROP_LOGO:
       if (gtk_image_get_storage_type (GTK_IMAGE (priv->logo_image)) == GTK_IMAGE_PIXBUF)
-       g_value_set_object (value, gtk_image_get_pixbuf (GTK_IMAGE (priv->logo_image)));
+        g_value_set_object (value, gtk_image_get_pixbuf (GTK_IMAGE (priv->logo_image)));
       else
-       g_value_set_object (value, NULL);
+        g_value_set_object (value, NULL);
       break;
     case PROP_LOGO_ICON_NAME:
       if (gtk_image_get_storage_type (GTK_IMAGE (priv->logo_image)) == GTK_IMAGE_ICON_NAME)
-       {
-         const gchar *icon_name;
+        {
+          const gchar *icon_name;
 
-         gtk_image_get_icon_name (GTK_IMAGE (priv->logo_image), &icon_name, NULL);
-         g_value_set_string (value, icon_name);
-       }
+          gtk_image_get_icon_name (GTK_IMAGE (priv->logo_image), &icon_name, NULL);
+          g_value_set_string (value, icon_name);
+        }
       else
-       g_value_set_string (value, NULL);
+        g_value_set_string (value, NULL);
       break;
     case PROP_WRAP_LICENSE:
       g_value_set_boolean (value, priv->wrap_license);
@@ -736,30 +959,70 @@ gtk_about_dialog_get_property (GObject    *object,
     }
 }
 
+static gboolean
+gtk_about_dialog_activate_link (GtkAboutDialog *about,
+                                const gchar    *uri)
+{
+  GdkScreen *screen;
+  GError *error = NULL;
+
+  screen = gtk_widget_get_screen (GTK_WIDGET (about));
+
+  if (!gtk_show_uri (screen, uri, gtk_get_current_event_time (), &error))
+    {
+      GtkWidget *dialog;
+
+      dialog = gtk_message_dialog_new (GTK_WINDOW (about),
+                                       GTK_DIALOG_DESTROY_WITH_PARENT |
+                                       GTK_DIALOG_MODAL,
+                                       GTK_MESSAGE_ERROR,
+                                       GTK_BUTTONS_CLOSE,
+                                       "%s", _("Could not show link"));
+      gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+                                                "%s", error->message);
+      g_error_free (error);
+
+      g_signal_connect (dialog, "response",
+                        G_CALLBACK (gtk_widget_destroy), NULL);
+
+      gtk_window_present (GTK_WINDOW (dialog));
+    }
+
+  return TRUE;
+}
+
 static void
 update_website (GtkAboutDialog *about)
 {
-  GtkAboutDialogPrivate *priv = (GtkAboutDialogPrivate *)about->private_data;
+  GtkAboutDialogPrivate *priv = about->priv;
+
+  gtk_widget_show (priv->website_label);
 
-  if (priv->website_url && (!activate_url_hook_set || activate_url_hook != NULL))
+  if (priv->website_url)
     {
-      gtk_widget_show (priv->website_button);
-      gtk_widget_hide (priv->website_label);
+      gchar *markup;
 
-      gtk_link_button_set_uri (GTK_LINK_BUTTON (priv->website_button), priv->website_url);
       if (priv->website_text)
-        gtk_button_set_label (GTK_BUTTON (priv->website_button), priv->website_text);
-      else 
-        gtk_button_set_label (GTK_BUTTON (priv->website_button), priv->website_url);
+        {
+          gchar *escaped;
+
+          escaped = g_markup_escape_text (priv->website_text, -1);
+          markup = g_strdup_printf ("<a href=\"%s\">%s</a>",
+                                    priv->website_url, escaped);
+          g_free (escaped);
+        }
+      else
+        {
+          markup = g_strdup_printf ("<a href=\"%s\">%s</a>",
+                                    priv->website_url, _("Website"));
+        }
+
+      gtk_label_set_markup (GTK_LABEL (priv->website_label), markup);
+      g_free (markup);
     }
   else
     {
-      gtk_widget_show (priv->website_label);
-      gtk_widget_hide (priv->website_button);
-
-      if (priv->website_url)
-        gtk_label_set_text (GTK_LABEL (priv->website_label), priv->website_url);
-      else if (priv->website_text)
+      if (priv->website_text)
         gtk_label_set_text (GTK_LABEL (priv->website_label), priv->website_text);
       else
         gtk_widget_hide (priv->website_label);
@@ -770,48 +1033,29 @@ static void
 gtk_about_dialog_show (GtkWidget *widget)
 {
   update_website (GTK_ABOUT_DIALOG (widget));
-  
-  GTK_WIDGET_CLASS (gtk_about_dialog_parent_class)->show (widget);
-}
 
-/**
- * gtk_about_dialog_get_name:
- * @about: a #GtkAboutDialog
- * 
- * Returns the program name displayed in the about dialog.
- * 
- * Return value: The program name. The string is owned by the about
- *  dialog and must not be modified.
- *
- * Since: 2.6
- *
- * Deprecated: 2.12: Use gtk_about_dialog_get_program_name() instead.
- **/
-G_CONST_RETURN gchar *
-gtk_about_dialog_get_name (GtkAboutDialog *about)
-{
-  return gtk_about_dialog_get_program_name (about);
+  GTK_WIDGET_CLASS (gtk_about_dialog_parent_class)->show (widget);
 }
 
 /**
  * gtk_about_dialog_get_program_name:
  * @about: a #GtkAboutDialog
- * 
+ *
  * Returns the program name displayed in the about dialog.
- * 
+ *
  * Return value: The program name. The string is owned by the about
  *  dialog and must not be modified.
  *
  * Since: 2.12
- **/
-G_CONST_RETURN gchar *
+ */
+const gchar *
 gtk_about_dialog_get_program_name (GtkAboutDialog *about)
 {
   GtkAboutDialogPrivate *priv;
-  
+
   g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL);
 
-  priv = (GtkAboutDialogPrivate *)about->private_data;
+  priv = about->priv;
 
   return priv->name;
 }
@@ -822,63 +1066,47 @@ update_name_version (GtkAboutDialog *about)
   GtkAboutDialogPrivate *priv;
   gchar *title_string, *name_string;
 
-  priv = (GtkAboutDialogPrivate *)about->private_data;
+  priv = about->priv;
 
   title_string = g_strdup_printf (_("About %s"), priv->name);
   gtk_window_set_title (GTK_WINDOW (about), title_string);
   g_free (title_string);
 
-  if (priv->version != NULL) 
-    name_string = g_markup_printf_escaped ("<span size=\"xx-large\" weight=\"bold\">%s %s</span>", 
-                                            priv->name, priv->version);
+  if (priv->version != NULL)
+    {
+      gtk_label_set_markup (GTK_LABEL (priv->version_label), priv->version);
+      gtk_widget_show (priv->version_label);
+    }
   else
-    name_string = g_markup_printf_escaped ("<span size=\"xx-large\" weight=\"bold\">%s</span>", 
-                                          priv->name);
+    gtk_widget_hide (priv->version_label);
 
+  name_string = g_markup_printf_escaped ("<span weight=\"bold\">%s</span>",
+                                         priv->name);
   gtk_label_set_markup (GTK_LABEL (priv->name_label), name_string);
-
   g_free (name_string);
 }
 
-/**
- * gtk_about_dialog_set_name:
- * @about: a #GtkAboutDialog
- * @name: the program name
- *
- * Sets the name to display in the about dialog. 
- * If this is not set, it defaults to g_get_application_name().
- * 
- * Since: 2.6
- *
- * Deprecated: 2.12: Use gtk_about_dialog_set_program_name() instead.
- **/
-void
-gtk_about_dialog_set_name (GtkAboutDialog *about, 
-                          const gchar    *name)
-{
-    gtk_about_dialog_set_program_name (about, name);
-}
-
 /**
  * gtk_about_dialog_set_program_name:
  * @about: a #GtkAboutDialog
  * @name: the program name
  *
- * Sets the name to display in the about dialog. 
+ * Sets the name to display in the about dialog.
  * If this is not set, it defaults to g_get_application_name().
- * 
+ *
  * Since: 2.12
- **/
+ */
 void
-gtk_about_dialog_set_program_name (GtkAboutDialog *about, 
+gtk_about_dialog_set_program_name (GtkAboutDialog *about,
                                    const gchar    *name)
 {
   GtkAboutDialogPrivate *priv;
   gchar *tmp;
 
   g_return_if_fail (GTK_IS_ABOUT_DIALOG (about));
-       
-  priv = (GtkAboutDialogPrivate *)about->private_data;
+
+  priv = about->priv;
+
   tmp = priv->name;
   priv->name = g_strdup (name ? name : g_get_application_name ());
   g_free (tmp);
@@ -892,49 +1120,45 @@ gtk_about_dialog_set_program_name (GtkAboutDialog *about,
 /**
  * gtk_about_dialog_get_version:
  * @about: a #GtkAboutDialog
- * 
+ *
  * Returns the version string.
- * 
+ *
  * Return value: The version string. The string is owned by the about
  *  dialog and must not be modified.
  *
  * Since: 2.6
- **/
-G_CONST_RETURN gchar *
+ */
+const gchar *
 gtk_about_dialog_get_version (GtkAboutDialog *about)
 {
-  GtkAboutDialogPrivate *priv;
-  
   g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL);
 
-  priv = (GtkAboutDialogPrivate *)about->private_data;
-
-  return priv->version;
+  return about->priv->version;
 }
 
 /**
  * gtk_about_dialog_set_version:
  * @about: a #GtkAboutDialog
- * @version: the version string 
+ * @version: (allow-none): the version string
  *
  * Sets the version string to display in the about dialog.
- * 
+ *
  * Since: 2.6
- **/
+ */
 void
-gtk_about_dialog_set_version (GtkAboutDialog *about, 
-                             const gchar    *version)
+gtk_about_dialog_set_version (GtkAboutDialog *about,
+                              const gchar    *version)
 {
   GtkAboutDialogPrivate *priv;
   gchar *tmp;
 
   g_return_if_fail (GTK_IS_ABOUT_DIALOG (about));
 
-  priv = (GtkAboutDialogPrivate *)about->private_data;
-  
+  priv = about->priv;
+
   tmp = priv->version;
   priv->version = g_strdup (version);
-  g_free (tmp); 
+  g_free (tmp);
 
   update_name_version (about);
 
@@ -944,113 +1168,104 @@ gtk_about_dialog_set_version (GtkAboutDialog *about,
 /**
  * gtk_about_dialog_get_copyright:
  * @about: a #GtkAboutDialog
- * 
+ *
  * Returns the copyright string.
- * 
+ *
  * Return value: The copyright string. The string is owned by the about
  *  dialog and must not be modified.
  *
  * Since: 2.6
- **/
-G_CONST_RETURN gchar *
+ */
+const gchar *
 gtk_about_dialog_get_copyright (GtkAboutDialog *about)
 {
-  GtkAboutDialogPrivate *priv;
-  
   g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL);
 
-  priv = (GtkAboutDialogPrivate *)about->private_data;
-
-  return priv->copyright;
+  return about->priv->copyright;
 }
 
 /**
  * gtk_about_dialog_set_copyright:
  * @about: a #GtkAboutDialog
- * @copyright: the copyright string
- * 
+ * @copyright: (allow-none) the copyright string
+ *
  * Sets the copyright string to display in the about dialog.
- * This should be a short string of one or two lines. 
+ * This should be a short string of one or two lines.
  *
  * Since: 2.6
- **/
+ */
 void
-gtk_about_dialog_set_copyright (GtkAboutDialog *about, 
-                               const gchar    *copyright)
+gtk_about_dialog_set_copyright (GtkAboutDialog *about,
+                                const gchar    *copyright)
 {
   GtkAboutDialogPrivate *priv;
   gchar *copyright_string, *tmp;
 
   g_return_if_fail (GTK_IS_ABOUT_DIALOG (about));
 
-  priv = (GtkAboutDialogPrivate *)about->private_data;
-       
+  priv = about->priv;
+
   tmp = priv->copyright;
   priv->copyright = g_strdup (copyright);
   g_free (tmp);
-  
-  if (priv->copyright != NULL) 
+
+  if (priv->copyright != NULL)
     {
-      copyright_string = g_markup_printf_escaped ("<span size=\"small\">%s</span>", 
-                                                 priv->copyright);
+      copyright_string = g_markup_printf_escaped ("<span size=\"small\">%s</span>",
+                                                  priv->copyright);
       gtk_label_set_markup (GTK_LABEL (priv->copyright_label), copyright_string);
       g_free (copyright_string);
-  
+
       gtk_widget_show (priv->copyright_label);
     }
-  else 
+  else
     gtk_widget_hide (priv->copyright_label);
-  
+
   g_object_notify (G_OBJECT (about), "copyright");
 }
 
 /**
  * gtk_about_dialog_get_comments:
  * @about: a #GtkAboutDialog
- * 
+ *
  * Returns the comments string.
- * 
+ *
  * Return value: The comments. The string is owned by the about
  *  dialog and must not be modified.
  *
  * Since: 2.6
- **/
-G_CONST_RETURN gchar *
+ */
+const gchar *
 gtk_about_dialog_get_comments (GtkAboutDialog *about)
 {
-  GtkAboutDialogPrivate *priv;
-  
   g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL);
 
-  priv = (GtkAboutDialogPrivate *)about->private_data;
-
-  return priv->comments;
+  return about->priv->comments;
 }
 
 /**
  * gtk_about_dialog_set_comments:
  * @about: a #GtkAboutDialog
- * @comments: a comments string
- * 
- * Sets the comments string to display in the about 
- * dialog. This should be a short string of one or
- * two lines.
+ * @comments: (allow-none): a comments string
+ *
+ * Sets the comments string to display in the about dialog.
+ * This should be a short string of one or two lines.
  *
  * Since: 2.6
- **/
+ */
 void
-gtk_about_dialog_set_comments (GtkAboutDialog *about, 
-                              const gchar    *comments)
+gtk_about_dialog_set_comments (GtkAboutDialog *about,
+                               const gchar    *comments)
 {
   GtkAboutDialogPrivate *priv;
   gchar *tmp;
 
   g_return_if_fail (GTK_IS_ABOUT_DIALOG (about));
 
-  priv = (GtkAboutDialogPrivate *)about->private_data;
-  
+  priv = about->priv;
+
   tmp = priv->comments;
-  if (comments) 
+  if (comments)
     {
       priv->comments = g_strdup (comments);
       gtk_label_set_text (GTK_LABEL (priv->comments_label), priv->comments);
@@ -1069,85 +1284,82 @@ gtk_about_dialog_set_comments (GtkAboutDialog *about,
 /**
  * gtk_about_dialog_get_license:
  * @about: a #GtkAboutDialog
- * 
+ *
  * Returns the license information.
- * 
+ *
  * Return value: The license information. The string is owned by the about
  *  dialog and must not be modified.
  *
  * Since: 2.6
- **/
-G_CONST_RETURN gchar *
+ */
+const gchar *
 gtk_about_dialog_get_license (GtkAboutDialog *about)
 {
-  GtkAboutDialogPrivate *priv;
-  
   g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL);
 
-  priv = (GtkAboutDialogPrivate *)about->private_data;
-
-  return priv->license;
+  return about->priv->license;
 }
 
 /**
  * gtk_about_dialog_set_license:
  * @about: a #GtkAboutDialog
- * @license: the license information or %NULL
+ * @license: (allow-none): the license information or %NULL
  *
  * Sets the license information to be displayed in the secondary
  * license dialog. If @license is %NULL, the license button is
  * hidden.
- * 
+ *
  * Since: 2.6
- **/
+ */
 void
-gtk_about_dialog_set_license (GtkAboutDialog *about, 
-                             const gchar    *license)
+gtk_about_dialog_set_license (GtkAboutDialog *about,
+                              const gchar    *license)
 {
   GtkAboutDialogPrivate *priv;
   gchar *tmp;
 
   g_return_if_fail (GTK_IS_ABOUT_DIALOG (about));
 
-  priv = (GtkAboutDialogPrivate *)about->private_data;
+  priv = about->priv;
 
   tmp = priv->license;
-  if (license) 
+  if (license)
     {
       priv->license = g_strdup (license);
-      gtk_widget_show (priv->license_button);
+      priv->license_type = GTK_LICENSE_CUSTOM;
     }
   else
     {
       priv->license = NULL;
-      gtk_widget_hide (priv->license_button);
+      priv->license_type = GTK_LICENSE_UNKNOWN;
     }
   g_free (tmp);
 
+  gtk_widget_hide (priv->license_label);
+
+  update_license_button_visibility (about);
+
   g_object_notify (G_OBJECT (about), "license");
+  g_object_notify (G_OBJECT (about), "license-type");
 }
 
 /**
  * gtk_about_dialog_get_wrap_license:
  * @about: a #GtkAboutDialog
  *
- * Returns whether the license text in @about is 
+ * Returns whether the license text in @about is
  * automatically wrapped.
  *
- * Returns: %TRUE if the license text is wrapped 
+ * Returns: %TRUE if the license text is wrapped
  *
  * Since: 2.8
  */
 gboolean
 gtk_about_dialog_get_wrap_license (GtkAboutDialog *about)
 {
-  GtkAboutDialogPrivate *priv;
-
   g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), FALSE);
 
-  priv = (GtkAboutDialogPrivate *)about->private_data;
-
-  return priv->wrap_license;
+  return about->priv->wrap_license;
 }
 
 /**
@@ -1155,9 +1367,9 @@ gtk_about_dialog_get_wrap_license (GtkAboutDialog *about)
  * @about: a #GtkAboutDialog
  * @wrap_license: whether to wrap the license
  *
- * Sets whether the license text in @about is 
+ * Sets whether the license text in @about is
  * automatically wrapped.
- * 
+ *
  * Since: 2.8
  */
 void
@@ -1168,10 +1380,10 @@ gtk_about_dialog_set_wrap_license (GtkAboutDialog *about,
 
   g_return_if_fail (GTK_IS_ABOUT_DIALOG (about));
 
-  priv = (GtkAboutDialogPrivate *)about->private_data;
+  priv = about->priv;
 
   wrap_license = wrap_license != FALSE;
-  
+
   if (priv->wrap_license != wrap_license)
     {
        priv->wrap_license = wrap_license;
@@ -1183,22 +1395,22 @@ gtk_about_dialog_set_wrap_license (GtkAboutDialog *about,
 /**
  * gtk_about_dialog_get_website:
  * @about: a #GtkAboutDialog
- * 
+ *
  * Returns the website URL.
- * 
+ *
  * Return value: The website URL. The string is owned by the about
  *  dialog and must not be modified.
  *
  * Since: 2.6
- **/
-G_CONST_RETURN gchar *
+ */
+const gchar *
 gtk_about_dialog_get_website (GtkAboutDialog *about)
 {
   GtkAboutDialogPrivate *priv;
-  
+
   g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL);
 
-  priv = (GtkAboutDialogPrivate *)about->private_data;
+  priv = about->priv;
 
   return priv->website_url;
 }
@@ -1206,29 +1418,26 @@ gtk_about_dialog_get_website (GtkAboutDialog *about)
 /**
  * gtk_about_dialog_set_website:
  * @about: a #GtkAboutDialog
- * @website: a URL string starting with "http://"
- * 
- * Sets the URL to use for the website link.
+ * @website: (allow-none): a URL string starting with "http://"
  *
- * Note that that the hook functions need to be set up
- * before calling this function.
+ * Sets the URL to use for the website link.
  *
  * Since: 2.6
- **/
+ */
 void
-gtk_about_dialog_set_website (GtkAboutDialog *about, 
-                             const gchar    *website)
+gtk_about_dialog_set_website (GtkAboutDialog *about,
+                              const gchar    *website)
 {
   GtkAboutDialogPrivate *priv;
   gchar *tmp;
 
   g_return_if_fail (GTK_IS_ABOUT_DIALOG (about));
 
-  priv = (GtkAboutDialogPrivate *)about->private_data;
-  
+  priv = about->priv;
+
   tmp = priv->website_url;
   priv->website_url = g_strdup (website);
-  g_free (tmp); 
+  g_free (tmp);
 
   update_website (about);
 
@@ -1238,22 +1447,22 @@ gtk_about_dialog_set_website (GtkAboutDialog *about,
 /**
  * gtk_about_dialog_get_website_label:
  * @about: a #GtkAboutDialog
- * 
- * Returns the label used for the website link. 
- * 
- * Return value: The label used for the website link. The string is owned by the about
- *  dialog and must not be modified.
+ *
+ * Returns the label used for the website link.
+ *
+ * Return value: The label used for the website link. The string is
+ *     owned by the about dialog and must not be modified.
  *
  * Since: 2.6
- **/
-G_CONST_RETURN gchar *
+ */
+const gchar *
 gtk_about_dialog_get_website_label (GtkAboutDialog *about)
 {
   GtkAboutDialogPrivate *priv;
-  
+
   g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL);
 
-  priv = (GtkAboutDialogPrivate *)about->private_data;
+  priv = about->priv;
 
   return priv->website_text;
 }
@@ -1262,22 +1471,21 @@ gtk_about_dialog_get_website_label (GtkAboutDialog *about)
  * gtk_about_dialog_set_website_label:
  * @about: a #GtkAboutDialog
  * @website_label: the label used for the website link
- * 
+ *
  * Sets the label to be used for the website link.
- * It defaults to the website URL.
  *
  * Since: 2.6
- **/
+ */
 void
-gtk_about_dialog_set_website_label (GtkAboutDialog *about, 
-                                   const gchar    *website_label)
+gtk_about_dialog_set_website_label (GtkAboutDialog *about,
+                                    const gchar    *website_label)
 {
   GtkAboutDialogPrivate *priv;
   gchar *tmp;
 
   g_return_if_fail (GTK_IS_ABOUT_DIALOG (about));
 
-  priv = (GtkAboutDialogPrivate *)about->private_data;
+  priv = about->priv;
 
   tmp = priv->website_text;
   priv->website_text = g_strdup (website_label);
@@ -1291,66 +1499,48 @@ gtk_about_dialog_set_website_label (GtkAboutDialog *about,
 /**
  * gtk_about_dialog_get_authors:
  * @about: a #GtkAboutDialog
- * 
+ *
  * Returns the string which are displayed in the authors tab
  * of the secondary credits dialog.
- * 
- * Return value: A %NULL-terminated string array containing
- *  the authors. The array is owned by the about dialog 
- *  and must not be modified.
+ *
+ * Return value: (array zero-terminated=1) (transfer none): A
+ *  %NULL-terminated string array containing the authors. The array is
+ *  owned by the about dialog and must not be modified.
  *
  * Since: 2.6
- **/
-G_CONST_RETURN gchar * G_CONST_RETURN *
+ */
+const gchar * const *
 gtk_about_dialog_get_authors (GtkAboutDialog *about)
 {
   GtkAboutDialogPrivate *priv;
-  
+
   g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL);
 
-  priv = (GtkAboutDialogPrivate *)about->private_data;
+  priv = about->priv;
 
   return (const gchar * const *) priv->authors;
 }
 
-static void
-update_credits_button_visibility (GtkAboutDialog *about)
-{
-  GtkAboutDialogPrivate *priv = about->private_data;
-  gboolean show;
-
-  show = priv->authors != NULL ||
-         priv->documenters != NULL ||
-         priv->artists != NULL ||
-         (priv->translator_credits != NULL &&
-          strcmp (priv->translator_credits, "translator_credits") &&
-          strcmp (priv->translator_credits, "translator-credits"));
-  if (show)
-    gtk_widget_show (priv->credits_button);
-  else
-    gtk_widget_hide (priv->credits_button);
-}
-
 /**
  * gtk_about_dialog_set_authors:
  * @about: a #GtkAboutDialog
- * @authors: a %NULL-terminated array of strings 
+ * @authors: (array zero-terminated=1): a %NULL-terminated array of strings
  *
  * Sets the strings which are displayed in the authors tab
- * of the secondary credits dialog. 
- * 
+ * of the secondary credits dialog.
+ *
  * Since: 2.6
- **/
+ */
 void
-gtk_about_dialog_set_authors (GtkAboutDialog  *about, 
-                             const gchar    **authors)
+gtk_about_dialog_set_authors (GtkAboutDialog  *about,
+                              const gchar    **authors)
 {
   GtkAboutDialogPrivate *priv;
   gchar **tmp;
 
   g_return_if_fail (GTK_IS_ABOUT_DIALOG (about));
 
-  priv = (GtkAboutDialogPrivate *)about->private_data;
+  priv = about->priv;
 
   tmp = priv->authors;
   priv->authors = g_strdupv ((gchar **)authors);
@@ -1364,24 +1554,24 @@ gtk_about_dialog_set_authors (GtkAboutDialog  *about,
 /**
  * gtk_about_dialog_get_documenters:
  * @about: a #GtkAboutDialog
- * 
- * Returns the string which are displayed in the documenters 
+ *
+ * Returns the string which are displayed in the documenters
  * tab of the secondary credits dialog.
- * 
- * Return value: A %NULL-terminated string array containing
- *  the documenters. The array is owned by the about dialog 
- *  and must not be modified.
+ *
+ * Return value: (array zero-terminated=1) (transfer none): A
+ *  %NULL-terminated string array containing the documenters. The
+ *  array is owned by the about dialog and must not be modified.
  *
  * Since: 2.6
- **/
-G_CONST_RETURN gchar * G_CONST_RETURN *
+ */
+const gchar * const *
 gtk_about_dialog_get_documenters (GtkAboutDialog *about)
 {
   GtkAboutDialogPrivate *priv;
-  
+
   g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL);
 
-  priv = (GtkAboutDialogPrivate *)about->private_data;
+  priv = about->priv;
 
   return (const gchar * const *)priv->documenters;
 }
@@ -1389,24 +1579,24 @@ gtk_about_dialog_get_documenters (GtkAboutDialog *about)
 /**
  * gtk_about_dialog_set_documenters:
  * @about: a #GtkAboutDialog
- * @documenters: a %NULL-terminated array of strings 
+ * @documenters: (array zero-terminated=1): a %NULL-terminated array of strings
  *
  * Sets the strings which are displayed in the documenters tab
- * of the secondary credits dialog. 
- * 
+ * of the secondary credits dialog.
+ *
  * Since: 2.6
- **/
+ */
 void
-gtk_about_dialog_set_documenters (GtkAboutDialog *about, 
-                                 const gchar   **documenters)
+gtk_about_dialog_set_documenters (GtkAboutDialog *about,
+                                  const gchar   **documenters)
 {
   GtkAboutDialogPrivate *priv;
   gchar **tmp;
 
   g_return_if_fail (GTK_IS_ABOUT_DIALOG (about));
 
-  priv = (GtkAboutDialogPrivate *)about->private_data;
-  
+  priv = about->priv;
+
   tmp = priv->documenters;
   priv->documenters = g_strdupv ((gchar **)documenters);
   g_strfreev (tmp);
@@ -1419,24 +1609,24 @@ gtk_about_dialog_set_documenters (GtkAboutDialog *about,
 /**
  * gtk_about_dialog_get_artists:
  * @about: a #GtkAboutDialog
- * 
+ *
  * Returns the string which are displayed in the artists tab
  * of the secondary credits dialog.
- * 
- * Return value: A %NULL-terminated string array containing
- *  the artists. The array is owned by the about dialog 
- *  and must not be modified.
+ *
+ * Return value: (array zero-terminated=1) (transfer none): A
+ *  %NULL-terminated string array containing the artists. The array is
+ *  owned by the about dialog and must not be modified.
  *
  * Since: 2.6
- **/
-G_CONST_RETURN gchar * G_CONST_RETURN *
+ */
+const gchar * const *
 gtk_about_dialog_get_artists (GtkAboutDialog *about)
 {
   GtkAboutDialogPrivate *priv;
-  
+
   g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL);
 
-  priv = (GtkAboutDialogPrivate *)about->private_data;
+  priv = about->priv;
 
   return (const gchar * const *)priv->artists;
 }
@@ -1444,24 +1634,24 @@ gtk_about_dialog_get_artists (GtkAboutDialog *about)
 /**
  * gtk_about_dialog_set_artists:
  * @about: a #GtkAboutDialog
- * @artists: a %NULL-terminated array of strings 
+ * @artists: (array zero-terminated=1): a %NULL-terminated array of strings
  *
  * Sets the strings which are displayed in the artists tab
- * of the secondary credits dialog. 
- * 
+ * of the secondary credits dialog.
+ *
  * Since: 2.6
- **/
+ */
 void
-gtk_about_dialog_set_artists (GtkAboutDialog *about, 
-                             const gchar   **artists)
+gtk_about_dialog_set_artists (GtkAboutDialog *about,
+                              const gchar   **artists)
 {
   GtkAboutDialogPrivate *priv;
   gchar **tmp;
 
   g_return_if_fail (GTK_IS_ABOUT_DIALOG (about));
 
-  priv = (GtkAboutDialogPrivate *)about->private_data;
-  
+  priv = about->priv;
+
   tmp = priv->artists;
   priv->artists = g_strdupv ((gchar **)artists);
   g_strfreev (tmp);
@@ -1474,35 +1664,31 @@ gtk_about_dialog_set_artists (GtkAboutDialog *about,
 /**
  * gtk_about_dialog_get_translator_credits:
  * @about: a #GtkAboutDialog
- * 
+ *
  * Returns the translator credits string which is displayed
  * in the translators tab of the secondary credits dialog.
- * 
+ *
  * Return value: The translator credits string. The string is
  *   owned by the about dialog and must not be modified.
  *
  * Since: 2.6
- **/
-G_CONST_RETURN gchar *
+ */
+const gchar *
 gtk_about_dialog_get_translator_credits (GtkAboutDialog *about)
 {
-  GtkAboutDialogPrivate *priv;
-  
   g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL);
 
-  priv = (GtkAboutDialogPrivate *)about->private_data;
-
-  return priv->translator_credits;
+  return about->priv->translator_credits;
 }
 
 /**
  * gtk_about_dialog_set_translator_credits:
  * @about: a #GtkAboutDialog
- * @translator_credits: the translator credits
- * 
+ * @translator_credits: (allow-none): the translator credits
+ *
  * Sets the translator credits string which is displayed in
  * the translators tab of the secondary credits dialog.
- * 
+ *
  * The intended use for this string is to display the translator
  * of the language which is currently used in the user interface.
  * Using gettext(), a simple way to achieve that is to mark the
@@ -1516,17 +1702,17 @@ gtk_about_dialog_get_translator_credits (GtkAboutDialog *about)
  * and hide the tab.
  *
  * Since: 2.6
- **/
+ */
 void
-gtk_about_dialog_set_translator_credits (GtkAboutDialog *about, 
-                                        const gchar    *translator_credits)
+gtk_about_dialog_set_translator_credits (GtkAboutDialog *about,
+                                         const gchar    *translator_credits)
 {
   GtkAboutDialogPrivate *priv;
   gchar *tmp;
 
   g_return_if_fail (GTK_IS_ABOUT_DIALOG (about));
 
-  priv = (GtkAboutDialogPrivate *)about->private_data;
+  priv = about->priv;
 
   tmp = priv->translator_credits;
   priv->translator_credits = g_strdup (translator_credits);
@@ -1540,23 +1726,23 @@ gtk_about_dialog_set_translator_credits (GtkAboutDialog *about,
 /**
  * gtk_about_dialog_get_logo:
  * @about: a #GtkAboutDialog
- * 
+ *
  * Returns the pixbuf displayed as logo in the about dialog.
- * 
- * Return value: the pixbuf displayed as logo. The pixbuf is
- *   owned by the about dialog. If you want to keep a reference
- *   to it, you have to call g_object_ref() on it.
+ *
+ * Return value: (transfer none): the pixbuf displayed as logo. The
+ *   pixbuf is owned by the about dialog. If you want to keep a
+ *   reference to it, you have to call g_object_ref() on it.
  *
  * Since: 2.6
- **/
+ */
 GdkPixbuf *
 gtk_about_dialog_get_logo (GtkAboutDialog *about)
 {
   GtkAboutDialogPrivate *priv;
-  
+
   g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL);
 
-  priv = (GtkAboutDialogPrivate *)about->private_data;
+  priv = about->priv;
 
   if (gtk_image_get_storage_type (GTK_IMAGE (priv->logo_image)) == GTK_IMAGE_PIXBUF)
     return gtk_image_get_pixbuf (GTK_IMAGE (priv->logo_image));
@@ -1568,7 +1754,7 @@ static GtkIconSet *
 icon_set_new_from_pixbufs (GList *pixbufs)
 {
   GtkIconSet *icon_set = gtk_icon_set_new ();
-  
+
   for (; pixbufs; pixbufs = pixbufs->next)
     {
       GdkPixbuf *pixbuf = GDK_PIXBUF (pixbufs->data);
@@ -1578,53 +1764,52 @@ icon_set_new_from_pixbufs (GList *pixbufs)
       gtk_icon_set_add_source (icon_set, icon_source);
       gtk_icon_source_free (icon_source);
     }
-  
+
   return icon_set;
 }
 
 /**
  * gtk_about_dialog_set_logo:
  * @about: a #GtkAboutDialog
- * @logo: a #GdkPixbuf, or %NULL
- * 
- * Sets the pixbuf to be displayed as logo in 
- * the about dialog. If it is %NULL, the default
- * window icon set with gtk_window_set_default_icon ()
- * will be used.
+ * @logo: (allow-none): a #GdkPixbuf, or %NULL
+ *
+ * Sets the pixbuf to be displayed as logo in the about dialog.
+ * If it is %NULL, the default window icon set with
+ * gtk_window_set_default_icon() will be used.
  *
  * Since: 2.6
- **/
+ */
 void
 gtk_about_dialog_set_logo (GtkAboutDialog *about,
-                          GdkPixbuf      *logo)
+                           GdkPixbuf      *logo)
 {
   GtkAboutDialogPrivate *priv;
 
   g_return_if_fail (GTK_IS_ABOUT_DIALOG (about));
 
-  priv = (GtkAboutDialogPrivate *)about->private_data;
+  priv = about->priv;
 
   g_object_freeze_notify (G_OBJECT (about));
 
   if (gtk_image_get_storage_type (GTK_IMAGE (priv->logo_image)) == GTK_IMAGE_ICON_NAME)
     g_object_notify (G_OBJECT (about), "logo-icon-name");
 
-  if (logo != NULL) 
+  if (logo != NULL)
     gtk_image_set_from_pixbuf (GTK_IMAGE (priv->logo_image), logo);
-  else 
+  else
     {
       GList *pixbufs = gtk_window_get_default_icon_list ();
 
       if (pixbufs != NULL)
-       {
-         GtkIconSet *icon_set = icon_set_new_from_pixbufs (pixbufs); 
-         
-         gtk_image_set_from_icon_set (GTK_IMAGE (priv->logo_image),
-                                      icon_set, GTK_ICON_SIZE_DIALOG);
-         
-         gtk_icon_set_unref (icon_set);
-         g_list_free (pixbufs);
-       }
+        {
+          GtkIconSet *icon_set = icon_set_new_from_pixbufs (pixbufs);
+
+          gtk_image_set_from_icon_set (GTK_IMAGE (priv->logo_image),
+                                       icon_set, GTK_ICON_SIZE_DIALOG);
+
+          gtk_icon_set_unref (icon_set);
+          g_list_free (pixbufs);
+        }
     }
 
   g_object_notify (G_OBJECT (about), "logo");
@@ -1635,24 +1820,24 @@ gtk_about_dialog_set_logo (GtkAboutDialog *about,
 /**
  * gtk_about_dialog_get_logo_icon_name:
  * @about: a #GtkAboutDialog
- * 
+ *
  * Returns the icon name displayed as logo in the about dialog.
- * 
+ *
  * Return value: the icon name displayed as logo. The string is
  *   owned by the dialog. If you want to keep a reference
  *   to it, you have to call g_strdup() on it.
  *
  * Since: 2.6
- **/
-G_CONST_RETURN gchar *
+ */
+const gchar *
 gtk_about_dialog_get_logo_icon_name (GtkAboutDialog *about)
 {
   GtkAboutDialogPrivate *priv;
   const gchar *icon_name = NULL;
-  
+
   g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL);
 
-  priv = (GtkAboutDialogPrivate *)about->private_data;
+  priv = about->priv;
 
   if (gtk_image_get_storage_type (GTK_IMAGE (priv->logo_image)) == GTK_IMAGE_ICON_NAME)
     gtk_image_get_icon_name (GTK_IMAGE (priv->logo_image), &icon_name, NULL);
@@ -1663,24 +1848,23 @@ gtk_about_dialog_get_logo_icon_name (GtkAboutDialog *about)
 /**
  * gtk_about_dialog_set_logo_icon_name:
  * @about: a #GtkAboutDialog
- * @icon_name: an icon name, or %NULL
- * 
- * Sets the pixbuf to be displayed as logo in 
- * the about dialog. If it is %NULL, the default
- * window icon set with gtk_window_set_default_icon()
- * will be used.
+ * @icon_name: (allow-none): an icon name, or %NULL
+ *
+ * Sets the pixbuf to be displayed as logo in the about dialog.
+ * If it is %NULL, the default window icon set with
+ * gtk_window_set_default_icon() will be used.
  *
  * Since: 2.6
- **/
+ */
 void
 gtk_about_dialog_set_logo_icon_name (GtkAboutDialog *about,
-                                    const gchar    *icon_name)
+                                     const gchar    *icon_name)
 {
   GtkAboutDialogPrivate *priv;
 
   g_return_if_fail (GTK_IS_ABOUT_DIALOG (about));
 
-  priv = (GtkAboutDialogPrivate *)about->private_data;
+  priv = about->priv;
 
   g_object_freeze_notify (G_OBJECT (about));
 
@@ -1688,112 +1872,53 @@ gtk_about_dialog_set_logo_icon_name (GtkAboutDialog *about,
     g_object_notify (G_OBJECT (about), "logo");
 
   gtk_image_set_from_icon_name (GTK_IMAGE (priv->logo_image), icon_name,
-                               GTK_ICON_SIZE_DIALOG);
+                                GTK_ICON_SIZE_DIALOG);
   g_object_notify (G_OBJECT (about), "logo-icon-name");
 
   g_object_thaw_notify (G_OBJECT (about));
 }
 
-static void
-activate_url (GtkWidget *widget, 
-             gpointer   data)
-{
-  GtkAboutDialog *about = GTK_ABOUT_DIALOG (data);
-  const gchar *url = gtk_link_button_get_uri (GTK_LINK_BUTTON (widget));
-  GtkAboutDialogActivateLinkFunc url_hook;
-  gpointer url_hook_data;
-
-  if (activate_url_hook_set)
-    {
-      url_hook = activate_url_hook;
-      url_hook_data = activate_url_hook_data;
-    }
-  else
-    {
-      url_hook = default_url_hook;
-      url_hook_data = NULL;
-    }
-
-  if (url_hook)
-    url_hook (about, url, url_hook_data);
-}
-
 static void
 follow_if_link (GtkAboutDialog *about,
-               GtkTextView    *text_view,
-               GtkTextIter    *iter)
+                GtkTextView    *text_view,
+                GtkTextIter    *iter)
 {
   GSList *tags = NULL, *tagp = NULL;
-  GtkAboutDialogPrivate *priv = (GtkAboutDialogPrivate *)about->private_data;
-  gchar *url = NULL;
-  GtkAboutDialogActivateLinkFunc email_hook, url_hook;
-  gpointer email_hook_data, url_hook_data;
-
-  if (activate_email_hook_set)
-    {
-      email_hook = activate_email_hook;
-      email_hook_data = activate_email_hook_data;
-    }
-  else
-    {
-      email_hook = default_email_hook;
-      email_hook_data = NULL;
-    }
-
-  if (activate_url_hook_set)
-    {
-      url_hook = activate_url_hook;
-      url_hook_data = activate_url_hook_data;
-    }
-  else
-    {
-      url_hook = default_url_hook;
-      url_hook_data = NULL;
-    }
+  GtkAboutDialogPrivate *priv = about->priv;
+  gchar *uri = NULL;
 
   tags = gtk_text_iter_get_tags (iter);
-  for (tagp = tags; tagp != NULL && !url; tagp = tagp->next)
+  for (tagp = tags; tagp != NULL && !uri; tagp = tagp->next)
     {
       GtkTextTag *tag = tagp->data;
 
-      if (email_hook != NULL)
-        {
-         url = g_object_get_data (G_OBJECT (tag), "email");
-          if (url)
-            email_hook (about, url, email_hook_data);
-        }
+      uri = g_object_get_data (G_OBJECT (tag), "uri");
+      if (uri)
+        emit_activate_link (about, uri);
 
-      if (!url && url_hook != NULL)
+      if (uri && !g_slist_find_custom (priv->visited_links, uri, (GCompareFunc)strcmp))
         {
-         url = g_object_get_data (G_OBJECT (tag), "url");
-         if (url) 
-           url_hook (about, url, url_hook_data);
-        }
+          GdkColor *style_visited_link_color;
+          GdkColor color;
 
-      if (url && !g_slist_find_custom (priv->visited_links, url, (GCompareFunc)strcmp))
-       {
-         GdkColor *style_visited_link_color;
-         GdkColor color;
-         
-         gtk_widget_ensure_style (GTK_WIDGET (about));
-         gtk_widget_style_get (GTK_WIDGET (about), 
-                               "visited-link-color", &style_visited_link_color, 
-                               NULL);
-         if (style_visited_link_color)
-           {
-             color = *style_visited_link_color;
-             gdk_color_free (style_visited_link_color);
-           }
-         else
-           color = default_visited_link_color;
-         
-         g_object_set (G_OBJECT (tag), "foreground-gdk", &color, NULL);
-
-         priv->visited_links = g_slist_prepend (priv->visited_links, g_strdup (url));
-       }
+          gtk_widget_style_get (GTK_WIDGET (about),
+                                "visited-link-color", &style_visited_link_color,
+                                NULL);
+          if (style_visited_link_color)
+            {
+              color = *style_visited_link_color;
+              gdk_color_free (style_visited_link_color);
+            }
+          else
+            color = default_visited_link_color;
+
+          g_object_set (G_OBJECT (tag), "foreground-gdk", &color, NULL);
+
+          priv->visited_links = g_slist_prepend (priv->visited_links, g_strdup (uri));
+        }
     }
 
-  if (tags) 
+  if (tags)
     g_slist_free (tags);
 }
 
@@ -1807,11 +1932,11 @@ text_view_key_press_event (GtkWidget      *text_view,
 
   switch (event->keyval)
     {
-      case GDK_Return:
-      case GDK_ISO_Enter:
-      case GDK_KP_Enter:
+      case GDK_KEY_Return:
+      case GDK_KEY_ISO_Enter:
+      case GDK_KEY_KP_Enter:
         buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_view));
-        gtk_text_buffer_get_iter_at_mark (buffer, &iter, 
+        gtk_text_buffer_get_iter_at_mark (buffer, &iter,
                                           gtk_text_buffer_get_insert (buffer));
         follow_if_link (about, GTK_TEXT_VIEW (text_view), &iter);
         break;
@@ -1838,7 +1963,7 @@ text_view_event_after (GtkWidget      *text_view,
 
   button_event = (GdkEventButton *)event;
 
-  if (button_event->button != 1)
+  if (button_event->button != GDK_BUTTON_PRIMARY)
     return FALSE;
 
   buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_view));
@@ -1848,7 +1973,7 @@ text_view_event_after (GtkWidget      *text_view,
   if (gtk_text_iter_get_offset (&start) != gtk_text_iter_get_offset (&end))
     return FALSE;
 
-  gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (text_view), 
+  gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (text_view),
                                          GTK_TEXT_WINDOW_WIDGET,
                                          button_event->x, button_event->y, &x, &y);
 
@@ -1861,25 +1986,25 @@ text_view_event_after (GtkWidget      *text_view,
 
 static void
 set_cursor_if_appropriate (GtkAboutDialog *about,
-                          GtkTextView    *text_view,
-                          gint            x,
-                          gint            y)
+                           GtkTextView    *text_view,
+                           GdkDevice      *device,
+                           gint            x,
+                           gint            y)
 {
-  GtkAboutDialogPrivate *priv = (GtkAboutDialogPrivate *)about->private_data;
+  GtkAboutDialogPrivate *priv = about->priv;
   GSList *tags = NULL, *tagp = NULL;
   GtkTextIter iter;
   gboolean hovering_over_link = FALSE;
 
   gtk_text_view_get_iter_at_location (text_view, &iter, x, y);
-  
+
   tags = gtk_text_iter_get_tags (&iter);
   for (tagp = tags;  tagp != NULL;  tagp = tagp->next)
     {
       GtkTextTag *tag = tagp->data;
-      gchar *email = g_object_get_data (G_OBJECT (tag), "email");
-      gchar *url = g_object_get_data (G_OBJECT (tag), "url");
+      gchar *uri = g_object_get_data (G_OBJECT (tag), "uri");
 
-      if (email != NULL || url != NULL) 
+      if (uri != NULL)
         {
           hovering_over_link = TRUE;
           break;
@@ -1891,12 +2016,12 @@ set_cursor_if_appropriate (GtkAboutDialog *about,
       priv->hovering_over_link = hovering_over_link;
 
       if (hovering_over_link)
-        gdk_window_set_cursor (gtk_text_view_get_window (text_view, GTK_TEXT_WINDOW_TEXT), priv->hand_cursor);
+        gdk_window_set_device_cursor (gtk_text_view_get_window (text_view, GTK_TEXT_WINDOW_TEXT), device, priv->hand_cursor);
       else
-        gdk_window_set_cursor (gtk_text_view_get_window (text_view, GTK_TEXT_WINDOW_TEXT), priv->regular_cursor);
+        gdk_window_set_device_cursor (gtk_text_view_get_window (text_view, GTK_TEXT_WINDOW_TEXT), device, priv->regular_cursor);
     }
 
-  if (tags) 
+  if (tags)
     g_slist_free (tags);
 }
 
@@ -1907,11 +2032,11 @@ text_view_motion_notify_event (GtkWidget *text_view,
 {
   gint x, y;
 
-  gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (text_view), 
+  gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (text_view),
                                          GTK_TEXT_WINDOW_WIDGET,
                                          event->x, event->y, &x, &y);
 
-  set_cursor_if_appropriate (about, GTK_TEXT_VIEW (text_view), x, y);
+  set_cursor_if_appropriate (about, GTK_TEXT_VIEW (text_view), event->device, x, y);
 
   gdk_event_request_motions (event);
 
@@ -1924,22 +2049,39 @@ text_view_visibility_notify_event (GtkWidget          *text_view,
                                    GdkEventVisibility *event,
                                    GtkAboutDialog     *about)
 {
+  GdkDeviceManager *device_manager;
+  GdkDisplay *display;
+  GList *devices, *d;
   gint wx, wy, bx, by;
 
-  gdk_window_get_pointer (text_view->window, &wx, &wy, NULL);
+  display = gdk_window_get_display (event->window);
+  device_manager = gdk_display_get_device_manager (display);
+  devices = gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_MASTER);
 
-  gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (text_view), 
-                                         GTK_TEXT_WINDOW_WIDGET,
-                                         wx, wy, &bx, &by);
+  for (d = devices; d; d = d->next)
+    {
+      GdkDevice *dev = d->data;
+
+      if (gdk_device_get_source (dev) == GDK_SOURCE_KEYBOARD)
+        continue;
+
+      gdk_window_get_device_position (gtk_widget_get_window (text_view), dev,
+                                      &wx, &wy, NULL);
+
+      gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (text_view),
+                                             GTK_TEXT_WINDOW_WIDGET,
+                                             wx, wy, &bx, &by);
+
+      set_cursor_if_appropriate (about, GTK_TEXT_VIEW (text_view), dev, bx, by);
+    }
 
-  set_cursor_if_appropriate (about, GTK_TEXT_VIEW (text_view), bx, by);
+  g_list_free (devices);
 
   return FALSE;
 }
 
 static GtkWidget *
 text_view_new (GtkAboutDialog  *about,
-               GtkWidget       *dialog,
                gchar          **strings,
                GtkWrapMode      wrap_mode)
 {
@@ -1948,22 +2090,19 @@ text_view_new (GtkAboutDialog  *about,
   GtkWidget *view;
   GtkTextView *text_view;
   GtkTextBuffer *buffer;
-  gboolean linkify_email, linkify_urls;
   GdkColor *style_link_color;
   GdkColor *style_visited_link_color;
   GdkColor color;
   GdkColor link_color;
   GdkColor visited_link_color;
-  GtkAboutDialogPrivate *priv = (GtkAboutDialogPrivate *)about->private_data;
-  
-  linkify_email = (!activate_email_hook_set || activate_email_hook != NULL);
-  linkify_urls = (!activate_url_hook_set || activate_url_hook != NULL);
+  GtkAboutDialogPrivate *priv = about->priv;
+  GtkTextIter start_iter, end_iter;
+  GtkTextTag *tag;
 
-  gtk_widget_ensure_style (GTK_WIDGET (about));
   gtk_widget_style_get (GTK_WIDGET (about),
-                       "link-color", &style_link_color, 
-                       "visited-link-color", &style_visited_link_color, 
-                       NULL);
+                        "link-color", &style_link_color,
+                        "visited-link-color", &style_visited_link_color,
+                        NULL);
   if (style_link_color)
     {
       link_color = *style_link_color;
@@ -1987,6 +2126,12 @@ text_view_new (GtkAboutDialog  *about,
   gtk_text_view_set_editable (text_view, FALSE);
   gtk_text_view_set_wrap_mode (text_view, wrap_mode);
 
+  gtk_text_buffer_get_start_iter (buffer, &start_iter);
+  gtk_text_buffer_get_start_iter (buffer, &end_iter);
+  tag = gtk_text_tag_new (NULL);
+  g_object_set (tag, "font-scale", PANGO_SCALE_SMALL, NULL);
+  gtk_text_buffer_apply_tag (buffer, tag, &start_iter, &end_iter);
+
   gtk_text_view_set_left_margin (text_view, 8);
   gtk_text_view_set_right_margin (text_view, 8);
 
@@ -2009,73 +2154,86 @@ text_view_new (GtkAboutDialog  *about,
     {
       q0  = *p;
       while (*q0)
-       {
-         q1 = linkify_email ? strchr (q0, '<') : NULL;
-         q2 = q1 ? strchr (q1, '>') : NULL;
-         r1 = linkify_urls ? strstr (q0, "http://") : NULL;
+        {
+          q1 = strchr (q0, '<');
+          q2 = q1 ? strchr (q1, '>') : NULL;
+          r1 = strstr (q0, "http://");
           if (r1)
             {
               r2 = strpbrk (r1, " \n\t");
-             if (!r2)
-               r2 = strchr (r1, '\0');
-           }
-          else  
+              if (!r2)
+                r2 = strchr (r1, '\0');
+            }
+          else
             r2 = NULL;
 
-         if (r1 && r2 && (!q1 || !q2 || (r1 < q1))) 
-           {
-             q1 = r1;
-             q2 = r2;
-           }
-
-         if (q1 && q2) 
-           {
-             GtkTextIter end;
-             gchar *link;
-             const gchar *link_type;
-             GtkTextTag *tag;
-
-             if (*q1 == '<')
-               {
-                 gtk_text_buffer_insert_at_cursor (buffer, q0, (q1 - q0) + 1);
-                 gtk_text_buffer_get_end_iter (buffer, &end);
-                 q1++;
-                 link_type = I_("email");
-               }
-             else
-               {
-                 gtk_text_buffer_insert_at_cursor (buffer, q0, q1 - q0);
-                 gtk_text_buffer_get_end_iter (buffer, &end);
-                 link_type = I_("url");
-               }
-
-             q0 = q2;
-
-             link = g_strndup (q1, q2 - q1);
-
-             if (g_slist_find_custom (priv->visited_links, link, (GCompareFunc)strcmp))
-               color = visited_link_color;
-             else
-               color = link_color;
-             
-             tag = gtk_text_buffer_create_tag (buffer, NULL, 
-                                               "foreground-gdk", &color, 
-                                               "underline", PANGO_UNDERLINE_SINGLE, 
-                                               NULL);
-             g_object_set_data_full (G_OBJECT (tag), link_type, g_strdup (link), g_free);
-             gtk_text_buffer_insert_with_tags (buffer, &end, link, -1, tag, NULL);
-             
-             g_free (link);
-           }
-         else
-           {
-             gtk_text_buffer_insert_at_cursor (buffer, q0, -1);
-             break;
-           }
-       }
-      
+          if (r1 && r2 && (!q1 || !q2 || (r1 < q1)))
+            {
+              q1 = r1;
+              q2 = r2;
+            }
+
+          if (q1 && q2)
+            {
+              GtkTextIter end;
+              gchar *link;
+              gchar *uri;
+              const gchar *link_type;
+              GtkTextTag *tag;
+
+              if (*q1 == '<')
+                {
+                  gtk_text_buffer_insert_at_cursor (buffer, q0, q1 - q0 + 1);
+                  gtk_text_buffer_get_end_iter (buffer, &end);
+                  q1++;
+                  link_type = "email";
+                }
+              else
+                {
+                  gtk_text_buffer_insert_at_cursor (buffer, q0, q1 - q0);
+                  gtk_text_buffer_get_end_iter (buffer, &end);
+                  link_type = "uri";
+                }
+
+              q0 = q2;
+
+              link = g_strndup (q1, q2 - q1);
+
+              if (g_slist_find_custom (priv->visited_links, link, (GCompareFunc)strcmp))
+                color = visited_link_color;
+              else
+                color = link_color;
+
+              tag = gtk_text_buffer_create_tag (buffer, NULL,
+                                                "foreground-gdk", &color,
+                                                "underline", PANGO_UNDERLINE_SINGLE,
+                                                NULL);
+              if (strcmp (link_type, "email") == 0)
+                {
+                  gchar *escaped;
+
+                  escaped = g_uri_escape_string (link, NULL, FALSE);
+                  uri = g_strconcat ("mailto:", escaped, NULL);
+                  g_free (escaped);
+                }
+              else
+                {
+                  uri = g_strdup (link);
+                }
+              g_object_set_data_full (G_OBJECT (tag), I_("uri"), uri, g_free);
+              gtk_text_buffer_insert_with_tags (buffer, &end, link, -1, tag, NULL);
+
+              g_free (link);
+            }
+          else
+            {
+              gtk_text_buffer_insert_at_cursor (buffer, q0, -1);
+              break;
+            }
+        }
+
       if (p[1])
-       gtk_text_buffer_insert_at_cursor (buffer, "\n", 1);
+        gtk_text_buffer_insert_at_cursor (buffer, "\n", 1);
     }
 
   gtk_widget_show (view);
@@ -2083,162 +2241,245 @@ text_view_new (GtkAboutDialog  *about,
 }
 
 static void
-add_credits_page (GtkAboutDialog *about,
-                  GtkWidget      *credits_dialog,
-                 GtkWidget      *notebook,
-                 gchar          *title,
-                 gchar         **people)
+add_credits_section (GtkAboutDialog *about,
+                     GtkGrid        *grid,
+                     gint           *row,
+                     gchar          *title,
+                     gchar         **people)
 {
-  GtkWidget *sw, *view;
+  GtkWidget *label;
+  gchar *markup;
+  gchar **p;
+  gchar *q0, *q1, *q2, *r1, *r2;
 
-  view = text_view_new (about, credits_dialog, people, GTK_WRAP_NONE);
+  if (people == NULL)
+    return;
 
-  sw = gtk_scrolled_window_new (NULL, NULL);
-  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
-                                      GTK_SHADOW_IN);
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
-                                 GTK_POLICY_AUTOMATIC,
-                                 GTK_POLICY_AUTOMATIC);
-  gtk_container_add (GTK_CONTAINER (sw), view);
-  
-  gtk_notebook_append_page (GTK_NOTEBOOK (notebook), 
-                           sw, gtk_label_new (title));
+  markup = g_strdup_printf ("<span size=\"small\">%s</span>", title);
+  label = gtk_label_new (markup);
+  gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
+  g_free (markup);
+  gtk_widget_set_halign (label, GTK_ALIGN_END);
+  gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
+  gtk_grid_attach (grid, label, 0, *row, 1, 1);
+
+  for (p = people; *p; p++)
+    {
+      GString *str;
+
+      str = g_string_new ("<span size=\"small\">");
+
+      q0 = *p;
+      while (*q0)
+        {
+          q1 = strchr (q0, '<');
+          q2 = q1 ? strchr (q1, '>') : NULL;
+          r1 = strstr (q0, "http://");
+          if (r1)
+            {
+              r2 = strpbrk (r1, " \n\t");
+              if (!r2)
+                r2 = strchr (r1, '\0');
+            }
+          else
+            r2 = NULL;
+
+          if (r1 && r2 && (!q1 || !q2 || (r1 < q1)))
+            {
+              q1 = r1;
+              q2 = r2;
+            }
+          else if (q1 && (q1[1] == 'a' || q1[1] == 'A') && q1[2] == ' ')
+            {
+              /* if it is a <a> link leave it for the label to parse */
+              q1 = NULL;
+            }
+
+          if (q1 && q2)
+            {
+              gchar *link;
+              gchar *text;
+              gchar *name;
+
+              if (*q1 == '<')
+                {
+                  /* email */
+                  gchar *escaped;
+
+                  text = g_strstrip (g_strndup (q0, q1 - q0));
+                  name = g_markup_escape_text (text, -1);
+                  q1++;
+                  link = g_strndup (q1, q2 - q1);
+                  q2++;
+                  escaped = g_uri_escape_string (link, NULL, FALSE);
+                  g_string_append_printf (str,
+                                          "<a href=\"mailto:%s\">%s</a>",
+                                          escaped,
+                                          name[0] ? name : link);
+                  g_free (escaped);
+                  g_free (link);
+                  g_free (text);
+                  g_free (name);
+                }
+              else
+                {
+                  /* uri */
+                  text = g_strstrip (g_strndup (q0, q1 - q0));
+                  name = g_markup_escape_text (text, -1);
+                  link = g_strndup (q1, q2 - q1);
+                  g_string_append_printf (str,
+                                          "<a href=\"%s\">%s</a>",
+                                          link,
+                                          name[0] ? name : link);
+                  g_free (link);
+                  g_free (text);
+                  g_free (name);
+                }
+
+              q0 = q2;
+            }
+          else
+            {
+              g_string_append (str, q0);
+              break;
+            }
+        }
+      g_string_append (str, "</span>");
+
+      label = gtk_label_new (str->str);
+      gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
+      g_string_free (str, TRUE);
+      gtk_widget_set_halign (label, GTK_ALIGN_START);
+      gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
+      gtk_grid_attach (grid, label, 1, *row, 1, 1);
+      (*row)++;
+    }
+
+  /* skip one at the end */
+  label = gtk_label_new ("");
+  gtk_grid_attach (grid, label, 1, *row, 1, 1);
+  (*row)++;
 }
 
 static void
-display_credits_dialog (GtkWidget *button, 
-                       gpointer   data)
+create_credits_page (GtkAboutDialog *about)
 {
-  GtkAboutDialog *about = (GtkAboutDialog *)data;
-  GtkAboutDialogPrivate *priv = (GtkAboutDialogPrivate *)about->private_data;
-  GtkWidget *dialog, *notebook;
-  GtkDialog *credits_dialog;
+  GtkAboutDialogPrivate *priv = about->priv;
+  GtkWidget *page_vbox;
+  GtkWidget *sw;
+  GtkWidget *grid;
+  gint row;
+
+  page_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
+  gtk_widget_show (page_vbox);
+  priv->credits_page = gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook), page_vbox, NULL);
+
+  sw = gtk_scrolled_window_new (NULL, NULL);
+  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), GTK_SHADOW_IN);
+  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
+                                  GTK_POLICY_NEVER,
+                                  GTK_POLICY_AUTOMATIC);
+  gtk_box_pack_start (GTK_BOX (page_vbox), sw, TRUE, TRUE, 0);
+
+  grid = gtk_grid_new ();
+  gtk_container_set_border_width (GTK_CONTAINER (grid), 5);
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (grid), GTK_ORIENTATION_VERTICAL);
+  gtk_grid_set_column_spacing (GTK_GRID (grid), 8);
+  gtk_grid_set_row_spacing (GTK_GRID (grid), 2);
+  gtk_widget_set_halign (grid, GTK_ALIGN_CENTER);
+  gtk_widget_set_valign (grid, GTK_ALIGN_START);
+  gtk_container_add (GTK_CONTAINER (sw), grid);
+  gtk_style_context_add_class (gtk_widget_get_style_context (gtk_bin_get_child (GTK_BIN (sw))),
+                               GTK_STYLE_CLASS_VIEW);
+
+  row = 0;
+
+  if (priv->authors != NULL)
+    add_credits_section (about, GTK_GRID (grid), &row, _("Created by"), priv->authors);
 
-  if (priv->credits_dialog != NULL)
-    {
-      gtk_window_present (GTK_WINDOW (priv->credits_dialog));
-      return;
-    }
-       
-  dialog = gtk_dialog_new_with_buttons (_("Credits"),
-                                       GTK_WINDOW (about),
-                                       GTK_DIALOG_DESTROY_WITH_PARENT,
-                                       GTK_STOCK_CLOSE, GTK_RESPONSE_CANCEL,
-                                       NULL);
-  credits_dialog = GTK_DIALOG (dialog);
-  gtk_dialog_set_has_separator (credits_dialog, FALSE);
-  gtk_container_set_border_width (GTK_CONTAINER (credits_dialog), 5);
-  gtk_box_set_spacing (GTK_BOX (credits_dialog->vbox), 2); /* 2 * 5 + 2 = 12 */
-  gtk_container_set_border_width (GTK_CONTAINER (credits_dialog->action_area), 5);
-
-  priv->credits_dialog = dialog;
-  gtk_window_set_default_size (GTK_WINDOW (dialog), 360, 260);
-  gtk_dialog_set_default_response (credits_dialog, GTK_RESPONSE_CANCEL);
-
-  gtk_window_set_modal (GTK_WINDOW (dialog), 
-                       gtk_window_get_modal (GTK_WINDOW (about)));
-
-  g_signal_connect (dialog, "response",
-                   G_CALLBACK (gtk_widget_destroy), dialog);
-  g_signal_connect (dialog, "destroy",
-                   G_CALLBACK (gtk_widget_destroyed),
-                   &(priv->credits_dialog));
-
-  notebook = gtk_notebook_new ();
-  gtk_container_set_border_width (GTK_CONTAINER (notebook), 5);
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), notebook, TRUE, TRUE, 0);
-
-  if (priv->authors != NULL) 
-    add_credits_page (about, dialog, notebook, _("Written by"), priv->authors);
-  
   if (priv->documenters != NULL)
-    add_credits_page (about, dialog, notebook, _("Documented by"), priv->documenters);
-    
+    add_credits_section (about, GTK_GRID (grid), &row, _("Documented by"), priv->documenters);
+
   /* Don't show an untranslated gettext msgid */
   if (priv->translator_credits != NULL &&
-      strcmp (priv->translator_credits, "translator_credits") &&
-      strcmp (priv->translator_credits, "translator-credits")
+      strcmp (priv->translator_credits, "translator_credits") != 0 &&
+      strcmp (priv->translator_credits, "translator-credits") != 0)
     {
-      gchar *translators[2];
-      
-      translators[0] = priv->translator_credits;
-      translators[1] = NULL;
+      gchar **translators;
 
-      add_credits_page (about, dialog, notebook, _("Translated by"), translators);
+      translators = g_strsplit (priv->translator_credits, "\n", 0);
+      add_credits_section (about, GTK_GRID (grid), &row, _("Translated by"), translators);
+      g_strfreev (translators);
     }
 
-  if (priv->artists != NULL) 
-    add_credits_page (about, dialog, notebook, _("Artwork by"), priv->artists);
-  
-  gtk_widget_show_all (dialog);
+  if (priv->artists != NULL)
+    add_credits_section (about, GTK_GRID (grid), &row, _("Artwork by"), priv->artists);
+
+  if (priv->credit_sections != NULL)
+    {
+      GSList *cs;
+      for (cs = priv->credit_sections; cs != NULL; cs = cs->next)
+       {
+         CreditSection *section = cs->data;
+         add_credits_section (about, GTK_GRID (grid), &row, section->heading, section->people);
+       }
+    }
+
+  gtk_widget_show_all (sw);
 }
 
 static void
-set_policy (GtkWidget *sw)
+display_credits_page (GtkWidget *button,
+                      gpointer   data)
 {
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
-                                 GTK_POLICY_AUTOMATIC,
-                                 GTK_POLICY_AUTOMATIC);  
+  GtkAboutDialog *about = (GtkAboutDialog *)data;
+  GtkAboutDialogPrivate *priv = about->priv;
+
+  if (priv->credits_page == 0)
+    create_credits_page (about);
+
+  switch_page (about, priv->credits_page);
 }
 
 static void
-display_license_dialog (GtkWidget *button, 
-                       gpointer   data)
+create_license_page (GtkAboutDialog *about)
 {
-  GtkAboutDialog *about = (GtkAboutDialog *)data;
-  GtkAboutDialogPrivate *priv = (GtkAboutDialogPrivate *)about->private_data;
-  GtkWidget *dialog, *view, *sw;
-  GtkDialog *licence_dialog;
+  GtkAboutDialogPrivate *priv = about->priv;
+  GtkWidget *page_vbox;
+  GtkWidget *sw;
+  GtkWidget *view;
   gchar *strings[2];
-  
-  if (priv->license_dialog != NULL)
-    {
-      gtk_window_present (GTK_WINDOW (priv->license_dialog));
-      return;
-    }
-       
-  dialog = gtk_dialog_new_with_buttons (_("License"),
-                                       GTK_WINDOW (about),
-                                       GTK_DIALOG_DESTROY_WITH_PARENT,
-                                       GTK_STOCK_CLOSE, GTK_RESPONSE_CANCEL,
-                                       NULL);
-  licence_dialog = GTK_DIALOG (dialog);
-  gtk_dialog_set_has_separator (licence_dialog, FALSE);
-  gtk_container_set_border_width (GTK_CONTAINER (licence_dialog), 5);
-  gtk_box_set_spacing (GTK_BOX (licence_dialog->vbox), 2); /* 2 * 5 + 2 = 12 */
-  gtk_container_set_border_width (GTK_CONTAINER (licence_dialog->action_area), 5);
-
-  priv->license_dialog = dialog;
-  gtk_window_set_default_size (GTK_WINDOW (dialog), 420, 320);
-  gtk_dialog_set_default_response (licence_dialog, GTK_RESPONSE_CANCEL);
-
-  gtk_window_set_modal (GTK_WINDOW (dialog), 
-                       gtk_window_get_modal (GTK_WINDOW (about)));
-
-  g_signal_connect (dialog, "response",
-                   G_CALLBACK (gtk_widget_destroy), dialog);
-  g_signal_connect (dialog, "destroy",
-                   G_CALLBACK (gtk_widget_destroyed),
-                   &(priv->license_dialog));
+
+  page_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
+  priv->license_page = gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook), page_vbox, NULL);
 
   sw = gtk_scrolled_window_new (NULL, NULL);
-  gtk_container_set_border_width (GTK_CONTAINER (sw), 5);
-  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
-                                      GTK_SHADOW_IN);
+  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), GTK_SHADOW_IN);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
-                                 GTK_POLICY_NEVER,
-                                 GTK_POLICY_AUTOMATIC);
-  g_signal_connect (sw, "map", G_CALLBACK (set_policy), NULL);
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), sw, TRUE, TRUE, 0);
+                                  GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+  gtk_box_pack_start (GTK_BOX (page_vbox), sw, TRUE, TRUE, 0);
 
   strings[0] = priv->license;
   strings[1] = NULL;
-  view = text_view_new (about, dialog, strings,
+  view = text_view_new (about, strings,
                         priv->wrap_license ? GTK_WRAP_WORD : GTK_WRAP_NONE);
 
   gtk_container_add (GTK_CONTAINER (sw), view);
 
-  gtk_widget_show_all (dialog);
+  gtk_widget_show_all (page_vbox);
+}
+
+static void
+display_license_page (GtkWidget *button,
+                      gpointer   data)
+{
+  GtkAboutDialog *about = (GtkAboutDialog *)data;
+  GtkAboutDialogPrivate *priv = about->priv;
+
+  if (priv->license_page == 0)
+    create_license_page (about);
+
+  switch_page (about, priv->license_page);
 }
 
 /**
@@ -2258,115 +2499,33 @@ gtk_about_dialog_new (void)
   return GTK_WIDGET (dialog);
 }
 
-/**
- * gtk_about_dialog_set_email_hook:
- * @func: a function to call when an email link is activated.
- * @data: data to pass to @func
- * @destroy: #GDestroyNotify for @data
- * 
- * Installs a global function to be called whenever the user activates an
- * email link in an about dialog. 
- *
- * Since 2.18 there exists a default function which uses gtk_show_uri(). To
- * deactivate it, you can pass %NULL for @func.
- * 
- * Return value: the previous email hook.
- *
- * Since: 2.6
- */
-GtkAboutDialogActivateLinkFunc      
-gtk_about_dialog_set_email_hook (GtkAboutDialogActivateLinkFunc func, 
-                                gpointer                       data, 
-                                GDestroyNotify                 destroy)
-{
-  GtkAboutDialogActivateLinkFunc old;
-
-  if (activate_email_hook_destroy != NULL)
-    (* activate_email_hook_destroy) (activate_email_hook_data);
-
-  old = activate_email_hook;
-
-  activate_email_hook_set = TRUE;
-  activate_email_hook = func;
-  activate_email_hook_data = data;
-  activate_email_hook_destroy = destroy;
-
-  return old;
-}
-
-/**
- * gtk_about_dialog_set_url_hook:
- * @func: a function to call when a URL link is activated.
- * @data: data to pass to @func
- * @destroy: #GDestroyNotify for @data
- * 
- * Installs a global function to be called whenever the user activates a
- * URL link in an about dialog.
- * 
- * Since 2.18 here exists a default function which uses gtk_show_uri(). To
- * deactivate it, you can pass %NULL for @func.
- * 
- * Return value: the previous URL hook.
- *
- * Since: 2.6
- */
-GtkAboutDialogActivateLinkFunc      
-gtk_about_dialog_set_url_hook (GtkAboutDialogActivateLinkFunc func, 
-                              gpointer                       data, 
-                              GDestroyNotify                 destroy)
-{
-  GtkAboutDialogActivateLinkFunc old;
-
-  if (activate_url_hook_destroy != NULL)
-    (* activate_url_hook_destroy) (activate_url_hook_data);
-
-  old = activate_url_hook;
-
-  activate_url_hook_set = TRUE;
-  activate_url_hook = func;
-  activate_url_hook_data = data;
-  activate_url_hook_destroy = destroy;
-
-  return old;
-}
-
-static void 
+static void
 close_cb (GtkAboutDialog *about)
 {
-  GtkAboutDialogPrivate *priv = (GtkAboutDialogPrivate *)about->private_data;
-
-  if (priv->license_dialog != NULL)
-    {
-      gtk_widget_destroy (priv->license_dialog);
-      priv->license_dialog = NULL;
-    }
-
-  if (priv->credits_dialog != NULL)
-    {
-      gtk_widget_destroy (priv->credits_dialog);
-      priv->credits_dialog = NULL;
-    }
+  GtkAboutDialogPrivate *priv = about->priv;
 
+  switch_page (about, 0);
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->credits_button), FALSE);
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->license_button), FALSE);
   gtk_widget_hide (GTK_WIDGET (about));
-  
 }
 
 /**
  * gtk_show_about_dialog:
- * @parent: transient parent, or %NULL for none
- * @first_property_name: the name of the first property 
- * @Varargs: value of first property, followed by more properties, %NULL-terminated
+ * @parent: (allow-none): transient parent, or %NULL for none
+ * @first_property_name: the name of the first property
+ * @...: value of first property, followed by more properties, %NULL-terminated
  *
  * This is a convenience function for showing an application's about box.
- * The constructed dialog is associated with the parent window and 
+ * The constructed dialog is associated with the parent window and
  * reused for future invocations of this function.
  *
  * Since: 2.6
  */
 void
 gtk_show_about_dialog (GtkWindow   *parent,
-                      const gchar *first_property_name,
-                      ...)
+                       const gchar *first_property_name,
+                       ...)
 {
   static GtkWidget *global_about_dialog = NULL;
   GtkWidget *dialog = NULL;
@@ -2374,10 +2533,10 @@ gtk_show_about_dialog (GtkWindow   *parent,
 
   if (parent)
     dialog = g_object_get_data (G_OBJECT (parent), "gtk-about-dialog");
-  else 
+  else
     dialog = global_about_dialog;
 
-  if (!dialog) 
+  if (!dialog)
     {
       dialog = gtk_about_dialog_new ();
 
@@ -2394,21 +2553,140 @@ gtk_show_about_dialog (GtkWindow   *parent,
       g_object_set_valist (G_OBJECT (dialog), first_property_name, var_args);
       va_end (var_args);
 
-      if (parent) 
-       {
-         gtk_window_set_transient_for (GTK_WINDOW (dialog), parent);
-         gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE);
-         g_object_set_data_full (G_OBJECT (parent), 
-                                  I_("gtk-about-dialog"), 
-                                 dialog, g_object_unref);
-       }
-      else 
-       global_about_dialog = dialog;
-      
+      if (parent)
+        {
+          gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
+          gtk_window_set_transient_for (GTK_WINDOW (dialog), parent);
+          gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE);
+          g_object_set_data_full (G_OBJECT (parent),
+                                  I_("gtk-about-dialog"),
+                                  dialog, g_object_unref);
+        }
+      else
+        global_about_dialog = dialog;
+
     }
-  
+
   gtk_window_present (GTK_WINDOW (dialog));
 }
 
-#define __GTK_ABOUT_DIALOG_C__
-#include "gtkaliasdef.c"
+/**
+ * gtk_about_dialog_set_license_type:
+ * @about: a #GtkAboutDialog
+ * @license_type: the type of license
+ *
+ * Sets the license of the application showing the @about dialog from a
+ * list of known licenses.
+ *
+ * This function overrides the license set using
+ * gtk_about_dialog_set_license().
+ *
+ * Since: 3.0
+ */
+void
+gtk_about_dialog_set_license_type (GtkAboutDialog *about,
+                                   GtkLicense      license_type)
+{
+  GtkAboutDialogPrivate *priv;
+
+  g_return_if_fail (GTK_IS_ABOUT_DIALOG (about));
+  g_return_if_fail (license_type >= GTK_LICENSE_UNKNOWN &&
+                    license_type <= GTK_LICENSE_ARTISTIC);
+
+  priv = about->priv;
+
+  if (priv->license_type != license_type)
+    {
+      g_object_freeze_notify (G_OBJECT (about));
+
+      priv->license_type = license_type;
+
+      /* custom licenses use the contents of the :license property */
+      if (priv->license_type != GTK_LICENSE_CUSTOM)
+        {
+          const gchar *url;
+          gchar *license_string;
+          GString *str;
+
+          url = gtk_license_urls[priv->license_type];
+          if (url == NULL)
+            url = priv->website_url;
+
+          str = g_string_sized_new (256);
+          g_string_append_printf (str, _(gtk_license_preamble), url, url);
+
+          g_free (priv->license);
+          priv->license = g_string_free (str, FALSE);
+          priv->wrap_license = TRUE;
+
+          license_string = g_strdup_printf ("<span size=\"small\">%s</span>",
+                                            priv->license);
+          gtk_label_set_markup (GTK_LABEL (priv->license_label), license_string);
+          g_free (license_string);
+          gtk_widget_show (priv->license_label);
+
+          update_license_button_visibility (about);
+
+          g_object_notify (G_OBJECT (about), "wrap-license");
+          g_object_notify (G_OBJECT (about), "license");
+        }
+      else
+        {
+          gtk_widget_show (priv->license_label);
+        }
+
+      g_object_notify (G_OBJECT (about), "license-type");
+
+      g_object_thaw_notify (G_OBJECT (about));
+    }
+}
+
+/**
+ * gtk_about_dialog_get_license_type:
+ * @about: a #GtkAboutDialog
+ *
+ * Retrieves the license set using gtk_about_dialog_set_license_type()
+ *
+ * Return value: a #GtkLicense value
+ *
+ * Since: 3.0
+ */
+GtkLicense
+gtk_about_dialog_get_license_type (GtkAboutDialog *about)
+{
+  g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), GTK_LICENSE_UNKNOWN);
+
+  return about->priv->license_type;
+}
+
+/**
+ * gtk_about_dialog_add_credit_section:
+ * @about: A #GtkAboutDialog
+ * @section_name: The name of the section
+ * @people: (array zero-terminated=1): The people who belong to that section
+ *
+ * Creates a new section in the Credits page.
+ *
+ * Since: 3.4
+ */
+void
+gtk_about_dialog_add_credit_section (GtkAboutDialog  *about,
+                                     const gchar     *section_name,
+                                     const gchar    **people)
+{
+  GtkAboutDialogPrivate *priv;
+  CreditSection *new_entry;
+
+  g_return_if_fail (GTK_IS_ABOUT_DIALOG (about));
+  g_return_if_fail (section_name != NULL);
+  g_return_if_fail (people != NULL);
+
+  priv = about->priv;
+
+  new_entry = g_slice_new (CreditSection);
+  new_entry->heading = g_strdup ((gchar *)section_name);
+  new_entry->people = g_strdupv ((gchar **)people);
+
+  priv->credit_sections = g_slist_append (priv->credit_sections, new_entry);
+  update_credits_button_visibility (about);
+}