address-book-service

Merge lp:~renatofilho/address-book-service/create-eds-extension-package into lp:address-book-service

create-eds-extension-package
Merge into trunk

Proposed by Renato Araujo Oliveira Filho on 2016-06-03

Status:	Merged
Approved by:	Bill Filler on 2016-07-11
Approved revision:	214
Merged at revision:	208
Proposed branch:	lp:~renatofilho/address-book-service/create-eds-extension-package
Merge into:	lp:address-book-service
Diff against target:	438 lines (+257/-7) 9 files modified debian/address-book-service.install (+0/-2) debian/control (+23/-0) debian/evolution-data-server-ubuntu-dev.install (+2/-0) debian/evolution-data-server-ubuntu.install (+2/-0) eds-extension/CMakeLists.txt (+12/-1) eds-extension/e-source-ubuntu.c (+181/-1) eds-extension/e-source-ubuntu.h (+9/-0) eds-extension/evolution-data-server-ubuntu.pc.in (+11/-0) eds-extension/module-ubuntu-sources.c (+17/-3)
To merge this branch:	bzr merge lp:~renatofilho/address-book-service/create-eds-extension-package
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
system-apps-ci-bot	continuous-integration		Approve on 2016-07-11
Ken VanDine	packaging	2016-06-03	Approve on 2016-07-11
PS Jenkins bot	continuous-integration		Pending
Review via email: mp+296447@code.launchpad.net

Commit Message

Created a debian package "evolution-data-server-ubuntu" to used by others projects.

lp:~renatofilho/address-book-service/create-eds-extension-package updated on 2016-06-13

208. By Renato Araujo Oliveira Filho on 2016-06-03

Created a debian package "evolution-data-server-ubuntu" to used by others projects.

209. By Renato Araujo Oliveira Filho on 2016-06-03

Fix package build.

210. By Renato Araujo Oliveira Filho on 2016-06-06

Add a 'metatada' field into the ubuntu eds extension.

Allow to use for any arbitrary data.

211. By Renato Araujo Oliveira Filho on 2016-06-07

Avoid warnings when using account-id 0.

212. By Renato Araujo Oliveira Filho on 2016-06-13

Does not delete sources if account-id is 0.

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-06-20:

Download full text (3.3 KiB)

review: Needs Fixing (continuous-integration)

lp:~renatofilho/address-book-service/create-eds-extension-package updated on 2016-06-29

213. By Renato Araujo Oliveira Filho on 2016-06-29: Fix memory leak.

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-06-29:

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-address-book-service-ci/3/rebuild

review: Approve (continuous-integration)

Ken VanDine (ken-vandine) wrote on 2016-07-11:

The description of evolution-data-server-ubuntu-dev is the same as evolution-data-server-ubuntu. You should change it a bit to reflect that it provides files necessary for development.

review: Needs Fixing

lp:~renatofilho/address-book-service/create-eds-extension-package updated on 2016-07-11

214. By Renato Araujo Oliveira Filho on 2016-07-11: Extend dev package description.

Ken VanDine (ken-vandine) wrote on 2016-07-11:

Packaging is good

review: Approve (packaging)

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-07-11:

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-address-book-service-ci/4/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Renato Araujo Oliveira Filho

Ubuntu Phablet Team

 === modified file 'debian/address-book-service.install'
 --- debian/address-book-service.install	2015-10-15 15:26:45 +0000
 +++ debian/address-book-service.install	2016-07-11 14:39:54 +0000
@@ -1,5 +1,3 @@
--usr/lib/*/libubuntu-source-eds.so
--usr/lib/evolution-data-server/registry-modules/module-ubuntu-sources.so
  usr/lib/*/address-book-service/address-book-service
  usr/share/upstart/sessions/address-book-service.conf
  usr/share/locale/*/LC_MESSAGES/address-book-service.mo
 === modified file 'debian/control'
 --- debian/control	2015-10-15 15:26:45 +0000
 +++ debian/control	2016-07-11 14:39:54 +0000
@@ -34,6 +34,7 @@
  Architecture: any
  Multi-Arch: same
  Depends: address-book-updater (= ${binary:Version}),
++         evolution-data-server-ubuntu (= ${binary:Version}),
           evolution-data-server(>= 3.12.11),
           libfolks-eds25,
           ${misc:Depends},
@@ -78,3 +79,25 @@
  Description: Ubuntu contact service updater
   A helper program to update address book service and address book app configuration and sync files.
++Package: evolution-data-server-ubuntu
++Architecture: any
++Multi-Arch: same
++Depends: ${misc:Depends},
++         ${shlibs:Depends},
++Description: EDS extension used by Ubuntu apps
++ An EDS extension used by Ubuntu apps to store metadata about the online account and sync infomation.
++
++Package: evolution-data-server-ubuntu-dev
++Architecture: any
++Multi-Arch: same
++Depends: evolution-data-server-ubuntu (= ${binary:Version}),
++         ${misc:Depends},
++         ${shlibs:Depends},
++Description: EDS extension used by Ubuntu apps
++ An EDS extension used by Ubuntu apps to store metadata about the online account and sync infomation.
++ .
++ This package contains header files for evolution-data-server-ubuntu.
++
++
++
++
 === added file 'debian/evolution-data-server-ubuntu-dev.install'
 --- debian/evolution-data-server-ubuntu-dev.install	1970-01-01 00:00:00 +0000
 +++ debian/evolution-data-server-ubuntu-dev.install	2016-07-11 14:39:54 +0000
@@ -0,0 +1,2 @@
++usr/include/evolution-data-server-ubuntu/e-source-ubuntu.h
++usr/share/pkgconfig/evolution-data-server-ubuntu.pc
 === added file 'debian/evolution-data-server-ubuntu.install'
 --- debian/evolution-data-server-ubuntu.install	1970-01-01 00:00:00 +0000
 +++ debian/evolution-data-server-ubuntu.install	2016-07-11 14:39:54 +0000
@@ -0,0 +1,2 @@
++usr/lib/evolution-data-server/registry-modules/module-ubuntu-sources.so
++usr/lib/*/libubuntu-source-eds.so
 === modified file 'eds-extension/CMakeLists.txt'
 --- eds-extension/CMakeLists.txt	2015-07-13 20:25:36 +0000
 +++ eds-extension/CMakeLists.txt	2016-07-11 14:39:54 +0000
@@ -13,12 +13,17 @@
      OUTPUT_VARIABLE EDS_MODULES_DIR
      OUTPUT_STRIP_TRAILING_WHITESPACE
+ )
++set(UBUNTU_SOURCE_PC_FILE evolution-data-server-ubuntu.pc)
++configure_file(${UBUNTU_SOURCE_PC_FILE}.in ${CMAKE_CURRENT_BINARY_DIR}/${UBUNTU_SOURCE_PC_FILE} @ONLY)
  # Ubuntu Source
  set(UBUNTU_SOURCE_LIB ubuntu-source-eds)
++set(UBUNTU_SOURCE_LIB_HEADERS
++    e-source-ubuntu.h
++)
  set(UBUNTU_SOURCE_LIB_SRCS
      e-source-ubuntu.c
--    e-source-ubuntu.h
++    ${UBUNTU_SOURCE_LIB_HEADERS}
+ )
  add_library(${UBUNTU_SOURCE_LIB} SHARED
      ${UBUNTU_SOURCE_LIB_SRCS}
@@ -32,6 +37,12 @@
  install(TARGETS ${UBUNTU_SOURCE_LIB}
      LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
+ )
++install(FILES ${UBUNTU_SOURCE_LIB_HEADERS}
++    DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/evolution-data-server-ubuntu
++)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${UBUNTU_SOURCE_PC_FILE}
++    DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/pkgconfig/
++)
  # Module Ubuntu Sources
  set(MODULE_UBUNTU_SOURCES  module-ubuntu-sources)
 === modified file 'eds-extension/e-source-ubuntu.c'
 --- eds-extension/e-source-ubuntu.c	2015-07-13 20:25:36 +0000
 +++ eds-extension/e-source-ubuntu.c	2016-07-11 14:39:54 +0000
@@ -39,7 +39,9 @@
      guint account_id;
      gchar *application_id;
      gboolean auto_remove;
++    gboolean writable;
      gchar *provider;
++    gchar *metadata;
      AgAccount *account;
  };
@@ -48,7 +50,9 @@
      PROP_ACCOUNT_ID,
      PROP_APPLICATION_ID,
      PROP_AUTOREMOVE,
--    PROP_ACCOUNT_PROVIDER
++    PROP_ACCOUNT_PROVIDER,
++    PROP_WRITABLE,
++    PROP_METADATA
  };
  G_DEFINE_TYPE (
@@ -77,6 +81,15 @@
              e_source_ubuntu_set_autoremove (E_SOURCE_UBUNTU (object),
                                              g_value_get_boolean (value));
              return;
++        case PROP_WRITABLE:
++            e_source_ubuntu_set_writable (E_SOURCE_UBUNTU (object),
++                                          g_value_get_boolean (value));
++            return;
++
++        case PROP_METADATA:
++            e_source_ubuntu_set_metadata (E_SOURCE_UBUNTU (object),
++                                          g_value_get_string (value));
++            return;
+     }
      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@@ -109,6 +122,15 @@
                                   e_source_ubuntu_dup_account_provider (E_SOURCE_UBUNTU (object)));
              return;
++        case PROP_WRITABLE:
++            g_value_set_boolean (value,
++                                 e_source_ubuntu_get_writable (E_SOURCE_UBUNTU (object)));
++            return;
++
++        case PROP_METADATA:
++            g_value_take_string (value,
++                                 e_source_ubuntu_dup_metadata(E_SOURCE_UBUNTU (object)));
++            return;
+     }
      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@@ -128,6 +150,7 @@
      g_free (priv->application_id);
      g_free (priv->provider);
++    g_free (priv->metadata);
      /* Chain up to parent's finalize() method. */
      G_OBJECT_CLASS (e_source_ubuntu_parent_class)->finalize (object);
@@ -190,6 +213,32 @@
      g_object_class_install_property (
          object_class,
++        PROP_WRITABLE,
++        g_param_spec_boolean (
++            "writable",
++            "Writable source",
++            "Writable source",
++            TRUE,
++            G_PARAM_READWRITE |
++            G_PARAM_CONSTRUCT |
++            G_PARAM_STATIC_STRINGS |
++            E_SOURCE_PARAM_SETTING));
++
++    g_object_class_install_property (
++        object_class,
++        PROP_METADATA,
++        g_param_spec_string (
++            "metadata",
++            "metadata",
++            "Source metadata",
++            NULL,
++            G_PARAM_READWRITE |
++            G_PARAM_CONSTRUCT |
++            G_PARAM_STATIC_STRINGS |
++            E_SOURCE_PARAM_SETTING));
++
++    g_object_class_install_property (
++        object_class,
          PROP_ACCOUNT_PROVIDER,
          g_param_spec_string (
              "account-provider",
@@ -260,6 +309,7 @@
      if (account_id != 0) {
          AgManager *manager = ag_manager_new ();
          extension->priv->account = ag_manager_get_account (manager, account_id);
++        g_object_unref (manager);
+     }
      g_mutex_unlock (&extension->priv->property_lock);
@@ -408,3 +458,133 @@
      g_object_notify (G_OBJECT (extension), "auto-remove");
+ }
++
++/**
++ * e_source_ubuntu_get_writable:
++ * @extension: an #ESourceUbuntu
++ *
++ * This can be used as extra flag.
++ * For example for sources that are created from read-only remote sources.
++ *
++ * Returns: True if the source is marked as writable or False if not.
++ *
++ **/
++gboolean
++e_source_ubuntu_get_writable(ESourceUbuntu *extension)
++{
++    g_return_val_if_fail (E_IS_SOURCE_UBUNTU (extension), FALSE);
++
++    return extension->priv->writable;
++}
++
++/**
++ * e_source_ubuntu_set_writable:
++ * @extension: an #ESourceUbuntu
++ *
++ * This can be used as extra flag.
++ * For example for sources that are created from read-only remote sources.
++ *
++ * Sets if the source should be considered writable or not.
++ *
++ **/
++void
++e_source_ubuntu_set_writable(ESourceUbuntu *extension,
++                               gboolean flag)
++{
++    g_return_if_fail (E_IS_SOURCE_UBUNTU (extension));
++
++    g_mutex_lock (&extension->priv->property_lock);
++
++    if (extension->priv->writable == flag) {
++        g_mutex_unlock (&extension->priv->property_lock);
++        return;
++    }
++
++    extension->priv->writable = flag;
++
++    g_mutex_unlock (&extension->priv->property_lock);
++
++    g_object_notify (G_OBJECT (extension), "writable");
++}
++
++/**
++ * e_source_ubuntu_get_metadata:
++ * @extension: an #ESourceUbuntu
++ *
++ * Returns the metadata string of the application associated
++ * with the #ESource to which @extension belongs. Can be %NULL or an empty
++ * string.
++ *
++ * Returns: the associated metadata
++ *
++ **/
++const gchar *
++e_source_ubuntu_get_metadata (ESourceUbuntu *extension)
++{
++    g_return_val_if_fail (E_IS_SOURCE_UBUNTU (extension), NULL);
++
++    return extension->priv->metadata;
++}
++
++/**
++ * e_source_ubuntu_dup_metadata:
++ * @extension: an #ESourceUbuntu
++ *
++ * Thread-safe variation of e_source_ubuntu_get_metadata().
++ * Use this function when accessing @extension from multiple threads.
++ *
++ * The returned string should be freed with g_free() when no longer needed.
++ *
++ * Returns: a newly-allocated copy of #ESourceUbuntu:metadata
++ *
++ **/
++gchar *
++e_source_ubuntu_dup_metadata (ESourceUbuntu *extension)
++{
++    const gchar *metadata;
++    gchar *duplicate;
++
++    g_return_val_if_fail (E_IS_SOURCE_UBUNTU (extension), NULL);
++
++    g_mutex_lock (&extension->priv->property_lock);
++
++    metadata = e_source_ubuntu_get_metadata(extension);
++    duplicate = g_strdup (metadata);
++
++    g_mutex_unlock (&extension->priv->property_lock);
++
++    return duplicate;
++}
++
++/**
++ * e_source_ubuntu_set_metadata:
++ * @extension: an #ESourceUbuntu
++ * @metadata: (allow-none): the associated metadata, or %NULL
++ *
++ * Sets the metadata associated with the #ESource to which @extension belongs.
++ *
++ * The internal copy of @metadata is automatically stripped of leading
++ * and trailing whitespace.  If the resulting string is empty, %NULL is set
++ * instead.
++ *
++ **/
++void
++e_source_ubuntu_set_metadata (ESourceUbuntu *extension,
++                              const gchar *metadata)
++{
++    g_return_if_fail (E_IS_SOURCE_UBUNTU (extension));
++
++    g_mutex_lock (&extension->priv->property_lock);
++
++    if (g_strcmp0 (extension->priv->metadata, metadata) == 0) {
++        g_mutex_unlock (&extension->priv->property_lock);
++        return;
++    }
++
++    g_free (extension->priv->metadata);
++    extension->priv->metadata = e_util_strdup_strip (metadata);
++
++    g_mutex_unlock (&extension->priv->property_lock);
++
++    g_object_notify (G_OBJECT (extension), "metadata");
++}
 === modified file 'eds-extension/e-source-ubuntu.h'
 --- eds-extension/e-source-ubuntu.h	2015-07-13 20:25:36 +0000
 +++ eds-extension/e-source-ubuntu.h	2016-07-11 14:39:54 +0000
@@ -87,9 +87,18 @@
  void            e_source_ubuntu_set_autoremove      (ESourceUbuntu *extension,
                                                       gboolean flag);
++gboolean        e_source_ubuntu_get_writable        (ESourceUbuntu *extension);
++void            e_source_ubuntu_set_writable        (ESourceUbuntu *extension,
++                                                     gboolean flag);
++
  const gchar *   e_source_ubuntu_get_account_provider(ESourceUbuntu *extension);
  gchar *         e_source_ubuntu_dup_account_provider(ESourceUbuntu *extension);
++const gchar *   e_source_ubuntu_get_metadata        (ESourceUbuntu *extension);
++gchar *         e_source_ubuntu_dup_metadata        (ESourceUbuntu *extension);
++void            e_source_ubuntu_set_metadata        (ESourceUbuntu *extension,
++                                                     const gchar *metadata);
++
  G_END_DECLS
  #endif /* E_SOURCE_UBUNTU_H */
 === added file 'eds-extension/evolution-data-server-ubuntu.pc.in'
 --- eds-extension/evolution-data-server-ubuntu.pc.in	1970-01-01 00:00:00 +0000
 +++ eds-extension/evolution-data-server-ubuntu.pc.in	2016-07-11 14:39:54 +0000
@@ -0,0 +1,11 @@
++libdir=@CMAKE_INSTALL_FULL_LIBDIR@
++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@/evolution-data-server-ubuntu/
++
++Name: evolution-data-server-ubuntu
++Description: EDS extension used by Ubuntu apps
++Version: 1.0
++Libs: -L${libdir} -lubuntu-source-eds
++Cflags: -I${includedir}
++Requires: libedataserver-1.2
++
++
 === modified file 'eds-extension/module-ubuntu-sources.c'
 --- eds-extension/module-ubuntu-sources.c	2015-12-11 18:01:33 +0000
 +++ eds-extension/module-ubuntu-sources.c	2016-07-11 14:39:54 +0000
@@ -128,6 +128,10 @@
      GSList *link;
      GQueue trash = G_QUEUE_INIT;
++    if (ag_account_id == 0) {
++        return;
++    }
++
      server = ubuntu_sources_get_server (extension);
      eds_id_list = g_hash_table_lookup (extension->uoa_to_eds,
@@ -166,19 +170,25 @@
+ {
      ESourceUbuntu *ubuntu_ext;
      AgAccountId ag_account_id;
--    AgAccount *ag_account;
++    AgAccount *ag_account = NULL;
      g_debug("Register new source: %s/%s", e_source_get_display_name(source),
              e_source_get_uid(source));
      if (!e_source_has_extension (source, E_SOURCE_EXTENSION_UBUNTU)) {
++        g_debug("\tSource does not have ubuntu extension!");
          return FALSE;
+     }
      ubuntu_ext = e_source_get_extension (source, E_SOURCE_EXTENSION_UBUNTU);
      ag_account_id = e_source_ubuntu_get_account_id (ubuntu_ext);
--    ag_account = ag_manager_get_account (extension->ag_manager,
--                                         ag_account_id);
++    if (ag_account_id > 0) {
++        ag_account = ag_manager_get_account (extension->ag_manager,
++                                             ag_account_id);
++    } else {
++        // accept sources with empty account
++        return TRUE;
++    }
      if (ag_account) {
          GSList *eds_id_list;
@@ -300,6 +310,9 @@
+ {
      g_debug("loading ubuntu sources");
++    if (extension->ag_manager != NULL)
++        return;
++
      extension->ag_manager = ag_manager_new ();
      /* This populates a hash table of UOA ID -> ESource UID strings by
@@ -410,6 +423,7 @@
  static void
  e_ubuntu_sources_init (EUbuntuSources *extension)
+ {
++    extension->ag_manager = NULL;
      extension->uoa_to_eds = g_hash_table_new_full (
          (GHashFunc) g_direct_hash,
          (GEqualFunc) g_direct_equal,

address-book-service

Merge lp:~renatofilho/address-book-service/create-eds-extension-package into lp:address-book-service

Commit Message

Description of the Change

Preview Diff

Subscribers