diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2010-05-11 10:01:23 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2010-05-11 10:01:23 +0200 |
| commit | 96b296e6b66b13a458846ee2acf575965cff925c (patch) | |
| tree | 8482c40a275a394a98c852a5223315590194ec2a | |
| parent | f1a88ed76b3419d4084e55acbf3a243119731a28 (diff) | |
| download | gstreamer-plugins-bad-96b296e6b66b13a458846ee2acf575965cff925c.tar.gz | |
scaletempo: Don't use deprecated GTK symbols in the demo
| -rw-r--r-- | tests/examples/scaletempo/demo-gui.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/tests/examples/scaletempo/demo-gui.c b/tests/examples/scaletempo/demo-gui.c index 9d5779052..272cf7f6b 100644 --- a/tests/examples/scaletempo/demo-gui.c +++ b/tests/examples/scaletempo/demo-gui.c @@ -725,7 +725,11 @@ create_action (ActionEntry * p) gtk_action_connect_accelerator (p->action); p->button = gtk_button_new (); +#if GTK_CHECK_VERSION (2, 16, 0) + gtk_activatable_set_related_action (GTK_ACTIVATABLE (p->button), p->action); +#else gtk_action_connect_proxy (p->action, p->button); +#endif gtk_button_set_image (GTK_BUTTON (p->button), gtk_action_create_icon (p->action, GTK_ICON_SIZE_BUTTON)); g_signal_connect (G_OBJECT (p->action), "activate", p->callback, p->data); @@ -981,7 +985,12 @@ demo_gui_show_func (DemoGui * gui) gtk_action_set_accel_group (toggle_advanced, accel_group); gtk_action_connect_accelerator (toggle_advanced); gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (toggle_advanced), FALSE); +#if GTK_CHECK_VERSION (2, 16, 0) + gtk_activatable_set_related_action (GTK_ACTIVATABLE (adv_check), + toggle_advanced); +#else gtk_action_connect_proxy (toggle_advanced, adv_check); +#endif g_signal_connect (G_OBJECT (toggle_advanced), "activate", G_CALLBACK (demo_gui_do_toggle_advanced), build_gvalue_array (4, G_TYPE_OBJECT, gui, G_TYPE_OBJECT, stride_ui, G_TYPE_OBJECT, @@ -996,7 +1005,12 @@ demo_gui_show_func (DemoGui * gui) gtk_action_connect_accelerator (toggle_disabled); gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (toggle_disabled), FALSE); disabled_check = gtk_check_button_new (); +#if GTK_CHECK_VERSION (2, 16, 0) + gtk_activatable_set_related_action (GTK_ACTIVATABLE (disabled_check), + toggle_disabled); +#else gtk_action_connect_proxy (toggle_disabled, disabled_check); +#endif g_signal_connect (G_OBJECT (toggle_disabled), "activate", G_CALLBACK (demo_gui_do_toggle_disabled), build_gvalue_array (3, G_TYPE_OBJECT, gui, G_TYPE_OBJECT, toggle_advanced, G_TYPE_OBJECT, |