cleanup: Rename signals/methods that will conflict with Clutter.Actor

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/559
This commit is contained in:
Marco Trevisan (Treviño)
2019-08-28 23:06:14 +03:00
committed by Florian Müllner
parent ab6a629955
commit 0353a5bf2c
8 changed files with 66 additions and 50 deletions

View File

@ -1106,7 +1106,7 @@ var CalendarMessageList = class CalendarMessageList {
visibleId: 0,
emptyChangedId: 0,
canClearChangedId: 0,
keyFocusId: 0
messageFocusedId: 0
};
obj.destroyId = section.actor.connect('destroy', () => {
this._removeSection(section);
@ -1117,8 +1117,8 @@ var CalendarMessageList = class CalendarMessageList {
this._sync.bind(this));
obj.canClearChangedId = section.connect('can-clear-changed',
this._sync.bind(this));
obj.keyFocusId = section.connect('key-focus-in',
this._onKeyFocusIn.bind(this));
obj.messageFocusedId = section.connect('message-focused',
this._onMessageFocused.bind(this));
this._sections.set(section, obj);
this._sectionList.add_actor(section.actor);
@ -1131,15 +1131,15 @@ var CalendarMessageList = class CalendarMessageList {
section.actor.disconnect(obj.visibleId);
section.disconnect(obj.emptyChangedId);
section.disconnect(obj.canClearChangedId);
section.disconnect(obj.keyFocusId);
section.disconnect(obj.messageFocusedId);
this._sections.delete(section);
this._sectionList.remove_actor(section.actor);
this._sync();
}
_onKeyFocusIn(section, actor) {
Util.ensureActorVisibleInScrollView(this._scrollView, actor);
_onMessageFocused(_section, messageActor) {
Util.ensureActorVisibleInScrollView(this._scrollView, messageActor);
}
_sync() {