uimanager: Work around deprecations

This commit is contained in:
Matthias Clasen 2011-11-09 23:45:58 -05:00
parent a7958f06e3
commit f711da3d1b

View File

@ -422,6 +422,8 @@ static void gtk_ui_manager_buildable_custom_tag_end (GtkBuildable *buildab
GObject *child, GObject *child,
const gchar *tagname, const gchar *tagname,
gpointer *data); gpointer *data);
static void gtk_ui_manager_do_set_add_tearoffs (GtkUIManager *manager,
gboolean add_tearoffs);
@ -775,7 +777,7 @@ gtk_ui_manager_set_property (GObject *object,
switch (prop_id) switch (prop_id)
{ {
case PROP_ADD_TEAROFFS: case PROP_ADD_TEAROFFS:
gtk_ui_manager_set_add_tearoffs (manager, g_value_get_boolean (value)); gtk_ui_manager_do_set_add_tearoffs (manager, g_value_get_boolean (value));
break; break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@ -903,6 +905,13 @@ gtk_ui_manager_set_add_tearoffs (GtkUIManager *manager,
{ {
g_return_if_fail (GTK_IS_UI_MANAGER (manager)); g_return_if_fail (GTK_IS_UI_MANAGER (manager));
gtk_ui_manager_do_set_add_tearoffs (manager, add_tearoffs);
}
static void
gtk_ui_manager_do_set_add_tearoffs (GtkUIManager *manager,
gboolean add_tearoffs)
{
add_tearoffs = add_tearoffs != FALSE; add_tearoffs = add_tearoffs != FALSE;
if (add_tearoffs != manager->private_data->add_tearoffs) if (add_tearoffs != manager->private_data->add_tearoffs)