[evolution-kolab/ek-wip-acl: 6/6] EPlugin: use the metadata and ACL query / UI update stubs
- From: Christian Hilberg <chilberg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-kolab/ek-wip-acl: 6/6] EPlugin: use the metadata and ACL query / UI update stubs
- Date: Fri, 10 Aug 2012 09:22:50 +0000 (UTC)
commit 2f486bc6a18dd7957ee791083ef2544f54e1a9db
Author: Christian Hilberg <hilberg kernelconcepts de>
Date: Wed Aug 8 18:10:49 2012 +0200
EPlugin: use the metadata and ACL query / UI update stubs
src/eplugin/e-kolab-plugin-ui.c | 35 ++++++++++++++++++++++++-----------
1 files changed, 24 insertions(+), 11 deletions(-)
---
diff --git a/src/eplugin/e-kolab-plugin-ui.c b/src/eplugin/e-kolab-plugin-ui.c
index 07a1023..41117c0 100644
--- a/src/eplugin/e-kolab-plugin-ui.c
+++ b/src/eplugin/e-kolab-plugin-ui.c
@@ -340,7 +340,8 @@ kolab_folder_prop_ui_dialog_update_from_uidata (KolabFolderPropUIData *uidata)
g_return_if_fail (uidata->widgets != NULL);
g_return_if_fail (GTK_IS_DIALOG (uidata->widgets->dialog));
- g_warning ("%s: FIXME implement me", __func__);
+ e_kolab_folder_metadata_ui_update_from_uidata (uidata->meta_ui_data);
+ e_kolab_folder_permissions_ui_update_from_uidata (uidata->perm_ui_data);
}
static void
@@ -376,14 +377,20 @@ kolab_folder_prop_ui_query_metadata (KolabFolderPropUIData *uidata,
GCancellable *cancellable,
GError **err)
{
+ GError *tmp_err = NULL;
+ gboolean ok = FALSE;
+
g_return_val_if_fail (uidata != NULL, FALSE);
- g_return_val_if_fail (E_IS_SHELL_VIEW (uidata->shell_view), FALSE);
- g_return_val_if_fail (uidata->widgets != NULL, FALSE);
- g_return_val_if_fail (E_IS_ALERT_BAR (uidata->widgets->alert_bar), FALSE);
+ /* cancellable may be NULL */
g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
- g_warning ("%s: FIXME implement me", __func__);
- return TRUE;
+ ok = e_kolab_folder_metadata_ui_query_metadata (uidata->meta_ui_data,
+ cancellable,
+ &tmp_err);
+ if (tmp_err != NULL)
+ g_propagate_error (err, tmp_err);
+
+ return ok;
}
static gboolean
@@ -391,14 +398,20 @@ kolab_folder_prop_ui_query_acl (KolabFolderPropUIData *uidata,
GCancellable *cancellable,
GError **err)
{
+ GError *tmp_err = NULL;
+ gboolean ok = FALSE;
+
g_return_val_if_fail (uidata != NULL, FALSE);
- g_return_val_if_fail (E_IS_SHELL_VIEW (uidata->shell_view), FALSE);
- g_return_val_if_fail (uidata->widgets != NULL, FALSE);
- g_return_val_if_fail (E_IS_ALERT_BAR (uidata->widgets->alert_bar), FALSE);
+ /* cancellable may be NULL */
g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
- g_warning ("%s: FIXME implement me", __func__);
- return TRUE;
+ ok = e_kolab_folder_permissions_ui_query_acl (uidata->perm_ui_data,
+ cancellable,
+ &tmp_err);
+ if (tmp_err != NULL)
+ g_propagate_error (err, tmp_err);
+
+ return ok;
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]