Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: freeze-exception
Hi,
please unblock libwnck for squeeze.
libwnck (2.30.3-1) unstable; urgency=low
.
[ Emilio Pozuelo Monfort ]
* debian/control.in:
- Standards-Version is 3.9.0, no changes needed.
.
[ Josselin Mouette ]
* New upstream translation and bugfix release.
The upstream changes follow:
[release] 2.30.3
[screen] Wrap gtk-doc comments
Add introspection annotations
Updated the Kannada translations
Updated Slovenian translation
Fix failure to build outside source tree
[pager] And really use the right version for gseal check
Oops, use the right version check
bgo#612490 - Use gtk_accessible_set_widget() for the GSEAL()ed field
[release] post-release bump to 2.30.3
[release] 2.30.2
Revert "[build] Fix build when building out of source tree"
[build] Do not dist gir_DATA
[build] Fix build when building out of source tree
Added Norwegian bokmål translation
Updated Galician translations
Updated Latvian translation.
[all] More GSeal work
updated breton translation
updated breton translation
updated breton translation
updated breton translation
updated breton translation
Updated Shavian transliteration
Updated Galician translations
Updated Kannada translations
Revert part of last commit
Fix a few issues when building with GSEAL_ENABLED. See bug 612490.
Fixes to Catalan translation
Updated Basque language
[release] post-release bump to 2.30.1
I’m attaching the diff for C files.
Cheers,
--
.''`. Josselin Mouette
: :' :
`. `' “If you behave this way because you are blackmailed by someone,
`- […] I will see what I can do for you.” -- Jörg Schilling
--- libwnck-2.30.0/libwnck/application.c 2009-06-30 00:41:44.000000000 +0200
+++ libwnck-2.30.3/libwnck/application.c 2010-08-04 13:22:28.000000000 +0200
@@ -208,9 +208,10 @@ wnck_application_finalize (GObject *obje
* Gets the #WnckApplication corresponding to the group leader with @xwindow
* as X window ID.
*
- * Return value: the #WnckApplication corresponding to @xwindow, or %NULL if
- * there no such #WnckApplication could be found. The returned #WnckApplication
- * is owned by libwnck and must not be referenced or unreferenced.
+ * Return value: (transfer none): the #WnckApplication corresponding to
+ * @xwindow, or %NULL if there no such #WnckApplication could be found. The
+ * returned #WnckApplication is owned by libwnck and must not be referenced or
+ * unreferenced.
*/
WnckApplication*
wnck_application_get (gulong xwindow)
@@ -243,9 +244,9 @@ wnck_application_get_xid (WnckApplicatio
*
* Gets the list of #WnckWindow belonging to @app.
*
- * Return value: the list of #WnckWindow belonging to @app, or %NULL if the
- * application contains no window. The list should not be modified nor freed,
- * as it is owned by @app.
+ * Return value: (element-type WnckWindow) (transfer none): the list of
+ * #WnckWindow belonging to @app, or %NULL if the application contains no
+ * window. The list should not be modified nor freed, as it is owned by @app.
**/
GList*
wnck_application_get_windows (WnckApplication *app)
--- libwnck-2.30.0/libwnck/class-group.c 2009-04-19 19:40:32.000000000 +0200
+++ libwnck-2.30.3/libwnck/class-group.c 2010-08-04 13:22:28.000000000 +0200
@@ -165,10 +165,10 @@ wnck_class_group_finalize (GObject *obje
*
* Gets the #WnckClassGroup corresponding to @res_class.
*
- * Return value: the #WnckClassGroup corresponding to @res_class, or %NULL if
- * there is no #WnckClassGroup with the specified @res_class. The returned
- * #WnckClassGroup is owned by libwnck and must not be referenced or
- * unreferenced.
+ * Return value: (transfer none): the #WnckClassGroup corresponding to
+ * @res_class, or %NULL if there is no #WnckClassGroup with the specified
+ * @res_class. The returned #WnckClassGroup is owned by libwnck and must not be
+ * referenced or unreferenced.
*
* Since: 2.2
**/
@@ -500,9 +500,10 @@ _wnck_class_group_remove_window (WnckCla
*
* Gets the list of #WnckWindow that are grouped in @class_group.
*
- * Return value: the list of #WnckWindow grouped in @class_group, or %NULL if
- * the group contains no window. The list should not be modified nor freed, as
- * it is owned by @class_group.
+ * Return value: (element-type WnckWindow) (transfer none): the list of
+ * #WnckWindow grouped in @class_group, or %NULL if the group contains no
+ * window. The list should not be modified nor freed, as it is owned by
+ * @class_group.
*
* Since: 2.2
**/
--- libwnck-2.30.0/libwnck/pager-accessible.c 2010-02-22 20:14:20.000000000 +0100
+++ libwnck-2.30.3/libwnck/pager-accessible.c 2010-06-22 19:56:33.000000000 +0200
@@ -153,7 +153,11 @@ wnck_pager_add_selection (AtkSelection *
GtkWidget *widget;
int n_spaces;
+#if GTK_CHECK_VERSION(2,21,0)
+ widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (selection));
+#else
widget = GTK_ACCESSIBLE (selection)->widget;
+#endif
if (widget == NULL)
{
@@ -194,7 +198,11 @@ wnck_pager_ref_selection (AtkSelection *
g_return_val_if_fail (i == 0, NULL);
+#if GTK_CHECK_VERSION(2,21,0)
+ widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (selection));
+#else
widget = GTK_ACCESSIBLE (selection)->widget;
+#endif
if (widget == NULL)
{
/*
@@ -221,7 +229,11 @@ wnck_pager_selection_count (AtkSelection
{
GtkWidget *widget;
+#if GTK_CHECK_VERSION(2,21,0)
+ widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (selection));
+#else
widget = GTK_ACCESSIBLE (selection)->widget;
+#endif
if (widget == NULL)
{
/*
@@ -248,7 +260,11 @@ wnck_pager_is_child_selected (AtkSelecti
WnckWorkspace *active_wspace;
int wsno;
+#if GTK_CHECK_VERSION(2,21,0)
+ widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (selection));
+#else
widget = GTK_ACCESSIBLE (selection)->widget;
+#endif
if (widget == NULL)
{
/*
@@ -277,7 +293,11 @@ wnck_pager_accessible_new (GtkWidget *wi
aobj_pager = ATK_OBJECT (object);
gtk_accessible = GTK_ACCESSIBLE (aobj_pager);
+#if GTK_CHECK_VERSION(2,21,3)
+ gtk_accessible_set_widget (gtk_accessible, widget);
+#else
gtk_accessible->widget = widget;
+#endif
atk_object_initialize (aobj_pager, widget);
aobj_pager->role = ATK_ROLE_PANEL;
@@ -348,7 +368,11 @@ wnck_pager_accessible_get_n_children (At
g_return_val_if_fail (WNCK_PAGER_IS_ACCESSIBLE (obj), 0);
accessible = GTK_ACCESSIBLE (obj);
+#if GTK_CHECK_VERSION(2,21,0)
+ widget = gtk_accessible_get_widget (accessible);
+#else
widget = accessible->widget;
+#endif
if (widget == NULL)
/* State is defunct */
@@ -378,7 +402,11 @@ wnck_pager_accessible_ref_child (AtkObje
g_return_val_if_fail (ATK_IS_OBJECT (obj), NULL);
accessible = GTK_ACCESSIBLE (obj);
+#if GTK_CHECK_VERSION(2,21,0)
+ widget = gtk_accessible_get_widget (accessible);
+#else
widget = accessible->widget;
+#endif
if (widget == NULL)
/* State is defunct */
--- libwnck-2.30.0/libwnck/pager.c 2010-03-11 01:38:15.000000000 +0100
+++ libwnck-2.30.3/libwnck/pager.c 2010-06-01 15:56:13.000000000 +0200
@@ -1502,7 +1502,12 @@ wnck_pager_drag_motion (GtkWidget
if (gtk_drag_dest_find_target (widget, context, NULL))
{
- gdk_drag_status (context, context->suggested_action, time);
+#if GTK_CHECK_VERSION(2,21,0)
+ gdk_drag_status (context,
+ gdk_drag_context_get_suggested_action (context), time);
+#else
+ gdk_drag_status (context, context->suggested_action, time);
+#endif
}
else
{
--- libwnck-2.30.0/libwnck/screen.c 2009-04-19 19:40:32.000000000 +0200
+++ libwnck-2.30.3/libwnck/screen.c 2010-08-04 13:28:16.000000000 +0200
@@ -617,9 +617,9 @@ wnck_screen_construct (WnckScreen *scree
*
* Gets the #WnckScreen for a given screen on the default display.
*
- * Return value: the #WnckScreen for screen @index, or %NULL if no such screen
- * exists. The returned #WnckScreen is owned by libwnck and must not be
- * referenced or unreferenced.
+ * Return value: (transfer none): the #WnckScreen for screen @index, or %NULL
+ * if no such screen exists. The returned #WnckScreen is owned by libwnck and
+ * must not be referenced or unreferenced.
**/
WnckScreen*
wnck_screen_get (int index)
@@ -662,8 +662,8 @@ _wnck_screen_get_existing (int number)
*
* Gets the default #WnckScreen on the default display.
*
- * Return value: the default #WnckScreen. The returned #WnckScreen is
- * owned by libwnck and must not be referenced or unreferenced.
+ * Return value: (transfer none): the default #WnckScreen. The returned
+ * #WnckScreen is owned by libwnck and must not be referenced or unreferenced.
**/
WnckScreen*
wnck_screen_get_default (void)
@@ -685,9 +685,9 @@ wnck_screen_get_default (void)
* This function does not work if wnck_screen_get() was not called for the
* sought #WnckScreen before, and returns %NULL.
*
- * Return value: the #WnckScreen for the root window at @root_window_id, or
- * %NULL. The returned #WnckScreen is owned by libwnck and must not be
- * referenced or unreferenced.
+ * Return value: (transfer none): the #WnckScreen for the root window at
+ * @root_window_id, or %NULL. The returned #WnckScreen is owned by libwnck and
+ * must not be referenced or unreferenced.
**/
WnckScreen*
wnck_screen_get_for_root (gulong root_window_id)
@@ -735,8 +735,9 @@ wnck_screen_get_number (WnckScreen *scre
* Gets the list of #WnckWorkspace on @screen. The list is ordered: the
* first element in the list is the first #WnckWorkspace, etc..
*
- * Return value: the list of #WnckWorkspace on @screen. The list should not be
- * modified nor freed, as it is owned by @screen.
+ * Return value: (element-type WnckWorkspace) (transfer none): the list of
+ * #WnckWorkspace on @screen. The list should not be modified nor freed, as it
+ * is owned by @screen.
*
* Since: 2.20
**/
@@ -755,9 +756,9 @@ wnck_screen_get_workspaces (WnckScreen *
*
* Gets the #WnckWorkspace numbered @workspace on @screen.
*
- * Return value: the #WnckWorkspace numbered @workspace on @screen, or
- * %NULL if no such workspace exists. The returned #WnckWorkspace is owned by
- * libwnck and must not be referenced or unreferenced.
+ * Return value: (transfer none): the #WnckWorkspace numbered @workspace on
+ * @screen, or %NULL if no such workspace exists. The returned #WnckWorkspace
+ * is owned by libwnck and must not be referenced or unreferenced.
**/
WnckWorkspace*
wnck_screen_get_workspace (WnckScreen *screen,
@@ -822,9 +823,9 @@ wnck_screen_get_workspace_index (WnckScr
* if libwnck is in a weird state due to the asynchronous nature of the
* interaction with the window manager.
*
- * Return value: the active #WnckWorkspace on @screen, or %NULL. The returned
- * #WnckWorkspace is owned by libwnck and must not be referenced or
- * unreferenced.
+ * Return value: (transfer none): the active #WnckWorkspace on @screen, or
+ * %NULL. The returned #WnckWorkspace is owned by libwnck and must not be
+ * referenced or unreferenced.
**/
WnckWorkspace*
wnck_screen_get_active_workspace (WnckScreen *screen)
@@ -843,10 +844,10 @@ wnck_screen_get_active_workspace (WnckSc
* Gets the neighbor #WnckWorkspace of @space in the @direction direction on
* @screen.
*
- * Return value: the neighbor #WnckWorkspace of @space in the @direction
- * direction on @screen, or %NULL if no such neighbor #WnckWorkspace exists.
- * The returned #WnckWorkspace is owned by libwnck and must not be referenced
- * or unreferenced.
+ * Return value: (transfer none): the neighbor #WnckWorkspace of @space in the
+ * @direction direction on @screen, or %NULL if no such neighbor #WnckWorkspace
+ * exists. The returned #WnckWorkspace is owned by libwnck and must not be
+ * referenced or unreferenced.
*
* Since: 2.14
* Deprecated:2.20: Use wnck_workspace_get_neighbor() instead.
@@ -907,8 +908,9 @@ wnck_screen_get_workspace_neighbor (Wnck
* Gets the active #WnckWindow on @screen. May return %NULL sometimes, since
* not all window managers guarantee that a window is always active.
*
- * Return value: the active #WnckWindow on @screen, or %NULL. The returned
- * #WnckWindow is owned by libwnck and must not be referenced or unreferenced.
+ * Return value: (transfer none): the active #WnckWindow on @screen, or %NULL.
+ * The returned #WnckWindow is owned by libwnck and must not be referenced or
+ * unreferenced.
**/
WnckWindow*
wnck_screen_get_active_window (WnckScreen *screen)
@@ -926,9 +928,9 @@ wnck_screen_get_active_window (WnckScree
* sometimes, since not all window managers guarantee that a window is always
* active.
*
- * Return value: the previously active #WnckWindow on @screen, or %NULL. The
- * returned #WnckWindow is owned by libwnck and must not be referenced or
- * unreferenced.
+ * Return value: (transfer none): the previously active #WnckWindow on @screen,
+ * or %NULL. The returned #WnckWindow is owned by libwnck and must not be
+ * referenced or unreferenced.
*
* Since: 2.8
**/
@@ -949,9 +951,9 @@ wnck_screen_get_previously_active_window
* However, the stability of the list is established by the window manager, so
* don't blame libwnck if it breaks down.
*
- * Return value: the list of #WnckWindow on @screen, or %NULL if there is no
- * window on @screen. The list should not be modified nor freed, as it is owned
- * by @screen.
+ * Return value: (element-type WnckWindow) (transfer none): the list of
+ * #WnckWindow on @screen, or %NULL if there is no window on @screen. The list
+ * should not be modified nor freed, as it is owned by @screen.
**/
GList*
wnck_screen_get_windows (WnckScreen *screen)
@@ -967,9 +969,10 @@ wnck_screen_get_windows (WnckScreen *scr
*
* Gets the list of #WnckWindow on @screen in bottom-to-top order.
*
- * Return value: the list of #WnckWindow in stacking order on @screen, or %NULL
- * if there is no window on @screen. The list should not be modified nor freed,
- * as it is owned by @screen.
+ * Return value: (element-type WnckWindow) (transfer none): the list of
+ * #WnckWindow in stacking order on @screen, or %NULL if there is no window on
+ * @screen. The list should not be modified nor freed, as it is owned by
+ * @screen.
**/
GList*
wnck_screen_get_windows_stacked (WnckScreen *screen)
--- libwnck-2.30.0/libwnck/tasklist.c 2010-03-30 01:55:24.000000000 +0200
+++ libwnck-2.30.3/libwnck/tasklist.c 2010-06-22 19:54:30.000000000 +0200
@@ -3569,7 +3569,12 @@ wnck_task_drag_motion (GtkWidget
if (gtk_drag_dest_find_target (widget, context, NULL))
{
gtk_drag_highlight (widget);
+#if GTK_CHECK_VERSION(2,21,0)
+ gdk_drag_status (context,
+ gdk_drag_context_get_suggested_action (context), time);
+#else
gdk_drag_status (context, context->suggested_action, time);
+#endif
}
else
{
--- libwnck-2.30.0/libwnck/test-tasklist.c 2009-04-19 19:40:32.000000000 +0200
+++ libwnck-2.30.3/libwnck/test-tasklist.c 2010-04-16 13:49:34.000000000 +0200
@@ -29,7 +29,7 @@ window_expose_event (GtkWidget *wid
{
cairo_t *cr;
- cr = gdk_cairo_create (widget->window);
+ cr = gdk_cairo_create (gtk_widget_get_window (widget));
cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
gdk_cairo_region (cr, event->region);
cairo_set_source_rgba (cr, 1., 1., 1., .5);
--- libwnck-2.30.0/libwnck/window.c 2010-03-11 01:38:15.000000000 +0100
+++ libwnck-2.30.3/libwnck/window.c 2010-08-04 13:22:28.000000000 +0200
@@ -464,8 +464,8 @@ wnck_window_finalize (GObject *object)
* create a #WnckWindow if none exists. The function is robust against bogus
* window IDs.
*
- * Return value: the #WnckWindow for @xwindow. The returned #WnckWindow is
- * owned by libwnck and must not be referenced or unreferenced.
+ * Return value: (transfer none): the #WnckWindow for @xwindow. The returned
+ * #WnckWindow is owned by libwnck and must not be referenced or unreferenced.
**/
WnckWindow*
wnck_window_get (gulong xwindow)
@@ -482,8 +482,8 @@ wnck_window_get (gulong xwindow)
*
* Gets the #WnckScreen @window is on.
*
- * Return value: the #WnckScreen @window is on. The returned #WnckScreen is
- * owned by libwnck and must not be referenced or unreferenced.
+ * Return value: (transfer none): the #WnckScreen @window is on. The returned
+ * #WnckScreen is owned by libwnck and must not be referenced or unreferenced.
**/
WnckScreen*
wnck_window_get_screen (WnckWindow *window)
@@ -718,9 +718,9 @@ _wnck_window_get_name_for_display (WnckW
*
* Gets the #WnckApplication to which @window belongs.
*
- * Return value: the #WnckApplication to which @window belongs. The returned
- * #WnckApplication is owned by libwnck and must not be referenced or
- * unreferenced.
+ * Return value: (transfer none): the #WnckApplication to which @window belongs.
+ * The returned #WnckApplication is owned by libwnck and must not be referenced
+ * or unreferenced.
**/
WnckApplication*
wnck_window_get_application (WnckWindow *window)
@@ -789,9 +789,9 @@ wnck_window_get_xid (WnckWindow *window)
*
* Gets the #WnckClassGroup to which @window belongs.
*
- * Return value: the #WnckClassGroup to which @window belongs. The returned
- * #WnckClassGroup is owned by libwnck and must not be referenced or
- * unreferenced.
+ * Return value: (transfer none): the #WnckClassGroup to which @window belongs.
+ * The returned #WnckClassGroup is owned by libwnck and must not be referenced
+ * or unreferenced.
*
* Since: 2.2
**/
@@ -1749,9 +1749,9 @@ wnck_window_keyboard_size (WnckWindow *w
* Gets the current workspace @window is on. If the window is pinned (on all
* workspaces), or not on any workspaces, %NULL may be returned.
*
- * Return value: the single current workspace @window is on, or %NULL. The
- * returned #WnckWorkspace is owned by libwnck and must not be referenced or
- * unreferenced.
+ * Return value: (transfer none): the single current workspace @window is on, or
+ * %NULL. The returned #WnckWorkspace is owned by libwnck and must not be
+ * referenced or unreferenced.
**/
WnckWorkspace*
wnck_window_get_workspace (WnckWindow *window)
--- libwnck-2.30.0/libwnck/wnck-enum-types.c 2010-03-10 23:33:19.000000000 +0100
+++ libwnck-2.30.3/libwnck/wnck-enum-types.c 2010-06-22 13:07:37.000000000 +0200
@@ -1,5 +1,5 @@
-/* Generated data (by glib-mkenums) */
+
#include <libwnck/libwnck.h>
@@ -250,5 +250,5 @@ wnck_window_move_resize_mask_get_type (v
}
-/* Generated data ends here */
+
--- libwnck-2.30.0/libwnck/wnck-enum-types.h 2010-03-10 23:33:19.000000000 +0100
+++ libwnck-2.30.3/libwnck/wnck-enum-types.h 2010-06-22 13:07:37.000000000 +0200
@@ -1,5 +1,5 @@
-/* Generated data (by glib-mkenums) */
+
#ifndef __WNCK_ENUM_TYPES_H__
#define __WNCK_ENUM_TYPES_H__
@@ -42,5 +42,5 @@ G_END_DECLS
#endif /* __WNCK_ENUM_TYPES_H__ */
-/* Generated data ends here */
+
--- libwnck-2.30.0/libwnck/wnck-marshal.c 2010-03-10 23:33:21.000000000 +0100
+++ libwnck-2.30.3/libwnck/wnck-marshal.c 2010-06-22 13:07:38.000000000 +0200
@@ -23,6 +23,7 @@
#define g_marshal_value_peek_boxed(v) g_value_get_boxed (v)
#define g_marshal_value_peek_pointer(v) g_value_get_pointer (v)
#define g_marshal_value_peek_object(v) g_value_get_object (v)
+#define g_marshal_value_peek_variant(v) g_value_get_variant (v)
#else /* !G_ENABLE_DEBUG */
/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API.
* Do not access GValues directly in your code. Instead, use the
@@ -46,6 +47,7 @@
#define g_marshal_value_peek_boxed(v) (v)->data[0].v_pointer
#define g_marshal_value_peek_pointer(v) (v)->data[0].v_pointer
#define g_marshal_value_peek_object(v) (v)->data[0].v_pointer
+#define g_marshal_value_peek_variant(v) (v)->data[0].v_pointer
#endif /* !G_ENABLE_DEBUG */
--- libwnck-2.30.0/libwnck/workspace-accessible.c 2009-04-19 19:40:32.000000000 +0200
+++ libwnck-2.30.3/libwnck/workspace-accessible.c 2010-04-16 13:49:34.000000000 +0200
@@ -120,7 +120,11 @@ wnck_workspace_accessible_get_extents (A
workspace = WNCK_WORKSPACE (g_obj);
parent = atk_object_get_parent (ATK_OBJECT(component));
+#if GTK_CHECK_VERSION(2,21,0)
+ widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (parent));
+#else
widget = GTK_ACCESSIBLE (parent)->widget;
+#endif
if (widget == NULL)
{
--- libwnck-2.30.0/libwnck/xutils.c 2009-04-19 19:40:32.000000000 +0200
+++ libwnck-2.30.3/libwnck/xutils.c 2010-06-01 15:56:13.000000000 +0200
@@ -1617,8 +1617,14 @@ get_cmap (GdkPixmap *pixmap)
/* Be sure we aren't going to blow up due to visual mismatch */
if (cmap &&
+#if GTK_CHECK_VERSION(2,21,0)
+ (gdk_visual_get_depth (gdk_colormap_get_visual (cmap)) !=
+ gdk_drawable_get_depth (pixmap))
+#else
(gdk_colormap_get_visual (cmap)->depth !=
- gdk_drawable_get_depth (pixmap)))
+ gdk_drawable_get_depth (pixmap))
+#endif
+ )
{
g_object_unref (G_OBJECT (cmap));
cmap = NULL;
signature.asc
Description: This is a digitally signed message part
