summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.ac2
-rw-r--r--src/canberra-gtk-module.c8
-rw-r--r--src/canberra-gtk.c2
3 files changed, 6 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac
index 66812f6..0e74581 100644
--- a/configure.ac
+++ b/configure.ac
@@ -354,7 +354,7 @@ AC_ARG_ENABLE([gtk],
AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [false])
if test "x${gtk}" != xno ; then
- PKG_CHECK_MODULES(GTK, [ gtk+-2.0 >= 2.13.4 gthread-2.0 ],
+ PKG_CHECK_MODULES(GTK, [ gtk+-2.0 >= 2.20.0 gthread-2.0 ],
[
HAVE_GTK=1
AC_DEFINE([HAVE_GTK], 1, [Have GTK?])
diff --git a/src/canberra-gtk-module.c b/src/canberra-gtk-module.c
index da37756..90c583a 100644
--- a/src/canberra-gtk-module.c
+++ b/src/canberra-gtk-module.c
@@ -450,7 +450,7 @@ static void dispatch_sound_event(SoundEventData *d) {
gboolean is_xembed;
is_xembed =
- GTK_WIDGET_REALIZED(GTK_WIDGET(d->object)) &&
+ gtk_widget_get_realized(GTK_WIDGET(d->object)) &&
window_is_xembed(
gtk_widget_get_display(GTK_WIDGET(d->object)),
gtk_widget_get_window(GTK_WIDGET(d->object)));
@@ -568,7 +568,7 @@ static void dispatch_sound_event(SoundEventData *d) {
* minimized. We then store this information, so that we know
* later on when the window is unminimized again. */
- if (GTK_WIDGET_REALIZED(GTK_WIDGET(d->object))) {
+ if (gtk_widget_get_realized(GTK_WIDGET(d->object))) {
GdkDisplay *display;
display = gtk_widget_get_display(GTK_WIDGET(d->object));
@@ -639,7 +639,7 @@ static void dispatch_sound_event(SoundEventData *d) {
} else if (GTK_IS_MENU_ITEM(d->object) && d->signal_id == signal_id_menu_item_activate) {
- if (!GTK_MENU_ITEM(d->object)->submenu)
+ if (!gtk_menu_item_get_submenu(GTK_MENU_ITEM(d->object)))
ret = ca_gtk_play_for_event(d->event, 0,
CA_PROP_EVENT_ID, "menu-click",
CA_PROP_EVENT_DESCRIPTION, "Menu item clicked",
@@ -859,7 +859,7 @@ static gboolean emission_hook_cb(GSignalInvocationHint *hint, guint n_param_valu
if (hint->signal_id != signal_id_widget_hide &&
hint->signal_id != signal_id_dialog_response &&
- !GTK_WIDGET_DRAWABLE(object))
+ !gtk_widget_is_drawable(GTK_WIDGET (object)))
return TRUE;
d = g_slice_new0(SoundEventData);
diff --git a/src/canberra-gtk.c b/src/canberra-gtk.c
index c6581a2..fffcfef 100644
--- a/src/canberra-gtk.c
+++ b/src/canberra-gtk.c
@@ -252,7 +252,7 @@ int ca_gtk_proplist_set_for_widget(ca_proplist *p, GtkWidget *widget) {
if ((ret = ca_proplist_sets(p, CA_PROP_WINDOW_ICON_NAME, t)) < 0)
return ret;
- if (GTK_WIDGET_REALIZED(GTK_WIDGET(w))) {
+ if (gtk_widget_get_realized(GTK_WIDGET(w))) {
GdkWindow *dw = NULL;
GdkScreen *screen = NULL;
GdkDisplay *display = NULL;