X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkselection.c;h=67a774f7683107abffe95c8d9a9ddef0e1b6f7f7;hb=cade42d5094ceaa7799aa8e2135959573646a4b6;hp=4063bb2d052786c08da2e78c2af9f203dfe3a9f1;hpb=abc8ac1a8bccf1ad187b55e35e81de1f9eae4785;p=~andy%2Fgtk diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c index 4063bb2d0..67a774f76 100644 --- a/gtk/gtkselection.c +++ b/gtk/gtkselection.c @@ -12,9 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser 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 . */ /* This file implements most of the work of the ICCCM selection protocol. @@ -216,12 +214,12 @@ static const char gtk_selection_handler_key[] = "gtk-selection-handlers"; /** * gtk_target_list_new: - * @targets: Pointer to an array of #GtkTargetEntry - * @ntargets: number of entries in @targets. + * @targets: (array length=ntargets): Pointer to an array of #GtkTargetEntry + * @ntargets: number of entries in @targets. * * Creates a new #GtkTargetList from an array of #GtkTargetEntry. * - * Return value: the new #GtkTargetList. + * Return value: (transfer full): the new #GtkTargetList. **/ GtkTargetList * gtk_target_list_new (const GtkTargetEntry *targets, @@ -499,7 +497,7 @@ gtk_target_list_add_uri_targets (GtkTargetList *list, /** * gtk_target_list_add_table: * @list: a #GtkTargetList - * @targets: the table of #GtkTargetEntry + * @targets: (array length=ntargets): the table of #GtkTargetEntry * @ntargets: number of targets in the table * * Prepends a table of #GtkTargetEntry to a target list. @@ -598,14 +596,14 @@ gtk_target_list_find (GtkTargetList *list, /** * gtk_target_table_new_from_list: * @list: a #GtkTargetList - * @n_targets: return location for the number ot targets in the table + * @n_targets: (out): return location for the number ot targets in the table * * This function creates an #GtkTargetEntry array that contains the * same targets as the passed %list. The returned table is newly * allocated and should be freed using gtk_target_table_free() when no * longer needed. * - * Return value: the new table. + * Return value: (array length=n_targets) (transfer full): the new table. * * Since: 2.10 **/ @@ -639,7 +637,7 @@ gtk_target_table_new_from_list (GtkTargetList *list, /** * gtk_target_table_free: - * @targets: a #GtkTargetEntry array + * @targets: (array length=n_targets): a #GtkTargetEntry array * @n_targets: the number of entries in the array * * This function frees a target table as returned by @@ -663,8 +661,8 @@ gtk_target_table_free (GtkTargetEntry *targets, /** * gtk_selection_owner_set_for_display: - * @display: the #Gdkdisplay where the selection is set - * @widget: (allow-none): new selection owner (a #GdkWidget), or %NULL. + * @display: the #GdkDisplay where the selection is set + * @widget: (allow-none): new selection owner (a #GtkWidget), or %NULL. * @selection: an interned atom representing the selection to claim. * @time_: timestamp with which to claim the selection * @@ -931,7 +929,7 @@ gtk_selection_add_target (GtkWidget *widget, * gtk_selection_add_targets: * @widget: a #GtkWidget * @selection: the selection - * @targets: a table of targets to add + * @targets: (array length=ntargets): a table of targets to add * @ntargets: number of entries in @targets * * Prepends a table of targets to the list of supported targets @@ -1097,11 +1095,10 @@ gtk_selection_convert (GtkWidget *widget, { GtkWidget *owner_widget; gpointer owner_widget_ptr; - GtkSelectionData selection_data; + GtkSelectionData selection_data = {0}; selection_data.selection = selection; selection_data.target = target; - selection_data.data = NULL; selection_data.length = -1; selection_data.display = display; @@ -1146,7 +1143,7 @@ gtk_selection_convert (GtkWidget *widget, * * Retrieves the selection #GdkAtom of the selection data. * - * Returns: the selection #GdkAtom of the selection data. + * Returns: (transfer none): the selection #GdkAtom of the selection data. * * Since: 2.16 **/ @@ -1164,7 +1161,7 @@ gtk_selection_data_get_selection (const GtkSelectionData *selection_data) * * Retrieves the target of the selection. * - * Returns: the target of the selection. + * Returns: (transfer none): the target of the selection. * * Since: 2.14 **/ @@ -1182,7 +1179,7 @@ gtk_selection_data_get_target (const GtkSelectionData *selection_data) * * Retrieves the data type of the selection. * - * Returns: the data type of the selection. + * Returns: (transfer none): the data type of the selection. * * Since: 2.14 **/ @@ -1213,7 +1210,7 @@ gtk_selection_data_get_format (const GtkSelectionData *selection_data) } /** - * gtk_selection_data_get_data: + * gtk_selection_data_get_data: (skip) * @selection_data: a pointer to a #GtkSelectionData structure. * * Retrieves the raw data of the selection. @@ -1251,7 +1248,7 @@ gtk_selection_data_get_length (const GtkSelectionData *selection_data) /** * gtk_selection_data_get_data_with_length: * @selection_data: a pointer to a #GtkSelectionData structure - * @length: return location for length of the data segment + * @length: (out): return location for length of the data segment * * Retrieves the raw data of the selection along with its length. * @@ -1294,7 +1291,7 @@ gtk_selection_data_get_display (const GtkSelectionData *selection_data) * @selection_data: a pointer to a #GtkSelectionData structure. * @type: the type of selection data * @format: format (number of bits in a unit) - * @data: (array) (element-type guchar): pointer to the data (will be copied) + * @data: (array length=length): pointer to the data (will be copied) * @length: length of the data * * Stores new data into a #GtkSelectionData object. Should @@ -1596,9 +1593,9 @@ gtk_selection_data_set_text (GtkSelectionData *selection_data, * * Gets the contents of the selection data as a UTF-8 string. * - * Return value: if the selection data contained a recognized - * text type and it could be converted to UTF-8, a newly allocated - * string containing the converted text, otherwise %NULL. + * Return value: (type utf8): if the selection data contained a + * recognized text type and it could be converted to UTF-8, a newly + * allocated string containing the converted text, otherwise %NULL. * If the result is non-%NULL it must be freed with g_free(). **/ guchar * @@ -1752,7 +1749,8 @@ gtk_selection_data_get_pixbuf (const GtkSelectionData *selection_data) /** * gtk_selection_data_set_uris: * @selection_data: a #GtkSelectionData - * @uris: a %NULL-terminated array of strings holding URIs + * @uris: (array zero-terminated=1): a %NULL-terminated array of + * strings holding URIs * * Sets the contents of the selection from a list of URIs. * The string is converted to the form determined by @@ -1852,8 +1850,9 @@ gtk_selection_data_get_uris (const GtkSelectionData *selection_data) /** * gtk_selection_data_get_targets: * @selection_data: a #GtkSelectionData object - * @targets: location to store an array of targets. The result - * stored here must be freed with g_free(). + * @targets: (out) (array length=n_atoms) (transfer container): + * location to store an array of targets. The result stored + * here must be freed with g_free(). * @n_atoms: location to store number of items in @targets. * * Gets the contents of @selection_data as an array of targets. @@ -1895,7 +1894,7 @@ gtk_selection_data_get_targets (const GtkSelectionData *selection_data, /** * gtk_targets_include_text: - * @targets: an array of #GdkAtoms + * @targets: (array length=n_targets): an array of #GdkAtoms * @n_targets: the length of @targets * * Determines if any of the targets in @targets can be used to @@ -1940,7 +1939,7 @@ gtk_targets_include_text (GdkAtom *targets, /** * gtk_targets_include_rich_text: - * @targets: an array of #GdkAtoms + * @targets: (array length=n_targets): an array of #GdkAtoms * @n_targets: the length of @targets * @buffer: a #GtkTextBuffer * @@ -2058,7 +2057,7 @@ gtk_selection_data_targets_include_rich_text (const GtkSelectionData *selection_ /** * gtk_targets_include_image: - * @targets: an array of #GdkAtoms + * @targets: (array length=n_targets): an array of #GdkAtoms * @n_targets: the length of @targets * @writable: whether to accept only targets for which GTK+ knows * how to convert a pixbuf into the format @@ -2140,7 +2139,7 @@ gtk_selection_data_targets_include_image (const GtkSelectionData *selection_data /** * gtk_targets_include_uri: - * @targets: an array of #GdkAtoms + * @targets: (array length=n_targets): an array of #GdkAtoms * @n_targets: the length of @targets * * Determines if any of the targets in @targets can be used to @@ -2322,15 +2321,7 @@ _gtk_selection_request (GtkWidget *widget, info->selection = event->selection; info->num_incrs = 0; - - /* Create GdkWindow structure for the requestor */ - -#ifdef GDK_WINDOWING_X11 - if (GDK_IS_X11_DISPLAY (display)) - info->requestor = gdk_x11_window_foreign_new_for_display (display, event->requestor); - else -#endif - info->requestor = NULL; + info->requestor = g_object_ref (event->requestor); /* Determine conversions we need to perform */ if (event->target == gtk_selection_atoms[MULTIPLE])