diff options
| author | monsta <[email protected]> | 2018-01-04 19:20:07 +0300 |
|---|---|---|
| committer | monsta <[email protected]> | 2018-01-04 20:42:59 +0300 |
| commit | 180ba4ae21e8f5bc7d67f4902d0cda6ff053f4b2 (patch) | |
| tree | a779805dce868ef2a7a1bc5fe9e3f5f7e65e056e /mate-panel/libmate-panel-applet-private/panel-applet-container.h | |
| parent | 45a11a76d63de53a556c1f112e7db90e2d8bbf39 (diff) | |
| download | mate-panel-180ba4ae21e8f5bc7d67f4902d0cda6ff053f4b2.tar.bz2 mate-panel-180ba4ae21e8f5bc7d67f4902d0cda6ff053f4b2.tar.xz | |
rework the process of cancelling the background change operation
don't mess with additional references to a GCancellable, instead
keep just a const pointer to the internal operation data and use
it as a key when it's needed to cancel the operation.
fixes https://github.com/mate-desktop/mate-panel/issues/214
fixes https://github.com/mate-desktop/mate-panel/issues/431
Diffstat (limited to 'mate-panel/libmate-panel-applet-private/panel-applet-container.h')
| -rw-r--r-- | mate-panel/libmate-panel-applet-private/panel-applet-container.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mate-panel/libmate-panel-applet-private/panel-applet-container.h b/mate-panel/libmate-panel-applet-private/panel-applet-container.h index 108a38c9..63f5f078 100644 --- a/mate-panel/libmate-panel-applet-private/panel-applet-container.h +++ b/mate-panel/libmate-panel-applet-private/panel-applet-container.h @@ -94,7 +94,7 @@ gboolean mate_panel_applet_container_child_popup_menu_finish (MatePanelAppletC GAsyncResult *result, GError **error); -void mate_panel_applet_container_child_set (MatePanelAppletContainer *container, +gconstpointer mate_panel_applet_container_child_set (MatePanelAppletContainer *container, const gchar *property_name, const GVariant *value, GCancellable *cancellable, @@ -103,7 +103,7 @@ void mate_panel_applet_container_child_set (MatePanelAppletC gboolean mate_panel_applet_container_child_set_finish (MatePanelAppletContainer *container, GAsyncResult *result, GError **error); -void mate_panel_applet_container_child_get (MatePanelAppletContainer *container, +gconstpointer mate_panel_applet_container_child_get (MatePanelAppletContainer *container, const gchar *property_name, GCancellable *cancellable, GAsyncReadyCallback callback, @@ -112,6 +112,9 @@ GVariant *mate_panel_applet_container_child_get_finish (MatePanelAppletC GAsyncResult *result, GError **error); +void mate_panel_applet_container_cancel_operation (MatePanelAppletContainer *container, + gconstpointer operation); + #ifdef __cplusplus } #endif |