GtkModelButton: fix up naming

The convention we follow is that the PROP_foo define should
match the property name. Therefore, change PROP_MODEL to
PROP_MENU_MODEL to match "menu-model".
This commit is contained in:
Matthias Clasen 2014-02-22 12:08:45 -05:00
parent ac50e4e9df
commit 1de4c698cc

View File

@ -135,7 +135,7 @@ enum
{ {
PROP_0, PROP_0,
PROP_POPUP, PROP_POPUP,
PROP_MODEL, PROP_MENU_MODEL,
PROP_ALIGN_WIDGET, PROP_ALIGN_WIDGET,
PROP_DIRECTION, PROP_DIRECTION,
PROP_USE_POPOVER, PROP_USE_POPOVER,
@ -159,7 +159,7 @@ gtk_menu_button_set_property (GObject *object,
case PROP_POPUP: case PROP_POPUP:
gtk_menu_button_set_popup (self, g_value_get_object (value)); gtk_menu_button_set_popup (self, g_value_get_object (value));
break; break;
case PROP_MODEL: case PROP_MENU_MODEL:
gtk_menu_button_set_menu_model (self, g_value_get_object (value)); gtk_menu_button_set_menu_model (self, g_value_get_object (value));
break; break;
case PROP_ALIGN_WIDGET: case PROP_ALIGN_WIDGET:
@ -192,7 +192,7 @@ gtk_menu_button_get_property (GObject *object,
case PROP_POPUP: case PROP_POPUP:
g_value_set_object (value, priv->menu); g_value_set_object (value, priv->menu);
break; break;
case PROP_MODEL: case PROP_MENU_MODEL:
g_value_set_object (value, priv->model); g_value_set_object (value, priv->model);
break; break;
case PROP_ALIGN_WIDGET: case PROP_ALIGN_WIDGET:
@ -519,7 +519,7 @@ gtk_menu_button_class_init (GtkMenuButtonClass *klass)
* Since: 3.6 * Since: 3.6
*/ */
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_MODEL, PROP_MENU_MODEL,
g_param_spec_object ("menu-model", g_param_spec_object ("menu-model",
P_("Menu model"), P_("Menu model"),
P_("The model from which the popup is made."), P_("The model from which the popup is made."),