diff options
Diffstat (limited to 'src/canberra-gtk.c')
| -rw-r--r-- | src/canberra-gtk.c | 510 |
1 files changed, 258 insertions, 252 deletions
diff --git a/src/canberra-gtk.c b/src/canberra-gtk.c index 6d9a6d9..9f8a31d 100644 --- a/src/canberra-gtk.c +++ b/src/canberra-gtk.c @@ -1,3 +1,5 @@ +/*-*- Mode: C; c-basic-offset: 8 -*-*/ + /*** This file is part of libcanberra. @@ -49,31 +51,31 @@ */ static void read_sound_theme_name(ca_context *c, GtkSettings *s) { - gchar *theme_name = NULL; + gchar *theme_name = NULL; - g_object_get(G_OBJECT(s), "gtk-sound-theme-name", &theme_name, NULL); + g_object_get(G_OBJECT(s), "gtk-sound-theme-name", &theme_name, NULL); - if (theme_name) { - ca_context_change_props(c, CA_PROP_CANBERRA_XDG_THEME_NAME, theme_name, NULL); - g_free(theme_name); - } + if (theme_name) { + ca_context_change_props(c, CA_PROP_CANBERRA_XDG_THEME_NAME, theme_name, NULL); + g_free(theme_name); + } } static void read_enable_event_sounds(ca_context *c, GtkSettings *s) { - gboolean enable_event_sounds = TRUE; + gboolean enable_event_sounds = TRUE; - if (!g_getenv("CANBERRA_FORCE_EVENT_SOUNDS")) - g_object_get(G_OBJECT(s), "gtk-enable-event-sounds", &enable_event_sounds, NULL); + if (!g_getenv("CANBERRA_FORCE_EVENT_SOUNDS")) + g_object_get(G_OBJECT(s), "gtk-enable-event-sounds", &enable_event_sounds, NULL); - ca_context_change_props(c, CA_PROP_CANBERRA_ENABLE, enable_event_sounds ? "1" : "0", NULL); + ca_context_change_props(c, CA_PROP_CANBERRA_ENABLE, enable_event_sounds ? "1" : "0", NULL); } static void sound_theme_name_changed(GtkSettings *s, GParamSpec *arg1, ca_context *c) { - read_sound_theme_name(c, s); + read_sound_theme_name(c, s); } static void enable_event_sounds_changed(GtkSettings *s, GParamSpec *arg1, ca_context *c) { - read_enable_event_sounds(c, s); + read_enable_event_sounds(c, s); } /** @@ -86,7 +88,7 @@ static void enable_event_sounds_changed(GtkSettings *s, GParamSpec *arg1, ca_con * and must not be destroyed */ ca_context *ca_gtk_context_get(void) { - return ca_gtk_context_get_for_screen(NULL); + return ca_gtk_context_get_for_screen(NULL); } /** @@ -107,92 +109,92 @@ ca_context *ca_gtk_context_get(void) { * Since: 0.13 */ ca_context *ca_gtk_context_get_for_screen(GdkScreen *screen) { - ca_context *c = NULL; - ca_proplist *p = NULL; - const char *name; - GtkSettings *s; + ca_context *c = NULL; + ca_proplist *p = NULL; + const char *name; + GtkSettings *s; - if (!screen) - screen = gdk_screen_get_default(); + if (!screen) + screen = gdk_screen_get_default(); - if ((c = g_object_get_data(G_OBJECT(screen), "canberra::gtk::context"))) - return c; + if ((c = g_object_get_data(G_OBJECT(screen), "canberra::gtk::context"))) + return c; - if (ca_context_create(&c) != CA_SUCCESS) - return NULL; + if (ca_context_create(&c) != CA_SUCCESS) + return NULL; - if (ca_proplist_create(&p) != CA_SUCCESS) { - ca_context_destroy(c); - return NULL; - } + if (ca_proplist_create(&p) != CA_SUCCESS) { + ca_context_destroy(c); + return NULL; + } - if ((name = g_get_application_name())) - ca_proplist_sets(p, CA_PROP_APPLICATION_NAME, name); + if ((name = g_get_application_name())) + ca_proplist_sets(p, CA_PROP_APPLICATION_NAME, name); - if ((name = gdk_display_get_name(gdk_screen_get_display(screen)))) - ca_proplist_sets(p, CA_PROP_WINDOW_X11_DISPLAY, name); + if ((name = gdk_display_get_name(gdk_screen_get_display(screen)))) + ca_proplist_sets(p, CA_PROP_WINDOW_X11_DISPLAY, name); - ca_proplist_setf(p, CA_PROP_WINDOW_X11_SCREEN, "%i", gdk_screen_get_number(screen)); + ca_proplist_setf(p, CA_PROP_WINDOW_X11_SCREEN, "%i", gdk_screen_get_number(screen)); - ca_context_change_props_full(c, p); - ca_proplist_destroy(p); + ca_context_change_props_full(c, p); + ca_proplist_destroy(p); - if ((s = gtk_settings_get_for_screen(screen))) { + if ((s = gtk_settings_get_for_screen(screen))) { - if (g_object_class_find_property(G_OBJECT_GET_CLASS(s), "gtk-sound-theme-name")) { - g_signal_connect(G_OBJECT(s), "notify::gtk-sound-theme-name", G_CALLBACK(sound_theme_name_changed), c); - read_sound_theme_name(c, s); - } else - g_debug("This Gtk+ version doesn't have the GtkSettings::gtk-sound-theme-name property."); + if (g_object_class_find_property(G_OBJECT_GET_CLASS(s), "gtk-sound-theme-name")) { + g_signal_connect(G_OBJECT(s), "notify::gtk-sound-theme-name", G_CALLBACK(sound_theme_name_changed), c); + read_sound_theme_name(c, s); + } else + g_debug("This Gtk+ version doesn't have the GtkSettings::gtk-sound-theme-name property."); - if (g_object_class_find_property(G_OBJECT_GET_CLASS(s), "gtk-enable-event-sounds")) { - g_signal_connect(G_OBJECT(s), "notify::gtk-enable-event-sounds", G_CALLBACK(enable_event_sounds_changed), c); - read_enable_event_sounds(c, s); - } else - g_debug("This Gtk+ version doesn't have the GtkSettings::gtk-enable-event-sounds property."); - } + if (g_object_class_find_property(G_OBJECT_GET_CLASS(s), "gtk-enable-event-sounds")) { + g_signal_connect(G_OBJECT(s), "notify::gtk-enable-event-sounds", G_CALLBACK(enable_event_sounds_changed), c); + read_enable_event_sounds(c, s); + } else + g_debug("This Gtk+ version doesn't have the GtkSettings::gtk-enable-event-sounds property."); + } - g_object_set_data_full(G_OBJECT(screen), "canberra::gtk::context", c, (GDestroyNotify) ca_context_destroy); + g_object_set_data_full(G_OBJECT(screen), "canberra::gtk::context", c, (GDestroyNotify) ca_context_destroy); - return c; + return c; } static GtkWindow* get_toplevel(GtkWidget *w) { - if (!(w = gtk_widget_get_toplevel(w))) - return NULL; + if (!(w = gtk_widget_get_toplevel(w))) + return NULL; - if (!GTK_IS_WINDOW(w)) - return NULL; + if (!GTK_IS_WINDOW(w)) + return NULL; - return GTK_WINDOW(w); + return GTK_WINDOW(w); } static gint window_get_desktop(GdkDisplay *d, GdkWindow *w) { - Atom type_return; - gint format_return; - gulong nitems_return; - gulong bytes_after_return; - guchar *data = NULL; - gint ret = -1; - - if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), GDK_WINDOW_XID(w), - gdk_x11_get_xatom_by_name_for_display(d, "_NET_WM_DESKTOP"), - 0, G_MAXLONG, False, XA_CARDINAL, &type_return, - &format_return, &nitems_return, &bytes_after_return, - &data) != Success) - return -1; - - if (type_return == XA_CARDINAL && format_return == 32 && data) { - guint32 desktop = *(guint32*) data; - - if (desktop != 0xFFFFFFFF) - ret = (gint) desktop; - } - - if (type_return != None && data != NULL) - XFree(data); - - return ret; + Atom type_return; + gint format_return; + gulong nitems_return; + gulong bytes_after_return; + guchar *data = NULL; + gint ret = -1; + + if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), GDK_WINDOW_XID(w), + gdk_x11_get_xatom_by_name_for_display(d, "_NET_WM_DESKTOP"), + 0, G_MAXLONG, False, XA_CARDINAL, &type_return, + &format_return, &nitems_return, &bytes_after_return, + &data) != Success) + return -1; + + if (type_return == XA_CARDINAL && format_return == 32 && data) { + guint32 desktop = *(guint32*) data; + + if (desktop != 0xFFFFFFFF) + ret = (gint) desktop; + } + + if (type_return != None && data != NULL) + XFree(data); + + return ret; } /** @@ -208,122 +210,124 @@ static gint window_get_desktop(GdkDisplay *d, GdkWindow *w) { */ int ca_gtk_proplist_set_for_widget(ca_proplist *p, GtkWidget *widget) { - GtkWindow *w; - int ret; - const char *t, *role; + GtkWindow *w; + int ret; + const char *t, *role; - ca_return_val_if_fail(p, CA_ERROR_INVALID); - ca_return_val_if_fail(widget, CA_ERROR_INVALID); - ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED); + ca_return_val_if_fail(p, CA_ERROR_INVALID); + ca_return_val_if_fail(widget, CA_ERROR_INVALID); + ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED); - if (!(w = get_toplevel(widget))) - return CA_ERROR_INVALID; + if (!(w = get_toplevel(widget))) + return CA_ERROR_INVALID; - if ((t = gtk_window_get_title(w))) - if ((ret = ca_proplist_sets(p, CA_PROP_WINDOW_NAME, t)) < 0) - return ret; + if ((t = gtk_window_get_title(w))) + if ((ret = ca_proplist_sets(p, CA_PROP_WINDOW_NAME, t)) < 0) + return ret; - if ((role = gtk_window_get_role(w))) { - if (role && t) { - char *id = ca_sprintf_malloc("%s#%s", t, role); + if ((role = gtk_window_get_role(w))) { + if (role && t) { + char *id = ca_sprintf_malloc("%s#%s", t, role); - if ((ret = ca_proplist_sets(p, CA_PROP_WINDOW_ID, id)) < 0) { - ca_free(id); - return ret; - } + if ((ret = ca_proplist_sets(p, CA_PROP_WINDOW_ID, id)) < 0) { + ca_free(id); + return ret; + } - ca_free(id); - } - } else if (t) - if ((ret = ca_proplist_sets(p, CA_PROP_WINDOW_ID, t)) < 0) - return ret; - - if ((t = gtk_window_get_icon_name(w))) - if ((ret = ca_proplist_sets(p, CA_PROP_WINDOW_ICON_NAME, t)) < 0) - return ret; - - if (GTK_WIDGET_REALIZED(GTK_WIDGET(w))) { - GdkWindow *dw = NULL; - GdkScreen *screen = NULL; - GdkDisplay *display = NULL; - gint x = -1, y = -1, width = -1, height = -1, screen_width = -1, screen_height = -1; - - if ((dw = gtk_widget_get_window(GTK_WIDGET(w)))) - if ((ret = ca_proplist_setf(p, CA_PROP_WINDOW_X11_XID, "%lu", (unsigned long) GDK_WINDOW_XID(dw))) < 0) - return ret; + ca_free(id); + } + } else if (t) + if ((ret = ca_proplist_sets(p, CA_PROP_WINDOW_ID, t)) < 0) + return ret; - if ((display = gtk_widget_get_display(GTK_WIDGET(w)))) { - if ((t = gdk_display_get_name(display))) - if ((ret = ca_proplist_sets(p, CA_PROP_WINDOW_X11_DISPLAY, t)) < 0) - return ret; + if ((t = gtk_window_get_icon_name(w))) + if ((ret = ca_proplist_sets(p, CA_PROP_WINDOW_ICON_NAME, t)) < 0) + return ret; - if (dw) { - gint desktop = window_get_desktop(display, dw); + if (GTK_WIDGET_REALIZED(GTK_WIDGET(w))) { + GdkWindow *dw = NULL; + GdkScreen *screen = NULL; + GdkDisplay *display = NULL; + gint x = -1, y = -1, width = -1, height = -1, screen_width = -1, screen_height = -1; - if (desktop >= 0) - if ((ret = ca_proplist_setf(p, CA_PROP_WINDOW_DESKTOP, "%i", desktop)) < 0) - return ret; - } - } + if ((dw = gtk_widget_get_window(GTK_WIDGET(w)))) + if ((ret = ca_proplist_setf(p, CA_PROP_WINDOW_X11_XID, "%lu", (unsigned long) GDK_WINDOW_XID(dw))) < 0) + return ret; - if ((screen = gtk_widget_get_screen(GTK_WIDGET(w)))) { + if ((display = gtk_widget_get_display(GTK_WIDGET(w)))) { + if ((t = gdk_display_get_name(display))) + if ((ret = ca_proplist_sets(p, CA_PROP_WINDOW_X11_DISPLAY, t)) < 0) + return ret; - if ((ret = ca_proplist_setf(p, CA_PROP_WINDOW_X11_SCREEN, "%i", gdk_screen_get_number(screen))) < 0) - return ret; + if (dw) { + gint desktop = window_get_desktop(display, dw); - if (dw) - if ((ret = ca_proplist_setf(p, CA_PROP_WINDOW_X11_MONITOR, "%i", gdk_screen_get_monitor_at_window(screen, dw))) < 0) - return ret; - } + if (desktop >= 0) + if ((ret = ca_proplist_setf(p, CA_PROP_WINDOW_DESKTOP, "%i", desktop)) < 0) + return ret; + } + } - /* FIXME, this might cause a round trip */ + if ((screen = gtk_widget_get_screen(GTK_WIDGET(w)))) { - if (dw) { - gdk_window_get_origin(dw, &x, &y); + if ((ret = ca_proplist_setf(p, CA_PROP_WINDOW_X11_SCREEN, "%i", gdk_screen_get_number(screen))) < 0) + return ret; - if (x >= 0) - if ((ret = ca_proplist_setf(p, CA_PROP_WINDOW_X, "%i", x)) < 0) - return ret; - if (y >= 0) - if ((ret = ca_proplist_setf(p, CA_PROP_WINDOW_Y, "%i", y)) < 0) - return ret; - } + if (dw) + if ((ret = ca_proplist_setf(p, CA_PROP_WINDOW_X11_MONITOR, "%i", gdk_screen_get_monitor_at_window(screen, dw))) < 0) + return ret; + } - gtk_window_get_size(w, &width, &height); + /* FIXME, this might cause a round trip */ - if (width > 0) - if ((ret = ca_proplist_setf(p, CA_PROP_WINDOW_WIDTH, "%i", width)) < 0) - return ret; - if (height > 0) - if ((ret = ca_proplist_setf(p, CA_PROP_WINDOW_HEIGHT, "%i", height)) < 0) - return ret; + if (dw) { + gdk_window_get_origin(dw, &x, &y); - if (x >= 0 && width > 0) { - screen_width = gdk_screen_get_width(gtk_widget_get_screen(GTK_WIDGET(w))); + if (x >= 0) + if ((ret = ca_proplist_setf(p, CA_PROP_WINDOW_X, "%i", x)) < 0) + return ret; + if (y >= 0) + if ((ret = ca_proplist_setf(p, CA_PROP_WINDOW_Y, "%i", y)) < 0) + return ret; + } - x += width/2; - x = CA_CLAMP(x, 0, screen_width-1); + gtk_window_get_size(w, &width, &height); - /* We use these strange format strings here to avoid that libc - * applies locale information on the formatting of floating - * numbers. */ + if (width > 0) + if ((ret = ca_proplist_setf(p, CA_PROP_WINDOW_WIDTH, "%i", width)) < 0) + return ret; + if (height > 0) + if ((ret = ca_proplist_setf(p, CA_PROP_WINDOW_HEIGHT, "%i", height)) < 0) + return ret; - if ((ret = ca_proplist_setf(p, CA_PROP_WINDOW_HPOS, "%i.%03i", (int) (x/(screen_width-1)), (int) (1000.0*x/(screen_width-1)) % 1000)) < 0) - return ret; - } + if (x >= 0 && width > 0) { + screen_width = gdk_screen_get_width(gtk_widget_get_screen(GTK_WIDGET(w))); - if (y >= 0 && height > 0) { - screen_height = gdk_screen_get_height(gtk_widget_get_screen(GTK_WIDGET(w))); + x += width/2; + x = CA_CLAMP(x, 0, screen_width-1); - y += height/2; - y = CA_CLAMP(y, 0, screen_height-1); + /* We use these strange format strings here to avoid that libc + * applies locale information on the formatting of floating + * numbers. */ - if ((ret = ca_proplist_setf(p, CA_PROP_WINDOW_VPOS, "%i.%03i", (int) (y/(screen_height-1)), (int) (1000.0*y/(screen_height-1)) % 1000)) < 0) - return ret; + if ((ret = ca_proplist_setf(p, CA_PROP_WINDOW_HPOS, "%i.%03i", + (int) (x/(screen_width-1)), (int) (1000.0*x/(screen_width-1)) % 1000)) < 0) + return ret; + } + + if (y >= 0 && height > 0) { + screen_height = gdk_screen_get_height(gtk_widget_get_screen(GTK_WIDGET(w))); + + y += height/2; + y = CA_CLAMP(y, 0, screen_height-1); + + if ((ret = ca_proplist_setf(p, CA_PROP_WINDOW_VPOS, "%i.%03i", + (int) (y/(screen_height-1)), (int) (1000.0*y/(screen_height-1)) % 1000)) < 0) + return ret; + } } - } - return CA_SUCCESS; + return CA_SUCCESS; } /** @@ -341,59 +345,61 @@ int ca_gtk_proplist_set_for_widget(ca_proplist *p, GtkWidget *widget) { */ int ca_gtk_proplist_set_for_event(ca_proplist *p, GdkEvent *e) { - gdouble x, y; - GdkWindow *gw; - GtkWidget *w = NULL; - int ret; + gdouble x, y; + GdkWindow *gw; + GtkWidget *w = NULL; + int ret; - ca_return_val_if_fail(p, CA_ERROR_INVALID); - ca_return_val_if_fail(e, CA_ERROR_INVALID); - ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED); + ca_return_val_if_fail(p, CA_ERROR_INVALID); + ca_return_val_if_fail(e, CA_ERROR_INVALID); + ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED); - if ((gw = e->any.window)) { - gdk_window_get_user_data(gw, (gpointer*) &w); + if ((gw = e->any.window)) { + gdk_window_get_user_data(gw, (gpointer*) &w); - if (w) - if ((ret = ca_gtk_proplist_set_for_widget(p, w)) < 0) - return ret; - } + if (w) + if ((ret = ca_gtk_proplist_set_for_widget(p, w)) < 0) + return ret; + } - if (gdk_event_get_root_coords(e, &x, &y)) { + if (gdk_event_get_root_coords(e, &x, &y)) { - if ((ret = ca_proplist_setf(p, CA_PROP_EVENT_MOUSE_X, "%0.0f", x)) < 0) - return ret; + if ((ret = ca_proplist_setf(p, CA_PROP_EVENT_MOUSE_X, "%0.0f", x)) < 0) + return ret; - if ((ret = ca_proplist_setf(p, CA_PROP_EVENT_MOUSE_Y, "%0.0f", y)) < 0) - return ret; + if ((ret = ca_proplist_setf(p, CA_PROP_EVENT_MOUSE_Y, "%0.0f", y)) < 0) + return ret; - if (w) { - int width, height; + if (w) { + int width, height; - width = gdk_screen_get_width(gtk_widget_get_screen(w)); - height = gdk_screen_get_height(gtk_widget_get_screen(w)); + width = gdk_screen_get_width(gtk_widget_get_screen(w)); + height = gdk_screen_get_height(gtk_widget_get_screen(w)); - /* We use these strange format strings here to avoid that - * libc applies locale information on the formatting of - * floating numbers. */ + /* We use these strange format strings here to avoid that + * libc applies locale information on the formatting of + * floating numbers. */ - if ((ret = ca_proplist_setf(p, CA_PROP_EVENT_MOUSE_HPOS, "%i.%03i", (int) (x/(width-1)), (int) (1000.0*x/(width-1)) % 1000)) < 0) - return ret; + if ((ret = ca_proplist_setf(p, CA_PROP_EVENT_MOUSE_HPOS, "%i.%03i", + (int) (x/(width-1)), (int) (1000.0*x/(width-1)) % 1000)) < 0) + return ret; - if ((ret = ca_proplist_setf(p, CA_PROP_EVENT_MOUSE_VPOS, "%i.%03i", (int) (y/(height-1)), (int) (1000.0*y/(height-1)) % 1000)) < 0) - return ret; + if ((ret = ca_proplist_setf(p, CA_PROP_EVENT_MOUSE_VPOS, "%i.%03i", + (int) (y/(height-1)), (int) (1000.0*y/(height-1)) % 1000)) < 0) + return ret; + } } - } - if (e->type == GDK_BUTTON_PRESS || - e->type == GDK_2BUTTON_PRESS || - e->type == GDK_3BUTTON_PRESS || - e->type == GDK_BUTTON_RELEASE) { + if (e->type == GDK_BUTTON_PRESS || + e->type == GDK_2BUTTON_PRESS || + e->type == GDK_3BUTTON_PRESS || + e->type == GDK_BUTTON_RELEASE) { - if ((ret = ca_proplist_setf(p, CA_PROP_EVENT_MOUSE_BUTTON, "%u", e->button.button)) < 0) - return ret; - } + if ((ret = ca_proplist_setf(p, CA_PROP_EVENT_MOUSE_BUTTON, "%u", e->button.button)) < 0) + return ret; + } - return CA_SUCCESS; + return CA_SUCCESS; } /** @@ -417,35 +423,35 @@ int ca_gtk_proplist_set_for_event(ca_proplist *p, GdkEvent *e) { */ int ca_gtk_play_for_widget(GtkWidget *w, uint32_t id, ...) { - va_list ap; - int ret; - ca_proplist *p; - GdkScreen *s; + va_list ap; + int ret; + ca_proplist *p; + GdkScreen *s; - ca_return_val_if_fail(w, CA_ERROR_INVALID); - ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED); + ca_return_val_if_fail(w, CA_ERROR_INVALID); + ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED); - if ((ret = ca_proplist_create(&p)) < 0) - return ret; + if ((ret = ca_proplist_create(&p)) < 0) + return ret; - if ((ret = ca_gtk_proplist_set_for_widget(p, w)) < 0) - goto fail; + if ((ret = ca_gtk_proplist_set_for_widget(p, w)) < 0) + goto fail; - va_start(ap, id); - ret = ca_proplist_merge_ap(p, ap); - va_end(ap); + va_start(ap, id); + ret = ca_proplist_merge_ap(p, ap); + va_end(ap); - if (ret < 0) - goto fail; + if (ret < 0) + goto fail; - s = gtk_widget_get_screen(w); - ret = ca_context_play_full(ca_gtk_context_get_for_screen(s), id, p, NULL, NULL); + s = gtk_widget_get_screen(w); + ret = ca_context_play_full(ca_gtk_context_get_for_screen(s), id, p, NULL, NULL); fail: - ca_assert_se(ca_proplist_destroy(p) == 0); + ca_assert_se(ca_proplist_destroy(p) == 0); - return ret; + return ret; } /** @@ -469,39 +475,39 @@ fail: */ int ca_gtk_play_for_event(GdkEvent *e, uint32_t id, ...) { - va_list ap; - int ret; - ca_proplist *p; - GdkScreen *s; + va_list ap; + int ret; + ca_proplist *p; + GdkScreen *s; - ca_return_val_if_fail(e, CA_ERROR_INVALID); - ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED); + ca_return_val_if_fail(e, CA_ERROR_INVALID); + ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED); - if ((ret = ca_proplist_create(&p)) < 0) - return ret; + if ((ret = ca_proplist_create(&p)) < 0) + return ret; - if ((ret = ca_gtk_proplist_set_for_event(p, e)) < 0) - goto fail; + if ((ret = ca_gtk_proplist_set_for_event(p, e)) < 0) + goto fail; - va_start(ap, id); - ret = ca_proplist_merge_ap(p, ap); - va_end(ap); + va_start(ap, id); + ret = ca_proplist_merge_ap(p, ap); + va_end(ap); - if (ret < 0) - goto fail; + if (ret < 0) + goto fail; - if (e->any.window) - s = gdk_drawable_get_screen(GDK_DRAWABLE(e->any.window)); - else - s = gdk_screen_get_default(); + if (e->any.window) + s = gdk_drawable_get_screen(GDK_DRAWABLE(e->any.window)); + else + s = gdk_screen_get_default(); - ret = ca_context_play_full(ca_gtk_context_get_for_screen(s), id, p, NULL, NULL); + ret = ca_context_play_full(ca_gtk_context_get_for_screen(s), id, p, NULL, NULL); fail: - ca_assert_se(ca_proplist_destroy(p) == 0); + ca_assert_se(ca_proplist_destroy(p) == 0); - return ret; + return ret; } /** @@ -516,11 +522,11 @@ fail: */ void ca_gtk_widget_disable_sounds(GtkWidget *w, gboolean enable) { - static GQuark disable_sound_quark = 0; + static GQuark disable_sound_quark = 0; - /* This is the same quark used by libgnomeui! */ - if (!disable_sound_quark) - disable_sound_quark = g_quark_from_static_string("gnome_disable_sound_events"); + /* This is the same quark used by libgnomeui! */ + if (!disable_sound_quark) + disable_sound_quark = g_quark_from_static_string("gnome_disable_sound_events"); - g_object_set_qdata(G_OBJECT(w), disable_sound_quark, GINT_TO_POINTER(!!enable)); + g_object_set_qdata(G_OBJECT(w), disable_sound_quark, GINT_TO_POINTER(!!enable)); } |