diff options
| -rw-r--r-- | eel/eel-editable-label.c | 16 | ||||
| -rw-r--r-- | eel/eel-labeled-image.c | 2 | ||||
| -rw-r--r-- | src/caja-pathbar.c | 10 | 
3 files changed, 14 insertions, 14 deletions
| diff --git a/eel/eel-editable-label.c b/eel/eel-editable-label.c index 6683b476..af008c56 100644 --- a/eel/eel-editable-label.c +++ b/eel/eel-editable-label.c @@ -94,8 +94,8 @@ static void     eel_editable_label_get_preferred_height    (GtkWidget  static void     eel_editable_label_size_allocate           (GtkWidget             *widget,          GtkAllocation         *allocation); -static void     eel_editable_label_state_changed           (GtkWidget             *widget, -        GtkStateType           state); +static void     eel_editable_label_state_flags_changed     (GtkWidget             *widget, +        GtkStateFlags          state);  static void     eel_editable_label_style_updated           (GtkWidget             *widget); @@ -239,7 +239,7 @@ eel_editable_label_class_init (EelEditableLabelClass *class)      widget_class->get_preferred_width = eel_editable_label_get_preferred_width;      widget_class->get_preferred_height = eel_editable_label_get_preferred_height;      widget_class->size_allocate = eel_editable_label_size_allocate; -    widget_class->state_changed = eel_editable_label_state_changed; +    widget_class->state_flags_changed = eel_editable_label_state_flags_changed;      widget_class->style_updated = eel_editable_label_style_updated;      widget_class->direction_changed = eel_editable_label_direction_changed;      widget_class->draw = eel_editable_label_draw; @@ -1211,8 +1211,8 @@ eel_editable_label_size_allocate (GtkWidget     *widget,  }  static void -eel_editable_label_state_changed (GtkWidget   *widget, -                                  GtkStateType prev_state) +eel_editable_label_state_flags_changed (GtkWidget    *widget, +                                        GtkStateFlags prev_state)  {      EelEditableLabel *label; @@ -1222,8 +1222,8 @@ eel_editable_label_state_changed (GtkWidget   *widget,      if (!gtk_widget_is_sensitive (widget))          eel_editable_label_select_region (label, 0, 0); -    if (GTK_WIDGET_CLASS (eel_editable_label_parent_class)->state_changed) -        GTK_WIDGET_CLASS (eel_editable_label_parent_class)->state_changed (widget, prev_state); +    if (GTK_WIDGET_CLASS (eel_editable_label_parent_class)->state_flags_changed) +        GTK_WIDGET_CLASS (eel_editable_label_parent_class)->state_flags_changed (widget, prev_state);  }  static void @@ -1578,7 +1578,7 @@ eel_editable_label_draw (GtkWidget *widget,          {              gint range[2];              cairo_region_t *clip; -            GtkStateType state; +            GtkStateFlags state;              GdkRGBA background_color;              GdkRGBA *c; diff --git a/eel/eel-labeled-image.c b/eel/eel-labeled-image.c index daa9a866..66880c42 100644 --- a/eel/eel-labeled-image.c +++ b/eel/eel-labeled-image.c @@ -1530,7 +1530,7 @@ void  eel_labeled_image_set_selected (EelLabeledImage *labeled_image,                                  gboolean selected)  { -    GtkStateType state; +    GtkStateFlags state;      g_return_if_fail (EEL_IS_LABELED_IMAGE (labeled_image));      state = selected ? GTK_STATE_FLAG_SELECTED : GTK_STATE_FLAG_NORMAL; diff --git a/src/caja-pathbar.c b/src/caja-pathbar.c index 131a8b1e..e0fb4b3b 100644 --- a/src/caja-pathbar.c +++ b/src/caja-pathbar.c @@ -127,8 +127,8 @@ static gboolean caja_path_bar_slider_button_release    (GtkWidget       *widget,          CajaPathBar *path_bar);  static void     caja_path_bar_grab_notify              (GtkWidget       *widget,          gboolean         was_grabbed); -static void     caja_path_bar_state_changed            (GtkWidget       *widget, -        GtkStateType     previous_state); +static void     caja_path_bar_state_flags_changed      (GtkWidget       *widget, +        GtkStateFlags    previous_state);  static void     caja_path_bar_style_updated            (GtkWidget       *widget); @@ -401,7 +401,7 @@ caja_path_bar_class_init (CajaPathBarClass *path_bar_class)      widget_class->screen_changed = caja_path_bar_screen_changed;      widget_class->grab_notify = caja_path_bar_grab_notify; -    widget_class->state_changed = caja_path_bar_state_changed; +    widget_class->state_flags_changed = caja_path_bar_state_flags_changed;      widget_class->scroll_event = caja_path_bar_scroll;      container_class->add = caja_path_bar_add; @@ -1238,8 +1238,8 @@ caja_path_bar_grab_notify (GtkWidget *widget,  }  static void -caja_path_bar_state_changed (GtkWidget    *widget, -                             GtkStateType  previous_state) +caja_path_bar_state_flags_changed (GtkWidget     *widget, +                                   GtkStateFlags  previous_state)  {      if (!gtk_widget_get_sensitive (widget))      { | 
