diff options
| author | Colin Walters <walters@verbum.org> | 2009-12-10 08:23:40 -0200 |
|---|---|---|
| committer | Johan Dahlin <johan@gnome.org> | 2009-12-16 17:22:01 -0200 |
| commit | 6529c07614ebfbfac73f526efb057d8a8e3a7354 (patch) | |
| tree | 6470d8b8af29900905a07ff7838d180cec8fd36e /gtk/gtkcombobox.c | |
| parent | b3c48a4501d77c15ae236f1fe4514cc02de187f3 (diff) | |
| download | gtk+-6529c07614ebfbfac73f526efb057d8a8e3a7354.tar.gz | |
[introspection] Merge in Gtk-custom.c annotations
The Gtk-custom.c file in gir-repository contained a number of
introspection annotations. Merge those into the GTK source files.
Some documentation was moved from the tmpl/ files to accomodate
the addition of annotations.
Diffstat (limited to 'gtk/gtkcombobox.c')
| -rw-r--r-- | gtk/gtkcombobox.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c index 666cb7fb00..8df31ed239 100644 --- a/gtk/gtkcombobox.c +++ b/gtk/gtkcombobox.c @@ -5020,9 +5020,9 @@ gtk_combo_box_set_active_iter (GtkComboBox *combo_box, /** * gtk_combo_box_set_model: * @combo_box: A #GtkComboBox - * @model: A #GtkTreeModel + * @model: (allow-none): A #GtkTreeModel * - * Sets the model used by @combo_box to be @model. Will unset a previously set + * Sets the model used by @combo_box to be @model. Will unset a previously set * model (if applicable). If model is %NULL, then it will unset the model. * * Note that this function does not clear the cell renderers, you have to @@ -5104,7 +5104,7 @@ out: * * Returns the #GtkTreeModel which is acting as data source for @combo_box. * - * Return value: A #GtkTreeModel which was passed during construction. + * Return value: (transfer none): A #GtkTreeModel which was passed during construction. * * Since: 2.4 */ @@ -5129,7 +5129,7 @@ gtk_combo_box_get_model (GtkComboBox *combo_box) * gtk_combo_box_insert_text(), gtk_combo_box_prepend_text() and * gtk_combo_box_remove_text(). * - * Return value: A new text combo box. + * Return value: (transfer none): A new text combo box. * * Since: 2.4 */ |