Merge lp://qastaging/~gordallott/unity/rename-ubus-place-view-messages into lp://qastaging/unity

Proposed by Gord Allott
Status: Merged
Approved by: Mirco Müller
Approved revision: no longer in the source branch.
Merged at revision: 1892
Proposed branch: lp://qastaging/~gordallott/unity/rename-ubus-place-view-messages
Merge into: lp://qastaging/unity
Diff against target: 355 lines (+102/-61)
9 files modified
plugins/unityshell/src/DashController.cpp (+5/-3)
plugins/unityshell/src/Launcher.cpp (+53/-32)
plugins/unityshell/src/Launcher.h (+2/-2)
plugins/unityshell/src/PanelMenuView.cpp (+2/-2)
plugins/unityshell/src/PanelView.cpp (+9/-3)
plugins/unityshell/src/ShortcutController.cpp (+1/-1)
plugins/unityshell/src/UBusMessages.h (+5/-3)
plugins/unityshell/src/WindowButtons.cpp (+23/-13)
plugins/unityshell/src/unityshell.cpp (+2/-2)
To merge this branch: bzr merge lp://qastaging/~gordallott/unity/rename-ubus-place-view-messages
Reviewer Review Type Date Requested Status
Mirco Müller (community) Approve
Sam Spilsbury (community) Needs Information
Review via email: mp+89251@code.qastaging.launchpad.net

Description of the change

Small spring cleaning of the ubus message UBUS_PLACE_VIEW_SHOWN/HIDDEN
Replaces it with UBUS_OVERLAY_SHOWN/HIDDEN - also sends along a gvariant that ID's the overlay and sends whether it can
be maximised or not

To post a comment you must log in.
Revision history for this message
Sam Spilsbury (smspillaz) wrote :

8 - ubus_manager_.SendMessage(UBUS_PLACE_VIEW_SHOWN);
9 + GVariant* info = g_variant_new(UBUS_OVERLAY_FORMAT_STRING, "dash", TRUE);
10 + ubus_manager_.SendMessage(UBUS_OVERLAY_SHOWN, info);
11 }
12
18 -
19 - ubus_manager_.SendMessage(UBUS_PLACE_VIEW_HIDDEN);
20 +
21 + GVariant* info = g_variant_new(UBUS_OVERLAY_FORMAT_STRING, "dash", TRUE);
22 + ubus_manager_.SendMessage(UBUS_OVERLAY_HIDDEN, info);
23 }

Who owns the variant here ? It is not being unrefd by the callback nor is it being unreffed post callback ?

review: Needs Information
Revision history for this message
Gord Allott (gordallott) wrote :

> 8 - ubus_manager_.SendMessage(UBUS_PLACE_VIEW_SHOWN);
> 9 + GVariant* info = g_variant_new(UBUS_OVERLAY_FORMAT_STRING, "dash",
> TRUE);
> 10 + ubus_manager_.SendMessage(UBUS_OVERLAY_SHOWN, info);
> 11 }
> 12
> 18 -
> 19 - ubus_manager_.SendMessage(UBUS_PLACE_VIEW_HIDDEN);
> 20 +
> 21 + GVariant* info = g_variant_new(UBUS_OVERLAY_FORMAT_STRING, "dash",
> TRUE);
> 22 + ubus_manager_.SendMessage(UBUS_OVERLAY_HIDDEN, info);
> 23 }
>
> Who owns the variant here ? It is not being unrefd by the callback nor is it
> being unreffed post callback ?

ubus does - i wrote ubus ;) it frees the variants

Revision history for this message
Mirco Müller (macslow) wrote :

There is a merge-conflict with current unity trunk. In trunk the file...

  plugins/unityshell/src/PlacesHomeView.cpp

... was removed. But it's still there in your branch. You need to merge your branch with trunk again.

review: Needs Fixing
Revision history for this message
Mirco Müller (macslow) wrote :

Looking good now.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.