Skip to content

clutter: return correct enum type

Thomas H.P. Andersen requested to merge phomes/mutter:fix-enum-warning into master

clutter_event_get_scroll_finish_flags() should return a ClutterScrollFinishFlags but due to what looks like a bad copy/paste it instead returns a ClutterScrollSource on asserts.

The definitions of the enums are these:

typedef enum
{
  CLUTTER_SCROLL_SOURCE_UNKNOWN,
  CLUTTER_SCROLL_SOURCE_WHEEL,
  CLUTTER_SCROLL_SOURCE_FINGER,
  CLUTTER_SCROLL_SOURCE_CONTINUOUS
} ClutterScrollSource;

typedef enum
{
  CLUTTER_SCROLL_FINISHED_NONE       = 0,
  CLUTTER_SCROLL_FINISHED_HORIZONTAL = 1 << 0,
  CLUTTER_SCROLL_FINISHED_VERTICAL   = 1 << 1
} ClutterScrollFinishFlags;

The asserts would only return CLUTTER_SCROLL_SOURCE_UNKNOWN. This is equal to CLUTTER_SCROLL_FINISHED_NONE which this patch uses instead. Thus no functional change is intended. This only fixes a compile warning.

Edited by Thomas H.P. Andersen

Merge request reports