diff options
| author | Vincent Untz <vuntz@gnome.org> | 2010-06-01 15:55:16 +0200 |
|---|---|---|
| committer | Vincent Untz <vuntz@gnome.org> | 2010-06-01 15:56:13 +0200 |
| commit | a7a7dd95ea090e2338085fca05aff18995401978 (patch) | |
| tree | 9d1fe914775575f742984ad29eebc3aa388bee97 | |
| parent | f818901668c2783163f67a5322cb6c1665a3957f (diff) | |
| download | libwnck-a7a7dd95ea090e2338085fca05aff18995401978.tar.gz | |
[all] More GSeal work
https://bugzilla.gnome.org/show_bug.cgi?id=612490
| -rw-r--r-- | libwnck/pager-accessible.c | 4 | ||||
| -rw-r--r-- | libwnck/pager.c | 7 | ||||
| -rw-r--r-- | libwnck/tasklist.c | 5 | ||||
| -rw-r--r-- | libwnck/xutils.c | 8 |
4 files changed, 22 insertions, 2 deletions
diff --git a/libwnck/pager-accessible.c b/libwnck/pager-accessible.c index c216081..a045e7d 100644 --- a/libwnck/pager-accessible.c +++ b/libwnck/pager-accessible.c @@ -364,7 +364,11 @@ wnck_pager_accessible_get_n_children (AtkObject* obj) 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 */ diff --git a/libwnck/pager.c b/libwnck/pager.c index 2398c27..9474d1a 100644 --- a/libwnck/pager.c +++ b/libwnck/pager.c @@ -1502,7 +1502,12 @@ wnck_pager_drag_motion (GtkWidget *widget, 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 { diff --git a/libwnck/tasklist.c b/libwnck/tasklist.c index 9e1c6ad..4f0c6c4 100644 --- a/libwnck/tasklist.c +++ b/libwnck/tasklist.c @@ -3569,7 +3569,12 @@ wnck_task_drag_motion (GtkWidget *widget, 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 { diff --git a/libwnck/xutils.c b/libwnck/xutils.c index 0e5e984..a480c83 100644 --- a/libwnck/xutils.c +++ b/libwnck/xutils.c @@ -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; |