Gitiles
Code Review Sign In
review.jami.net / jami-client-macos / 067dec6d4930477d2a766e68c178ca2a825889d8
commit067dec6d4930477d2a766e68c178ca2a825889d8[log] [tgz]
authorKateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com>Fri Jun 30 16:26:18 2017 -0400
committerAnthony Léonard <anthony.leonard@savoirfairelinux.com>Mon Jul 10 12:32:42 2017 -0400
treee06547d3b19a5252aecccfeef71c24da28a3d913
parentfd179e5a5d297c58032696c31636e3d71af1d96c [diff]
SmartList: one entry for Ring and Mac contact

If MAC Address Book is available when user save contact two persons
are created. It may be unclear for user because those entries looks
similar and point to the same ringID. And it could cause other duplication
in future if user will select contact related to Address Book to make
call. This patch use same person for Ring and Mac contact, by assigning
person UID from MAC when user create new contact and also it checks if
person exists before adding new from Mac contacts.

Change-Id: I80daccba1bcbcfc8eed27b6962e692171012fdd9
Reviewed-by: Anthony Léonard <anthony.leonard@savoirfairelinux.com>
2 files changed
tree: e06547d3b19a5252aecccfeef71c24da28a3d913
  1. .tx/
  2. cmake/
  3. data/
  4. sparkle/
  5. src/
  6. ui/
  7. libqrencode
  8. .gitignore
  9. .gitmodules
  10. .gitreview
  11. CMakeLists.txt
  12. COPYING
  13. Credits.rtf
  14. generate-string.sh
  15. README.md
  16. update-translations.sh
README.md

Ring Mac OSX

This is the official Mac port of Ring.

For more information about the ring project, see the following:

AppCIPackaging
Download from ring.cxBuild StatusBuild Status

Requirements

  • Ring daemon
  • libRingClient (Qt5 version)
  • Qt5 Core
  • Cocoa framework

Build instructions

Build Sparkle framework (optional)

Ring can ship with the Sparkle framework to allow automatic app updates. This can be disabled for your custom build by specifying -DENABLE_SPARKLE=false in the cmake phase.

  1. cd sparkle/
  2. git submodule update
  3. cd Sparkle/
  4. make release
  5. A Finder window will popup in the directory where Sparkle has been built. Copy-paste the Sparkle.framework in sparkle/ in our project, or in /Library/Frameworks on your system.

Build Client

  1. mkdir build && cd build

  2. export CMAKE_PREFIX_PATH=<dir_to_qt5>

Now generate an Xcode project with CMake: 3. cmake ../ -DCMAKE_INSTALL_PREFIX=<libringclient_install_path> -G Xcode 4. open Ring.xcodeproj/ 5. Build and run it from Xcode. You can also generate the final Ring.app bundle.

You can also build it from the command line:

  1. cmake ../ -DCMAKE_INSTALL_PREFIX=<libringclient_install_path>
  2. make
  3. open Ring.app/

If you want to create the final app (self-containing .dmg):

  1. make install
  2. cpack -G DragNDrop Ring

Notes:

By default the client version is specified in CMakeLists.txt but it can be overriden by specifying -DRING_VERSION=<num> in the cmake command line.

You can specify a custom ringtone folder containing audio files (only) with -DRINGTONE_DIR option

Debugging

For now, the build type of the client is "Debug" by default, however it is useful to also have the debug symbols of libRingClient. To do this, specify this when compiling libRingClient with '-DCMAKE_BUILD_TYPE=Debug' in the cmake options.